diff --git a/firmware/config/boards/cypress/config/controllers/algo/engine_configuration_generated_structures_cypress.h b/firmware/config/boards/cypress/config/controllers/algo/engine_configuration_generated_structures_cypress.h index 5396910467..96367b2de7 100644 --- a/firmware/config/boards/cypress/config/controllers/algo/engine_configuration_generated_structures_cypress.h +++ b/firmware/config/boards/cypress/config/controllers/algo/engine_configuration_generated_structures_cypress.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:05:05 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:40:35 UTC 2024 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -4649,11 +4649,9 @@ struct blend_table_s { */ gppwm_channel_e blendParameter; /** - * need 4 byte alignment - * units: units * offset 161 */ - uint8_t alignmentFill_at_161[1]; + gppwm_channel_e yAxisOverride; /** * offset 162 */ @@ -5530,4 +5528,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22176); // end -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:05:05 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:40:35 UTC 2024 diff --git a/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated_cypress.h b/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated_cypress.h index 69cf6f597e..b3d9705f49 100644 --- a/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated_cypress.h +++ b/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated_cypress.h @@ -831,7 +831,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 781393164 +#define SIGNATURE_HASH 2721864336 #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" @@ -1149,7 +1149,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.2024.01.17.cypress.781393164" +#define TS_SIGNATURE "rusEFI master.2024.01.17.cypress.2721864336" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures_kin.h b/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures_kin.h index 946d5cc034..3709ce399e 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures_kin.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures_kin.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:05:04 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:40:34 UTC 2024 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -4649,11 +4649,9 @@ struct blend_table_s { */ gppwm_channel_e blendParameter; /** - * need 4 byte alignment - * units: units * offset 161 */ - uint8_t alignmentFill_at_161[1]; + gppwm_channel_e yAxisOverride; /** * offset 162 */ @@ -5530,4 +5528,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 20800); // end -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:05:04 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:40:34 UTC 2024 diff --git a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated_kin.h b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated_kin.h index bcbe0d8486..f070919bc6 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated_kin.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated_kin.h @@ -831,7 +831,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 1816320674 +#define SIGNATURE_HASH 3773668670 #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" @@ -1149,7 +1149,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.2024.01.17.kin.1816320674" +#define TS_SIGNATURE "rusEFI master.2024.01.17.kin.3773668670" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/config/boards/subaru_eg33/config/controllers/algo/engine_configuration_generated_structures_subaru_eg33_f7.h b/firmware/config/boards/subaru_eg33/config/controllers/algo/engine_configuration_generated_structures_subaru_eg33_f7.h index 1040f27808..908da9cb64 100644 --- a/firmware/config/boards/subaru_eg33/config/controllers/algo/engine_configuration_generated_structures_subaru_eg33_f7.h +++ b/firmware/config/boards/subaru_eg33/config/controllers/algo/engine_configuration_generated_structures_subaru_eg33_f7.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:05:06 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:40:36 UTC 2024 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -4649,11 +4649,9 @@ struct blend_table_s { */ gppwm_channel_e blendParameter; /** - * need 4 byte alignment - * units: units * offset 161 */ - uint8_t alignmentFill_at_161[1]; + gppwm_channel_e yAxisOverride; /** * offset 162 */ @@ -5530,4 +5528,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22176); // end -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:05:06 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:40:36 UTC 2024 diff --git a/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated_subaru_eg33_f7.h b/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated_subaru_eg33_f7.h index 497e512093..fb5eaf12b4 100644 --- a/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated_subaru_eg33_f7.h +++ b/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated_subaru_eg33_f7.h @@ -1068,7 +1068,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 2641693668 +#define SIGNATURE_HASH 299519096 #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" @@ -1386,7 +1386,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.2024.01.17.subaru_eg33_f7.2641693668" +#define TS_SIGNATURE "rusEFI master.2024.01.17.subaru_eg33_f7.299519096" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_alphax-2chan.h b/firmware/controllers/generated/engine_configuration_generated_structures_alphax-2chan.h index cb9630dd05..e9ba4bff36 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_alphax-2chan.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_alphax-2chan.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:05:08 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:40:39 UTC 2024 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -4649,11 +4649,9 @@ struct blend_table_s { */ gppwm_channel_e blendParameter; /** - * need 4 byte alignment - * units: units * offset 161 */ - uint8_t alignmentFill_at_161[1]; + gppwm_channel_e yAxisOverride; /** * offset 162 */ @@ -5530,4 +5528,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22176); // end -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:05:08 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:40:39 UTC 2024 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_alphax-4chan.h b/firmware/controllers/generated/engine_configuration_generated_structures_alphax-4chan.h index 7c72031bf1..0961b4c7ee 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_alphax-4chan.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_alphax-4chan.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:05:11 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:40:42 UTC 2024 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -4649,11 +4649,9 @@ struct blend_table_s { */ gppwm_channel_e blendParameter; /** - * need 4 byte alignment - * units: units * offset 161 */ - uint8_t alignmentFill_at_161[1]; + gppwm_channel_e yAxisOverride; /** * offset 162 */ @@ -5530,4 +5528,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22176); // end -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:05:11 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:40:42 UTC 2024 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_alphax-4chan_f7.h b/firmware/controllers/generated/engine_configuration_generated_structures_alphax-4chan_f7.h index f7a0d2ee9a..93902c7f23 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_alphax-4chan_f7.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_alphax-4chan_f7.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:05:14 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:40:45 UTC 2024 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -4649,11 +4649,9 @@ struct blend_table_s { */ gppwm_channel_e blendParameter; /** - * need 4 byte alignment - * units: units * offset 161 */ - uint8_t alignmentFill_at_161[1]; + gppwm_channel_e yAxisOverride; /** * offset 162 */ @@ -5530,4 +5528,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22176); // end -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:05:14 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:40:45 UTC 2024 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_alphax-8chan-revA.h b/firmware/controllers/generated/engine_configuration_generated_structures_alphax-8chan-revA.h index 493a3661a5..04c5547dea 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_alphax-8chan-revA.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_alphax-8chan-revA.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:05:22 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:40:53 UTC 2024 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -4649,11 +4649,9 @@ struct blend_table_s { */ gppwm_channel_e blendParameter; /** - * need 4 byte alignment - * units: units * offset 161 */ - uint8_t alignmentFill_at_161[1]; + gppwm_channel_e yAxisOverride; /** * offset 162 */ @@ -5530,4 +5528,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22176); // end -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:05:22 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:40:53 UTC 2024 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_alphax-8chan.h b/firmware/controllers/generated/engine_configuration_generated_structures_alphax-8chan.h index ea3bfda928..8182a1274a 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_alphax-8chan.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_alphax-8chan.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:05:17 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:40:47 UTC 2024 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -4649,11 +4649,9 @@ struct blend_table_s { */ gppwm_channel_e blendParameter; /** - * need 4 byte alignment - * units: units * offset 161 */ - uint8_t alignmentFill_at_161[1]; + gppwm_channel_e yAxisOverride; /** * offset 162 */ @@ -5530,4 +5528,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22192); // end -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:05:17 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:40:47 UTC 2024 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_alphax-8chan_f7.h b/firmware/controllers/generated/engine_configuration_generated_structures_alphax-8chan_f7.h index 36427e02ba..76278cfe3d 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_alphax-8chan_f7.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_alphax-8chan_f7.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:05:19 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:40:50 UTC 2024 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -4649,11 +4649,9 @@ struct blend_table_s { */ gppwm_channel_e blendParameter; /** - * need 4 byte alignment - * units: units * offset 161 */ - uint8_t alignmentFill_at_161[1]; + gppwm_channel_e yAxisOverride; /** * offset 162 */ @@ -5530,4 +5528,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22192); // end -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:05:19 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:40:50 UTC 2024 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_at_start_f435.h b/firmware/controllers/generated/engine_configuration_generated_structures_at_start_f435.h index 706fc771f9..95e3745b7f 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_at_start_f435.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_at_start_f435.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:06:52 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:42:22 UTC 2024 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -4649,11 +4649,9 @@ struct blend_table_s { */ gppwm_channel_e blendParameter; /** - * need 4 byte alignment - * units: units * offset 161 */ - uint8_t alignmentFill_at_161[1]; + gppwm_channel_e yAxisOverride; /** * offset 162 */ @@ -5530,4 +5528,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22176); // end -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:06:52 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:42:22 UTC 2024 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_atlas.h b/firmware/controllers/generated/engine_configuration_generated_structures_atlas.h index 0091d89d14..10fd214289 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_atlas.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_atlas.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:06:45 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:42:15 UTC 2024 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -4649,11 +4649,9 @@ struct blend_table_s { */ gppwm_channel_e blendParameter; /** - * need 4 byte alignment - * units: units * offset 161 */ - uint8_t alignmentFill_at_161[1]; + gppwm_channel_e yAxisOverride; /** * offset 162 */ @@ -5530,4 +5528,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 21676); // end -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:06:45 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:42:15 UTC 2024 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_f407-discovery.h b/firmware/controllers/generated/engine_configuration_generated_structures_f407-discovery.h index 407ab27320..6200fd599a 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_f407-discovery.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_f407-discovery.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:06:50 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:42:20 UTC 2024 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -4649,11 +4649,9 @@ struct blend_table_s { */ gppwm_channel_e blendParameter; /** - * need 4 byte alignment - * units: units * offset 161 */ - uint8_t alignmentFill_at_161[1]; + gppwm_channel_e yAxisOverride; /** * offset 162 */ @@ -5530,4 +5528,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22176); // end -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:06:50 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:42:20 UTC 2024 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_f429-discovery.h b/firmware/controllers/generated/engine_configuration_generated_structures_f429-discovery.h index d5a62b6542..99dcc35c97 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_f429-discovery.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_f429-discovery.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:06:30 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:42:01 UTC 2024 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -4649,11 +4649,9 @@ struct blend_table_s { */ gppwm_channel_e blendParameter; /** - * need 4 byte alignment - * units: units * offset 161 */ - uint8_t alignmentFill_at_161[1]; + gppwm_channel_e yAxisOverride; /** * offset 162 */ @@ -5530,4 +5528,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22176); // end -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:06:30 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:42:01 UTC 2024 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_f469-discovery.h b/firmware/controllers/generated/engine_configuration_generated_structures_f469-discovery.h index 346cdb3252..41dbf86f4e 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_f469-discovery.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_f469-discovery.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:06:33 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:42:03 UTC 2024 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -4649,11 +4649,9 @@ struct blend_table_s { */ gppwm_channel_e blendParameter; /** - * need 4 byte alignment - * units: units * offset 161 */ - uint8_t alignmentFill_at_161[1]; + gppwm_channel_e yAxisOverride; /** * offset 162 */ @@ -5530,4 +5528,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22176); // end -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:06:33 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:42:03 UTC 2024 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_frankenso_na6.h b/firmware/controllers/generated/engine_configuration_generated_structures_frankenso_na6.h index c87589deba..c555485a84 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_frankenso_na6.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_frankenso_na6.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:06:15 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:41:46 UTC 2024 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -4649,11 +4649,9 @@ struct blend_table_s { */ gppwm_channel_e blendParameter; /** - * need 4 byte alignment - * units: units * offset 161 */ - uint8_t alignmentFill_at_161[1]; + gppwm_channel_e yAxisOverride; /** * offset 162 */ @@ -5530,4 +5528,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22176); // end -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:06:15 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:41:46 UTC 2024 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_hellen-112-17.h b/firmware/controllers/generated/engine_configuration_generated_structures_hellen-112-17.h index ff261284d1..36261e5142 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_hellen-112-17.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_hellen-112-17.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:05:43 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:41:13 UTC 2024 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -4649,11 +4649,9 @@ struct blend_table_s { */ gppwm_channel_e blendParameter; /** - * need 4 byte alignment - * units: units * offset 161 */ - uint8_t alignmentFill_at_161[1]; + gppwm_channel_e yAxisOverride; /** * offset 162 */ @@ -5530,4 +5528,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22176); // end -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:05:43 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:41:13 UTC 2024 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_hellen-gm-e67.h b/firmware/controllers/generated/engine_configuration_generated_structures_hellen-gm-e67.h index 7d554768b6..8254a64206 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_hellen-gm-e67.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_hellen-gm-e67.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:05:53 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:41:24 UTC 2024 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -4649,11 +4649,9 @@ struct blend_table_s { */ gppwm_channel_e blendParameter; /** - * need 4 byte alignment - * units: units * offset 161 */ - uint8_t alignmentFill_at_161[1]; + gppwm_channel_e yAxisOverride; /** * offset 162 */ @@ -5530,4 +5528,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22176); // end -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:05:53 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:41:24 UTC 2024 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_hellen-honda-k.h b/firmware/controllers/generated/engine_configuration_generated_structures_hellen-honda-k.h index 2bcd87c745..4318c2d343 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_hellen-honda-k.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_hellen-honda-k.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:05:32 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:41:03 UTC 2024 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -4649,11 +4649,9 @@ struct blend_table_s { */ gppwm_channel_e blendParameter; /** - * need 4 byte alignment - * units: units * offset 161 */ - uint8_t alignmentFill_at_161[1]; + gppwm_channel_e yAxisOverride; /** * offset 162 */ @@ -5530,4 +5528,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22848); // end -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:05:32 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:41:03 UTC 2024 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_hellen-nb1.h b/firmware/controllers/generated/engine_configuration_generated_structures_hellen-nb1.h index e555cd7864..1ce720fda6 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_hellen-nb1.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_hellen-nb1.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:05:50 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:41:21 UTC 2024 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -4649,11 +4649,9 @@ struct blend_table_s { */ gppwm_channel_e blendParameter; /** - * need 4 byte alignment - * units: units * offset 161 */ - uint8_t alignmentFill_at_161[1]; + gppwm_channel_e yAxisOverride; /** * offset 162 */ @@ -5530,4 +5528,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22176); // end -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:05:50 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:41:21 UTC 2024 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_hellen121nissan.h b/firmware/controllers/generated/engine_configuration_generated_structures_hellen121nissan.h index 242e07b38f..d4f54a8853 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_hellen121nissan.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_hellen121nissan.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:05:30 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:41:00 UTC 2024 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -4649,11 +4649,9 @@ struct blend_table_s { */ gppwm_channel_e blendParameter; /** - * need 4 byte alignment - * units: units * offset 161 */ - uint8_t alignmentFill_at_161[1]; + gppwm_channel_e yAxisOverride; /** * offset 162 */ @@ -5530,4 +5528,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22176); // end -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:05:30 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:41:00 UTC 2024 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_hellen121vag.h b/firmware/controllers/generated/engine_configuration_generated_structures_hellen121vag.h index 68e7231483..95f643db71 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_hellen121vag.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_hellen121vag.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:05:27 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:40:58 UTC 2024 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -4649,11 +4649,9 @@ struct blend_table_s { */ gppwm_channel_e blendParameter; /** - * need 4 byte alignment - * units: units * offset 161 */ - uint8_t alignmentFill_at_161[1]; + gppwm_channel_e yAxisOverride; /** * offset 162 */ @@ -5530,4 +5528,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22176); // end -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:05:27 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:40:58 UTC 2024 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_hellen128.h b/firmware/controllers/generated/engine_configuration_generated_structures_hellen128.h index dd0798ff40..acbb3369fd 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_hellen128.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_hellen128.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:05:24 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:40:55 UTC 2024 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -4649,11 +4649,9 @@ struct blend_table_s { */ gppwm_channel_e blendParameter; /** - * need 4 byte alignment - * units: units * offset 161 */ - uint8_t alignmentFill_at_161[1]; + gppwm_channel_e yAxisOverride; /** * offset 162 */ @@ -5530,4 +5528,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22176); // end -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:05:24 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:40:55 UTC 2024 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_hellen154hyundai.h b/firmware/controllers/generated/engine_configuration_generated_structures_hellen154hyundai.h index 15cfca25d6..03c0bf0e31 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_hellen154hyundai.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_hellen154hyundai.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:05:35 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:41:05 UTC 2024 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -4649,11 +4649,9 @@ struct blend_table_s { */ gppwm_channel_e blendParameter; /** - * need 4 byte alignment - * units: units * offset 161 */ - uint8_t alignmentFill_at_161[1]; + gppwm_channel_e yAxisOverride; /** * offset 162 */ @@ -5530,4 +5528,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22176); // end -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:05:35 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:41:05 UTC 2024 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_hellen72.h b/firmware/controllers/generated/engine_configuration_generated_structures_hellen72.h index 85c9bd79f1..188bd46b78 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_hellen72.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_hellen72.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:05:45 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:41:16 UTC 2024 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -4649,11 +4649,9 @@ struct blend_table_s { */ gppwm_channel_e blendParameter; /** - * need 4 byte alignment - * units: units * offset 161 */ - uint8_t alignmentFill_at_161[1]; + gppwm_channel_e yAxisOverride; /** * offset 162 */ @@ -5530,4 +5528,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22176); // end -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:05:45 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:41:16 UTC 2024 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_hellen81.h b/firmware/controllers/generated/engine_configuration_generated_structures_hellen81.h index 1c00e10e35..9ea368734d 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_hellen81.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_hellen81.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:05:48 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:41:19 UTC 2024 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -4649,11 +4649,9 @@ struct blend_table_s { */ gppwm_channel_e blendParameter; /** - * need 4 byte alignment - * units: units * offset 161 */ - uint8_t alignmentFill_at_161[1]; + gppwm_channel_e yAxisOverride; /** * offset 162 */ @@ -5530,4 +5528,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22176); // end -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:05:48 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:41:19 UTC 2024 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_hellen88bmw.h b/firmware/controllers/generated/engine_configuration_generated_structures_hellen88bmw.h index ac7d3c80fa..4347c14946 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_hellen88bmw.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_hellen88bmw.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:05:37 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:41:08 UTC 2024 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -4649,11 +4649,9 @@ struct blend_table_s { */ gppwm_channel_e blendParameter; /** - * need 4 byte alignment - * units: units * offset 161 */ - uint8_t alignmentFill_at_161[1]; + gppwm_channel_e yAxisOverride; /** * offset 162 */ @@ -5530,4 +5528,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22176); // end -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:05:37 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:41:08 UTC 2024 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_hellenNA6.h b/firmware/controllers/generated/engine_configuration_generated_structures_hellenNA6.h index cdc4f0920e..4c794bc664 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_hellenNA6.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_hellenNA6.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:05:55 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:41:26 UTC 2024 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -4649,11 +4649,9 @@ struct blend_table_s { */ gppwm_channel_e blendParameter; /** - * need 4 byte alignment - * units: units * offset 161 */ - uint8_t alignmentFill_at_161[1]; + gppwm_channel_e yAxisOverride; /** * offset 162 */ @@ -5530,4 +5528,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22176); // end -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:05:55 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:41:26 UTC 2024 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_hellenNA8_96.h b/firmware/controllers/generated/engine_configuration_generated_structures_hellenNA8_96.h index deb15a409d..b2b699877a 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_hellenNA8_96.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_hellenNA8_96.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:05:58 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:41:29 UTC 2024 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -4649,11 +4649,9 @@ struct blend_table_s { */ gppwm_channel_e blendParameter; /** - * need 4 byte alignment - * units: units * offset 161 */ - uint8_t alignmentFill_at_161[1]; + gppwm_channel_e yAxisOverride; /** * offset 162 */ @@ -5530,4 +5528,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22176); // end -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:05:58 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:41:29 UTC 2024 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_m74_9.h b/firmware/controllers/generated/engine_configuration_generated_structures_m74_9.h index 60bb604ce2..9f6401209a 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_m74_9.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_m74_9.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:06:08 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:41:39 UTC 2024 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -4649,11 +4649,9 @@ struct blend_table_s { */ gppwm_channel_e blendParameter; /** - * need 4 byte alignment - * units: units * offset 161 */ - uint8_t alignmentFill_at_161[1]; + gppwm_channel_e yAxisOverride; /** * offset 162 */ @@ -5530,4 +5528,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22176); // end -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:06:08 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:41:39 UTC 2024 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_mre_f4.h b/firmware/controllers/generated/engine_configuration_generated_structures_mre_f4.h index 49286d33fb..4d4f5a0b52 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_mre_f4.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_mre_f4.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:06:06 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:41:36 UTC 2024 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -4649,11 +4649,9 @@ struct blend_table_s { */ gppwm_channel_e blendParameter; /** - * need 4 byte alignment - * units: units * offset 161 */ - uint8_t alignmentFill_at_161[1]; + gppwm_channel_e yAxisOverride; /** * offset 162 */ @@ -5530,4 +5528,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22176); // end -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:06:06 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:41:36 UTC 2024 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_mre_f7.h b/firmware/controllers/generated/engine_configuration_generated_structures_mre_f7.h index cba06aecd0..8bcbc1c2c0 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_mre_f7.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_mre_f7.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:06:03 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:41:34 UTC 2024 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -4649,11 +4649,9 @@ struct blend_table_s { */ gppwm_channel_e blendParameter; /** - * need 4 byte alignment - * units: units * offset 161 */ - uint8_t alignmentFill_at_161[1]; + gppwm_channel_e yAxisOverride; /** * offset 162 */ @@ -5530,4 +5528,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22176); // end -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:06:03 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:41:34 UTC 2024 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_nucleo_h743.h b/firmware/controllers/generated/engine_configuration_generated_structures_nucleo_h743.h index 88974da9d0..4c33423630 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_nucleo_h743.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_nucleo_h743.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:06:42 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:42:12 UTC 2024 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -4649,11 +4649,9 @@ struct blend_table_s { */ gppwm_channel_e blendParameter; /** - * need 4 byte alignment - * units: units * offset 161 */ - uint8_t alignmentFill_at_161[1]; + gppwm_channel_e yAxisOverride; /** * offset 162 */ @@ -5530,4 +5528,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22176); // end -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:06:42 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:42:12 UTC 2024 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_prometheus_405.h b/firmware/controllers/generated/engine_configuration_generated_structures_prometheus_405.h index 7bba29b986..9171308f8c 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_prometheus_405.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_prometheus_405.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:06:20 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:41:51 UTC 2024 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -4649,11 +4649,9 @@ struct blend_table_s { */ gppwm_channel_e blendParameter; /** - * need 4 byte alignment - * units: units * offset 161 */ - uint8_t alignmentFill_at_161[1]; + gppwm_channel_e yAxisOverride; /** * offset 162 */ @@ -5530,4 +5528,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22176); // end -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:06:20 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:41:51 UTC 2024 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_prometheus_469.h b/firmware/controllers/generated/engine_configuration_generated_structures_prometheus_469.h index 8de6c9e9e7..dd67ffe55f 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_prometheus_469.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_prometheus_469.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:06:18 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:41:48 UTC 2024 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -4649,11 +4649,9 @@ struct blend_table_s { */ gppwm_channel_e blendParameter; /** - * need 4 byte alignment - * units: units * offset 161 */ - uint8_t alignmentFill_at_161[1]; + gppwm_channel_e yAxisOverride; /** * offset 162 */ @@ -5530,4 +5528,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22176); // end -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:06:18 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:41:48 UTC 2024 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_proteus_f4.h b/firmware/controllers/generated/engine_configuration_generated_structures_proteus_f4.h index df266fc5d8..01bce37f7a 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_proteus_f4.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_proteus_f4.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:06:25 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:41:56 UTC 2024 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -4649,11 +4649,9 @@ struct blend_table_s { */ gppwm_channel_e blendParameter; /** - * need 4 byte alignment - * units: units * offset 161 */ - uint8_t alignmentFill_at_161[1]; + gppwm_channel_e yAxisOverride; /** * offset 162 */ @@ -5530,4 +5528,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 26176); // end -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:06:25 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:41:56 UTC 2024 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_proteus_f7.h b/firmware/controllers/generated/engine_configuration_generated_structures_proteus_f7.h index 56d690f19b..5b3eb187e5 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_proteus_f7.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_proteus_f7.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:06:23 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:41:53 UTC 2024 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -4649,11 +4649,9 @@ struct blend_table_s { */ gppwm_channel_e blendParameter; /** - * need 4 byte alignment - * units: units * offset 161 */ - uint8_t alignmentFill_at_161[1]; + gppwm_channel_e yAxisOverride; /** * offset 162 */ @@ -5530,4 +5528,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 26176); // end -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:06:23 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:41:53 UTC 2024 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_proteus_h7.h b/firmware/controllers/generated/engine_configuration_generated_structures_proteus_h7.h index aee455ed25..6545d98964 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_proteus_h7.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_proteus_h7.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:06:28 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:41:58 UTC 2024 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -4649,11 +4649,9 @@ struct blend_table_s { */ gppwm_channel_e blendParameter; /** - * need 4 byte alignment - * units: units * offset 161 */ - uint8_t alignmentFill_at_161[1]; + gppwm_channel_e yAxisOverride; /** * offset 162 */ @@ -5530,4 +5528,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 26176); // end -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:06:28 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:41:58 UTC 2024 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_s105.h b/firmware/controllers/generated/engine_configuration_generated_structures_s105.h index c59752b469..5674494dd3 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_s105.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_s105.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:06:11 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:41:41 UTC 2024 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -4649,11 +4649,9 @@ struct blend_table_s { */ gppwm_channel_e blendParameter; /** - * need 4 byte alignment - * units: units * offset 161 */ - uint8_t alignmentFill_at_161[1]; + gppwm_channel_e yAxisOverride; /** * offset 162 */ @@ -5530,4 +5528,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22176); // end -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:06:11 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:41:41 UTC 2024 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_small-can-board.h b/firmware/controllers/generated/engine_configuration_generated_structures_small-can-board.h index 7863af0fd8..f1f89f7d0b 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_small-can-board.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_small-can-board.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:06:00 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:41:31 UTC 2024 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -4649,11 +4649,9 @@ struct blend_table_s { */ gppwm_channel_e blendParameter; /** - * need 4 byte alignment - * units: units * offset 161 */ - uint8_t alignmentFill_at_161[1]; + gppwm_channel_e yAxisOverride; /** * offset 162 */ @@ -5530,4 +5528,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22176); // end -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:06:00 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:41:31 UTC 2024 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_stm32f413_nucleo.h b/firmware/controllers/generated/engine_configuration_generated_structures_stm32f413_nucleo.h index f7c3c8b03a..a546dad8f0 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_stm32f413_nucleo.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_stm32f413_nucleo.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:06:35 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:42:05 UTC 2024 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -4649,11 +4649,9 @@ struct blend_table_s { */ gppwm_channel_e blendParameter; /** - * need 4 byte alignment - * units: units * offset 161 */ - uint8_t alignmentFill_at_161[1]; + gppwm_channel_e yAxisOverride; /** * offset 162 */ @@ -5530,4 +5528,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22176); // end -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:06:35 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:42:05 UTC 2024 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_stm32f429_nucleo.h b/firmware/controllers/generated/engine_configuration_generated_structures_stm32f429_nucleo.h index 525cb9817f..cc309c6fa8 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_stm32f429_nucleo.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_stm32f429_nucleo.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:06:38 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:42:08 UTC 2024 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -4649,11 +4649,9 @@ struct blend_table_s { */ gppwm_channel_e blendParameter; /** - * need 4 byte alignment - * units: units * offset 161 */ - uint8_t alignmentFill_at_161[1]; + gppwm_channel_e yAxisOverride; /** * offset 162 */ @@ -5530,4 +5528,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22176); // end -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:06:38 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:42:08 UTC 2024 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_stm32f767_nucleo.h b/firmware/controllers/generated/engine_configuration_generated_structures_stm32f767_nucleo.h index 4f759e7828..a10917b7c9 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_stm32f767_nucleo.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_stm32f767_nucleo.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:06:40 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:42:10 UTC 2024 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -4649,11 +4649,9 @@ struct blend_table_s { */ gppwm_channel_e blendParameter; /** - * need 4 byte alignment - * units: units * offset 161 */ - uint8_t alignmentFill_at_161[1]; + gppwm_channel_e yAxisOverride; /** * offset 162 */ @@ -5530,4 +5528,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22176); // end -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:06:40 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:42:10 UTC 2024 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_t-b-g.h b/firmware/controllers/generated/engine_configuration_generated_structures_t-b-g.h index a0fe748e05..1a97984fc5 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_t-b-g.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_t-b-g.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:06:13 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:41:44 UTC 2024 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -4649,11 +4649,9 @@ struct blend_table_s { */ gppwm_channel_e blendParameter; /** - * need 4 byte alignment - * units: units * offset 161 */ - uint8_t alignmentFill_at_161[1]; + gppwm_channel_e yAxisOverride; /** * offset 162 */ @@ -5530,4 +5528,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22176); // end -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:06:13 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:41:44 UTC 2024 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_tdg-pdm8.h b/firmware/controllers/generated/engine_configuration_generated_structures_tdg-pdm8.h index 3a25376e24..8e46e1b99f 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_tdg-pdm8.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_tdg-pdm8.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:06:47 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:42:17 UTC 2024 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -4649,11 +4649,9 @@ struct blend_table_s { */ gppwm_channel_e blendParameter; /** - * need 4 byte alignment - * units: units * offset 161 */ - uint8_t alignmentFill_at_161[1]; + gppwm_channel_e yAxisOverride; /** * offset 162 */ @@ -5530,4 +5528,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22176); // end -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:06:47 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:42:17 UTC 2024 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_uaefi.h b/firmware/controllers/generated/engine_configuration_generated_structures_uaefi.h index ecbaf78c5b..a9b7abf667 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_uaefi.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_uaefi.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:05:40 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:41:11 UTC 2024 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -4649,11 +4649,9 @@ struct blend_table_s { */ gppwm_channel_e blendParameter; /** - * need 4 byte alignment - * units: units * offset 161 */ - uint8_t alignmentFill_at_161[1]; + gppwm_channel_e yAxisOverride; /** * offset 162 */ @@ -5530,4 +5528,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22176); // end -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:05:40 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:41:11 UTC 2024 diff --git a/firmware/controllers/generated/rusefi_generated_alphax-2chan.h b/firmware/controllers/generated/rusefi_generated_alphax-2chan.h index 0bf09b97e4..71ef8b9711 100644 --- a/firmware/controllers/generated/rusefi_generated_alphax-2chan.h +++ b/firmware/controllers/generated/rusefi_generated_alphax-2chan.h @@ -1159,7 +1159,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 1592174859 +#define SIGNATURE_HASH 3528060567 #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" @@ -1477,7 +1477,7 @@ #define ts_show_vr_threshold_2 false #define ts_show_vr_threshold_all true #define ts_show_vr_threshold_pins false -#define TS_SIGNATURE "rusEFI master.2024.01.17.alphax-2chan.1592174859" +#define TS_SIGNATURE "rusEFI master.2024.01.17.alphax-2chan.3528060567" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_alphax-4chan.h b/firmware/controllers/generated/rusefi_generated_alphax-4chan.h index a6380b80ca..f977e37452 100644 --- a/firmware/controllers/generated/rusefi_generated_alphax-4chan.h +++ b/firmware/controllers/generated/rusefi_generated_alphax-4chan.h @@ -1160,7 +1160,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 1035192307 +#define SIGNATURE_HASH 2971435119 #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" @@ -1478,7 +1478,7 @@ #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true #define ts_show_vr_threshold_pins false -#define TS_SIGNATURE "rusEFI master.2024.01.17.alphax-4chan.1035192307" +#define TS_SIGNATURE "rusEFI master.2024.01.17.alphax-4chan.2971435119" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_alphax-4chan_f7.h b/firmware/controllers/generated/rusefi_generated_alphax-4chan_f7.h index 2c832d945e..231401c557 100644 --- a/firmware/controllers/generated/rusefi_generated_alphax-4chan_f7.h +++ b/firmware/controllers/generated/rusefi_generated_alphax-4chan_f7.h @@ -1160,7 +1160,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 1035192307 +#define SIGNATURE_HASH 2971435119 #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" @@ -1478,7 +1478,7 @@ #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true #define ts_show_vr_threshold_pins false -#define TS_SIGNATURE "rusEFI master.2024.01.17.alphax-4chan_f7.1035192307" +#define TS_SIGNATURE "rusEFI master.2024.01.17.alphax-4chan_f7.2971435119" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_alphax-8chan-revA.h b/firmware/controllers/generated/rusefi_generated_alphax-8chan-revA.h index 87712cb193..9c0c6488ba 100644 --- a/firmware/controllers/generated/rusefi_generated_alphax-8chan-revA.h +++ b/firmware/controllers/generated/rusefi_generated_alphax-8chan-revA.h @@ -1159,7 +1159,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 1876173588 +#define SIGNATURE_HASH 3816514696 #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" @@ -1477,7 +1477,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.2024.01.17.alphax-8chan-revA.1876173588" +#define TS_SIGNATURE "rusEFI master.2024.01.17.alphax-8chan-revA.3816514696" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_alphax-8chan.h b/firmware/controllers/generated/rusefi_generated_alphax-8chan.h index 57358b5d4e..d736aba749 100644 --- a/firmware/controllers/generated/rusefi_generated_alphax-8chan.h +++ b/firmware/controllers/generated/rusefi_generated_alphax-8chan.h @@ -1159,7 +1159,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 809234667 +#define SIGNATURE_HASH 3163862903 #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" @@ -1477,7 +1477,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.2024.01.17.alphax-8chan.809234667" +#define TS_SIGNATURE "rusEFI master.2024.01.17.alphax-8chan.3163862903" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_alphax-8chan_f7.h b/firmware/controllers/generated/rusefi_generated_alphax-8chan_f7.h index 57add796e3..14053b11dd 100644 --- a/firmware/controllers/generated/rusefi_generated_alphax-8chan_f7.h +++ b/firmware/controllers/generated/rusefi_generated_alphax-8chan_f7.h @@ -1159,7 +1159,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 809234667 +#define SIGNATURE_HASH 3163862903 #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" @@ -1477,7 +1477,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.2024.01.17.alphax-8chan_f7.809234667" +#define TS_SIGNATURE "rusEFI master.2024.01.17.alphax-8chan_f7.3163862903" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_at_start_f435.h b/firmware/controllers/generated/rusefi_generated_at_start_f435.h index 523e25a5ea..01a26c6d66 100644 --- a/firmware/controllers/generated/rusefi_generated_at_start_f435.h +++ b/firmware/controllers/generated/rusefi_generated_at_start_f435.h @@ -1157,7 +1157,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 781393164 +#define SIGNATURE_HASH 2721864336 #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" @@ -1475,7 +1475,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.2024.01.17.at_start_f435.781393164" +#define TS_SIGNATURE "rusEFI master.2024.01.17.at_start_f435.2721864336" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_atlas.h b/firmware/controllers/generated/rusefi_generated_atlas.h index 6f726339f1..6437af902a 100644 --- a/firmware/controllers/generated/rusefi_generated_atlas.h +++ b/firmware/controllers/generated/rusefi_generated_atlas.h @@ -1157,7 +1157,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 1788135746 +#define SIGNATURE_HASH 3862662878 #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" @@ -1475,7 +1475,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.2024.01.17.atlas.1788135746" +#define TS_SIGNATURE "rusEFI master.2024.01.17.atlas.3862662878" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_f407-discovery.h b/firmware/controllers/generated/rusefi_generated_f407-discovery.h index 04616a00ce..adc65ad2ef 100644 --- a/firmware/controllers/generated/rusefi_generated_f407-discovery.h +++ b/firmware/controllers/generated/rusefi_generated_f407-discovery.h @@ -1157,7 +1157,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets true -#define SIGNATURE_HASH 3431326988 +#define SIGNATURE_HASH 1076535952 #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" @@ -1475,7 +1475,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.2024.01.17.f407-discovery.3431326988" +#define TS_SIGNATURE "rusEFI master.2024.01.17.f407-discovery.1076535952" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_f429-discovery.h b/firmware/controllers/generated/rusefi_generated_f429-discovery.h index 3a1431f459..166ff996c9 100644 --- a/firmware/controllers/generated/rusefi_generated_f429-discovery.h +++ b/firmware/controllers/generated/rusefi_generated_f429-discovery.h @@ -1157,7 +1157,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 781393164 +#define SIGNATURE_HASH 2721864336 #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" @@ -1475,7 +1475,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.2024.01.17.f429-discovery.781393164" +#define TS_SIGNATURE "rusEFI master.2024.01.17.f429-discovery.2721864336" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_f469-discovery.h b/firmware/controllers/generated/rusefi_generated_f469-discovery.h index 36a745239f..fe9be52ed0 100644 --- a/firmware/controllers/generated/rusefi_generated_f469-discovery.h +++ b/firmware/controllers/generated/rusefi_generated_f469-discovery.h @@ -1157,7 +1157,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 474225567 +#define SIGNATURE_HASH 2431343619 #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" @@ -1475,7 +1475,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.2024.01.17.f469-discovery.474225567" +#define TS_SIGNATURE "rusEFI master.2024.01.17.f469-discovery.2431343619" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_frankenso_na6.h b/firmware/controllers/generated/rusefi_generated_frankenso_na6.h index fbda01c429..365a7670df 100644 --- a/firmware/controllers/generated/rusefi_generated_frankenso_na6.h +++ b/firmware/controllers/generated/rusefi_generated_frankenso_na6.h @@ -1157,7 +1157,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets true -#define SIGNATURE_HASH 2137303335 +#define SIGNATURE_HASH 4090228411 #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" @@ -1475,7 +1475,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.2024.01.17.frankenso_na6.2137303335" +#define TS_SIGNATURE "rusEFI master.2024.01.17.frankenso_na6.4090228411" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_hellen-112-17.h b/firmware/controllers/generated/rusefi_generated_hellen-112-17.h index 6ddfc871b9..a276f700fc 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen-112-17.h +++ b/firmware/controllers/generated/rusefi_generated_hellen-112-17.h @@ -1159,7 +1159,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 3884623866 +#define SIGNATURE_HASH 1797644390 #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" @@ -1477,7 +1477,7 @@ #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true -#define TS_SIGNATURE "rusEFI master.2024.01.17.hellen-112-17.3884623866" +#define TS_SIGNATURE "rusEFI master.2024.01.17.hellen-112-17.1797644390" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_hellen-gm-e67.h b/firmware/controllers/generated/rusefi_generated_hellen-gm-e67.h index 1c2ed46969..8367c27092 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen-gm-e67.h +++ b/firmware/controllers/generated/rusefi_generated_hellen-gm-e67.h @@ -1158,7 +1158,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 212776628 +#define SIGNATURE_HASH 2147610920 #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" @@ -1476,7 +1476,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.2024.01.17.hellen-gm-e67.212776628" +#define TS_SIGNATURE "rusEFI master.2024.01.17.hellen-gm-e67.2147610920" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_hellen-honda-k.h b/firmware/controllers/generated/rusefi_generated_hellen-honda-k.h index 0cc16d6281..a53312f32c 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen-honda-k.h +++ b/firmware/controllers/generated/rusefi_generated_hellen-honda-k.h @@ -1158,7 +1158,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 1756954338 +#define SIGNATURE_HASH 3826760062 #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" @@ -1477,7 +1477,7 @@ #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true -#define TS_SIGNATURE "rusEFI master.2024.01.17.hellen-honda-k.1756954338" +#define TS_SIGNATURE "rusEFI master.2024.01.17.hellen-honda-k.3826760062" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_hellen-nb1.h b/firmware/controllers/generated/rusefi_generated_hellen-nb1.h index 00fb001856..746592260f 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen-nb1.h +++ b/firmware/controllers/generated/rusefi_generated_hellen-nb1.h @@ -1159,7 +1159,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 855296709 +#define SIGNATURE_HASH 3193277785 #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" @@ -1477,7 +1477,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.2024.01.17.hellen-nb1.855296709" +#define TS_SIGNATURE "rusEFI master.2024.01.17.hellen-nb1.3193277785" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_hellen121nissan.h b/firmware/controllers/generated/rusefi_generated_hellen121nissan.h index 3d1e484a2e..7bc7a02f79 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen121nissan.h +++ b/firmware/controllers/generated/rusefi_generated_hellen121nissan.h @@ -1158,7 +1158,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 1176766107 +#define SIGNATURE_HASH 3398123783 #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" @@ -1476,7 +1476,7 @@ #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true -#define TS_SIGNATURE "rusEFI master.2024.01.17.hellen121nissan.1176766107" +#define TS_SIGNATURE "rusEFI master.2024.01.17.hellen121nissan.3398123783" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_hellen121vag.h b/firmware/controllers/generated/rusefi_generated_hellen121vag.h index e413d3d437..3a0cd6e75c 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen121vag.h +++ b/firmware/controllers/generated/rusefi_generated_hellen121vag.h @@ -1158,7 +1158,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 518652138 +#define SIGNATURE_HASH 2454013814 #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" @@ -1476,7 +1476,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.2024.01.17.hellen121vag.518652138" +#define TS_SIGNATURE "rusEFI master.2024.01.17.hellen121vag.2454013814" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_hellen128.h b/firmware/controllers/generated/rusefi_generated_hellen128.h index 129dca4843..87137de95a 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen128.h +++ b/firmware/controllers/generated/rusefi_generated_hellen128.h @@ -1158,7 +1158,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 3271636987 +#define SIGNATURE_HASH 1336832103 #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" @@ -1476,7 +1476,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.2024.01.17.hellen128.3271636987" +#define TS_SIGNATURE "rusEFI master.2024.01.17.hellen128.1336832103" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_hellen154hyundai.h b/firmware/controllers/generated/rusefi_generated_hellen154hyundai.h index 79683c2e43..4fa349341c 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen154hyundai.h +++ b/firmware/controllers/generated/rusefi_generated_hellen154hyundai.h @@ -1158,7 +1158,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 2184010421 +#define SIGNATURE_HASH 243408169 #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" @@ -1476,7 +1476,7 @@ #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true -#define TS_SIGNATURE "rusEFI master.2024.01.17.hellen154hyundai.2184010421" +#define TS_SIGNATURE "rusEFI master.2024.01.17.hellen154hyundai.243408169" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_hellen72.h b/firmware/controllers/generated/rusefi_generated_hellen72.h index 8a84e25a7a..6c29d0c3ea 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen72.h +++ b/firmware/controllers/generated/rusefi_generated_hellen72.h @@ -1158,7 +1158,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 2926766480 +#define SIGNATURE_HASH 584953356 #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" @@ -1476,7 +1476,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.2024.01.17.hellen72.2926766480" +#define TS_SIGNATURE "rusEFI master.2024.01.17.hellen72.584953356" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_hellen81.h b/firmware/controllers/generated/rusefi_generated_hellen81.h index 6c80d5faab..11d82112fc 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen81.h +++ b/firmware/controllers/generated/rusefi_generated_hellen81.h @@ -1157,7 +1157,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 1258524138 +#define SIGNATURE_HASH 3349990006 #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" @@ -1475,7 +1475,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.2024.01.17.hellen81.1258524138" +#define TS_SIGNATURE "rusEFI master.2024.01.17.hellen81.3349990006" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_hellen88bmw.h b/firmware/controllers/generated/rusefi_generated_hellen88bmw.h index 5ada9da3a6..435fe65545 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen88bmw.h +++ b/firmware/controllers/generated/rusefi_generated_hellen88bmw.h @@ -1158,7 +1158,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 4196147246 +#define SIGNATURE_HASH 1991468978 #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" @@ -1476,7 +1476,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.2024.01.17.hellen88bmw.4196147246" +#define TS_SIGNATURE "rusEFI master.2024.01.17.hellen88bmw.1991468978" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_hellenNA6.h b/firmware/controllers/generated/rusefi_generated_hellenNA6.h index 9ba8d86839..330d86858e 100644 --- a/firmware/controllers/generated/rusefi_generated_hellenNA6.h +++ b/firmware/controllers/generated/rusefi_generated_hellenNA6.h @@ -1159,7 +1159,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 1447185003 +#define SIGNATURE_HASH 3672968695 #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" @@ -1477,7 +1477,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.2024.01.17.hellenNA6.1447185003" +#define TS_SIGNATURE "rusEFI master.2024.01.17.hellenNA6.3672968695" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_hellenNA8_96.h b/firmware/controllers/generated/rusefi_generated_hellenNA8_96.h index 8b296baf00..27bd8a332a 100644 --- a/firmware/controllers/generated/rusefi_generated_hellenNA8_96.h +++ b/firmware/controllers/generated/rusefi_generated_hellenNA8_96.h @@ -1160,7 +1160,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 1502342915 +#define SIGNATURE_HASH 3575949471 #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" @@ -1478,7 +1478,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.2024.01.17.hellenNA8_96.1502342915" +#define TS_SIGNATURE "rusEFI master.2024.01.17.hellenNA8_96.3575949471" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_m74_9.h b/firmware/controllers/generated/rusefi_generated_m74_9.h index b147183516..5d1ef57fe3 100644 --- a/firmware/controllers/generated/rusefi_generated_m74_9.h +++ b/firmware/controllers/generated/rusefi_generated_m74_9.h @@ -1158,7 +1158,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 1142092327 +#define SIGNATURE_HASH 3367876027 #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" @@ -1477,7 +1477,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.2024.01.17.m74_9.1142092327" +#define TS_SIGNATURE "rusEFI master.2024.01.17.m74_9.3367876027" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_mre_f4.h b/firmware/controllers/generated/rusefi_generated_mre_f4.h index 30fabcb5ac..a6e3788265 100644 --- a/firmware/controllers/generated/rusefi_generated_mre_f4.h +++ b/firmware/controllers/generated/rusefi_generated_mre_f4.h @@ -1158,7 +1158,7 @@ #define show_microRusEFI_presets true #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 1669972886 +#define SIGNATURE_HASH 4012278794 #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" @@ -1476,7 +1476,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.2024.01.17.mre_f4.1669972886" +#define TS_SIGNATURE "rusEFI master.2024.01.17.mre_f4.4012278794" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_mre_f7.h b/firmware/controllers/generated/rusefi_generated_mre_f7.h index feaf77cb4e..e8db6e5652 100644 --- a/firmware/controllers/generated/rusefi_generated_mre_f7.h +++ b/firmware/controllers/generated/rusefi_generated_mre_f7.h @@ -1158,7 +1158,7 @@ #define show_microRusEFI_presets true #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 1669972886 +#define SIGNATURE_HASH 4012278794 #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" @@ -1476,7 +1476,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.2024.01.17.mre_f7.1669972886" +#define TS_SIGNATURE "rusEFI master.2024.01.17.mre_f7.4012278794" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_nucleo_h743.h b/firmware/controllers/generated/rusefi_generated_nucleo_h743.h index 8500bca23d..43dc5e972f 100644 --- a/firmware/controllers/generated/rusefi_generated_nucleo_h743.h +++ b/firmware/controllers/generated/rusefi_generated_nucleo_h743.h @@ -1157,7 +1157,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 781393164 +#define SIGNATURE_HASH 2721864336 #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" @@ -1475,7 +1475,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.2024.01.17.nucleo_h743.781393164" +#define TS_SIGNATURE "rusEFI master.2024.01.17.nucleo_h743.2721864336" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_prometheus_405.h b/firmware/controllers/generated/rusefi_generated_prometheus_405.h index 4663932937..a278ee015a 100644 --- a/firmware/controllers/generated/rusefi_generated_prometheus_405.h +++ b/firmware/controllers/generated/rusefi_generated_prometheus_405.h @@ -1157,7 +1157,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 503828636 +#define SIGNATURE_HASH 2460522240 #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" @@ -1475,7 +1475,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.2024.01.17.prometheus_405.503828636" +#define TS_SIGNATURE "rusEFI master.2024.01.17.prometheus_405.2460522240" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_prometheus_469.h b/firmware/controllers/generated/rusefi_generated_prometheus_469.h index 5b7a2b3f09..9c738a09a4 100644 --- a/firmware/controllers/generated/rusefi_generated_prometheus_469.h +++ b/firmware/controllers/generated/rusefi_generated_prometheus_469.h @@ -1157,7 +1157,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 503828636 +#define SIGNATURE_HASH 2460522240 #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" @@ -1475,7 +1475,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.2024.01.17.prometheus_469.503828636" +#define TS_SIGNATURE "rusEFI master.2024.01.17.prometheus_469.2460522240" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_proteus_f4.h b/firmware/controllers/generated/rusefi_generated_proteus_f4.h index f68d60ca63..e317b14da2 100644 --- a/firmware/controllers/generated/rusefi_generated_proteus_f4.h +++ b/firmware/controllers/generated/rusefi_generated_proteus_f4.h @@ -1157,7 +1157,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets true #define show_test_presets false -#define SIGNATURE_HASH 1173530770 +#define SIGNATURE_HASH 3378376462 #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" @@ -1475,7 +1475,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.2024.01.17.proteus_f4.1173530770" +#define TS_SIGNATURE "rusEFI master.2024.01.17.proteus_f4.3378376462" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_proteus_f7.h b/firmware/controllers/generated/rusefi_generated_proteus_f7.h index 8665c4839e..3423301db4 100644 --- a/firmware/controllers/generated/rusefi_generated_proteus_f7.h +++ b/firmware/controllers/generated/rusefi_generated_proteus_f7.h @@ -1157,7 +1157,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets true #define show_test_presets false -#define SIGNATURE_HASH 1173530770 +#define SIGNATURE_HASH 3378376462 #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" @@ -1475,7 +1475,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.2024.01.17.proteus_f7.1173530770" +#define TS_SIGNATURE "rusEFI master.2024.01.17.proteus_f7.3378376462" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_proteus_h7.h b/firmware/controllers/generated/rusefi_generated_proteus_h7.h index 6cc98a9da5..96f261cc5c 100644 --- a/firmware/controllers/generated/rusefi_generated_proteus_h7.h +++ b/firmware/controllers/generated/rusefi_generated_proteus_h7.h @@ -1157,7 +1157,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets true #define show_test_presets false -#define SIGNATURE_HASH 1173530770 +#define SIGNATURE_HASH 3378376462 #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" @@ -1475,7 +1475,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.2024.01.17.proteus_h7.1173530770" +#define TS_SIGNATURE "rusEFI master.2024.01.17.proteus_h7.3378376462" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_s105.h b/firmware/controllers/generated/rusefi_generated_s105.h index 5dc63fea0c..0ed049d9c1 100644 --- a/firmware/controllers/generated/rusefi_generated_s105.h +++ b/firmware/controllers/generated/rusefi_generated_s105.h @@ -1158,7 +1158,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 2270432330 +#define SIGNATURE_HASH 201018326 #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" @@ -1477,7 +1477,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.2024.01.17.s105.2270432330" +#define TS_SIGNATURE "rusEFI master.2024.01.17.s105.201018326" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_small-can-board.h b/firmware/controllers/generated/rusefi_generated_small-can-board.h index d98e74f356..4936766e05 100644 --- a/firmware/controllers/generated/rusefi_generated_small-can-board.h +++ b/firmware/controllers/generated/rusefi_generated_small-can-board.h @@ -1158,7 +1158,7 @@ #define show_Proteus_presets false #define show_small_can_board_presets true #define show_test_presets false -#define SIGNATURE_HASH 271765893 +#define SIGNATURE_HASH 2627573273 #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" @@ -1476,7 +1476,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.2024.01.17.small-can-board.271765893" +#define TS_SIGNATURE "rusEFI master.2024.01.17.small-can-board.2627573273" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_stm32f413_nucleo.h b/firmware/controllers/generated/rusefi_generated_stm32f413_nucleo.h index a376679d95..5c27d71a64 100644 --- a/firmware/controllers/generated/rusefi_generated_stm32f413_nucleo.h +++ b/firmware/controllers/generated/rusefi_generated_stm32f413_nucleo.h @@ -1157,7 +1157,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 781393164 +#define SIGNATURE_HASH 2721864336 #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" @@ -1475,7 +1475,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.2024.01.17.stm32f413_nucleo.781393164" +#define TS_SIGNATURE "rusEFI master.2024.01.17.stm32f413_nucleo.2721864336" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_stm32f429_nucleo.h b/firmware/controllers/generated/rusefi_generated_stm32f429_nucleo.h index 66f2a99f67..e09bc052cb 100644 --- a/firmware/controllers/generated/rusefi_generated_stm32f429_nucleo.h +++ b/firmware/controllers/generated/rusefi_generated_stm32f429_nucleo.h @@ -1157,7 +1157,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 781393164 +#define SIGNATURE_HASH 2721864336 #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" @@ -1475,7 +1475,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.2024.01.17.stm32f429_nucleo.781393164" +#define TS_SIGNATURE "rusEFI master.2024.01.17.stm32f429_nucleo.2721864336" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_stm32f767_nucleo.h b/firmware/controllers/generated/rusefi_generated_stm32f767_nucleo.h index d75c0744c7..b513f0529f 100644 --- a/firmware/controllers/generated/rusefi_generated_stm32f767_nucleo.h +++ b/firmware/controllers/generated/rusefi_generated_stm32f767_nucleo.h @@ -1157,7 +1157,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 781393164 +#define SIGNATURE_HASH 2721864336 #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" @@ -1475,7 +1475,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.2024.01.17.stm32f767_nucleo.781393164" +#define TS_SIGNATURE "rusEFI master.2024.01.17.stm32f767_nucleo.2721864336" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_t-b-g.h b/firmware/controllers/generated/rusefi_generated_t-b-g.h index cbe51cbbb8..c3c1817d56 100644 --- a/firmware/controllers/generated/rusefi_generated_t-b-g.h +++ b/firmware/controllers/generated/rusefi_generated_t-b-g.h @@ -1157,7 +1157,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 781393164 +#define SIGNATURE_HASH 2721864336 #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" @@ -1475,7 +1475,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.2024.01.17.t-b-g.781393164" +#define TS_SIGNATURE "rusEFI master.2024.01.17.t-b-g.2721864336" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_tdg-pdm8.h b/firmware/controllers/generated/rusefi_generated_tdg-pdm8.h index c4b48962c8..f01b03daf5 100644 --- a/firmware/controllers/generated/rusefi_generated_tdg-pdm8.h +++ b/firmware/controllers/generated/rusefi_generated_tdg-pdm8.h @@ -1157,7 +1157,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 2755473710 +#define SIGNATURE_HASH 680687282 #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" @@ -1475,7 +1475,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.2024.01.17.tdg-pdm8.2755473710" +#define TS_SIGNATURE "rusEFI master.2024.01.17.tdg-pdm8.680687282" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_uaefi.h b/firmware/controllers/generated/rusefi_generated_uaefi.h index e579548cf6..eeabbc6e9e 100644 --- a/firmware/controllers/generated/rusefi_generated_uaefi.h +++ b/firmware/controllers/generated/rusefi_generated_uaefi.h @@ -1159,7 +1159,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 3527289219 +#define SIGNATURE_HASH 1586589215 #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" @@ -1477,7 +1477,7 @@ #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true -#define TS_SIGNATURE "rusEFI master.2024.01.17.uaefi.3527289219" +#define TS_SIGNATURE "rusEFI master.2024.01.17.uaefi.1586589215" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/signature_alphax-2chan.h b/firmware/controllers/generated/signature_alphax-2chan.h index 0d21356fba..5635263d47 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 1592174859 -#define TS_SIGNATURE "rusEFI master.2024.01.17.alphax-2chan.1592174859" +#define SIGNATURE_HASH 3528060567 +#define TS_SIGNATURE "rusEFI master.2024.01.17.alphax-2chan.3528060567" diff --git a/firmware/controllers/generated/signature_alphax-4chan.h b/firmware/controllers/generated/signature_alphax-4chan.h index 222a57b12d..ce0c2256fc 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 1035192307 -#define TS_SIGNATURE "rusEFI master.2024.01.17.alphax-4chan.1035192307" +#define SIGNATURE_HASH 2971435119 +#define TS_SIGNATURE "rusEFI master.2024.01.17.alphax-4chan.2971435119" diff --git a/firmware/controllers/generated/signature_alphax-4chan_f7.h b/firmware/controllers/generated/signature_alphax-4chan_f7.h index fb56e553a0..317eaf6f03 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 1035192307 -#define TS_SIGNATURE "rusEFI master.2024.01.17.alphax-4chan_f7.1035192307" +#define SIGNATURE_HASH 2971435119 +#define TS_SIGNATURE "rusEFI master.2024.01.17.alphax-4chan_f7.2971435119" diff --git a/firmware/controllers/generated/signature_alphax-8chan-revA.h b/firmware/controllers/generated/signature_alphax-8chan-revA.h index 0afcdc978f..018c7feb59 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 1876173588 -#define TS_SIGNATURE "rusEFI master.2024.01.17.alphax-8chan-revA.1876173588" +#define SIGNATURE_HASH 3816514696 +#define TS_SIGNATURE "rusEFI master.2024.01.17.alphax-8chan-revA.3816514696" diff --git a/firmware/controllers/generated/signature_alphax-8chan.h b/firmware/controllers/generated/signature_alphax-8chan.h index 5437aa7f4d..b49935287b 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 809234667 -#define TS_SIGNATURE "rusEFI master.2024.01.17.alphax-8chan.809234667" +#define SIGNATURE_HASH 3163862903 +#define TS_SIGNATURE "rusEFI master.2024.01.17.alphax-8chan.3163862903" diff --git a/firmware/controllers/generated/signature_alphax-8chan_f7.h b/firmware/controllers/generated/signature_alphax-8chan_f7.h index 017b4da331..42ccab42ef 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 809234667 -#define TS_SIGNATURE "rusEFI master.2024.01.17.alphax-8chan_f7.809234667" +#define SIGNATURE_HASH 3163862903 +#define TS_SIGNATURE "rusEFI master.2024.01.17.alphax-8chan_f7.3163862903" diff --git a/firmware/controllers/generated/signature_at_start_f435.h b/firmware/controllers/generated/signature_at_start_f435.h index dc995d9c00..ac03c03caf 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 781393164 -#define TS_SIGNATURE "rusEFI master.2024.01.17.at_start_f435.781393164" +#define SIGNATURE_HASH 2721864336 +#define TS_SIGNATURE "rusEFI master.2024.01.17.at_start_f435.2721864336" diff --git a/firmware/controllers/generated/signature_atlas.h b/firmware/controllers/generated/signature_atlas.h index 32f0b88f11..d7991b84a3 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 1788135746 -#define TS_SIGNATURE "rusEFI master.2024.01.17.atlas.1788135746" +#define SIGNATURE_HASH 3862662878 +#define TS_SIGNATURE "rusEFI master.2024.01.17.atlas.3862662878" diff --git a/firmware/controllers/generated/signature_cypress.h b/firmware/controllers/generated/signature_cypress.h index 9381077f95..e74e96f733 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 781393164 -#define TS_SIGNATURE "rusEFI master.2024.01.17.cypress.781393164" +#define SIGNATURE_HASH 2721864336 +#define TS_SIGNATURE "rusEFI master.2024.01.17.cypress.2721864336" diff --git a/firmware/controllers/generated/signature_f407-discovery.h b/firmware/controllers/generated/signature_f407-discovery.h index 180f200510..b0ef2da0e2 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 3431326988 -#define TS_SIGNATURE "rusEFI master.2024.01.17.f407-discovery.3431326988" +#define SIGNATURE_HASH 1076535952 +#define TS_SIGNATURE "rusEFI master.2024.01.17.f407-discovery.1076535952" diff --git a/firmware/controllers/generated/signature_f429-discovery.h b/firmware/controllers/generated/signature_f429-discovery.h index 75dc2b97ca..2a5d2a194a 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 781393164 -#define TS_SIGNATURE "rusEFI master.2024.01.17.f429-discovery.781393164" +#define SIGNATURE_HASH 2721864336 +#define TS_SIGNATURE "rusEFI master.2024.01.17.f429-discovery.2721864336" diff --git a/firmware/controllers/generated/signature_f469-discovery.h b/firmware/controllers/generated/signature_f469-discovery.h index ca160c42fe..dce39f8419 100644 --- a/firmware/controllers/generated/signature_f469-discovery.h +++ b/firmware/controllers/generated/signature_f469-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 474225567 -#define TS_SIGNATURE "rusEFI master.2024.01.17.f469-discovery.474225567" +#define SIGNATURE_HASH 2431343619 +#define TS_SIGNATURE "rusEFI master.2024.01.17.f469-discovery.2431343619" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index 2afdeadb7d..d8a7a9b0c8 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 2137303335 -#define TS_SIGNATURE "rusEFI master.2024.01.17.frankenso_na6.2137303335" +#define SIGNATURE_HASH 4090228411 +#define TS_SIGNATURE "rusEFI master.2024.01.17.frankenso_na6.4090228411" diff --git a/firmware/controllers/generated/signature_hellen-112-17.h b/firmware/controllers/generated/signature_hellen-112-17.h index 200885b9aa..49ae50464e 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 3884623866 -#define TS_SIGNATURE "rusEFI master.2024.01.17.hellen-112-17.3884623866" +#define SIGNATURE_HASH 1797644390 +#define TS_SIGNATURE "rusEFI master.2024.01.17.hellen-112-17.1797644390" diff --git a/firmware/controllers/generated/signature_hellen-gm-e67.h b/firmware/controllers/generated/signature_hellen-gm-e67.h index 1291ccc800..f6f6e98326 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 212776628 -#define TS_SIGNATURE "rusEFI master.2024.01.17.hellen-gm-e67.212776628" +#define SIGNATURE_HASH 2147610920 +#define TS_SIGNATURE "rusEFI master.2024.01.17.hellen-gm-e67.2147610920" diff --git a/firmware/controllers/generated/signature_hellen-honda-k.h b/firmware/controllers/generated/signature_hellen-honda-k.h index 8c1bcce7de..d19497db6c 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 1756954338 -#define TS_SIGNATURE "rusEFI master.2024.01.17.hellen-honda-k.1756954338" +#define SIGNATURE_HASH 3826760062 +#define TS_SIGNATURE "rusEFI master.2024.01.17.hellen-honda-k.3826760062" diff --git a/firmware/controllers/generated/signature_hellen-nb1.h b/firmware/controllers/generated/signature_hellen-nb1.h index 5f16f4f19e..88c43ccce6 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 855296709 -#define TS_SIGNATURE "rusEFI master.2024.01.17.hellen-nb1.855296709" +#define SIGNATURE_HASH 3193277785 +#define TS_SIGNATURE "rusEFI master.2024.01.17.hellen-nb1.3193277785" diff --git a/firmware/controllers/generated/signature_hellen121nissan.h b/firmware/controllers/generated/signature_hellen121nissan.h index a276c60854..dede4ea6c7 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 1176766107 -#define TS_SIGNATURE "rusEFI master.2024.01.17.hellen121nissan.1176766107" +#define SIGNATURE_HASH 3398123783 +#define TS_SIGNATURE "rusEFI master.2024.01.17.hellen121nissan.3398123783" diff --git a/firmware/controllers/generated/signature_hellen121vag.h b/firmware/controllers/generated/signature_hellen121vag.h index 16461e0fdc..c7b8ec471c 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 518652138 -#define TS_SIGNATURE "rusEFI master.2024.01.17.hellen121vag.518652138" +#define SIGNATURE_HASH 2454013814 +#define TS_SIGNATURE "rusEFI master.2024.01.17.hellen121vag.2454013814" diff --git a/firmware/controllers/generated/signature_hellen128.h b/firmware/controllers/generated/signature_hellen128.h index 37a3a50dde..6ecb4fbbfa 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 3271636987 -#define TS_SIGNATURE "rusEFI master.2024.01.17.hellen128.3271636987" +#define SIGNATURE_HASH 1336832103 +#define TS_SIGNATURE "rusEFI master.2024.01.17.hellen128.1336832103" diff --git a/firmware/controllers/generated/signature_hellen154hyundai.h b/firmware/controllers/generated/signature_hellen154hyundai.h index 1e4fda17e7..b527c953e6 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 2184010421 -#define TS_SIGNATURE "rusEFI master.2024.01.17.hellen154hyundai.2184010421" +#define SIGNATURE_HASH 243408169 +#define TS_SIGNATURE "rusEFI master.2024.01.17.hellen154hyundai.243408169" diff --git a/firmware/controllers/generated/signature_hellen72.h b/firmware/controllers/generated/signature_hellen72.h index 7fc445afef..15d5c9b73b 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 2926766480 -#define TS_SIGNATURE "rusEFI master.2024.01.17.hellen72.2926766480" +#define SIGNATURE_HASH 584953356 +#define TS_SIGNATURE "rusEFI master.2024.01.17.hellen72.584953356" diff --git a/firmware/controllers/generated/signature_hellen81.h b/firmware/controllers/generated/signature_hellen81.h index 4d2e391eb8..07a3f01d7f 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 1258524138 -#define TS_SIGNATURE "rusEFI master.2024.01.17.hellen81.1258524138" +#define SIGNATURE_HASH 3349990006 +#define TS_SIGNATURE "rusEFI master.2024.01.17.hellen81.3349990006" diff --git a/firmware/controllers/generated/signature_hellen88bmw.h b/firmware/controllers/generated/signature_hellen88bmw.h index 8908605ffe..441e2f84ed 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 4196147246 -#define TS_SIGNATURE "rusEFI master.2024.01.17.hellen88bmw.4196147246" +#define SIGNATURE_HASH 1991468978 +#define TS_SIGNATURE "rusEFI master.2024.01.17.hellen88bmw.1991468978" diff --git a/firmware/controllers/generated/signature_hellenNA6.h b/firmware/controllers/generated/signature_hellenNA6.h index f7a3799ae5..d1a9235810 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 1447185003 -#define TS_SIGNATURE "rusEFI master.2024.01.17.hellenNA6.1447185003" +#define SIGNATURE_HASH 3672968695 +#define TS_SIGNATURE "rusEFI master.2024.01.17.hellenNA6.3672968695" diff --git a/firmware/controllers/generated/signature_hellenNA8_96.h b/firmware/controllers/generated/signature_hellenNA8_96.h index 3f4d3453ea..383563c120 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 1502342915 -#define TS_SIGNATURE "rusEFI master.2024.01.17.hellenNA8_96.1502342915" +#define SIGNATURE_HASH 3575949471 +#define TS_SIGNATURE "rusEFI master.2024.01.17.hellenNA8_96.3575949471" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index a418889021..634f23674b 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 1816320674 -#define TS_SIGNATURE "rusEFI master.2024.01.17.kin.1816320674" +#define SIGNATURE_HASH 3773668670 +#define TS_SIGNATURE "rusEFI master.2024.01.17.kin.3773668670" diff --git a/firmware/controllers/generated/signature_m74_9.h b/firmware/controllers/generated/signature_m74_9.h index 2fdb18e5c9..dafa72c4a0 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 1142092327 -#define TS_SIGNATURE "rusEFI master.2024.01.17.m74_9.1142092327" +#define SIGNATURE_HASH 3367876027 +#define TS_SIGNATURE "rusEFI master.2024.01.17.m74_9.3367876027" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index 17cb1edf74..19a2fd1ba2 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 1669972886 -#define TS_SIGNATURE "rusEFI master.2024.01.17.mre_f4.1669972886" +#define SIGNATURE_HASH 4012278794 +#define TS_SIGNATURE "rusEFI master.2024.01.17.mre_f4.4012278794" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index 0fa5816dcb..a10cd21c20 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 1669972886 -#define TS_SIGNATURE "rusEFI master.2024.01.17.mre_f7.1669972886" +#define SIGNATURE_HASH 4012278794 +#define TS_SIGNATURE "rusEFI master.2024.01.17.mre_f7.4012278794" diff --git a/firmware/controllers/generated/signature_nucleo_h743.h b/firmware/controllers/generated/signature_nucleo_h743.h index 273b8001bd..9f0a6009b5 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 781393164 -#define TS_SIGNATURE "rusEFI master.2024.01.17.nucleo_h743.781393164" +#define SIGNATURE_HASH 2721864336 +#define TS_SIGNATURE "rusEFI master.2024.01.17.nucleo_h743.2721864336" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index 5d3d6c3156..8aa88cddb5 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 503828636 -#define TS_SIGNATURE "rusEFI master.2024.01.17.prometheus_405.503828636" +#define SIGNATURE_HASH 2460522240 +#define TS_SIGNATURE "rusEFI master.2024.01.17.prometheus_405.2460522240" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index 203432d910..b65af94ebd 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 503828636 -#define TS_SIGNATURE "rusEFI master.2024.01.17.prometheus_469.503828636" +#define SIGNATURE_HASH 2460522240 +#define TS_SIGNATURE "rusEFI master.2024.01.17.prometheus_469.2460522240" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index 6fe80a02ea..166ac49063 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 1173530770 -#define TS_SIGNATURE "rusEFI master.2024.01.17.proteus_f4.1173530770" +#define SIGNATURE_HASH 3378376462 +#define TS_SIGNATURE "rusEFI master.2024.01.17.proteus_f4.3378376462" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index 90d7d82a37..647ebbb967 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 1173530770 -#define TS_SIGNATURE "rusEFI master.2024.01.17.proteus_f7.1173530770" +#define SIGNATURE_HASH 3378376462 +#define TS_SIGNATURE "rusEFI master.2024.01.17.proteus_f7.3378376462" diff --git a/firmware/controllers/generated/signature_proteus_h7.h b/firmware/controllers/generated/signature_proteus_h7.h index 6666b8ddba..1644a7385a 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 1173530770 -#define TS_SIGNATURE "rusEFI master.2024.01.17.proteus_h7.1173530770" +#define SIGNATURE_HASH 3378376462 +#define TS_SIGNATURE "rusEFI master.2024.01.17.proteus_h7.3378376462" diff --git a/firmware/controllers/generated/signature_s105.h b/firmware/controllers/generated/signature_s105.h index a529f04038..7ea102cd99 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 2270432330 -#define TS_SIGNATURE "rusEFI master.2024.01.17.s105.2270432330" +#define SIGNATURE_HASH 201018326 +#define TS_SIGNATURE "rusEFI master.2024.01.17.s105.201018326" diff --git a/firmware/controllers/generated/signature_small-can-board.h b/firmware/controllers/generated/signature_small-can-board.h index 26ad17ce1b..bb259b3bf0 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 271765893 -#define TS_SIGNATURE "rusEFI master.2024.01.17.small-can-board.271765893" +#define SIGNATURE_HASH 2627573273 +#define TS_SIGNATURE "rusEFI master.2024.01.17.small-can-board.2627573273" diff --git a/firmware/controllers/generated/signature_stm32f413_nucleo.h b/firmware/controllers/generated/signature_stm32f413_nucleo.h index 5236853760..b929dc6d9b 100644 --- a/firmware/controllers/generated/signature_stm32f413_nucleo.h +++ b/firmware/controllers/generated/signature_stm32f413_nucleo.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 781393164 -#define TS_SIGNATURE "rusEFI master.2024.01.17.stm32f413_nucleo.781393164" +#define SIGNATURE_HASH 2721864336 +#define TS_SIGNATURE "rusEFI master.2024.01.17.stm32f413_nucleo.2721864336" diff --git a/firmware/controllers/generated/signature_stm32f429_nucleo.h b/firmware/controllers/generated/signature_stm32f429_nucleo.h index ad612ad302..240ff3a9fd 100644 --- a/firmware/controllers/generated/signature_stm32f429_nucleo.h +++ b/firmware/controllers/generated/signature_stm32f429_nucleo.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 781393164 -#define TS_SIGNATURE "rusEFI master.2024.01.17.stm32f429_nucleo.781393164" +#define SIGNATURE_HASH 2721864336 +#define TS_SIGNATURE "rusEFI master.2024.01.17.stm32f429_nucleo.2721864336" diff --git a/firmware/controllers/generated/signature_stm32f767_nucleo.h b/firmware/controllers/generated/signature_stm32f767_nucleo.h index f67d1cba9d..fb8ec7a6de 100644 --- a/firmware/controllers/generated/signature_stm32f767_nucleo.h +++ b/firmware/controllers/generated/signature_stm32f767_nucleo.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 781393164 -#define TS_SIGNATURE "rusEFI master.2024.01.17.stm32f767_nucleo.781393164" +#define SIGNATURE_HASH 2721864336 +#define TS_SIGNATURE "rusEFI master.2024.01.17.stm32f767_nucleo.2721864336" diff --git a/firmware/controllers/generated/signature_subaru_eg33_f7.h b/firmware/controllers/generated/signature_subaru_eg33_f7.h index 2f8c024b3c..015e6d9737 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 2641693668 -#define TS_SIGNATURE "rusEFI master.2024.01.17.subaru_eg33_f7.2641693668" +#define SIGNATURE_HASH 299519096 +#define TS_SIGNATURE "rusEFI master.2024.01.17.subaru_eg33_f7.299519096" diff --git a/firmware/controllers/generated/signature_t-b-g.h b/firmware/controllers/generated/signature_t-b-g.h index 5ccf72d854..3f12375cef 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 781393164 -#define TS_SIGNATURE "rusEFI master.2024.01.17.t-b-g.781393164" +#define SIGNATURE_HASH 2721864336 +#define TS_SIGNATURE "rusEFI master.2024.01.17.t-b-g.2721864336" diff --git a/firmware/controllers/generated/signature_tdg-pdm8.h b/firmware/controllers/generated/signature_tdg-pdm8.h index 7a5f8ee1ce..3687949c30 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 2755473710 -#define TS_SIGNATURE "rusEFI master.2024.01.17.tdg-pdm8.2755473710" +#define SIGNATURE_HASH 680687282 +#define TS_SIGNATURE "rusEFI master.2024.01.17.tdg-pdm8.680687282" diff --git a/firmware/controllers/generated/signature_uaefi.h b/firmware/controllers/generated/signature_uaefi.h index bcc92be53e..df2543ef64 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 3527289219 -#define TS_SIGNATURE "rusEFI master.2024.01.17.uaefi.3527289219" +#define SIGNATURE_HASH 1586589215 +#define TS_SIGNATURE "rusEFI master.2024.01.17.uaefi.1586589215" diff --git a/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini index 552a6bf21a..0c5cc4adf6 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.2024.01.17.alphax-2chan.1592174859" + signature = "rusEFI master.2024.01.17.alphax-2chan.3528060567" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.01.17.alphax-2chan.1592174859" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.01.17.alphax-2chan.3528060567" ; 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","INVALID","X1 - AIN1","INVALID","INVALID","B2 - MAP","B7 - CLT","B3 - IAT","X3 - AIN2","X7 - AIN4" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:05:08 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:40:39 UTC 2024 pageSize = 22176 page = 1 @@ -1504,48 +1504,56 @@ ignBlends1_table = array, S16, 19712, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends1_loadBins = array, U16, 19840, [8], "Load", 1, 0, 0, 1000, 0 ignBlends1_rpmBins = array, U16, 19856, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends1_blendParameter = bits, U08, 19872, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends1_yAxisOverride = bits, U08, 19873, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends1_blendBins = array, S16, 19874, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends1_blendValues = array, U08, 19890, [8], "%", 0.5, 0, 0, 100, 1 ignBlends2_table = array, S16, 19900, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends2_loadBins = array, U16, 20028, [8], "Load", 1, 0, 0, 1000, 0 ignBlends2_rpmBins = array, U16, 20044, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends2_blendParameter = bits, U08, 20060, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends2_yAxisOverride = bits, U08, 20061, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends2_blendBins = array, S16, 20062, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends2_blendValues = array, U08, 20078, [8], "%", 0.5, 0, 0, 100, 1 ignBlends3_table = array, S16, 20088, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends3_loadBins = array, U16, 20216, [8], "Load", 1, 0, 0, 1000, 0 ignBlends3_rpmBins = array, U16, 20232, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends3_blendParameter = bits, U08, 20248, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends3_yAxisOverride = bits, U08, 20249, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends3_blendBins = array, S16, 20250, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends3_blendValues = array, U08, 20266, [8], "%", 0.5, 0, 0, 100, 1 ignBlends4_table = array, S16, 20276, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends4_loadBins = array, U16, 20404, [8], "Load", 1, 0, 0, 1000, 0 ignBlends4_rpmBins = array, U16, 20420, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends4_blendParameter = bits, U08, 20436, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends4_yAxisOverride = bits, U08, 20437, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends4_blendBins = array, S16, 20438, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends4_blendValues = array, U08, 20454, [8], "%", 0.5, 0, 0, 100, 1 veBlends1_table = array, S16, 20464, [8x8], "", 0.1, 0, -100, 100, 1 veBlends1_loadBins = array, U16, 20592, [8], "Load", 1, 0, 0, 1000, 0 veBlends1_rpmBins = array, U16, 20608, [8], "RPM", 1, 0, 0, 18000, 0 veBlends1_blendParameter = bits, U08, 20624, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends1_yAxisOverride = bits, U08, 20625, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends1_blendBins = array, S16, 20626, [8], "", 0.1, 0, -1000, 1000, 1 veBlends1_blendValues = array, U08, 20642, [8], "%", 0.5, 0, 0, 100, 1 veBlends2_table = array, S16, 20652, [8x8], "", 0.1, 0, -100, 100, 1 veBlends2_loadBins = array, U16, 20780, [8], "Load", 1, 0, 0, 1000, 0 veBlends2_rpmBins = array, U16, 20796, [8], "RPM", 1, 0, 0, 18000, 0 veBlends2_blendParameter = bits, U08, 20812, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends2_yAxisOverride = bits, U08, 20813, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends2_blendBins = array, S16, 20814, [8], "", 0.1, 0, -1000, 1000, 1 veBlends2_blendValues = array, U08, 20830, [8], "%", 0.5, 0, 0, 100, 1 veBlends3_table = array, S16, 20840, [8x8], "", 0.1, 0, -100, 100, 1 veBlends3_loadBins = array, U16, 20968, [8], "Load", 1, 0, 0, 1000, 0 veBlends3_rpmBins = array, U16, 20984, [8], "RPM", 1, 0, 0, 18000, 0 veBlends3_blendParameter = bits, U08, 21000, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends3_yAxisOverride = bits, U08, 21001, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends3_blendBins = array, S16, 21002, [8], "", 0.1, 0, -1000, 1000, 1 veBlends3_blendValues = array, U08, 21018, [8], "%", 0.5, 0, 0, 100, 1 veBlends4_table = array, S16, 21028, [8x8], "", 0.1, 0, -100, 100, 1 veBlends4_loadBins = array, U16, 21156, [8], "Load", 1, 0, 0, 1000, 0 veBlends4_rpmBins = array, U16, 21172, [8], "RPM", 1, 0, 0, 18000, 0 veBlends4_blendParameter = bits, U08, 21188, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends4_yAxisOverride = bits, U08, 21189, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends4_blendBins = array, S16, 21190, [8], "", 0.1, 0, -1000, 1000, 1 veBlends4_blendValues = array, U08, 21206, [8], "%", 0.5, 0, 0, 100, 1 throttleEstimateEffectiveAreaBins = array, U16, 21216, [12], "%", 0.1, 0, 0, 100, 1 @@ -1554,24 +1562,28 @@ boostOpenLoopBlends1_table = array, S16, 21264, [8x8], "", 0.1, 0, -100, 100, 1 boostOpenLoopBlends1_loadBins = array, U16, 21392, [8], "Load", 1, 0, 0, 1000, 0 boostOpenLoopBlends1_rpmBins = array, U16, 21408, [8], "RPM", 1, 0, 0, 18000, 0 boostOpenLoopBlends1_blendParameter = bits, U08, 21424, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostOpenLoopBlends1_yAxisOverride = bits, U08, 21425, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostOpenLoopBlends1_blendBins = array, S16, 21426, [8], "", 0.1, 0, -1000, 1000, 1 boostOpenLoopBlends1_blendValues = array, U08, 21442, [8], "%", 0.5, 0, 0, 100, 1 boostOpenLoopBlends2_table = array, S16, 21452, [8x8], "", 0.1, 0, -100, 100, 1 boostOpenLoopBlends2_loadBins = array, U16, 21580, [8], "Load", 1, 0, 0, 1000, 0 boostOpenLoopBlends2_rpmBins = array, U16, 21596, [8], "RPM", 1, 0, 0, 18000, 0 boostOpenLoopBlends2_blendParameter = bits, U08, 21612, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostOpenLoopBlends2_yAxisOverride = bits, U08, 21613, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostOpenLoopBlends2_blendBins = array, S16, 21614, [8], "", 0.1, 0, -1000, 1000, 1 boostOpenLoopBlends2_blendValues = array, U08, 21630, [8], "%", 0.5, 0, 0, 100, 1 boostClosedLoopBlends1_table = array, S16, 21640, [8x8], "", 0.1, 0, -100, 100, 1 boostClosedLoopBlends1_loadBins = array, U16, 21768, [8], "Load", 1, 0, 0, 1000, 0 boostClosedLoopBlends1_rpmBins = array, U16, 21784, [8], "RPM", 1, 0, 0, 18000, 0 boostClosedLoopBlends1_blendParameter = bits, U08, 21800, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostClosedLoopBlends1_yAxisOverride = bits, U08, 21801, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostClosedLoopBlends1_blendBins = array, S16, 21802, [8], "", 0.1, 0, -1000, 1000, 1 boostClosedLoopBlends1_blendValues = array, U08, 21818, [8], "%", 0.5, 0, 0, 100, 1 boostClosedLoopBlends2_table = array, S16, 21828, [8x8], "", 0.1, 0, -100, 100, 1 boostClosedLoopBlends2_loadBins = array, U16, 21956, [8], "Load", 1, 0, 0, 1000, 0 boostClosedLoopBlends2_rpmBins = array, U16, 21972, [8], "RPM", 1, 0, 0, 18000, 0 boostClosedLoopBlends2_blendParameter = bits, U08, 21988, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostClosedLoopBlends2_yAxisOverride = bits, U08, 21989, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostClosedLoopBlends2_blendBins = array, S16, 21990, [8], "", 0.1, 0, -1000, 1000, 1 boostClosedLoopBlends2_blendValues = array, U08, 22006, [8], "%", 0.5, 0, 0, 100, 1 tcu_rangeP = array, U08, 22016, [6], "level", 1, 0, 0, 3, 0 @@ -6895,7 +6907,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends1_blendParameter - panel = ignAdder1Bias + field = "Y axis override (set Zero for no override)", ignBlends1_yAxisOverride, {ignBlends1_blendParameter} + panel = ignAdder1Bias, {ignBlends1_blendParameter} dialog = ignAdder2Cfg, "Ignition adder 2 config" field = "#The bias table controls how much of the blend table" @@ -6905,7 +6918,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends2_blendParameter - panel = ignAdder2Bias + field = "Y axis override (set Zero for no override)", ignBlends2_yAxisOverride, {ignBlends2_blendParameter} + panel = ignAdder2Bias, {ignBlends2_blendParameter} dialog = ignAdder3Cfg, "Ignition adder 3 config" field = "#The bias table controls how much of the blend table" @@ -6915,7 +6929,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends3_blendParameter - panel = ignAdder3Bias + field = "Y axis override (set Zero for no override)", ignBlends3_yAxisOverride, {ignBlends3_blendParameter} + panel = ignAdder3Bias, {ignBlends3_blendParameter} dialog = ignAdder4Cfg, "Ignition adder 4 config" field = "#The bias table controls how much of the blend table" @@ -6925,7 +6940,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends4_blendParameter - panel = ignAdder4Bias + field = "Y axis override (set Zero for no override)", ignBlends4_yAxisOverride, {ignBlends4_blendParameter} + panel = ignAdder4Bias, {ignBlends4_blendParameter} dialog = veBlend1Cfg, "VE blend 1 config" field = "#The bias table controls how much of the blend table" @@ -6936,7 +6952,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends1_blendParameter - panel = veBlend1Bias + field = "Y axis override (set Zero for no override)", veBlends1_yAxisOverride, {veBlends1_blendParameter} + panel = veBlend1Bias, {veBlends1_blendParameter} dialog = veBlend2Cfg, "VE blend 2 config" field = "#The bias table controls how much of the blend table" @@ -6947,7 +6964,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends2_blendParameter - panel = veBlend2Bias + field = "Y axis override (set Zero for no override)", veBlends2_yAxisOverride, {veBlends2_blendParameter} + panel = veBlend2Bias, {veBlends2_blendParameter} dialog = veBlend3Cfg, "VE blend 3 config" field = "#The bias table controls how much of the blend table" @@ -6958,7 +6976,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends3_blendParameter - panel = veBlend3Bias + field = "Y axis override (set Zero for no override)", veBlends3_yAxisOverride, {veBlends3_blendParameter} + panel = veBlend3Bias, {veBlends3_blendParameter} dialog = veBlend4Cfg, "VE blend 4 config" field = "#The bias table controls how much of the blend table" @@ -6969,7 +6988,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends4_blendParameter - panel = veBlend4Bias + field = "Y axis override (set Zero for no override)", veBlends4_yAxisOverride, {veBlends4_blendParameter} + panel = veBlend4Bias, {veBlends4_blendParameter} indicatorPanel = isBoostControlledPanel, 1 indicator = {isBoostControlled}, "No Boost Control", "Boost Control Active" @@ -6983,7 +7003,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#parameter below." panel = isBoostControlledPanel field = "Blend parameter", boostOpenLoopBlends1_blendParameter - panel = boostOpenLoopBlend1Bias + field = "Y axis override (set Zero for no override)", boostOpenLoopBlends1_yAxisOverride, {boostOpenLoopBlends1_blendParameter} + panel = boostOpenLoopBlend1Bias, {boostOpenLoopBlends1_blendParameter} dialog = boostOpenBlend2Cfg, "Boost open loop blend 2 config" field = "#The bias table controls how much of the blend table" @@ -6994,7 +7015,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#parameter below." panel = isBoostControlledPanel field = "Blend parameter", boostOpenLoopBlends2_blendParameter - panel = boostOpenLoopBlend2Bias + field = "Y axis override (set Zero for no override)", boostOpenLoopBlends2_yAxisOverride, {boostOpenLoopBlends2_blendParameter} + panel = boostOpenLoopBlend2Bias, {boostOpenLoopBlends2_blendParameter} dialog = boostClosedBlend1Cfg, "Boost closed loop blend 1 config" field = "#The bias table controls how much of the blend table" @@ -7004,7 +7026,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", boostClosedLoopBlends1_blendParameter - panel = boostClosedLoopBlend1Bias + field = "Y axis override (set Zero for no override)", boostClosedLoopBlends1_yAxisOverride, {boostClosedLoopBlends1_blendParameter} + panel = boostClosedLoopBlend1Bias, {boostClosedLoopBlends1_blendParameter} dialog = boostClosedBlend2Cfg, "Boost closed loop blend 2 config" field = "#The bias table controls how much of the blend table" @@ -7014,7 +7037,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", boostClosedLoopBlends2_blendParameter - panel = boostClosedLoopBlend2Bias + field = "Y axis override (set Zero for no override)", boostClosedLoopBlends2_yAxisOverride, {boostClosedLoopBlends2_blendParameter} + panel = boostClosedLoopBlend2Bias, {boostClosedLoopBlends2_blendParameter} dialog = dwellSettings, "", yAxis panel = dwellCorrection diff --git a/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini index 84195a3486..67976e4177 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.2024.01.17.alphax-4chan.1035192307" + signature = "rusEFI master.2024.01.17.alphax-4chan.2971435119" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.01.17.alphax-4chan.1035192307" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.01.17.alphax-4chan.2971435119" ; 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","X7 - AIN4","D4 - TPS2","INVALID","X5 - AIN3","B2 - MAP","B7 - CLT","B3 - IAT","F6 - PPS2","INVALID","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 Wed Jan 17 14:05:11 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:40:42 UTC 2024 pageSize = 22176 page = 1 @@ -1504,48 +1504,56 @@ ignBlends1_table = array, S16, 19712, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends1_loadBins = array, U16, 19840, [8], "Load", 1, 0, 0, 1000, 0 ignBlends1_rpmBins = array, U16, 19856, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends1_blendParameter = bits, U08, 19872, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends1_yAxisOverride = bits, U08, 19873, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends1_blendBins = array, S16, 19874, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends1_blendValues = array, U08, 19890, [8], "%", 0.5, 0, 0, 100, 1 ignBlends2_table = array, S16, 19900, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends2_loadBins = array, U16, 20028, [8], "Load", 1, 0, 0, 1000, 0 ignBlends2_rpmBins = array, U16, 20044, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends2_blendParameter = bits, U08, 20060, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends2_yAxisOverride = bits, U08, 20061, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends2_blendBins = array, S16, 20062, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends2_blendValues = array, U08, 20078, [8], "%", 0.5, 0, 0, 100, 1 ignBlends3_table = array, S16, 20088, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends3_loadBins = array, U16, 20216, [8], "Load", 1, 0, 0, 1000, 0 ignBlends3_rpmBins = array, U16, 20232, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends3_blendParameter = bits, U08, 20248, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends3_yAxisOverride = bits, U08, 20249, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends3_blendBins = array, S16, 20250, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends3_blendValues = array, U08, 20266, [8], "%", 0.5, 0, 0, 100, 1 ignBlends4_table = array, S16, 20276, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends4_loadBins = array, U16, 20404, [8], "Load", 1, 0, 0, 1000, 0 ignBlends4_rpmBins = array, U16, 20420, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends4_blendParameter = bits, U08, 20436, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends4_yAxisOverride = bits, U08, 20437, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends4_blendBins = array, S16, 20438, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends4_blendValues = array, U08, 20454, [8], "%", 0.5, 0, 0, 100, 1 veBlends1_table = array, S16, 20464, [8x8], "", 0.1, 0, -100, 100, 1 veBlends1_loadBins = array, U16, 20592, [8], "Load", 1, 0, 0, 1000, 0 veBlends1_rpmBins = array, U16, 20608, [8], "RPM", 1, 0, 0, 18000, 0 veBlends1_blendParameter = bits, U08, 20624, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends1_yAxisOverride = bits, U08, 20625, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends1_blendBins = array, S16, 20626, [8], "", 0.1, 0, -1000, 1000, 1 veBlends1_blendValues = array, U08, 20642, [8], "%", 0.5, 0, 0, 100, 1 veBlends2_table = array, S16, 20652, [8x8], "", 0.1, 0, -100, 100, 1 veBlends2_loadBins = array, U16, 20780, [8], "Load", 1, 0, 0, 1000, 0 veBlends2_rpmBins = array, U16, 20796, [8], "RPM", 1, 0, 0, 18000, 0 veBlends2_blendParameter = bits, U08, 20812, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends2_yAxisOverride = bits, U08, 20813, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends2_blendBins = array, S16, 20814, [8], "", 0.1, 0, -1000, 1000, 1 veBlends2_blendValues = array, U08, 20830, [8], "%", 0.5, 0, 0, 100, 1 veBlends3_table = array, S16, 20840, [8x8], "", 0.1, 0, -100, 100, 1 veBlends3_loadBins = array, U16, 20968, [8], "Load", 1, 0, 0, 1000, 0 veBlends3_rpmBins = array, U16, 20984, [8], "RPM", 1, 0, 0, 18000, 0 veBlends3_blendParameter = bits, U08, 21000, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends3_yAxisOverride = bits, U08, 21001, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends3_blendBins = array, S16, 21002, [8], "", 0.1, 0, -1000, 1000, 1 veBlends3_blendValues = array, U08, 21018, [8], "%", 0.5, 0, 0, 100, 1 veBlends4_table = array, S16, 21028, [8x8], "", 0.1, 0, -100, 100, 1 veBlends4_loadBins = array, U16, 21156, [8], "Load", 1, 0, 0, 1000, 0 veBlends4_rpmBins = array, U16, 21172, [8], "RPM", 1, 0, 0, 18000, 0 veBlends4_blendParameter = bits, U08, 21188, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends4_yAxisOverride = bits, U08, 21189, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends4_blendBins = array, S16, 21190, [8], "", 0.1, 0, -1000, 1000, 1 veBlends4_blendValues = array, U08, 21206, [8], "%", 0.5, 0, 0, 100, 1 throttleEstimateEffectiveAreaBins = array, U16, 21216, [12], "%", 0.1, 0, 0, 100, 1 @@ -1554,24 +1562,28 @@ boostOpenLoopBlends1_table = array, S16, 21264, [8x8], "", 0.1, 0, -100, 100, 1 boostOpenLoopBlends1_loadBins = array, U16, 21392, [8], "Load", 1, 0, 0, 1000, 0 boostOpenLoopBlends1_rpmBins = array, U16, 21408, [8], "RPM", 1, 0, 0, 18000, 0 boostOpenLoopBlends1_blendParameter = bits, U08, 21424, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostOpenLoopBlends1_yAxisOverride = bits, U08, 21425, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostOpenLoopBlends1_blendBins = array, S16, 21426, [8], "", 0.1, 0, -1000, 1000, 1 boostOpenLoopBlends1_blendValues = array, U08, 21442, [8], "%", 0.5, 0, 0, 100, 1 boostOpenLoopBlends2_table = array, S16, 21452, [8x8], "", 0.1, 0, -100, 100, 1 boostOpenLoopBlends2_loadBins = array, U16, 21580, [8], "Load", 1, 0, 0, 1000, 0 boostOpenLoopBlends2_rpmBins = array, U16, 21596, [8], "RPM", 1, 0, 0, 18000, 0 boostOpenLoopBlends2_blendParameter = bits, U08, 21612, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostOpenLoopBlends2_yAxisOverride = bits, U08, 21613, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostOpenLoopBlends2_blendBins = array, S16, 21614, [8], "", 0.1, 0, -1000, 1000, 1 boostOpenLoopBlends2_blendValues = array, U08, 21630, [8], "%", 0.5, 0, 0, 100, 1 boostClosedLoopBlends1_table = array, S16, 21640, [8x8], "", 0.1, 0, -100, 100, 1 boostClosedLoopBlends1_loadBins = array, U16, 21768, [8], "Load", 1, 0, 0, 1000, 0 boostClosedLoopBlends1_rpmBins = array, U16, 21784, [8], "RPM", 1, 0, 0, 18000, 0 boostClosedLoopBlends1_blendParameter = bits, U08, 21800, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostClosedLoopBlends1_yAxisOverride = bits, U08, 21801, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostClosedLoopBlends1_blendBins = array, S16, 21802, [8], "", 0.1, 0, -1000, 1000, 1 boostClosedLoopBlends1_blendValues = array, U08, 21818, [8], "%", 0.5, 0, 0, 100, 1 boostClosedLoopBlends2_table = array, S16, 21828, [8x8], "", 0.1, 0, -100, 100, 1 boostClosedLoopBlends2_loadBins = array, U16, 21956, [8], "Load", 1, 0, 0, 1000, 0 boostClosedLoopBlends2_rpmBins = array, U16, 21972, [8], "RPM", 1, 0, 0, 18000, 0 boostClosedLoopBlends2_blendParameter = bits, U08, 21988, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostClosedLoopBlends2_yAxisOverride = bits, U08, 21989, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostClosedLoopBlends2_blendBins = array, S16, 21990, [8], "", 0.1, 0, -1000, 1000, 1 boostClosedLoopBlends2_blendValues = array, U08, 22006, [8], "%", 0.5, 0, 0, 100, 1 tcu_rangeP = array, U08, 22016, [6], "level", 1, 0, 0, 3, 0 @@ -6898,7 +6910,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends1_blendParameter - panel = ignAdder1Bias + field = "Y axis override (set Zero for no override)", ignBlends1_yAxisOverride, {ignBlends1_blendParameter} + panel = ignAdder1Bias, {ignBlends1_blendParameter} dialog = ignAdder2Cfg, "Ignition adder 2 config" field = "#The bias table controls how much of the blend table" @@ -6908,7 +6921,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends2_blendParameter - panel = ignAdder2Bias + field = "Y axis override (set Zero for no override)", ignBlends2_yAxisOverride, {ignBlends2_blendParameter} + panel = ignAdder2Bias, {ignBlends2_blendParameter} dialog = ignAdder3Cfg, "Ignition adder 3 config" field = "#The bias table controls how much of the blend table" @@ -6918,7 +6932,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends3_blendParameter - panel = ignAdder3Bias + field = "Y axis override (set Zero for no override)", ignBlends3_yAxisOverride, {ignBlends3_blendParameter} + panel = ignAdder3Bias, {ignBlends3_blendParameter} dialog = ignAdder4Cfg, "Ignition adder 4 config" field = "#The bias table controls how much of the blend table" @@ -6928,7 +6943,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends4_blendParameter - panel = ignAdder4Bias + field = "Y axis override (set Zero for no override)", ignBlends4_yAxisOverride, {ignBlends4_blendParameter} + panel = ignAdder4Bias, {ignBlends4_blendParameter} dialog = veBlend1Cfg, "VE blend 1 config" field = "#The bias table controls how much of the blend table" @@ -6939,7 +6955,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends1_blendParameter - panel = veBlend1Bias + field = "Y axis override (set Zero for no override)", veBlends1_yAxisOverride, {veBlends1_blendParameter} + panel = veBlend1Bias, {veBlends1_blendParameter} dialog = veBlend2Cfg, "VE blend 2 config" field = "#The bias table controls how much of the blend table" @@ -6950,7 +6967,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends2_blendParameter - panel = veBlend2Bias + field = "Y axis override (set Zero for no override)", veBlends2_yAxisOverride, {veBlends2_blendParameter} + panel = veBlend2Bias, {veBlends2_blendParameter} dialog = veBlend3Cfg, "VE blend 3 config" field = "#The bias table controls how much of the blend table" @@ -6961,7 +6979,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends3_blendParameter - panel = veBlend3Bias + field = "Y axis override (set Zero for no override)", veBlends3_yAxisOverride, {veBlends3_blendParameter} + panel = veBlend3Bias, {veBlends3_blendParameter} dialog = veBlend4Cfg, "VE blend 4 config" field = "#The bias table controls how much of the blend table" @@ -6972,7 +6991,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends4_blendParameter - panel = veBlend4Bias + field = "Y axis override (set Zero for no override)", veBlends4_yAxisOverride, {veBlends4_blendParameter} + panel = veBlend4Bias, {veBlends4_blendParameter} indicatorPanel = isBoostControlledPanel, 1 indicator = {isBoostControlled}, "No Boost Control", "Boost Control Active" @@ -6986,7 +7006,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#parameter below." panel = isBoostControlledPanel field = "Blend parameter", boostOpenLoopBlends1_blendParameter - panel = boostOpenLoopBlend1Bias + field = "Y axis override (set Zero for no override)", boostOpenLoopBlends1_yAxisOverride, {boostOpenLoopBlends1_blendParameter} + panel = boostOpenLoopBlend1Bias, {boostOpenLoopBlends1_blendParameter} dialog = boostOpenBlend2Cfg, "Boost open loop blend 2 config" field = "#The bias table controls how much of the blend table" @@ -6997,7 +7018,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#parameter below." panel = isBoostControlledPanel field = "Blend parameter", boostOpenLoopBlends2_blendParameter - panel = boostOpenLoopBlend2Bias + field = "Y axis override (set Zero for no override)", boostOpenLoopBlends2_yAxisOverride, {boostOpenLoopBlends2_blendParameter} + panel = boostOpenLoopBlend2Bias, {boostOpenLoopBlends2_blendParameter} dialog = boostClosedBlend1Cfg, "Boost closed loop blend 1 config" field = "#The bias table controls how much of the blend table" @@ -7007,7 +7029,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", boostClosedLoopBlends1_blendParameter - panel = boostClosedLoopBlend1Bias + field = "Y axis override (set Zero for no override)", boostClosedLoopBlends1_yAxisOverride, {boostClosedLoopBlends1_blendParameter} + panel = boostClosedLoopBlend1Bias, {boostClosedLoopBlends1_blendParameter} dialog = boostClosedBlend2Cfg, "Boost closed loop blend 2 config" field = "#The bias table controls how much of the blend table" @@ -7017,7 +7040,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", boostClosedLoopBlends2_blendParameter - panel = boostClosedLoopBlend2Bias + field = "Y axis override (set Zero for no override)", boostClosedLoopBlends2_yAxisOverride, {boostClosedLoopBlends2_blendParameter} + panel = boostClosedLoopBlend2Bias, {boostClosedLoopBlends2_blendParameter} dialog = dwellSettings, "", yAxis panel = dwellCorrection diff --git a/firmware/tunerstudio/generated/rusefi_alphax-4chan_f7.ini b/firmware/tunerstudio/generated/rusefi_alphax-4chan_f7.ini index 75ace8f455..20e0c00066 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.2024.01.17.alphax-4chan_f7.1035192307" + signature = "rusEFI master.2024.01.17.alphax-4chan_f7.2971435119" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.01.17.alphax-4chan_f7.1035192307" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.01.17.alphax-4chan_f7.2971435119" ; 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","X7 - AIN4","D4 - TPS2","INVALID","X5 - AIN3","B2 - MAP","B7 - CLT","B3 - IAT","F6 - PPS2","INVALID","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 Wed Jan 17 14:05:14 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:40:45 UTC 2024 pageSize = 22176 page = 1 @@ -1504,48 +1504,56 @@ ignBlends1_table = array, S16, 19712, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends1_loadBins = array, U16, 19840, [8], "Load", 1, 0, 0, 1000, 0 ignBlends1_rpmBins = array, U16, 19856, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends1_blendParameter = bits, U08, 19872, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends1_yAxisOverride = bits, U08, 19873, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends1_blendBins = array, S16, 19874, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends1_blendValues = array, U08, 19890, [8], "%", 0.5, 0, 0, 100, 1 ignBlends2_table = array, S16, 19900, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends2_loadBins = array, U16, 20028, [8], "Load", 1, 0, 0, 1000, 0 ignBlends2_rpmBins = array, U16, 20044, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends2_blendParameter = bits, U08, 20060, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends2_yAxisOverride = bits, U08, 20061, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends2_blendBins = array, S16, 20062, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends2_blendValues = array, U08, 20078, [8], "%", 0.5, 0, 0, 100, 1 ignBlends3_table = array, S16, 20088, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends3_loadBins = array, U16, 20216, [8], "Load", 1, 0, 0, 1000, 0 ignBlends3_rpmBins = array, U16, 20232, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends3_blendParameter = bits, U08, 20248, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends3_yAxisOverride = bits, U08, 20249, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends3_blendBins = array, S16, 20250, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends3_blendValues = array, U08, 20266, [8], "%", 0.5, 0, 0, 100, 1 ignBlends4_table = array, S16, 20276, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends4_loadBins = array, U16, 20404, [8], "Load", 1, 0, 0, 1000, 0 ignBlends4_rpmBins = array, U16, 20420, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends4_blendParameter = bits, U08, 20436, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends4_yAxisOverride = bits, U08, 20437, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends4_blendBins = array, S16, 20438, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends4_blendValues = array, U08, 20454, [8], "%", 0.5, 0, 0, 100, 1 veBlends1_table = array, S16, 20464, [8x8], "", 0.1, 0, -100, 100, 1 veBlends1_loadBins = array, U16, 20592, [8], "Load", 1, 0, 0, 1000, 0 veBlends1_rpmBins = array, U16, 20608, [8], "RPM", 1, 0, 0, 18000, 0 veBlends1_blendParameter = bits, U08, 20624, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends1_yAxisOverride = bits, U08, 20625, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends1_blendBins = array, S16, 20626, [8], "", 0.1, 0, -1000, 1000, 1 veBlends1_blendValues = array, U08, 20642, [8], "%", 0.5, 0, 0, 100, 1 veBlends2_table = array, S16, 20652, [8x8], "", 0.1, 0, -100, 100, 1 veBlends2_loadBins = array, U16, 20780, [8], "Load", 1, 0, 0, 1000, 0 veBlends2_rpmBins = array, U16, 20796, [8], "RPM", 1, 0, 0, 18000, 0 veBlends2_blendParameter = bits, U08, 20812, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends2_yAxisOverride = bits, U08, 20813, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends2_blendBins = array, S16, 20814, [8], "", 0.1, 0, -1000, 1000, 1 veBlends2_blendValues = array, U08, 20830, [8], "%", 0.5, 0, 0, 100, 1 veBlends3_table = array, S16, 20840, [8x8], "", 0.1, 0, -100, 100, 1 veBlends3_loadBins = array, U16, 20968, [8], "Load", 1, 0, 0, 1000, 0 veBlends3_rpmBins = array, U16, 20984, [8], "RPM", 1, 0, 0, 18000, 0 veBlends3_blendParameter = bits, U08, 21000, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends3_yAxisOverride = bits, U08, 21001, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends3_blendBins = array, S16, 21002, [8], "", 0.1, 0, -1000, 1000, 1 veBlends3_blendValues = array, U08, 21018, [8], "%", 0.5, 0, 0, 100, 1 veBlends4_table = array, S16, 21028, [8x8], "", 0.1, 0, -100, 100, 1 veBlends4_loadBins = array, U16, 21156, [8], "Load", 1, 0, 0, 1000, 0 veBlends4_rpmBins = array, U16, 21172, [8], "RPM", 1, 0, 0, 18000, 0 veBlends4_blendParameter = bits, U08, 21188, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends4_yAxisOverride = bits, U08, 21189, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends4_blendBins = array, S16, 21190, [8], "", 0.1, 0, -1000, 1000, 1 veBlends4_blendValues = array, U08, 21206, [8], "%", 0.5, 0, 0, 100, 1 throttleEstimateEffectiveAreaBins = array, U16, 21216, [12], "%", 0.1, 0, 0, 100, 1 @@ -1554,24 +1562,28 @@ boostOpenLoopBlends1_table = array, S16, 21264, [8x8], "", 0.1, 0, -100, 100, 1 boostOpenLoopBlends1_loadBins = array, U16, 21392, [8], "Load", 1, 0, 0, 1000, 0 boostOpenLoopBlends1_rpmBins = array, U16, 21408, [8], "RPM", 1, 0, 0, 18000, 0 boostOpenLoopBlends1_blendParameter = bits, U08, 21424, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostOpenLoopBlends1_yAxisOverride = bits, U08, 21425, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostOpenLoopBlends1_blendBins = array, S16, 21426, [8], "", 0.1, 0, -1000, 1000, 1 boostOpenLoopBlends1_blendValues = array, U08, 21442, [8], "%", 0.5, 0, 0, 100, 1 boostOpenLoopBlends2_table = array, S16, 21452, [8x8], "", 0.1, 0, -100, 100, 1 boostOpenLoopBlends2_loadBins = array, U16, 21580, [8], "Load", 1, 0, 0, 1000, 0 boostOpenLoopBlends2_rpmBins = array, U16, 21596, [8], "RPM", 1, 0, 0, 18000, 0 boostOpenLoopBlends2_blendParameter = bits, U08, 21612, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostOpenLoopBlends2_yAxisOverride = bits, U08, 21613, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostOpenLoopBlends2_blendBins = array, S16, 21614, [8], "", 0.1, 0, -1000, 1000, 1 boostOpenLoopBlends2_blendValues = array, U08, 21630, [8], "%", 0.5, 0, 0, 100, 1 boostClosedLoopBlends1_table = array, S16, 21640, [8x8], "", 0.1, 0, -100, 100, 1 boostClosedLoopBlends1_loadBins = array, U16, 21768, [8], "Load", 1, 0, 0, 1000, 0 boostClosedLoopBlends1_rpmBins = array, U16, 21784, [8], "RPM", 1, 0, 0, 18000, 0 boostClosedLoopBlends1_blendParameter = bits, U08, 21800, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostClosedLoopBlends1_yAxisOverride = bits, U08, 21801, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostClosedLoopBlends1_blendBins = array, S16, 21802, [8], "", 0.1, 0, -1000, 1000, 1 boostClosedLoopBlends1_blendValues = array, U08, 21818, [8], "%", 0.5, 0, 0, 100, 1 boostClosedLoopBlends2_table = array, S16, 21828, [8x8], "", 0.1, 0, -100, 100, 1 boostClosedLoopBlends2_loadBins = array, U16, 21956, [8], "Load", 1, 0, 0, 1000, 0 boostClosedLoopBlends2_rpmBins = array, U16, 21972, [8], "RPM", 1, 0, 0, 18000, 0 boostClosedLoopBlends2_blendParameter = bits, U08, 21988, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostClosedLoopBlends2_yAxisOverride = bits, U08, 21989, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostClosedLoopBlends2_blendBins = array, S16, 21990, [8], "", 0.1, 0, -1000, 1000, 1 boostClosedLoopBlends2_blendValues = array, U08, 22006, [8], "%", 0.5, 0, 0, 100, 1 tcu_rangeP = array, U08, 22016, [6], "level", 1, 0, 0, 3, 0 @@ -6898,7 +6910,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends1_blendParameter - panel = ignAdder1Bias + field = "Y axis override (set Zero for no override)", ignBlends1_yAxisOverride, {ignBlends1_blendParameter} + panel = ignAdder1Bias, {ignBlends1_blendParameter} dialog = ignAdder2Cfg, "Ignition adder 2 config" field = "#The bias table controls how much of the blend table" @@ -6908,7 +6921,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends2_blendParameter - panel = ignAdder2Bias + field = "Y axis override (set Zero for no override)", ignBlends2_yAxisOverride, {ignBlends2_blendParameter} + panel = ignAdder2Bias, {ignBlends2_blendParameter} dialog = ignAdder3Cfg, "Ignition adder 3 config" field = "#The bias table controls how much of the blend table" @@ -6918,7 +6932,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends3_blendParameter - panel = ignAdder3Bias + field = "Y axis override (set Zero for no override)", ignBlends3_yAxisOverride, {ignBlends3_blendParameter} + panel = ignAdder3Bias, {ignBlends3_blendParameter} dialog = ignAdder4Cfg, "Ignition adder 4 config" field = "#The bias table controls how much of the blend table" @@ -6928,7 +6943,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends4_blendParameter - panel = ignAdder4Bias + field = "Y axis override (set Zero for no override)", ignBlends4_yAxisOverride, {ignBlends4_blendParameter} + panel = ignAdder4Bias, {ignBlends4_blendParameter} dialog = veBlend1Cfg, "VE blend 1 config" field = "#The bias table controls how much of the blend table" @@ -6939,7 +6955,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends1_blendParameter - panel = veBlend1Bias + field = "Y axis override (set Zero for no override)", veBlends1_yAxisOverride, {veBlends1_blendParameter} + panel = veBlend1Bias, {veBlends1_blendParameter} dialog = veBlend2Cfg, "VE blend 2 config" field = "#The bias table controls how much of the blend table" @@ -6950,7 +6967,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends2_blendParameter - panel = veBlend2Bias + field = "Y axis override (set Zero for no override)", veBlends2_yAxisOverride, {veBlends2_blendParameter} + panel = veBlend2Bias, {veBlends2_blendParameter} dialog = veBlend3Cfg, "VE blend 3 config" field = "#The bias table controls how much of the blend table" @@ -6961,7 +6979,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends3_blendParameter - panel = veBlend3Bias + field = "Y axis override (set Zero for no override)", veBlends3_yAxisOverride, {veBlends3_blendParameter} + panel = veBlend3Bias, {veBlends3_blendParameter} dialog = veBlend4Cfg, "VE blend 4 config" field = "#The bias table controls how much of the blend table" @@ -6972,7 +6991,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends4_blendParameter - panel = veBlend4Bias + field = "Y axis override (set Zero for no override)", veBlends4_yAxisOverride, {veBlends4_blendParameter} + panel = veBlend4Bias, {veBlends4_blendParameter} indicatorPanel = isBoostControlledPanel, 1 indicator = {isBoostControlled}, "No Boost Control", "Boost Control Active" @@ -6986,7 +7006,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#parameter below." panel = isBoostControlledPanel field = "Blend parameter", boostOpenLoopBlends1_blendParameter - panel = boostOpenLoopBlend1Bias + field = "Y axis override (set Zero for no override)", boostOpenLoopBlends1_yAxisOverride, {boostOpenLoopBlends1_blendParameter} + panel = boostOpenLoopBlend1Bias, {boostOpenLoopBlends1_blendParameter} dialog = boostOpenBlend2Cfg, "Boost open loop blend 2 config" field = "#The bias table controls how much of the blend table" @@ -6997,7 +7018,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#parameter below." panel = isBoostControlledPanel field = "Blend parameter", boostOpenLoopBlends2_blendParameter - panel = boostOpenLoopBlend2Bias + field = "Y axis override (set Zero for no override)", boostOpenLoopBlends2_yAxisOverride, {boostOpenLoopBlends2_blendParameter} + panel = boostOpenLoopBlend2Bias, {boostOpenLoopBlends2_blendParameter} dialog = boostClosedBlend1Cfg, "Boost closed loop blend 1 config" field = "#The bias table controls how much of the blend table" @@ -7007,7 +7029,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", boostClosedLoopBlends1_blendParameter - panel = boostClosedLoopBlend1Bias + field = "Y axis override (set Zero for no override)", boostClosedLoopBlends1_yAxisOverride, {boostClosedLoopBlends1_blendParameter} + panel = boostClosedLoopBlend1Bias, {boostClosedLoopBlends1_blendParameter} dialog = boostClosedBlend2Cfg, "Boost closed loop blend 2 config" field = "#The bias table controls how much of the blend table" @@ -7017,7 +7040,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", boostClosedLoopBlends2_blendParameter - panel = boostClosedLoopBlend2Bias + field = "Y axis override (set Zero for no override)", boostClosedLoopBlends2_yAxisOverride, {boostClosedLoopBlends2_blendParameter} + panel = boostClosedLoopBlend2Bias, {boostClosedLoopBlends2_blendParameter} dialog = dwellSettings, "", yAxis panel = dwellCorrection diff --git a/firmware/tunerstudio/generated/rusefi_alphax-8chan-revA.ini b/firmware/tunerstudio/generated/rusefi_alphax-8chan-revA.ini index a652378ec1..d510dddac3 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.2024.01.17.alphax-8chan-revA.1876173588" + signature = "rusEFI master.2024.01.17.alphax-8chan-revA.3816514696" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.01.17.alphax-8chan-revA.1876173588" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.01.17.alphax-8chan-revA.3816514696" ; 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 Wed Jan 17 14:05:22 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:40:53 UTC 2024 pageSize = 22176 page = 1 @@ -1504,48 +1504,56 @@ ignBlends1_table = array, S16, 19712, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends1_loadBins = array, U16, 19840, [8], "Load", 1, 0, 0, 1000, 0 ignBlends1_rpmBins = array, U16, 19856, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends1_blendParameter = bits, U08, 19872, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends1_yAxisOverride = bits, U08, 19873, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends1_blendBins = array, S16, 19874, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends1_blendValues = array, U08, 19890, [8], "%", 0.5, 0, 0, 100, 1 ignBlends2_table = array, S16, 19900, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends2_loadBins = array, U16, 20028, [8], "Load", 1, 0, 0, 1000, 0 ignBlends2_rpmBins = array, U16, 20044, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends2_blendParameter = bits, U08, 20060, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends2_yAxisOverride = bits, U08, 20061, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends2_blendBins = array, S16, 20062, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends2_blendValues = array, U08, 20078, [8], "%", 0.5, 0, 0, 100, 1 ignBlends3_table = array, S16, 20088, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends3_loadBins = array, U16, 20216, [8], "Load", 1, 0, 0, 1000, 0 ignBlends3_rpmBins = array, U16, 20232, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends3_blendParameter = bits, U08, 20248, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends3_yAxisOverride = bits, U08, 20249, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends3_blendBins = array, S16, 20250, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends3_blendValues = array, U08, 20266, [8], "%", 0.5, 0, 0, 100, 1 ignBlends4_table = array, S16, 20276, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends4_loadBins = array, U16, 20404, [8], "Load", 1, 0, 0, 1000, 0 ignBlends4_rpmBins = array, U16, 20420, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends4_blendParameter = bits, U08, 20436, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends4_yAxisOverride = bits, U08, 20437, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends4_blendBins = array, S16, 20438, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends4_blendValues = array, U08, 20454, [8], "%", 0.5, 0, 0, 100, 1 veBlends1_table = array, S16, 20464, [8x8], "", 0.1, 0, -100, 100, 1 veBlends1_loadBins = array, U16, 20592, [8], "Load", 1, 0, 0, 1000, 0 veBlends1_rpmBins = array, U16, 20608, [8], "RPM", 1, 0, 0, 18000, 0 veBlends1_blendParameter = bits, U08, 20624, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends1_yAxisOverride = bits, U08, 20625, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends1_blendBins = array, S16, 20626, [8], "", 0.1, 0, -1000, 1000, 1 veBlends1_blendValues = array, U08, 20642, [8], "%", 0.5, 0, 0, 100, 1 veBlends2_table = array, S16, 20652, [8x8], "", 0.1, 0, -100, 100, 1 veBlends2_loadBins = array, U16, 20780, [8], "Load", 1, 0, 0, 1000, 0 veBlends2_rpmBins = array, U16, 20796, [8], "RPM", 1, 0, 0, 18000, 0 veBlends2_blendParameter = bits, U08, 20812, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends2_yAxisOverride = bits, U08, 20813, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends2_blendBins = array, S16, 20814, [8], "", 0.1, 0, -1000, 1000, 1 veBlends2_blendValues = array, U08, 20830, [8], "%", 0.5, 0, 0, 100, 1 veBlends3_table = array, S16, 20840, [8x8], "", 0.1, 0, -100, 100, 1 veBlends3_loadBins = array, U16, 20968, [8], "Load", 1, 0, 0, 1000, 0 veBlends3_rpmBins = array, U16, 20984, [8], "RPM", 1, 0, 0, 18000, 0 veBlends3_blendParameter = bits, U08, 21000, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends3_yAxisOverride = bits, U08, 21001, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends3_blendBins = array, S16, 21002, [8], "", 0.1, 0, -1000, 1000, 1 veBlends3_blendValues = array, U08, 21018, [8], "%", 0.5, 0, 0, 100, 1 veBlends4_table = array, S16, 21028, [8x8], "", 0.1, 0, -100, 100, 1 veBlends4_loadBins = array, U16, 21156, [8], "Load", 1, 0, 0, 1000, 0 veBlends4_rpmBins = array, U16, 21172, [8], "RPM", 1, 0, 0, 18000, 0 veBlends4_blendParameter = bits, U08, 21188, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends4_yAxisOverride = bits, U08, 21189, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends4_blendBins = array, S16, 21190, [8], "", 0.1, 0, -1000, 1000, 1 veBlends4_blendValues = array, U08, 21206, [8], "%", 0.5, 0, 0, 100, 1 throttleEstimateEffectiveAreaBins = array, U16, 21216, [12], "%", 0.1, 0, 0, 100, 1 @@ -1554,24 +1562,28 @@ boostOpenLoopBlends1_table = array, S16, 21264, [8x8], "", 0.1, 0, -100, 100, 1 boostOpenLoopBlends1_loadBins = array, U16, 21392, [8], "Load", 1, 0, 0, 1000, 0 boostOpenLoopBlends1_rpmBins = array, U16, 21408, [8], "RPM", 1, 0, 0, 18000, 0 boostOpenLoopBlends1_blendParameter = bits, U08, 21424, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostOpenLoopBlends1_yAxisOverride = bits, U08, 21425, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostOpenLoopBlends1_blendBins = array, S16, 21426, [8], "", 0.1, 0, -1000, 1000, 1 boostOpenLoopBlends1_blendValues = array, U08, 21442, [8], "%", 0.5, 0, 0, 100, 1 boostOpenLoopBlends2_table = array, S16, 21452, [8x8], "", 0.1, 0, -100, 100, 1 boostOpenLoopBlends2_loadBins = array, U16, 21580, [8], "Load", 1, 0, 0, 1000, 0 boostOpenLoopBlends2_rpmBins = array, U16, 21596, [8], "RPM", 1, 0, 0, 18000, 0 boostOpenLoopBlends2_blendParameter = bits, U08, 21612, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostOpenLoopBlends2_yAxisOverride = bits, U08, 21613, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostOpenLoopBlends2_blendBins = array, S16, 21614, [8], "", 0.1, 0, -1000, 1000, 1 boostOpenLoopBlends2_blendValues = array, U08, 21630, [8], "%", 0.5, 0, 0, 100, 1 boostClosedLoopBlends1_table = array, S16, 21640, [8x8], "", 0.1, 0, -100, 100, 1 boostClosedLoopBlends1_loadBins = array, U16, 21768, [8], "Load", 1, 0, 0, 1000, 0 boostClosedLoopBlends1_rpmBins = array, U16, 21784, [8], "RPM", 1, 0, 0, 18000, 0 boostClosedLoopBlends1_blendParameter = bits, U08, 21800, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostClosedLoopBlends1_yAxisOverride = bits, U08, 21801, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostClosedLoopBlends1_blendBins = array, S16, 21802, [8], "", 0.1, 0, -1000, 1000, 1 boostClosedLoopBlends1_blendValues = array, U08, 21818, [8], "%", 0.5, 0, 0, 100, 1 boostClosedLoopBlends2_table = array, S16, 21828, [8x8], "", 0.1, 0, -100, 100, 1 boostClosedLoopBlends2_loadBins = array, U16, 21956, [8], "Load", 1, 0, 0, 1000, 0 boostClosedLoopBlends2_rpmBins = array, U16, 21972, [8], "RPM", 1, 0, 0, 18000, 0 boostClosedLoopBlends2_blendParameter = bits, U08, 21988, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostClosedLoopBlends2_yAxisOverride = bits, U08, 21989, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostClosedLoopBlends2_blendBins = array, S16, 21990, [8], "", 0.1, 0, -1000, 1000, 1 boostClosedLoopBlends2_blendValues = array, U08, 22006, [8], "%", 0.5, 0, 0, 100, 1 tcu_rangeP = array, U08, 22016, [6], "level", 1, 0, 0, 3, 0 @@ -6899,7 +6911,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends1_blendParameter - panel = ignAdder1Bias + field = "Y axis override (set Zero for no override)", ignBlends1_yAxisOverride, {ignBlends1_blendParameter} + panel = ignAdder1Bias, {ignBlends1_blendParameter} dialog = ignAdder2Cfg, "Ignition adder 2 config" field = "#The bias table controls how much of the blend table" @@ -6909,7 +6922,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends2_blendParameter - panel = ignAdder2Bias + field = "Y axis override (set Zero for no override)", ignBlends2_yAxisOverride, {ignBlends2_blendParameter} + panel = ignAdder2Bias, {ignBlends2_blendParameter} dialog = ignAdder3Cfg, "Ignition adder 3 config" field = "#The bias table controls how much of the blend table" @@ -6919,7 +6933,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends3_blendParameter - panel = ignAdder3Bias + field = "Y axis override (set Zero for no override)", ignBlends3_yAxisOverride, {ignBlends3_blendParameter} + panel = ignAdder3Bias, {ignBlends3_blendParameter} dialog = ignAdder4Cfg, "Ignition adder 4 config" field = "#The bias table controls how much of the blend table" @@ -6929,7 +6944,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends4_blendParameter - panel = ignAdder4Bias + field = "Y axis override (set Zero for no override)", ignBlends4_yAxisOverride, {ignBlends4_blendParameter} + panel = ignAdder4Bias, {ignBlends4_blendParameter} dialog = veBlend1Cfg, "VE blend 1 config" field = "#The bias table controls how much of the blend table" @@ -6940,7 +6956,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends1_blendParameter - panel = veBlend1Bias + field = "Y axis override (set Zero for no override)", veBlends1_yAxisOverride, {veBlends1_blendParameter} + panel = veBlend1Bias, {veBlends1_blendParameter} dialog = veBlend2Cfg, "VE blend 2 config" field = "#The bias table controls how much of the blend table" @@ -6951,7 +6968,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends2_blendParameter - panel = veBlend2Bias + field = "Y axis override (set Zero for no override)", veBlends2_yAxisOverride, {veBlends2_blendParameter} + panel = veBlend2Bias, {veBlends2_blendParameter} dialog = veBlend3Cfg, "VE blend 3 config" field = "#The bias table controls how much of the blend table" @@ -6962,7 +6980,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends3_blendParameter - panel = veBlend3Bias + field = "Y axis override (set Zero for no override)", veBlends3_yAxisOverride, {veBlends3_blendParameter} + panel = veBlend3Bias, {veBlends3_blendParameter} dialog = veBlend4Cfg, "VE blend 4 config" field = "#The bias table controls how much of the blend table" @@ -6973,7 +6992,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends4_blendParameter - panel = veBlend4Bias + field = "Y axis override (set Zero for no override)", veBlends4_yAxisOverride, {veBlends4_blendParameter} + panel = veBlend4Bias, {veBlends4_blendParameter} indicatorPanel = isBoostControlledPanel, 1 indicator = {isBoostControlled}, "No Boost Control", "Boost Control Active" @@ -6987,7 +7007,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#parameter below." panel = isBoostControlledPanel field = "Blend parameter", boostOpenLoopBlends1_blendParameter - panel = boostOpenLoopBlend1Bias + field = "Y axis override (set Zero for no override)", boostOpenLoopBlends1_yAxisOverride, {boostOpenLoopBlends1_blendParameter} + panel = boostOpenLoopBlend1Bias, {boostOpenLoopBlends1_blendParameter} dialog = boostOpenBlend2Cfg, "Boost open loop blend 2 config" field = "#The bias table controls how much of the blend table" @@ -6998,7 +7019,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#parameter below." panel = isBoostControlledPanel field = "Blend parameter", boostOpenLoopBlends2_blendParameter - panel = boostOpenLoopBlend2Bias + field = "Y axis override (set Zero for no override)", boostOpenLoopBlends2_yAxisOverride, {boostOpenLoopBlends2_blendParameter} + panel = boostOpenLoopBlend2Bias, {boostOpenLoopBlends2_blendParameter} dialog = boostClosedBlend1Cfg, "Boost closed loop blend 1 config" field = "#The bias table controls how much of the blend table" @@ -7008,7 +7030,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", boostClosedLoopBlends1_blendParameter - panel = boostClosedLoopBlend1Bias + field = "Y axis override (set Zero for no override)", boostClosedLoopBlends1_yAxisOverride, {boostClosedLoopBlends1_blendParameter} + panel = boostClosedLoopBlend1Bias, {boostClosedLoopBlends1_blendParameter} dialog = boostClosedBlend2Cfg, "Boost closed loop blend 2 config" field = "#The bias table controls how much of the blend table" @@ -7018,7 +7041,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", boostClosedLoopBlends2_blendParameter - panel = boostClosedLoopBlend2Bias + field = "Y axis override (set Zero for no override)", boostClosedLoopBlends2_yAxisOverride, {boostClosedLoopBlends2_blendParameter} + panel = boostClosedLoopBlend2Bias, {boostClosedLoopBlends2_blendParameter} dialog = dwellSettings, "", yAxis panel = dwellCorrection diff --git a/firmware/tunerstudio/generated/rusefi_alphax-8chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-8chan.ini index fd6963b77d..c7af41947e 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.2024.01.17.alphax-8chan.809234667" + signature = "rusEFI master.2024.01.17.alphax-8chan.3163862903" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.01.17.alphax-8chan.809234667" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.01.17.alphax-8chan.3163862903" ; 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 Wed Jan 17 14:05:17 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:40:47 UTC 2024 pageSize = 22192 page = 1 @@ -1507,48 +1507,56 @@ ignBlends1_table = array, S16, 19728, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends1_loadBins = array, U16, 19856, [8], "Load", 1, 0, 0, 1000, 0 ignBlends1_rpmBins = array, U16, 19872, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends1_blendParameter = bits, U08, 19888, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends1_yAxisOverride = bits, U08, 19889, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends1_blendBins = array, S16, 19890, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends1_blendValues = array, U08, 19906, [8], "%", 0.5, 0, 0, 100, 1 ignBlends2_table = array, S16, 19916, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends2_loadBins = array, U16, 20044, [8], "Load", 1, 0, 0, 1000, 0 ignBlends2_rpmBins = array, U16, 20060, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends2_blendParameter = bits, U08, 20076, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends2_yAxisOverride = bits, U08, 20077, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends2_blendBins = array, S16, 20078, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends2_blendValues = array, U08, 20094, [8], "%", 0.5, 0, 0, 100, 1 ignBlends3_table = array, S16, 20104, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends3_loadBins = array, U16, 20232, [8], "Load", 1, 0, 0, 1000, 0 ignBlends3_rpmBins = array, U16, 20248, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends3_blendParameter = bits, U08, 20264, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends3_yAxisOverride = bits, U08, 20265, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends3_blendBins = array, S16, 20266, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends3_blendValues = array, U08, 20282, [8], "%", 0.5, 0, 0, 100, 1 ignBlends4_table = array, S16, 20292, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends4_loadBins = array, U16, 20420, [8], "Load", 1, 0, 0, 1000, 0 ignBlends4_rpmBins = array, U16, 20436, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends4_blendParameter = bits, U08, 20452, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends4_yAxisOverride = bits, U08, 20453, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends4_blendBins = array, S16, 20454, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends4_blendValues = array, U08, 20470, [8], "%", 0.5, 0, 0, 100, 1 veBlends1_table = array, S16, 20480, [8x8], "", 0.1, 0, -100, 100, 1 veBlends1_loadBins = array, U16, 20608, [8], "Load", 1, 0, 0, 1000, 0 veBlends1_rpmBins = array, U16, 20624, [8], "RPM", 1, 0, 0, 18000, 0 veBlends1_blendParameter = bits, U08, 20640, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends1_yAxisOverride = bits, U08, 20641, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends1_blendBins = array, S16, 20642, [8], "", 0.1, 0, -1000, 1000, 1 veBlends1_blendValues = array, U08, 20658, [8], "%", 0.5, 0, 0, 100, 1 veBlends2_table = array, S16, 20668, [8x8], "", 0.1, 0, -100, 100, 1 veBlends2_loadBins = array, U16, 20796, [8], "Load", 1, 0, 0, 1000, 0 veBlends2_rpmBins = array, U16, 20812, [8], "RPM", 1, 0, 0, 18000, 0 veBlends2_blendParameter = bits, U08, 20828, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends2_yAxisOverride = bits, U08, 20829, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends2_blendBins = array, S16, 20830, [8], "", 0.1, 0, -1000, 1000, 1 veBlends2_blendValues = array, U08, 20846, [8], "%", 0.5, 0, 0, 100, 1 veBlends3_table = array, S16, 20856, [8x8], "", 0.1, 0, -100, 100, 1 veBlends3_loadBins = array, U16, 20984, [8], "Load", 1, 0, 0, 1000, 0 veBlends3_rpmBins = array, U16, 21000, [8], "RPM", 1, 0, 0, 18000, 0 veBlends3_blendParameter = bits, U08, 21016, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends3_yAxisOverride = bits, U08, 21017, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends3_blendBins = array, S16, 21018, [8], "", 0.1, 0, -1000, 1000, 1 veBlends3_blendValues = array, U08, 21034, [8], "%", 0.5, 0, 0, 100, 1 veBlends4_table = array, S16, 21044, [8x8], "", 0.1, 0, -100, 100, 1 veBlends4_loadBins = array, U16, 21172, [8], "Load", 1, 0, 0, 1000, 0 veBlends4_rpmBins = array, U16, 21188, [8], "RPM", 1, 0, 0, 18000, 0 veBlends4_blendParameter = bits, U08, 21204, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends4_yAxisOverride = bits, U08, 21205, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends4_blendBins = array, S16, 21206, [8], "", 0.1, 0, -1000, 1000, 1 veBlends4_blendValues = array, U08, 21222, [8], "%", 0.5, 0, 0, 100, 1 throttleEstimateEffectiveAreaBins = array, U16, 21232, [12], "%", 0.1, 0, 0, 100, 1 @@ -1557,24 +1565,28 @@ boostOpenLoopBlends1_table = array, S16, 21280, [8x8], "", 0.1, 0, -100, 100, 1 boostOpenLoopBlends1_loadBins = array, U16, 21408, [8], "Load", 1, 0, 0, 1000, 0 boostOpenLoopBlends1_rpmBins = array, U16, 21424, [8], "RPM", 1, 0, 0, 18000, 0 boostOpenLoopBlends1_blendParameter = bits, U08, 21440, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostOpenLoopBlends1_yAxisOverride = bits, U08, 21441, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostOpenLoopBlends1_blendBins = array, S16, 21442, [8], "", 0.1, 0, -1000, 1000, 1 boostOpenLoopBlends1_blendValues = array, U08, 21458, [8], "%", 0.5, 0, 0, 100, 1 boostOpenLoopBlends2_table = array, S16, 21468, [8x8], "", 0.1, 0, -100, 100, 1 boostOpenLoopBlends2_loadBins = array, U16, 21596, [8], "Load", 1, 0, 0, 1000, 0 boostOpenLoopBlends2_rpmBins = array, U16, 21612, [8], "RPM", 1, 0, 0, 18000, 0 boostOpenLoopBlends2_blendParameter = bits, U08, 21628, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostOpenLoopBlends2_yAxisOverride = bits, U08, 21629, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostOpenLoopBlends2_blendBins = array, S16, 21630, [8], "", 0.1, 0, -1000, 1000, 1 boostOpenLoopBlends2_blendValues = array, U08, 21646, [8], "%", 0.5, 0, 0, 100, 1 boostClosedLoopBlends1_table = array, S16, 21656, [8x8], "", 0.1, 0, -100, 100, 1 boostClosedLoopBlends1_loadBins = array, U16, 21784, [8], "Load", 1, 0, 0, 1000, 0 boostClosedLoopBlends1_rpmBins = array, U16, 21800, [8], "RPM", 1, 0, 0, 18000, 0 boostClosedLoopBlends1_blendParameter = bits, U08, 21816, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostClosedLoopBlends1_yAxisOverride = bits, U08, 21817, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostClosedLoopBlends1_blendBins = array, S16, 21818, [8], "", 0.1, 0, -1000, 1000, 1 boostClosedLoopBlends1_blendValues = array, U08, 21834, [8], "%", 0.5, 0, 0, 100, 1 boostClosedLoopBlends2_table = array, S16, 21844, [8x8], "", 0.1, 0, -100, 100, 1 boostClosedLoopBlends2_loadBins = array, U16, 21972, [8], "Load", 1, 0, 0, 1000, 0 boostClosedLoopBlends2_rpmBins = array, U16, 21988, [8], "RPM", 1, 0, 0, 18000, 0 boostClosedLoopBlends2_blendParameter = bits, U08, 22004, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostClosedLoopBlends2_yAxisOverride = bits, U08, 22005, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostClosedLoopBlends2_blendBins = array, S16, 22006, [8], "", 0.1, 0, -1000, 1000, 1 boostClosedLoopBlends2_blendValues = array, U08, 22022, [8], "%", 0.5, 0, 0, 100, 1 tcu_rangeP = array, U08, 22032, [6], "level", 1, 0, 0, 3, 0 @@ -6902,7 +6914,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends1_blendParameter - panel = ignAdder1Bias + field = "Y axis override (set Zero for no override)", ignBlends1_yAxisOverride, {ignBlends1_blendParameter} + panel = ignAdder1Bias, {ignBlends1_blendParameter} dialog = ignAdder2Cfg, "Ignition adder 2 config" field = "#The bias table controls how much of the blend table" @@ -6912,7 +6925,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends2_blendParameter - panel = ignAdder2Bias + field = "Y axis override (set Zero for no override)", ignBlends2_yAxisOverride, {ignBlends2_blendParameter} + panel = ignAdder2Bias, {ignBlends2_blendParameter} dialog = ignAdder3Cfg, "Ignition adder 3 config" field = "#The bias table controls how much of the blend table" @@ -6922,7 +6936,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends3_blendParameter - panel = ignAdder3Bias + field = "Y axis override (set Zero for no override)", ignBlends3_yAxisOverride, {ignBlends3_blendParameter} + panel = ignAdder3Bias, {ignBlends3_blendParameter} dialog = ignAdder4Cfg, "Ignition adder 4 config" field = "#The bias table controls how much of the blend table" @@ -6932,7 +6947,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends4_blendParameter - panel = ignAdder4Bias + field = "Y axis override (set Zero for no override)", ignBlends4_yAxisOverride, {ignBlends4_blendParameter} + panel = ignAdder4Bias, {ignBlends4_blendParameter} dialog = veBlend1Cfg, "VE blend 1 config" field = "#The bias table controls how much of the blend table" @@ -6943,7 +6959,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends1_blendParameter - panel = veBlend1Bias + field = "Y axis override (set Zero for no override)", veBlends1_yAxisOverride, {veBlends1_blendParameter} + panel = veBlend1Bias, {veBlends1_blendParameter} dialog = veBlend2Cfg, "VE blend 2 config" field = "#The bias table controls how much of the blend table" @@ -6954,7 +6971,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends2_blendParameter - panel = veBlend2Bias + field = "Y axis override (set Zero for no override)", veBlends2_yAxisOverride, {veBlends2_blendParameter} + panel = veBlend2Bias, {veBlends2_blendParameter} dialog = veBlend3Cfg, "VE blend 3 config" field = "#The bias table controls how much of the blend table" @@ -6965,7 +6983,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends3_blendParameter - panel = veBlend3Bias + field = "Y axis override (set Zero for no override)", veBlends3_yAxisOverride, {veBlends3_blendParameter} + panel = veBlend3Bias, {veBlends3_blendParameter} dialog = veBlend4Cfg, "VE blend 4 config" field = "#The bias table controls how much of the blend table" @@ -6976,7 +6995,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends4_blendParameter - panel = veBlend4Bias + field = "Y axis override (set Zero for no override)", veBlends4_yAxisOverride, {veBlends4_blendParameter} + panel = veBlend4Bias, {veBlends4_blendParameter} indicatorPanel = isBoostControlledPanel, 1 indicator = {isBoostControlled}, "No Boost Control", "Boost Control Active" @@ -6990,7 +7010,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#parameter below." panel = isBoostControlledPanel field = "Blend parameter", boostOpenLoopBlends1_blendParameter - panel = boostOpenLoopBlend1Bias + field = "Y axis override (set Zero for no override)", boostOpenLoopBlends1_yAxisOverride, {boostOpenLoopBlends1_blendParameter} + panel = boostOpenLoopBlend1Bias, {boostOpenLoopBlends1_blendParameter} dialog = boostOpenBlend2Cfg, "Boost open loop blend 2 config" field = "#The bias table controls how much of the blend table" @@ -7001,7 +7022,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#parameter below." panel = isBoostControlledPanel field = "Blend parameter", boostOpenLoopBlends2_blendParameter - panel = boostOpenLoopBlend2Bias + field = "Y axis override (set Zero for no override)", boostOpenLoopBlends2_yAxisOverride, {boostOpenLoopBlends2_blendParameter} + panel = boostOpenLoopBlend2Bias, {boostOpenLoopBlends2_blendParameter} dialog = boostClosedBlend1Cfg, "Boost closed loop blend 1 config" field = "#The bias table controls how much of the blend table" @@ -7011,7 +7033,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", boostClosedLoopBlends1_blendParameter - panel = boostClosedLoopBlend1Bias + field = "Y axis override (set Zero for no override)", boostClosedLoopBlends1_yAxisOverride, {boostClosedLoopBlends1_blendParameter} + panel = boostClosedLoopBlend1Bias, {boostClosedLoopBlends1_blendParameter} dialog = boostClosedBlend2Cfg, "Boost closed loop blend 2 config" field = "#The bias table controls how much of the blend table" @@ -7021,7 +7044,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", boostClosedLoopBlends2_blendParameter - panel = boostClosedLoopBlend2Bias + field = "Y axis override (set Zero for no override)", boostClosedLoopBlends2_yAxisOverride, {boostClosedLoopBlends2_blendParameter} + panel = boostClosedLoopBlend2Bias, {boostClosedLoopBlends2_blendParameter} dialog = dwellSettings, "", yAxis panel = dwellCorrection diff --git a/firmware/tunerstudio/generated/rusefi_alphax-8chan_f7.ini b/firmware/tunerstudio/generated/rusefi_alphax-8chan_f7.ini index 96de7489e9..1668cbfc58 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.2024.01.17.alphax-8chan_f7.809234667" + signature = "rusEFI master.2024.01.17.alphax-8chan_f7.3163862903" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.01.17.alphax-8chan_f7.809234667" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.01.17.alphax-8chan_f7.3163862903" ; 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 Wed Jan 17 14:05:19 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:40:50 UTC 2024 pageSize = 22192 page = 1 @@ -1507,48 +1507,56 @@ ignBlends1_table = array, S16, 19728, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends1_loadBins = array, U16, 19856, [8], "Load", 1, 0, 0, 1000, 0 ignBlends1_rpmBins = array, U16, 19872, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends1_blendParameter = bits, U08, 19888, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends1_yAxisOverride = bits, U08, 19889, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends1_blendBins = array, S16, 19890, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends1_blendValues = array, U08, 19906, [8], "%", 0.5, 0, 0, 100, 1 ignBlends2_table = array, S16, 19916, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends2_loadBins = array, U16, 20044, [8], "Load", 1, 0, 0, 1000, 0 ignBlends2_rpmBins = array, U16, 20060, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends2_blendParameter = bits, U08, 20076, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends2_yAxisOverride = bits, U08, 20077, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends2_blendBins = array, S16, 20078, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends2_blendValues = array, U08, 20094, [8], "%", 0.5, 0, 0, 100, 1 ignBlends3_table = array, S16, 20104, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends3_loadBins = array, U16, 20232, [8], "Load", 1, 0, 0, 1000, 0 ignBlends3_rpmBins = array, U16, 20248, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends3_blendParameter = bits, U08, 20264, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends3_yAxisOverride = bits, U08, 20265, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends3_blendBins = array, S16, 20266, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends3_blendValues = array, U08, 20282, [8], "%", 0.5, 0, 0, 100, 1 ignBlends4_table = array, S16, 20292, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends4_loadBins = array, U16, 20420, [8], "Load", 1, 0, 0, 1000, 0 ignBlends4_rpmBins = array, U16, 20436, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends4_blendParameter = bits, U08, 20452, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends4_yAxisOverride = bits, U08, 20453, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends4_blendBins = array, S16, 20454, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends4_blendValues = array, U08, 20470, [8], "%", 0.5, 0, 0, 100, 1 veBlends1_table = array, S16, 20480, [8x8], "", 0.1, 0, -100, 100, 1 veBlends1_loadBins = array, U16, 20608, [8], "Load", 1, 0, 0, 1000, 0 veBlends1_rpmBins = array, U16, 20624, [8], "RPM", 1, 0, 0, 18000, 0 veBlends1_blendParameter = bits, U08, 20640, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends1_yAxisOverride = bits, U08, 20641, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends1_blendBins = array, S16, 20642, [8], "", 0.1, 0, -1000, 1000, 1 veBlends1_blendValues = array, U08, 20658, [8], "%", 0.5, 0, 0, 100, 1 veBlends2_table = array, S16, 20668, [8x8], "", 0.1, 0, -100, 100, 1 veBlends2_loadBins = array, U16, 20796, [8], "Load", 1, 0, 0, 1000, 0 veBlends2_rpmBins = array, U16, 20812, [8], "RPM", 1, 0, 0, 18000, 0 veBlends2_blendParameter = bits, U08, 20828, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends2_yAxisOverride = bits, U08, 20829, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends2_blendBins = array, S16, 20830, [8], "", 0.1, 0, -1000, 1000, 1 veBlends2_blendValues = array, U08, 20846, [8], "%", 0.5, 0, 0, 100, 1 veBlends3_table = array, S16, 20856, [8x8], "", 0.1, 0, -100, 100, 1 veBlends3_loadBins = array, U16, 20984, [8], "Load", 1, 0, 0, 1000, 0 veBlends3_rpmBins = array, U16, 21000, [8], "RPM", 1, 0, 0, 18000, 0 veBlends3_blendParameter = bits, U08, 21016, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends3_yAxisOverride = bits, U08, 21017, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends3_blendBins = array, S16, 21018, [8], "", 0.1, 0, -1000, 1000, 1 veBlends3_blendValues = array, U08, 21034, [8], "%", 0.5, 0, 0, 100, 1 veBlends4_table = array, S16, 21044, [8x8], "", 0.1, 0, -100, 100, 1 veBlends4_loadBins = array, U16, 21172, [8], "Load", 1, 0, 0, 1000, 0 veBlends4_rpmBins = array, U16, 21188, [8], "RPM", 1, 0, 0, 18000, 0 veBlends4_blendParameter = bits, U08, 21204, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends4_yAxisOverride = bits, U08, 21205, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends4_blendBins = array, S16, 21206, [8], "", 0.1, 0, -1000, 1000, 1 veBlends4_blendValues = array, U08, 21222, [8], "%", 0.5, 0, 0, 100, 1 throttleEstimateEffectiveAreaBins = array, U16, 21232, [12], "%", 0.1, 0, 0, 100, 1 @@ -1557,24 +1565,28 @@ boostOpenLoopBlends1_table = array, S16, 21280, [8x8], "", 0.1, 0, -100, 100, 1 boostOpenLoopBlends1_loadBins = array, U16, 21408, [8], "Load", 1, 0, 0, 1000, 0 boostOpenLoopBlends1_rpmBins = array, U16, 21424, [8], "RPM", 1, 0, 0, 18000, 0 boostOpenLoopBlends1_blendParameter = bits, U08, 21440, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostOpenLoopBlends1_yAxisOverride = bits, U08, 21441, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostOpenLoopBlends1_blendBins = array, S16, 21442, [8], "", 0.1, 0, -1000, 1000, 1 boostOpenLoopBlends1_blendValues = array, U08, 21458, [8], "%", 0.5, 0, 0, 100, 1 boostOpenLoopBlends2_table = array, S16, 21468, [8x8], "", 0.1, 0, -100, 100, 1 boostOpenLoopBlends2_loadBins = array, U16, 21596, [8], "Load", 1, 0, 0, 1000, 0 boostOpenLoopBlends2_rpmBins = array, U16, 21612, [8], "RPM", 1, 0, 0, 18000, 0 boostOpenLoopBlends2_blendParameter = bits, U08, 21628, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostOpenLoopBlends2_yAxisOverride = bits, U08, 21629, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostOpenLoopBlends2_blendBins = array, S16, 21630, [8], "", 0.1, 0, -1000, 1000, 1 boostOpenLoopBlends2_blendValues = array, U08, 21646, [8], "%", 0.5, 0, 0, 100, 1 boostClosedLoopBlends1_table = array, S16, 21656, [8x8], "", 0.1, 0, -100, 100, 1 boostClosedLoopBlends1_loadBins = array, U16, 21784, [8], "Load", 1, 0, 0, 1000, 0 boostClosedLoopBlends1_rpmBins = array, U16, 21800, [8], "RPM", 1, 0, 0, 18000, 0 boostClosedLoopBlends1_blendParameter = bits, U08, 21816, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostClosedLoopBlends1_yAxisOverride = bits, U08, 21817, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostClosedLoopBlends1_blendBins = array, S16, 21818, [8], "", 0.1, 0, -1000, 1000, 1 boostClosedLoopBlends1_blendValues = array, U08, 21834, [8], "%", 0.5, 0, 0, 100, 1 boostClosedLoopBlends2_table = array, S16, 21844, [8x8], "", 0.1, 0, -100, 100, 1 boostClosedLoopBlends2_loadBins = array, U16, 21972, [8], "Load", 1, 0, 0, 1000, 0 boostClosedLoopBlends2_rpmBins = array, U16, 21988, [8], "RPM", 1, 0, 0, 18000, 0 boostClosedLoopBlends2_blendParameter = bits, U08, 22004, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostClosedLoopBlends2_yAxisOverride = bits, U08, 22005, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostClosedLoopBlends2_blendBins = array, S16, 22006, [8], "", 0.1, 0, -1000, 1000, 1 boostClosedLoopBlends2_blendValues = array, U08, 22022, [8], "%", 0.5, 0, 0, 100, 1 tcu_rangeP = array, U08, 22032, [6], "level", 1, 0, 0, 3, 0 @@ -6902,7 +6914,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends1_blendParameter - panel = ignAdder1Bias + field = "Y axis override (set Zero for no override)", ignBlends1_yAxisOverride, {ignBlends1_blendParameter} + panel = ignAdder1Bias, {ignBlends1_blendParameter} dialog = ignAdder2Cfg, "Ignition adder 2 config" field = "#The bias table controls how much of the blend table" @@ -6912,7 +6925,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends2_blendParameter - panel = ignAdder2Bias + field = "Y axis override (set Zero for no override)", ignBlends2_yAxisOverride, {ignBlends2_blendParameter} + panel = ignAdder2Bias, {ignBlends2_blendParameter} dialog = ignAdder3Cfg, "Ignition adder 3 config" field = "#The bias table controls how much of the blend table" @@ -6922,7 +6936,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends3_blendParameter - panel = ignAdder3Bias + field = "Y axis override (set Zero for no override)", ignBlends3_yAxisOverride, {ignBlends3_blendParameter} + panel = ignAdder3Bias, {ignBlends3_blendParameter} dialog = ignAdder4Cfg, "Ignition adder 4 config" field = "#The bias table controls how much of the blend table" @@ -6932,7 +6947,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends4_blendParameter - panel = ignAdder4Bias + field = "Y axis override (set Zero for no override)", ignBlends4_yAxisOverride, {ignBlends4_blendParameter} + panel = ignAdder4Bias, {ignBlends4_blendParameter} dialog = veBlend1Cfg, "VE blend 1 config" field = "#The bias table controls how much of the blend table" @@ -6943,7 +6959,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends1_blendParameter - panel = veBlend1Bias + field = "Y axis override (set Zero for no override)", veBlends1_yAxisOverride, {veBlends1_blendParameter} + panel = veBlend1Bias, {veBlends1_blendParameter} dialog = veBlend2Cfg, "VE blend 2 config" field = "#The bias table controls how much of the blend table" @@ -6954,7 +6971,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends2_blendParameter - panel = veBlend2Bias + field = "Y axis override (set Zero for no override)", veBlends2_yAxisOverride, {veBlends2_blendParameter} + panel = veBlend2Bias, {veBlends2_blendParameter} dialog = veBlend3Cfg, "VE blend 3 config" field = "#The bias table controls how much of the blend table" @@ -6965,7 +6983,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends3_blendParameter - panel = veBlend3Bias + field = "Y axis override (set Zero for no override)", veBlends3_yAxisOverride, {veBlends3_blendParameter} + panel = veBlend3Bias, {veBlends3_blendParameter} dialog = veBlend4Cfg, "VE blend 4 config" field = "#The bias table controls how much of the blend table" @@ -6976,7 +6995,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends4_blendParameter - panel = veBlend4Bias + field = "Y axis override (set Zero for no override)", veBlends4_yAxisOverride, {veBlends4_blendParameter} + panel = veBlend4Bias, {veBlends4_blendParameter} indicatorPanel = isBoostControlledPanel, 1 indicator = {isBoostControlled}, "No Boost Control", "Boost Control Active" @@ -6990,7 +7010,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#parameter below." panel = isBoostControlledPanel field = "Blend parameter", boostOpenLoopBlends1_blendParameter - panel = boostOpenLoopBlend1Bias + field = "Y axis override (set Zero for no override)", boostOpenLoopBlends1_yAxisOverride, {boostOpenLoopBlends1_blendParameter} + panel = boostOpenLoopBlend1Bias, {boostOpenLoopBlends1_blendParameter} dialog = boostOpenBlend2Cfg, "Boost open loop blend 2 config" field = "#The bias table controls how much of the blend table" @@ -7001,7 +7022,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#parameter below." panel = isBoostControlledPanel field = "Blend parameter", boostOpenLoopBlends2_blendParameter - panel = boostOpenLoopBlend2Bias + field = "Y axis override (set Zero for no override)", boostOpenLoopBlends2_yAxisOverride, {boostOpenLoopBlends2_blendParameter} + panel = boostOpenLoopBlend2Bias, {boostOpenLoopBlends2_blendParameter} dialog = boostClosedBlend1Cfg, "Boost closed loop blend 1 config" field = "#The bias table controls how much of the blend table" @@ -7011,7 +7033,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", boostClosedLoopBlends1_blendParameter - panel = boostClosedLoopBlend1Bias + field = "Y axis override (set Zero for no override)", boostClosedLoopBlends1_yAxisOverride, {boostClosedLoopBlends1_blendParameter} + panel = boostClosedLoopBlend1Bias, {boostClosedLoopBlends1_blendParameter} dialog = boostClosedBlend2Cfg, "Boost closed loop blend 2 config" field = "#The bias table controls how much of the blend table" @@ -7021,7 +7044,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", boostClosedLoopBlends2_blendParameter - panel = boostClosedLoopBlend2Bias + field = "Y axis override (set Zero for no override)", boostClosedLoopBlends2_yAxisOverride, {boostClosedLoopBlends2_blendParameter} + panel = boostClosedLoopBlend2Bias, {boostClosedLoopBlends2_blendParameter} dialog = dwellSettings, "", yAxis panel = dwellCorrection diff --git a/firmware/tunerstudio/generated/rusefi_at_start_f435.ini b/firmware/tunerstudio/generated/rusefi_at_start_f435.ini index ecc9465012..9a936b103b 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.2024.01.17.at_start_f435.781393164" + signature = "rusEFI master.2024.01.17.at_start_f435.2721864336" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.01.17.at_start_f435.781393164" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.01.17.at_start_f435.2721864336" ; 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 Wed Jan 17 14:06:52 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:42:22 UTC 2024 pageSize = 22176 page = 1 @@ -1504,48 +1504,56 @@ ignBlends1_table = array, S16, 19712, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends1_loadBins = array, U16, 19840, [8], "Load", 1, 0, 0, 1000, 0 ignBlends1_rpmBins = array, U16, 19856, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends1_blendParameter = bits, U08, 19872, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends1_yAxisOverride = bits, U08, 19873, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends1_blendBins = array, S16, 19874, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends1_blendValues = array, U08, 19890, [8], "%", 0.5, 0, 0, 100, 1 ignBlends2_table = array, S16, 19900, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends2_loadBins = array, U16, 20028, [8], "Load", 1, 0, 0, 1000, 0 ignBlends2_rpmBins = array, U16, 20044, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends2_blendParameter = bits, U08, 20060, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends2_yAxisOverride = bits, U08, 20061, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends2_blendBins = array, S16, 20062, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends2_blendValues = array, U08, 20078, [8], "%", 0.5, 0, 0, 100, 1 ignBlends3_table = array, S16, 20088, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends3_loadBins = array, U16, 20216, [8], "Load", 1, 0, 0, 1000, 0 ignBlends3_rpmBins = array, U16, 20232, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends3_blendParameter = bits, U08, 20248, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends3_yAxisOverride = bits, U08, 20249, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends3_blendBins = array, S16, 20250, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends3_blendValues = array, U08, 20266, [8], "%", 0.5, 0, 0, 100, 1 ignBlends4_table = array, S16, 20276, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends4_loadBins = array, U16, 20404, [8], "Load", 1, 0, 0, 1000, 0 ignBlends4_rpmBins = array, U16, 20420, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends4_blendParameter = bits, U08, 20436, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends4_yAxisOverride = bits, U08, 20437, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends4_blendBins = array, S16, 20438, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends4_blendValues = array, U08, 20454, [8], "%", 0.5, 0, 0, 100, 1 veBlends1_table = array, S16, 20464, [8x8], "", 0.1, 0, -100, 100, 1 veBlends1_loadBins = array, U16, 20592, [8], "Load", 1, 0, 0, 1000, 0 veBlends1_rpmBins = array, U16, 20608, [8], "RPM", 1, 0, 0, 18000, 0 veBlends1_blendParameter = bits, U08, 20624, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends1_yAxisOverride = bits, U08, 20625, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends1_blendBins = array, S16, 20626, [8], "", 0.1, 0, -1000, 1000, 1 veBlends1_blendValues = array, U08, 20642, [8], "%", 0.5, 0, 0, 100, 1 veBlends2_table = array, S16, 20652, [8x8], "", 0.1, 0, -100, 100, 1 veBlends2_loadBins = array, U16, 20780, [8], "Load", 1, 0, 0, 1000, 0 veBlends2_rpmBins = array, U16, 20796, [8], "RPM", 1, 0, 0, 18000, 0 veBlends2_blendParameter = bits, U08, 20812, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends2_yAxisOverride = bits, U08, 20813, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends2_blendBins = array, S16, 20814, [8], "", 0.1, 0, -1000, 1000, 1 veBlends2_blendValues = array, U08, 20830, [8], "%", 0.5, 0, 0, 100, 1 veBlends3_table = array, S16, 20840, [8x8], "", 0.1, 0, -100, 100, 1 veBlends3_loadBins = array, U16, 20968, [8], "Load", 1, 0, 0, 1000, 0 veBlends3_rpmBins = array, U16, 20984, [8], "RPM", 1, 0, 0, 18000, 0 veBlends3_blendParameter = bits, U08, 21000, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends3_yAxisOverride = bits, U08, 21001, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends3_blendBins = array, S16, 21002, [8], "", 0.1, 0, -1000, 1000, 1 veBlends3_blendValues = array, U08, 21018, [8], "%", 0.5, 0, 0, 100, 1 veBlends4_table = array, S16, 21028, [8x8], "", 0.1, 0, -100, 100, 1 veBlends4_loadBins = array, U16, 21156, [8], "Load", 1, 0, 0, 1000, 0 veBlends4_rpmBins = array, U16, 21172, [8], "RPM", 1, 0, 0, 18000, 0 veBlends4_blendParameter = bits, U08, 21188, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends4_yAxisOverride = bits, U08, 21189, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends4_blendBins = array, S16, 21190, [8], "", 0.1, 0, -1000, 1000, 1 veBlends4_blendValues = array, U08, 21206, [8], "%", 0.5, 0, 0, 100, 1 throttleEstimateEffectiveAreaBins = array, U16, 21216, [12], "%", 0.1, 0, 0, 100, 1 @@ -1554,24 +1562,28 @@ boostOpenLoopBlends1_table = array, S16, 21264, [8x8], "", 0.1, 0, -100, 100, 1 boostOpenLoopBlends1_loadBins = array, U16, 21392, [8], "Load", 1, 0, 0, 1000, 0 boostOpenLoopBlends1_rpmBins = array, U16, 21408, [8], "RPM", 1, 0, 0, 18000, 0 boostOpenLoopBlends1_blendParameter = bits, U08, 21424, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostOpenLoopBlends1_yAxisOverride = bits, U08, 21425, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostOpenLoopBlends1_blendBins = array, S16, 21426, [8], "", 0.1, 0, -1000, 1000, 1 boostOpenLoopBlends1_blendValues = array, U08, 21442, [8], "%", 0.5, 0, 0, 100, 1 boostOpenLoopBlends2_table = array, S16, 21452, [8x8], "", 0.1, 0, -100, 100, 1 boostOpenLoopBlends2_loadBins = array, U16, 21580, [8], "Load", 1, 0, 0, 1000, 0 boostOpenLoopBlends2_rpmBins = array, U16, 21596, [8], "RPM", 1, 0, 0, 18000, 0 boostOpenLoopBlends2_blendParameter = bits, U08, 21612, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostOpenLoopBlends2_yAxisOverride = bits, U08, 21613, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostOpenLoopBlends2_blendBins = array, S16, 21614, [8], "", 0.1, 0, -1000, 1000, 1 boostOpenLoopBlends2_blendValues = array, U08, 21630, [8], "%", 0.5, 0, 0, 100, 1 boostClosedLoopBlends1_table = array, S16, 21640, [8x8], "", 0.1, 0, -100, 100, 1 boostClosedLoopBlends1_loadBins = array, U16, 21768, [8], "Load", 1, 0, 0, 1000, 0 boostClosedLoopBlends1_rpmBins = array, U16, 21784, [8], "RPM", 1, 0, 0, 18000, 0 boostClosedLoopBlends1_blendParameter = bits, U08, 21800, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostClosedLoopBlends1_yAxisOverride = bits, U08, 21801, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostClosedLoopBlends1_blendBins = array, S16, 21802, [8], "", 0.1, 0, -1000, 1000, 1 boostClosedLoopBlends1_blendValues = array, U08, 21818, [8], "%", 0.5, 0, 0, 100, 1 boostClosedLoopBlends2_table = array, S16, 21828, [8x8], "", 0.1, 0, -100, 100, 1 boostClosedLoopBlends2_loadBins = array, U16, 21956, [8], "Load", 1, 0, 0, 1000, 0 boostClosedLoopBlends2_rpmBins = array, U16, 21972, [8], "RPM", 1, 0, 0, 18000, 0 boostClosedLoopBlends2_blendParameter = bits, U08, 21988, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostClosedLoopBlends2_yAxisOverride = bits, U08, 21989, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostClosedLoopBlends2_blendBins = array, S16, 21990, [8], "", 0.1, 0, -1000, 1000, 1 boostClosedLoopBlends2_blendValues = array, U08, 22006, [8], "%", 0.5, 0, 0, 100, 1 tcu_rangeP = array, U08, 22016, [6], "level", 1, 0, 0, 3, 0 @@ -6897,7 +6909,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends1_blendParameter - panel = ignAdder1Bias + field = "Y axis override (set Zero for no override)", ignBlends1_yAxisOverride, {ignBlends1_blendParameter} + panel = ignAdder1Bias, {ignBlends1_blendParameter} dialog = ignAdder2Cfg, "Ignition adder 2 config" field = "#The bias table controls how much of the blend table" @@ -6907,7 +6920,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends2_blendParameter - panel = ignAdder2Bias + field = "Y axis override (set Zero for no override)", ignBlends2_yAxisOverride, {ignBlends2_blendParameter} + panel = ignAdder2Bias, {ignBlends2_blendParameter} dialog = ignAdder3Cfg, "Ignition adder 3 config" field = "#The bias table controls how much of the blend table" @@ -6917,7 +6931,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends3_blendParameter - panel = ignAdder3Bias + field = "Y axis override (set Zero for no override)", ignBlends3_yAxisOverride, {ignBlends3_blendParameter} + panel = ignAdder3Bias, {ignBlends3_blendParameter} dialog = ignAdder4Cfg, "Ignition adder 4 config" field = "#The bias table controls how much of the blend table" @@ -6927,7 +6942,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends4_blendParameter - panel = ignAdder4Bias + field = "Y axis override (set Zero for no override)", ignBlends4_yAxisOverride, {ignBlends4_blendParameter} + panel = ignAdder4Bias, {ignBlends4_blendParameter} dialog = veBlend1Cfg, "VE blend 1 config" field = "#The bias table controls how much of the blend table" @@ -6938,7 +6954,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends1_blendParameter - panel = veBlend1Bias + field = "Y axis override (set Zero for no override)", veBlends1_yAxisOverride, {veBlends1_blendParameter} + panel = veBlend1Bias, {veBlends1_blendParameter} dialog = veBlend2Cfg, "VE blend 2 config" field = "#The bias table controls how much of the blend table" @@ -6949,7 +6966,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends2_blendParameter - panel = veBlend2Bias + field = "Y axis override (set Zero for no override)", veBlends2_yAxisOverride, {veBlends2_blendParameter} + panel = veBlend2Bias, {veBlends2_blendParameter} dialog = veBlend3Cfg, "VE blend 3 config" field = "#The bias table controls how much of the blend table" @@ -6960,7 +6978,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends3_blendParameter - panel = veBlend3Bias + field = "Y axis override (set Zero for no override)", veBlends3_yAxisOverride, {veBlends3_blendParameter} + panel = veBlend3Bias, {veBlends3_blendParameter} dialog = veBlend4Cfg, "VE blend 4 config" field = "#The bias table controls how much of the blend table" @@ -6971,7 +6990,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends4_blendParameter - panel = veBlend4Bias + field = "Y axis override (set Zero for no override)", veBlends4_yAxisOverride, {veBlends4_blendParameter} + panel = veBlend4Bias, {veBlends4_blendParameter} indicatorPanel = isBoostControlledPanel, 1 indicator = {isBoostControlled}, "No Boost Control", "Boost Control Active" @@ -6985,7 +7005,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#parameter below." panel = isBoostControlledPanel field = "Blend parameter", boostOpenLoopBlends1_blendParameter - panel = boostOpenLoopBlend1Bias + field = "Y axis override (set Zero for no override)", boostOpenLoopBlends1_yAxisOverride, {boostOpenLoopBlends1_blendParameter} + panel = boostOpenLoopBlend1Bias, {boostOpenLoopBlends1_blendParameter} dialog = boostOpenBlend2Cfg, "Boost open loop blend 2 config" field = "#The bias table controls how much of the blend table" @@ -6996,7 +7017,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#parameter below." panel = isBoostControlledPanel field = "Blend parameter", boostOpenLoopBlends2_blendParameter - panel = boostOpenLoopBlend2Bias + field = "Y axis override (set Zero for no override)", boostOpenLoopBlends2_yAxisOverride, {boostOpenLoopBlends2_blendParameter} + panel = boostOpenLoopBlend2Bias, {boostOpenLoopBlends2_blendParameter} dialog = boostClosedBlend1Cfg, "Boost closed loop blend 1 config" field = "#The bias table controls how much of the blend table" @@ -7006,7 +7028,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", boostClosedLoopBlends1_blendParameter - panel = boostClosedLoopBlend1Bias + field = "Y axis override (set Zero for no override)", boostClosedLoopBlends1_yAxisOverride, {boostClosedLoopBlends1_blendParameter} + panel = boostClosedLoopBlend1Bias, {boostClosedLoopBlends1_blendParameter} dialog = boostClosedBlend2Cfg, "Boost closed loop blend 2 config" field = "#The bias table controls how much of the blend table" @@ -7016,7 +7039,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", boostClosedLoopBlends2_blendParameter - panel = boostClosedLoopBlend2Bias + field = "Y axis override (set Zero for no override)", boostClosedLoopBlends2_yAxisOverride, {boostClosedLoopBlends2_blendParameter} + panel = boostClosedLoopBlend2Bias, {boostClosedLoopBlends2_blendParameter} dialog = dwellSettings, "", yAxis panel = dwellCorrection diff --git a/firmware/tunerstudio/generated/rusefi_atlas.ini b/firmware/tunerstudio/generated/rusefi_atlas.ini index 01fd9415ec..070c2c4fdd 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.2024.01.17.atlas.1788135746" + signature = "rusEFI master.2024.01.17.atlas.3862662878" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.01.17.atlas.1788135746" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.01.17.atlas.3862662878" ; 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 Wed Jan 17 14:06:45 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:42:15 UTC 2024 pageSize = 21676 page = 1 @@ -1504,48 +1504,56 @@ ignBlends1_table = array, S16, 19212, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends1_loadBins = array, U16, 19340, [8], "Load", 1, 0, 0, 1000, 0 ignBlends1_rpmBins = array, U16, 19356, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends1_blendParameter = bits, U08, 19372, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends1_yAxisOverride = bits, U08, 19373, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends1_blendBins = array, S16, 19374, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends1_blendValues = array, U08, 19390, [8], "%", 0.5, 0, 0, 100, 1 ignBlends2_table = array, S16, 19400, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends2_loadBins = array, U16, 19528, [8], "Load", 1, 0, 0, 1000, 0 ignBlends2_rpmBins = array, U16, 19544, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends2_blendParameter = bits, U08, 19560, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends2_yAxisOverride = bits, U08, 19561, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends2_blendBins = array, S16, 19562, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends2_blendValues = array, U08, 19578, [8], "%", 0.5, 0, 0, 100, 1 ignBlends3_table = array, S16, 19588, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends3_loadBins = array, U16, 19716, [8], "Load", 1, 0, 0, 1000, 0 ignBlends3_rpmBins = array, U16, 19732, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends3_blendParameter = bits, U08, 19748, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends3_yAxisOverride = bits, U08, 19749, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends3_blendBins = array, S16, 19750, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends3_blendValues = array, U08, 19766, [8], "%", 0.5, 0, 0, 100, 1 ignBlends4_table = array, S16, 19776, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends4_loadBins = array, U16, 19904, [8], "Load", 1, 0, 0, 1000, 0 ignBlends4_rpmBins = array, U16, 19920, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends4_blendParameter = bits, U08, 19936, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends4_yAxisOverride = bits, U08, 19937, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends4_blendBins = array, S16, 19938, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends4_blendValues = array, U08, 19954, [8], "%", 0.5, 0, 0, 100, 1 veBlends1_table = array, S16, 19964, [8x8], "", 0.1, 0, -100, 100, 1 veBlends1_loadBins = array, U16, 20092, [8], "Load", 1, 0, 0, 1000, 0 veBlends1_rpmBins = array, U16, 20108, [8], "RPM", 1, 0, 0, 18000, 0 veBlends1_blendParameter = bits, U08, 20124, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends1_yAxisOverride = bits, U08, 20125, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends1_blendBins = array, S16, 20126, [8], "", 0.1, 0, -1000, 1000, 1 veBlends1_blendValues = array, U08, 20142, [8], "%", 0.5, 0, 0, 100, 1 veBlends2_table = array, S16, 20152, [8x8], "", 0.1, 0, -100, 100, 1 veBlends2_loadBins = array, U16, 20280, [8], "Load", 1, 0, 0, 1000, 0 veBlends2_rpmBins = array, U16, 20296, [8], "RPM", 1, 0, 0, 18000, 0 veBlends2_blendParameter = bits, U08, 20312, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends2_yAxisOverride = bits, U08, 20313, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends2_blendBins = array, S16, 20314, [8], "", 0.1, 0, -1000, 1000, 1 veBlends2_blendValues = array, U08, 20330, [8], "%", 0.5, 0, 0, 100, 1 veBlends3_table = array, S16, 20340, [8x8], "", 0.1, 0, -100, 100, 1 veBlends3_loadBins = array, U16, 20468, [8], "Load", 1, 0, 0, 1000, 0 veBlends3_rpmBins = array, U16, 20484, [8], "RPM", 1, 0, 0, 18000, 0 veBlends3_blendParameter = bits, U08, 20500, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends3_yAxisOverride = bits, U08, 20501, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends3_blendBins = array, S16, 20502, [8], "", 0.1, 0, -1000, 1000, 1 veBlends3_blendValues = array, U08, 20518, [8], "%", 0.5, 0, 0, 100, 1 veBlends4_table = array, S16, 20528, [8x8], "", 0.1, 0, -100, 100, 1 veBlends4_loadBins = array, U16, 20656, [8], "Load", 1, 0, 0, 1000, 0 veBlends4_rpmBins = array, U16, 20672, [8], "RPM", 1, 0, 0, 18000, 0 veBlends4_blendParameter = bits, U08, 20688, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends4_yAxisOverride = bits, U08, 20689, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends4_blendBins = array, S16, 20690, [8], "", 0.1, 0, -1000, 1000, 1 veBlends4_blendValues = array, U08, 20706, [8], "%", 0.5, 0, 0, 100, 1 throttleEstimateEffectiveAreaBins = array, U16, 20716, [12], "%", 0.1, 0, 0, 100, 1 @@ -1554,24 +1562,28 @@ boostOpenLoopBlends1_table = array, S16, 20764, [8x8], "", 0.1, 0, -100, 100, 1 boostOpenLoopBlends1_loadBins = array, U16, 20892, [8], "Load", 1, 0, 0, 1000, 0 boostOpenLoopBlends1_rpmBins = array, U16, 20908, [8], "RPM", 1, 0, 0, 18000, 0 boostOpenLoopBlends1_blendParameter = bits, U08, 20924, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostOpenLoopBlends1_yAxisOverride = bits, U08, 20925, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostOpenLoopBlends1_blendBins = array, S16, 20926, [8], "", 0.1, 0, -1000, 1000, 1 boostOpenLoopBlends1_blendValues = array, U08, 20942, [8], "%", 0.5, 0, 0, 100, 1 boostOpenLoopBlends2_table = array, S16, 20952, [8x8], "", 0.1, 0, -100, 100, 1 boostOpenLoopBlends2_loadBins = array, U16, 21080, [8], "Load", 1, 0, 0, 1000, 0 boostOpenLoopBlends2_rpmBins = array, U16, 21096, [8], "RPM", 1, 0, 0, 18000, 0 boostOpenLoopBlends2_blendParameter = bits, U08, 21112, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostOpenLoopBlends2_yAxisOverride = bits, U08, 21113, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostOpenLoopBlends2_blendBins = array, S16, 21114, [8], "", 0.1, 0, -1000, 1000, 1 boostOpenLoopBlends2_blendValues = array, U08, 21130, [8], "%", 0.5, 0, 0, 100, 1 boostClosedLoopBlends1_table = array, S16, 21140, [8x8], "", 0.1, 0, -100, 100, 1 boostClosedLoopBlends1_loadBins = array, U16, 21268, [8], "Load", 1, 0, 0, 1000, 0 boostClosedLoopBlends1_rpmBins = array, U16, 21284, [8], "RPM", 1, 0, 0, 18000, 0 boostClosedLoopBlends1_blendParameter = bits, U08, 21300, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostClosedLoopBlends1_yAxisOverride = bits, U08, 21301, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostClosedLoopBlends1_blendBins = array, S16, 21302, [8], "", 0.1, 0, -1000, 1000, 1 boostClosedLoopBlends1_blendValues = array, U08, 21318, [8], "%", 0.5, 0, 0, 100, 1 boostClosedLoopBlends2_table = array, S16, 21328, [8x8], "", 0.1, 0, -100, 100, 1 boostClosedLoopBlends2_loadBins = array, U16, 21456, [8], "Load", 1, 0, 0, 1000, 0 boostClosedLoopBlends2_rpmBins = array, U16, 21472, [8], "RPM", 1, 0, 0, 18000, 0 boostClosedLoopBlends2_blendParameter = bits, U08, 21488, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostClosedLoopBlends2_yAxisOverride = bits, U08, 21489, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostClosedLoopBlends2_blendBins = array, S16, 21490, [8], "", 0.1, 0, -1000, 1000, 1 boostClosedLoopBlends2_blendValues = array, U08, 21506, [8], "%", 0.5, 0, 0, 100, 1 tcu_rangeP = array, U08, 21516, [6], "level", 1, 0, 0, 3, 0 @@ -6897,7 +6909,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends1_blendParameter - panel = ignAdder1Bias + field = "Y axis override (set Zero for no override)", ignBlends1_yAxisOverride, {ignBlends1_blendParameter} + panel = ignAdder1Bias, {ignBlends1_blendParameter} dialog = ignAdder2Cfg, "Ignition adder 2 config" field = "#The bias table controls how much of the blend table" @@ -6907,7 +6920,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends2_blendParameter - panel = ignAdder2Bias + field = "Y axis override (set Zero for no override)", ignBlends2_yAxisOverride, {ignBlends2_blendParameter} + panel = ignAdder2Bias, {ignBlends2_blendParameter} dialog = ignAdder3Cfg, "Ignition adder 3 config" field = "#The bias table controls how much of the blend table" @@ -6917,7 +6931,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends3_blendParameter - panel = ignAdder3Bias + field = "Y axis override (set Zero for no override)", ignBlends3_yAxisOverride, {ignBlends3_blendParameter} + panel = ignAdder3Bias, {ignBlends3_blendParameter} dialog = ignAdder4Cfg, "Ignition adder 4 config" field = "#The bias table controls how much of the blend table" @@ -6927,7 +6942,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends4_blendParameter - panel = ignAdder4Bias + field = "Y axis override (set Zero for no override)", ignBlends4_yAxisOverride, {ignBlends4_blendParameter} + panel = ignAdder4Bias, {ignBlends4_blendParameter} dialog = veBlend1Cfg, "VE blend 1 config" field = "#The bias table controls how much of the blend table" @@ -6938,7 +6954,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends1_blendParameter - panel = veBlend1Bias + field = "Y axis override (set Zero for no override)", veBlends1_yAxisOverride, {veBlends1_blendParameter} + panel = veBlend1Bias, {veBlends1_blendParameter} dialog = veBlend2Cfg, "VE blend 2 config" field = "#The bias table controls how much of the blend table" @@ -6949,7 +6966,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends2_blendParameter - panel = veBlend2Bias + field = "Y axis override (set Zero for no override)", veBlends2_yAxisOverride, {veBlends2_blendParameter} + panel = veBlend2Bias, {veBlends2_blendParameter} dialog = veBlend3Cfg, "VE blend 3 config" field = "#The bias table controls how much of the blend table" @@ -6960,7 +6978,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends3_blendParameter - panel = veBlend3Bias + field = "Y axis override (set Zero for no override)", veBlends3_yAxisOverride, {veBlends3_blendParameter} + panel = veBlend3Bias, {veBlends3_blendParameter} dialog = veBlend4Cfg, "VE blend 4 config" field = "#The bias table controls how much of the blend table" @@ -6971,7 +6990,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends4_blendParameter - panel = veBlend4Bias + field = "Y axis override (set Zero for no override)", veBlends4_yAxisOverride, {veBlends4_blendParameter} + panel = veBlend4Bias, {veBlends4_blendParameter} indicatorPanel = isBoostControlledPanel, 1 indicator = {isBoostControlled}, "No Boost Control", "Boost Control Active" @@ -6985,7 +7005,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#parameter below." panel = isBoostControlledPanel field = "Blend parameter", boostOpenLoopBlends1_blendParameter - panel = boostOpenLoopBlend1Bias + field = "Y axis override (set Zero for no override)", boostOpenLoopBlends1_yAxisOverride, {boostOpenLoopBlends1_blendParameter} + panel = boostOpenLoopBlend1Bias, {boostOpenLoopBlends1_blendParameter} dialog = boostOpenBlend2Cfg, "Boost open loop blend 2 config" field = "#The bias table controls how much of the blend table" @@ -6996,7 +7017,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#parameter below." panel = isBoostControlledPanel field = "Blend parameter", boostOpenLoopBlends2_blendParameter - panel = boostOpenLoopBlend2Bias + field = "Y axis override (set Zero for no override)", boostOpenLoopBlends2_yAxisOverride, {boostOpenLoopBlends2_blendParameter} + panel = boostOpenLoopBlend2Bias, {boostOpenLoopBlends2_blendParameter} dialog = boostClosedBlend1Cfg, "Boost closed loop blend 1 config" field = "#The bias table controls how much of the blend table" @@ -7006,7 +7028,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", boostClosedLoopBlends1_blendParameter - panel = boostClosedLoopBlend1Bias + field = "Y axis override (set Zero for no override)", boostClosedLoopBlends1_yAxisOverride, {boostClosedLoopBlends1_blendParameter} + panel = boostClosedLoopBlend1Bias, {boostClosedLoopBlends1_blendParameter} dialog = boostClosedBlend2Cfg, "Boost closed loop blend 2 config" field = "#The bias table controls how much of the blend table" @@ -7016,7 +7039,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", boostClosedLoopBlends2_blendParameter - panel = boostClosedLoopBlend2Bias + field = "Y axis override (set Zero for no override)", boostClosedLoopBlends2_yAxisOverride, {boostClosedLoopBlends2_blendParameter} + panel = boostClosedLoopBlend2Bias, {boostClosedLoopBlends2_blendParameter} dialog = dwellSettings, "", yAxis panel = dwellCorrection diff --git a/firmware/tunerstudio/generated/rusefi_cypress.ini b/firmware/tunerstudio/generated/rusefi_cypress.ini index 2d8fd041e8..b4e7aead66 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.2024.01.17.cypress.781393164" + signature = "rusEFI master.2024.01.17.cypress.2721864336" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.01.17.cypress.781393164" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.01.17.cypress.2721864336" ; 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 Wed Jan 17 14:05:05 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:40:35 UTC 2024 pageSize = 22176 page = 1 @@ -1504,48 +1504,56 @@ ignBlends1_table = array, S16, 19712, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends1_loadBins = array, U16, 19840, [8], "Load", 1, 0, 0, 1000, 0 ignBlends1_rpmBins = array, U16, 19856, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends1_blendParameter = bits, U08, 19872, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends1_yAxisOverride = bits, U08, 19873, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends1_blendBins = array, S16, 19874, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends1_blendValues = array, U08, 19890, [8], "%", 0.5, 0, 0, 100, 1 ignBlends2_table = array, S16, 19900, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends2_loadBins = array, U16, 20028, [8], "Load", 1, 0, 0, 1000, 0 ignBlends2_rpmBins = array, U16, 20044, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends2_blendParameter = bits, U08, 20060, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends2_yAxisOverride = bits, U08, 20061, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends2_blendBins = array, S16, 20062, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends2_blendValues = array, U08, 20078, [8], "%", 0.5, 0, 0, 100, 1 ignBlends3_table = array, S16, 20088, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends3_loadBins = array, U16, 20216, [8], "Load", 1, 0, 0, 1000, 0 ignBlends3_rpmBins = array, U16, 20232, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends3_blendParameter = bits, U08, 20248, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends3_yAxisOverride = bits, U08, 20249, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends3_blendBins = array, S16, 20250, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends3_blendValues = array, U08, 20266, [8], "%", 0.5, 0, 0, 100, 1 ignBlends4_table = array, S16, 20276, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends4_loadBins = array, U16, 20404, [8], "Load", 1, 0, 0, 1000, 0 ignBlends4_rpmBins = array, U16, 20420, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends4_blendParameter = bits, U08, 20436, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends4_yAxisOverride = bits, U08, 20437, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends4_blendBins = array, S16, 20438, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends4_blendValues = array, U08, 20454, [8], "%", 0.5, 0, 0, 100, 1 veBlends1_table = array, S16, 20464, [8x8], "", 0.1, 0, -100, 100, 1 veBlends1_loadBins = array, U16, 20592, [8], "Load", 1, 0, 0, 1000, 0 veBlends1_rpmBins = array, U16, 20608, [8], "RPM", 1, 0, 0, 18000, 0 veBlends1_blendParameter = bits, U08, 20624, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends1_yAxisOverride = bits, U08, 20625, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends1_blendBins = array, S16, 20626, [8], "", 0.1, 0, -1000, 1000, 1 veBlends1_blendValues = array, U08, 20642, [8], "%", 0.5, 0, 0, 100, 1 veBlends2_table = array, S16, 20652, [8x8], "", 0.1, 0, -100, 100, 1 veBlends2_loadBins = array, U16, 20780, [8], "Load", 1, 0, 0, 1000, 0 veBlends2_rpmBins = array, U16, 20796, [8], "RPM", 1, 0, 0, 18000, 0 veBlends2_blendParameter = bits, U08, 20812, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends2_yAxisOverride = bits, U08, 20813, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends2_blendBins = array, S16, 20814, [8], "", 0.1, 0, -1000, 1000, 1 veBlends2_blendValues = array, U08, 20830, [8], "%", 0.5, 0, 0, 100, 1 veBlends3_table = array, S16, 20840, [8x8], "", 0.1, 0, -100, 100, 1 veBlends3_loadBins = array, U16, 20968, [8], "Load", 1, 0, 0, 1000, 0 veBlends3_rpmBins = array, U16, 20984, [8], "RPM", 1, 0, 0, 18000, 0 veBlends3_blendParameter = bits, U08, 21000, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends3_yAxisOverride = bits, U08, 21001, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends3_blendBins = array, S16, 21002, [8], "", 0.1, 0, -1000, 1000, 1 veBlends3_blendValues = array, U08, 21018, [8], "%", 0.5, 0, 0, 100, 1 veBlends4_table = array, S16, 21028, [8x8], "", 0.1, 0, -100, 100, 1 veBlends4_loadBins = array, U16, 21156, [8], "Load", 1, 0, 0, 1000, 0 veBlends4_rpmBins = array, U16, 21172, [8], "RPM", 1, 0, 0, 18000, 0 veBlends4_blendParameter = bits, U08, 21188, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends4_yAxisOverride = bits, U08, 21189, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends4_blendBins = array, S16, 21190, [8], "", 0.1, 0, -1000, 1000, 1 veBlends4_blendValues = array, U08, 21206, [8], "%", 0.5, 0, 0, 100, 1 throttleEstimateEffectiveAreaBins = array, U16, 21216, [12], "%", 0.1, 0, 0, 100, 1 @@ -1554,24 +1562,28 @@ boostOpenLoopBlends1_table = array, S16, 21264, [8x8], "", 0.1, 0, -100, 100, 1 boostOpenLoopBlends1_loadBins = array, U16, 21392, [8], "Load", 1, 0, 0, 1000, 0 boostOpenLoopBlends1_rpmBins = array, U16, 21408, [8], "RPM", 1, 0, 0, 18000, 0 boostOpenLoopBlends1_blendParameter = bits, U08, 21424, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostOpenLoopBlends1_yAxisOverride = bits, U08, 21425, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostOpenLoopBlends1_blendBins = array, S16, 21426, [8], "", 0.1, 0, -1000, 1000, 1 boostOpenLoopBlends1_blendValues = array, U08, 21442, [8], "%", 0.5, 0, 0, 100, 1 boostOpenLoopBlends2_table = array, S16, 21452, [8x8], "", 0.1, 0, -100, 100, 1 boostOpenLoopBlends2_loadBins = array, U16, 21580, [8], "Load", 1, 0, 0, 1000, 0 boostOpenLoopBlends2_rpmBins = array, U16, 21596, [8], "RPM", 1, 0, 0, 18000, 0 boostOpenLoopBlends2_blendParameter = bits, U08, 21612, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostOpenLoopBlends2_yAxisOverride = bits, U08, 21613, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostOpenLoopBlends2_blendBins = array, S16, 21614, [8], "", 0.1, 0, -1000, 1000, 1 boostOpenLoopBlends2_blendValues = array, U08, 21630, [8], "%", 0.5, 0, 0, 100, 1 boostClosedLoopBlends1_table = array, S16, 21640, [8x8], "", 0.1, 0, -100, 100, 1 boostClosedLoopBlends1_loadBins = array, U16, 21768, [8], "Load", 1, 0, 0, 1000, 0 boostClosedLoopBlends1_rpmBins = array, U16, 21784, [8], "RPM", 1, 0, 0, 18000, 0 boostClosedLoopBlends1_blendParameter = bits, U08, 21800, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostClosedLoopBlends1_yAxisOverride = bits, U08, 21801, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostClosedLoopBlends1_blendBins = array, S16, 21802, [8], "", 0.1, 0, -1000, 1000, 1 boostClosedLoopBlends1_blendValues = array, U08, 21818, [8], "%", 0.5, 0, 0, 100, 1 boostClosedLoopBlends2_table = array, S16, 21828, [8x8], "", 0.1, 0, -100, 100, 1 boostClosedLoopBlends2_loadBins = array, U16, 21956, [8], "Load", 1, 0, 0, 1000, 0 boostClosedLoopBlends2_rpmBins = array, U16, 21972, [8], "RPM", 1, 0, 0, 18000, 0 boostClosedLoopBlends2_blendParameter = bits, U08, 21988, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostClosedLoopBlends2_yAxisOverride = bits, U08, 21989, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostClosedLoopBlends2_blendBins = array, S16, 21990, [8], "", 0.1, 0, -1000, 1000, 1 boostClosedLoopBlends2_blendValues = array, U08, 22006, [8], "%", 0.5, 0, 0, 100, 1 tcu_rangeP = array, U08, 22016, [6], "level", 1, 0, 0, 3, 0 @@ -6897,7 +6909,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends1_blendParameter - panel = ignAdder1Bias + field = "Y axis override (set Zero for no override)", ignBlends1_yAxisOverride, {ignBlends1_blendParameter} + panel = ignAdder1Bias, {ignBlends1_blendParameter} dialog = ignAdder2Cfg, "Ignition adder 2 config" field = "#The bias table controls how much of the blend table" @@ -6907,7 +6920,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends2_blendParameter - panel = ignAdder2Bias + field = "Y axis override (set Zero for no override)", ignBlends2_yAxisOverride, {ignBlends2_blendParameter} + panel = ignAdder2Bias, {ignBlends2_blendParameter} dialog = ignAdder3Cfg, "Ignition adder 3 config" field = "#The bias table controls how much of the blend table" @@ -6917,7 +6931,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends3_blendParameter - panel = ignAdder3Bias + field = "Y axis override (set Zero for no override)", ignBlends3_yAxisOverride, {ignBlends3_blendParameter} + panel = ignAdder3Bias, {ignBlends3_blendParameter} dialog = ignAdder4Cfg, "Ignition adder 4 config" field = "#The bias table controls how much of the blend table" @@ -6927,7 +6942,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends4_blendParameter - panel = ignAdder4Bias + field = "Y axis override (set Zero for no override)", ignBlends4_yAxisOverride, {ignBlends4_blendParameter} + panel = ignAdder4Bias, {ignBlends4_blendParameter} dialog = veBlend1Cfg, "VE blend 1 config" field = "#The bias table controls how much of the blend table" @@ -6938,7 +6954,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends1_blendParameter - panel = veBlend1Bias + field = "Y axis override (set Zero for no override)", veBlends1_yAxisOverride, {veBlends1_blendParameter} + panel = veBlend1Bias, {veBlends1_blendParameter} dialog = veBlend2Cfg, "VE blend 2 config" field = "#The bias table controls how much of the blend table" @@ -6949,7 +6966,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends2_blendParameter - panel = veBlend2Bias + field = "Y axis override (set Zero for no override)", veBlends2_yAxisOverride, {veBlends2_blendParameter} + panel = veBlend2Bias, {veBlends2_blendParameter} dialog = veBlend3Cfg, "VE blend 3 config" field = "#The bias table controls how much of the blend table" @@ -6960,7 +6978,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends3_blendParameter - panel = veBlend3Bias + field = "Y axis override (set Zero for no override)", veBlends3_yAxisOverride, {veBlends3_blendParameter} + panel = veBlend3Bias, {veBlends3_blendParameter} dialog = veBlend4Cfg, "VE blend 4 config" field = "#The bias table controls how much of the blend table" @@ -6971,7 +6990,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends4_blendParameter - panel = veBlend4Bias + field = "Y axis override (set Zero for no override)", veBlends4_yAxisOverride, {veBlends4_blendParameter} + panel = veBlend4Bias, {veBlends4_blendParameter} indicatorPanel = isBoostControlledPanel, 1 indicator = {isBoostControlled}, "No Boost Control", "Boost Control Active" @@ -6985,7 +7005,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#parameter below." panel = isBoostControlledPanel field = "Blend parameter", boostOpenLoopBlends1_blendParameter - panel = boostOpenLoopBlend1Bias + field = "Y axis override (set Zero for no override)", boostOpenLoopBlends1_yAxisOverride, {boostOpenLoopBlends1_blendParameter} + panel = boostOpenLoopBlend1Bias, {boostOpenLoopBlends1_blendParameter} dialog = boostOpenBlend2Cfg, "Boost open loop blend 2 config" field = "#The bias table controls how much of the blend table" @@ -6996,7 +7017,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#parameter below." panel = isBoostControlledPanel field = "Blend parameter", boostOpenLoopBlends2_blendParameter - panel = boostOpenLoopBlend2Bias + field = "Y axis override (set Zero for no override)", boostOpenLoopBlends2_yAxisOverride, {boostOpenLoopBlends2_blendParameter} + panel = boostOpenLoopBlend2Bias, {boostOpenLoopBlends2_blendParameter} dialog = boostClosedBlend1Cfg, "Boost closed loop blend 1 config" field = "#The bias table controls how much of the blend table" @@ -7006,7 +7028,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", boostClosedLoopBlends1_blendParameter - panel = boostClosedLoopBlend1Bias + field = "Y axis override (set Zero for no override)", boostClosedLoopBlends1_yAxisOverride, {boostClosedLoopBlends1_blendParameter} + panel = boostClosedLoopBlend1Bias, {boostClosedLoopBlends1_blendParameter} dialog = boostClosedBlend2Cfg, "Boost closed loop blend 2 config" field = "#The bias table controls how much of the blend table" @@ -7016,7 +7039,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", boostClosedLoopBlends2_blendParameter - panel = boostClosedLoopBlend2Bias + field = "Y axis override (set Zero for no override)", boostClosedLoopBlends2_yAxisOverride, {boostClosedLoopBlends2_blendParameter} + panel = boostClosedLoopBlend2Bias, {boostClosedLoopBlends2_blendParameter} dialog = dwellSettings, "", yAxis panel = dwellCorrection diff --git a/firmware/tunerstudio/generated/rusefi_f407-discovery.ini b/firmware/tunerstudio/generated/rusefi_f407-discovery.ini index c4901bcc2e..8f8d6db846 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.2024.01.17.f407-discovery.3431326988" + signature = "rusEFI master.2024.01.17.f407-discovery.1076535952" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.01.17.f407-discovery.3431326988" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.01.17.f407-discovery.1076535952" ; 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 Wed Jan 17 14:06:50 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:42:20 UTC 2024 pageSize = 22176 page = 1 @@ -1504,48 +1504,56 @@ ignBlends1_table = array, S16, 19712, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends1_loadBins = array, U16, 19840, [8], "Load", 1, 0, 0, 1000, 0 ignBlends1_rpmBins = array, U16, 19856, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends1_blendParameter = bits, U08, 19872, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends1_yAxisOverride = bits, U08, 19873, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends1_blendBins = array, S16, 19874, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends1_blendValues = array, U08, 19890, [8], "%", 0.5, 0, 0, 100, 1 ignBlends2_table = array, S16, 19900, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends2_loadBins = array, U16, 20028, [8], "Load", 1, 0, 0, 1000, 0 ignBlends2_rpmBins = array, U16, 20044, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends2_blendParameter = bits, U08, 20060, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends2_yAxisOverride = bits, U08, 20061, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends2_blendBins = array, S16, 20062, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends2_blendValues = array, U08, 20078, [8], "%", 0.5, 0, 0, 100, 1 ignBlends3_table = array, S16, 20088, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends3_loadBins = array, U16, 20216, [8], "Load", 1, 0, 0, 1000, 0 ignBlends3_rpmBins = array, U16, 20232, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends3_blendParameter = bits, U08, 20248, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends3_yAxisOverride = bits, U08, 20249, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends3_blendBins = array, S16, 20250, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends3_blendValues = array, U08, 20266, [8], "%", 0.5, 0, 0, 100, 1 ignBlends4_table = array, S16, 20276, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends4_loadBins = array, U16, 20404, [8], "Load", 1, 0, 0, 1000, 0 ignBlends4_rpmBins = array, U16, 20420, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends4_blendParameter = bits, U08, 20436, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends4_yAxisOverride = bits, U08, 20437, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends4_blendBins = array, S16, 20438, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends4_blendValues = array, U08, 20454, [8], "%", 0.5, 0, 0, 100, 1 veBlends1_table = array, S16, 20464, [8x8], "", 0.1, 0, -100, 100, 1 veBlends1_loadBins = array, U16, 20592, [8], "Load", 1, 0, 0, 1000, 0 veBlends1_rpmBins = array, U16, 20608, [8], "RPM", 1, 0, 0, 18000, 0 veBlends1_blendParameter = bits, U08, 20624, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends1_yAxisOverride = bits, U08, 20625, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends1_blendBins = array, S16, 20626, [8], "", 0.1, 0, -1000, 1000, 1 veBlends1_blendValues = array, U08, 20642, [8], "%", 0.5, 0, 0, 100, 1 veBlends2_table = array, S16, 20652, [8x8], "", 0.1, 0, -100, 100, 1 veBlends2_loadBins = array, U16, 20780, [8], "Load", 1, 0, 0, 1000, 0 veBlends2_rpmBins = array, U16, 20796, [8], "RPM", 1, 0, 0, 18000, 0 veBlends2_blendParameter = bits, U08, 20812, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends2_yAxisOverride = bits, U08, 20813, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends2_blendBins = array, S16, 20814, [8], "", 0.1, 0, -1000, 1000, 1 veBlends2_blendValues = array, U08, 20830, [8], "%", 0.5, 0, 0, 100, 1 veBlends3_table = array, S16, 20840, [8x8], "", 0.1, 0, -100, 100, 1 veBlends3_loadBins = array, U16, 20968, [8], "Load", 1, 0, 0, 1000, 0 veBlends3_rpmBins = array, U16, 20984, [8], "RPM", 1, 0, 0, 18000, 0 veBlends3_blendParameter = bits, U08, 21000, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends3_yAxisOverride = bits, U08, 21001, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends3_blendBins = array, S16, 21002, [8], "", 0.1, 0, -1000, 1000, 1 veBlends3_blendValues = array, U08, 21018, [8], "%", 0.5, 0, 0, 100, 1 veBlends4_table = array, S16, 21028, [8x8], "", 0.1, 0, -100, 100, 1 veBlends4_loadBins = array, U16, 21156, [8], "Load", 1, 0, 0, 1000, 0 veBlends4_rpmBins = array, U16, 21172, [8], "RPM", 1, 0, 0, 18000, 0 veBlends4_blendParameter = bits, U08, 21188, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends4_yAxisOverride = bits, U08, 21189, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends4_blendBins = array, S16, 21190, [8], "", 0.1, 0, -1000, 1000, 1 veBlends4_blendValues = array, U08, 21206, [8], "%", 0.5, 0, 0, 100, 1 throttleEstimateEffectiveAreaBins = array, U16, 21216, [12], "%", 0.1, 0, 0, 100, 1 @@ -1554,24 +1562,28 @@ boostOpenLoopBlends1_table = array, S16, 21264, [8x8], "", 0.1, 0, -100, 100, 1 boostOpenLoopBlends1_loadBins = array, U16, 21392, [8], "Load", 1, 0, 0, 1000, 0 boostOpenLoopBlends1_rpmBins = array, U16, 21408, [8], "RPM", 1, 0, 0, 18000, 0 boostOpenLoopBlends1_blendParameter = bits, U08, 21424, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostOpenLoopBlends1_yAxisOverride = bits, U08, 21425, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostOpenLoopBlends1_blendBins = array, S16, 21426, [8], "", 0.1, 0, -1000, 1000, 1 boostOpenLoopBlends1_blendValues = array, U08, 21442, [8], "%", 0.5, 0, 0, 100, 1 boostOpenLoopBlends2_table = array, S16, 21452, [8x8], "", 0.1, 0, -100, 100, 1 boostOpenLoopBlends2_loadBins = array, U16, 21580, [8], "Load", 1, 0, 0, 1000, 0 boostOpenLoopBlends2_rpmBins = array, U16, 21596, [8], "RPM", 1, 0, 0, 18000, 0 boostOpenLoopBlends2_blendParameter = bits, U08, 21612, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostOpenLoopBlends2_yAxisOverride = bits, U08, 21613, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostOpenLoopBlends2_blendBins = array, S16, 21614, [8], "", 0.1, 0, -1000, 1000, 1 boostOpenLoopBlends2_blendValues = array, U08, 21630, [8], "%", 0.5, 0, 0, 100, 1 boostClosedLoopBlends1_table = array, S16, 21640, [8x8], "", 0.1, 0, -100, 100, 1 boostClosedLoopBlends1_loadBins = array, U16, 21768, [8], "Load", 1, 0, 0, 1000, 0 boostClosedLoopBlends1_rpmBins = array, U16, 21784, [8], "RPM", 1, 0, 0, 18000, 0 boostClosedLoopBlends1_blendParameter = bits, U08, 21800, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostClosedLoopBlends1_yAxisOverride = bits, U08, 21801, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostClosedLoopBlends1_blendBins = array, S16, 21802, [8], "", 0.1, 0, -1000, 1000, 1 boostClosedLoopBlends1_blendValues = array, U08, 21818, [8], "%", 0.5, 0, 0, 100, 1 boostClosedLoopBlends2_table = array, S16, 21828, [8x8], "", 0.1, 0, -100, 100, 1 boostClosedLoopBlends2_loadBins = array, U16, 21956, [8], "Load", 1, 0, 0, 1000, 0 boostClosedLoopBlends2_rpmBins = array, U16, 21972, [8], "RPM", 1, 0, 0, 18000, 0 boostClosedLoopBlends2_blendParameter = bits, U08, 21988, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostClosedLoopBlends2_yAxisOverride = bits, U08, 21989, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostClosedLoopBlends2_blendBins = array, S16, 21990, [8], "", 0.1, 0, -1000, 1000, 1 boostClosedLoopBlends2_blendValues = array, U08, 22006, [8], "%", 0.5, 0, 0, 100, 1 tcu_rangeP = array, U08, 22016, [6], "level", 1, 0, 0, 3, 0 @@ -6901,7 +6913,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends1_blendParameter - panel = ignAdder1Bias + field = "Y axis override (set Zero for no override)", ignBlends1_yAxisOverride, {ignBlends1_blendParameter} + panel = ignAdder1Bias, {ignBlends1_blendParameter} dialog = ignAdder2Cfg, "Ignition adder 2 config" field = "#The bias table controls how much of the blend table" @@ -6911,7 +6924,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends2_blendParameter - panel = ignAdder2Bias + field = "Y axis override (set Zero for no override)", ignBlends2_yAxisOverride, {ignBlends2_blendParameter} + panel = ignAdder2Bias, {ignBlends2_blendParameter} dialog = ignAdder3Cfg, "Ignition adder 3 config" field = "#The bias table controls how much of the blend table" @@ -6921,7 +6935,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends3_blendParameter - panel = ignAdder3Bias + field = "Y axis override (set Zero for no override)", ignBlends3_yAxisOverride, {ignBlends3_blendParameter} + panel = ignAdder3Bias, {ignBlends3_blendParameter} dialog = ignAdder4Cfg, "Ignition adder 4 config" field = "#The bias table controls how much of the blend table" @@ -6931,7 +6946,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends4_blendParameter - panel = ignAdder4Bias + field = "Y axis override (set Zero for no override)", ignBlends4_yAxisOverride, {ignBlends4_blendParameter} + panel = ignAdder4Bias, {ignBlends4_blendParameter} dialog = veBlend1Cfg, "VE blend 1 config" field = "#The bias table controls how much of the blend table" @@ -6942,7 +6958,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends1_blendParameter - panel = veBlend1Bias + field = "Y axis override (set Zero for no override)", veBlends1_yAxisOverride, {veBlends1_blendParameter} + panel = veBlend1Bias, {veBlends1_blendParameter} dialog = veBlend2Cfg, "VE blend 2 config" field = "#The bias table controls how much of the blend table" @@ -6953,7 +6970,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends2_blendParameter - panel = veBlend2Bias + field = "Y axis override (set Zero for no override)", veBlends2_yAxisOverride, {veBlends2_blendParameter} + panel = veBlend2Bias, {veBlends2_blendParameter} dialog = veBlend3Cfg, "VE blend 3 config" field = "#The bias table controls how much of the blend table" @@ -6964,7 +6982,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends3_blendParameter - panel = veBlend3Bias + field = "Y axis override (set Zero for no override)", veBlends3_yAxisOverride, {veBlends3_blendParameter} + panel = veBlend3Bias, {veBlends3_blendParameter} dialog = veBlend4Cfg, "VE blend 4 config" field = "#The bias table controls how much of the blend table" @@ -6975,7 +6994,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends4_blendParameter - panel = veBlend4Bias + field = "Y axis override (set Zero for no override)", veBlends4_yAxisOverride, {veBlends4_blendParameter} + panel = veBlend4Bias, {veBlends4_blendParameter} indicatorPanel = isBoostControlledPanel, 1 indicator = {isBoostControlled}, "No Boost Control", "Boost Control Active" @@ -6989,7 +7009,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#parameter below." panel = isBoostControlledPanel field = "Blend parameter", boostOpenLoopBlends1_blendParameter - panel = boostOpenLoopBlend1Bias + field = "Y axis override (set Zero for no override)", boostOpenLoopBlends1_yAxisOverride, {boostOpenLoopBlends1_blendParameter} + panel = boostOpenLoopBlend1Bias, {boostOpenLoopBlends1_blendParameter} dialog = boostOpenBlend2Cfg, "Boost open loop blend 2 config" field = "#The bias table controls how much of the blend table" @@ -7000,7 +7021,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#parameter below." panel = isBoostControlledPanel field = "Blend parameter", boostOpenLoopBlends2_blendParameter - panel = boostOpenLoopBlend2Bias + field = "Y axis override (set Zero for no override)", boostOpenLoopBlends2_yAxisOverride, {boostOpenLoopBlends2_blendParameter} + panel = boostOpenLoopBlend2Bias, {boostOpenLoopBlends2_blendParameter} dialog = boostClosedBlend1Cfg, "Boost closed loop blend 1 config" field = "#The bias table controls how much of the blend table" @@ -7010,7 +7032,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", boostClosedLoopBlends1_blendParameter - panel = boostClosedLoopBlend1Bias + field = "Y axis override (set Zero for no override)", boostClosedLoopBlends1_yAxisOverride, {boostClosedLoopBlends1_blendParameter} + panel = boostClosedLoopBlend1Bias, {boostClosedLoopBlends1_blendParameter} dialog = boostClosedBlend2Cfg, "Boost closed loop blend 2 config" field = "#The bias table controls how much of the blend table" @@ -7020,7 +7043,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", boostClosedLoopBlends2_blendParameter - panel = boostClosedLoopBlend2Bias + field = "Y axis override (set Zero for no override)", boostClosedLoopBlends2_yAxisOverride, {boostClosedLoopBlends2_blendParameter} + panel = boostClosedLoopBlend2Bias, {boostClosedLoopBlends2_blendParameter} dialog = dwellSettings, "", yAxis panel = dwellCorrection diff --git a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini index cd7fc020e7..d24ed3900a 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.2024.01.17.f429-discovery.781393164" + signature = "rusEFI master.2024.01.17.f429-discovery.2721864336" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.01.17.f429-discovery.781393164" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.01.17.f429-discovery.2721864336" ; 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 Wed Jan 17 14:06:30 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:42:01 UTC 2024 pageSize = 22176 page = 1 @@ -1504,48 +1504,56 @@ ignBlends1_table = array, S16, 19712, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends1_loadBins = array, U16, 19840, [8], "Load", 1, 0, 0, 1000, 0 ignBlends1_rpmBins = array, U16, 19856, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends1_blendParameter = bits, U08, 19872, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends1_yAxisOverride = bits, U08, 19873, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends1_blendBins = array, S16, 19874, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends1_blendValues = array, U08, 19890, [8], "%", 0.5, 0, 0, 100, 1 ignBlends2_table = array, S16, 19900, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends2_loadBins = array, U16, 20028, [8], "Load", 1, 0, 0, 1000, 0 ignBlends2_rpmBins = array, U16, 20044, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends2_blendParameter = bits, U08, 20060, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends2_yAxisOverride = bits, U08, 20061, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends2_blendBins = array, S16, 20062, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends2_blendValues = array, U08, 20078, [8], "%", 0.5, 0, 0, 100, 1 ignBlends3_table = array, S16, 20088, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends3_loadBins = array, U16, 20216, [8], "Load", 1, 0, 0, 1000, 0 ignBlends3_rpmBins = array, U16, 20232, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends3_blendParameter = bits, U08, 20248, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends3_yAxisOverride = bits, U08, 20249, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends3_blendBins = array, S16, 20250, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends3_blendValues = array, U08, 20266, [8], "%", 0.5, 0, 0, 100, 1 ignBlends4_table = array, S16, 20276, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends4_loadBins = array, U16, 20404, [8], "Load", 1, 0, 0, 1000, 0 ignBlends4_rpmBins = array, U16, 20420, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends4_blendParameter = bits, U08, 20436, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends4_yAxisOverride = bits, U08, 20437, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends4_blendBins = array, S16, 20438, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends4_blendValues = array, U08, 20454, [8], "%", 0.5, 0, 0, 100, 1 veBlends1_table = array, S16, 20464, [8x8], "", 0.1, 0, -100, 100, 1 veBlends1_loadBins = array, U16, 20592, [8], "Load", 1, 0, 0, 1000, 0 veBlends1_rpmBins = array, U16, 20608, [8], "RPM", 1, 0, 0, 18000, 0 veBlends1_blendParameter = bits, U08, 20624, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends1_yAxisOverride = bits, U08, 20625, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends1_blendBins = array, S16, 20626, [8], "", 0.1, 0, -1000, 1000, 1 veBlends1_blendValues = array, U08, 20642, [8], "%", 0.5, 0, 0, 100, 1 veBlends2_table = array, S16, 20652, [8x8], "", 0.1, 0, -100, 100, 1 veBlends2_loadBins = array, U16, 20780, [8], "Load", 1, 0, 0, 1000, 0 veBlends2_rpmBins = array, U16, 20796, [8], "RPM", 1, 0, 0, 18000, 0 veBlends2_blendParameter = bits, U08, 20812, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends2_yAxisOverride = bits, U08, 20813, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends2_blendBins = array, S16, 20814, [8], "", 0.1, 0, -1000, 1000, 1 veBlends2_blendValues = array, U08, 20830, [8], "%", 0.5, 0, 0, 100, 1 veBlends3_table = array, S16, 20840, [8x8], "", 0.1, 0, -100, 100, 1 veBlends3_loadBins = array, U16, 20968, [8], "Load", 1, 0, 0, 1000, 0 veBlends3_rpmBins = array, U16, 20984, [8], "RPM", 1, 0, 0, 18000, 0 veBlends3_blendParameter = bits, U08, 21000, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends3_yAxisOverride = bits, U08, 21001, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends3_blendBins = array, S16, 21002, [8], "", 0.1, 0, -1000, 1000, 1 veBlends3_blendValues = array, U08, 21018, [8], "%", 0.5, 0, 0, 100, 1 veBlends4_table = array, S16, 21028, [8x8], "", 0.1, 0, -100, 100, 1 veBlends4_loadBins = array, U16, 21156, [8], "Load", 1, 0, 0, 1000, 0 veBlends4_rpmBins = array, U16, 21172, [8], "RPM", 1, 0, 0, 18000, 0 veBlends4_blendParameter = bits, U08, 21188, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends4_yAxisOverride = bits, U08, 21189, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends4_blendBins = array, S16, 21190, [8], "", 0.1, 0, -1000, 1000, 1 veBlends4_blendValues = array, U08, 21206, [8], "%", 0.5, 0, 0, 100, 1 throttleEstimateEffectiveAreaBins = array, U16, 21216, [12], "%", 0.1, 0, 0, 100, 1 @@ -1554,24 +1562,28 @@ boostOpenLoopBlends1_table = array, S16, 21264, [8x8], "", 0.1, 0, -100, 100, 1 boostOpenLoopBlends1_loadBins = array, U16, 21392, [8], "Load", 1, 0, 0, 1000, 0 boostOpenLoopBlends1_rpmBins = array, U16, 21408, [8], "RPM", 1, 0, 0, 18000, 0 boostOpenLoopBlends1_blendParameter = bits, U08, 21424, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostOpenLoopBlends1_yAxisOverride = bits, U08, 21425, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostOpenLoopBlends1_blendBins = array, S16, 21426, [8], "", 0.1, 0, -1000, 1000, 1 boostOpenLoopBlends1_blendValues = array, U08, 21442, [8], "%", 0.5, 0, 0, 100, 1 boostOpenLoopBlends2_table = array, S16, 21452, [8x8], "", 0.1, 0, -100, 100, 1 boostOpenLoopBlends2_loadBins = array, U16, 21580, [8], "Load", 1, 0, 0, 1000, 0 boostOpenLoopBlends2_rpmBins = array, U16, 21596, [8], "RPM", 1, 0, 0, 18000, 0 boostOpenLoopBlends2_blendParameter = bits, U08, 21612, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostOpenLoopBlends2_yAxisOverride = bits, U08, 21613, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostOpenLoopBlends2_blendBins = array, S16, 21614, [8], "", 0.1, 0, -1000, 1000, 1 boostOpenLoopBlends2_blendValues = array, U08, 21630, [8], "%", 0.5, 0, 0, 100, 1 boostClosedLoopBlends1_table = array, S16, 21640, [8x8], "", 0.1, 0, -100, 100, 1 boostClosedLoopBlends1_loadBins = array, U16, 21768, [8], "Load", 1, 0, 0, 1000, 0 boostClosedLoopBlends1_rpmBins = array, U16, 21784, [8], "RPM", 1, 0, 0, 18000, 0 boostClosedLoopBlends1_blendParameter = bits, U08, 21800, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostClosedLoopBlends1_yAxisOverride = bits, U08, 21801, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostClosedLoopBlends1_blendBins = array, S16, 21802, [8], "", 0.1, 0, -1000, 1000, 1 boostClosedLoopBlends1_blendValues = array, U08, 21818, [8], "%", 0.5, 0, 0, 100, 1 boostClosedLoopBlends2_table = array, S16, 21828, [8x8], "", 0.1, 0, -100, 100, 1 boostClosedLoopBlends2_loadBins = array, U16, 21956, [8], "Load", 1, 0, 0, 1000, 0 boostClosedLoopBlends2_rpmBins = array, U16, 21972, [8], "RPM", 1, 0, 0, 18000, 0 boostClosedLoopBlends2_blendParameter = bits, U08, 21988, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostClosedLoopBlends2_yAxisOverride = bits, U08, 21989, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostClosedLoopBlends2_blendBins = array, S16, 21990, [8], "", 0.1, 0, -1000, 1000, 1 boostClosedLoopBlends2_blendValues = array, U08, 22006, [8], "%", 0.5, 0, 0, 100, 1 tcu_rangeP = array, U08, 22016, [6], "level", 1, 0, 0, 3, 0 @@ -6897,7 +6909,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends1_blendParameter - panel = ignAdder1Bias + field = "Y axis override (set Zero for no override)", ignBlends1_yAxisOverride, {ignBlends1_blendParameter} + panel = ignAdder1Bias, {ignBlends1_blendParameter} dialog = ignAdder2Cfg, "Ignition adder 2 config" field = "#The bias table controls how much of the blend table" @@ -6907,7 +6920,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends2_blendParameter - panel = ignAdder2Bias + field = "Y axis override (set Zero for no override)", ignBlends2_yAxisOverride, {ignBlends2_blendParameter} + panel = ignAdder2Bias, {ignBlends2_blendParameter} dialog = ignAdder3Cfg, "Ignition adder 3 config" field = "#The bias table controls how much of the blend table" @@ -6917,7 +6931,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends3_blendParameter - panel = ignAdder3Bias + field = "Y axis override (set Zero for no override)", ignBlends3_yAxisOverride, {ignBlends3_blendParameter} + panel = ignAdder3Bias, {ignBlends3_blendParameter} dialog = ignAdder4Cfg, "Ignition adder 4 config" field = "#The bias table controls how much of the blend table" @@ -6927,7 +6942,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends4_blendParameter - panel = ignAdder4Bias + field = "Y axis override (set Zero for no override)", ignBlends4_yAxisOverride, {ignBlends4_blendParameter} + panel = ignAdder4Bias, {ignBlends4_blendParameter} dialog = veBlend1Cfg, "VE blend 1 config" field = "#The bias table controls how much of the blend table" @@ -6938,7 +6954,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends1_blendParameter - panel = veBlend1Bias + field = "Y axis override (set Zero for no override)", veBlends1_yAxisOverride, {veBlends1_blendParameter} + panel = veBlend1Bias, {veBlends1_blendParameter} dialog = veBlend2Cfg, "VE blend 2 config" field = "#The bias table controls how much of the blend table" @@ -6949,7 +6966,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends2_blendParameter - panel = veBlend2Bias + field = "Y axis override (set Zero for no override)", veBlends2_yAxisOverride, {veBlends2_blendParameter} + panel = veBlend2Bias, {veBlends2_blendParameter} dialog = veBlend3Cfg, "VE blend 3 config" field = "#The bias table controls how much of the blend table" @@ -6960,7 +6978,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends3_blendParameter - panel = veBlend3Bias + field = "Y axis override (set Zero for no override)", veBlends3_yAxisOverride, {veBlends3_blendParameter} + panel = veBlend3Bias, {veBlends3_blendParameter} dialog = veBlend4Cfg, "VE blend 4 config" field = "#The bias table controls how much of the blend table" @@ -6971,7 +6990,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends4_blendParameter - panel = veBlend4Bias + field = "Y axis override (set Zero for no override)", veBlends4_yAxisOverride, {veBlends4_blendParameter} + panel = veBlend4Bias, {veBlends4_blendParameter} indicatorPanel = isBoostControlledPanel, 1 indicator = {isBoostControlled}, "No Boost Control", "Boost Control Active" @@ -6985,7 +7005,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#parameter below." panel = isBoostControlledPanel field = "Blend parameter", boostOpenLoopBlends1_blendParameter - panel = boostOpenLoopBlend1Bias + field = "Y axis override (set Zero for no override)", boostOpenLoopBlends1_yAxisOverride, {boostOpenLoopBlends1_blendParameter} + panel = boostOpenLoopBlend1Bias, {boostOpenLoopBlends1_blendParameter} dialog = boostOpenBlend2Cfg, "Boost open loop blend 2 config" field = "#The bias table controls how much of the blend table" @@ -6996,7 +7017,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#parameter below." panel = isBoostControlledPanel field = "Blend parameter", boostOpenLoopBlends2_blendParameter - panel = boostOpenLoopBlend2Bias + field = "Y axis override (set Zero for no override)", boostOpenLoopBlends2_yAxisOverride, {boostOpenLoopBlends2_blendParameter} + panel = boostOpenLoopBlend2Bias, {boostOpenLoopBlends2_blendParameter} dialog = boostClosedBlend1Cfg, "Boost closed loop blend 1 config" field = "#The bias table controls how much of the blend table" @@ -7006,7 +7028,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", boostClosedLoopBlends1_blendParameter - panel = boostClosedLoopBlend1Bias + field = "Y axis override (set Zero for no override)", boostClosedLoopBlends1_yAxisOverride, {boostClosedLoopBlends1_blendParameter} + panel = boostClosedLoopBlend1Bias, {boostClosedLoopBlends1_blendParameter} dialog = boostClosedBlend2Cfg, "Boost closed loop blend 2 config" field = "#The bias table controls how much of the blend table" @@ -7016,7 +7039,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", boostClosedLoopBlends2_blendParameter - panel = boostClosedLoopBlend2Bias + field = "Y axis override (set Zero for no override)", boostClosedLoopBlends2_yAxisOverride, {boostClosedLoopBlends2_blendParameter} + panel = boostClosedLoopBlend2Bias, {boostClosedLoopBlends2_blendParameter} dialog = dwellSettings, "", yAxis panel = dwellCorrection diff --git a/firmware/tunerstudio/generated/rusefi_f469-discovery.ini b/firmware/tunerstudio/generated/rusefi_f469-discovery.ini index eb907c2509..f4c69ae0e4 100644 --- a/firmware/tunerstudio/generated/rusefi_f469-discovery.ini +++ b/firmware/tunerstudio/generated/rusefi_f469-discovery.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.01.17.f469-discovery.474225567" + signature = "rusEFI master.2024.01.17.f469-discovery.2431343619" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.01.17.f469-discovery.474225567" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.01.17.f469-discovery.2431343619" ; 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 Wed Jan 17 14:06:33 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:42:03 UTC 2024 pageSize = 22176 page = 1 @@ -1504,48 +1504,56 @@ ignBlends1_table = array, S16, 19712, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends1_loadBins = array, U16, 19840, [8], "Load", 1, 0, 0, 1000, 0 ignBlends1_rpmBins = array, U16, 19856, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends1_blendParameter = bits, U08, 19872, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends1_yAxisOverride = bits, U08, 19873, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends1_blendBins = array, S16, 19874, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends1_blendValues = array, U08, 19890, [8], "%", 0.5, 0, 0, 100, 1 ignBlends2_table = array, S16, 19900, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends2_loadBins = array, U16, 20028, [8], "Load", 1, 0, 0, 1000, 0 ignBlends2_rpmBins = array, U16, 20044, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends2_blendParameter = bits, U08, 20060, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends2_yAxisOverride = bits, U08, 20061, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends2_blendBins = array, S16, 20062, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends2_blendValues = array, U08, 20078, [8], "%", 0.5, 0, 0, 100, 1 ignBlends3_table = array, S16, 20088, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends3_loadBins = array, U16, 20216, [8], "Load", 1, 0, 0, 1000, 0 ignBlends3_rpmBins = array, U16, 20232, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends3_blendParameter = bits, U08, 20248, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends3_yAxisOverride = bits, U08, 20249, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends3_blendBins = array, S16, 20250, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends3_blendValues = array, U08, 20266, [8], "%", 0.5, 0, 0, 100, 1 ignBlends4_table = array, S16, 20276, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends4_loadBins = array, U16, 20404, [8], "Load", 1, 0, 0, 1000, 0 ignBlends4_rpmBins = array, U16, 20420, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends4_blendParameter = bits, U08, 20436, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends4_yAxisOverride = bits, U08, 20437, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends4_blendBins = array, S16, 20438, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends4_blendValues = array, U08, 20454, [8], "%", 0.5, 0, 0, 100, 1 veBlends1_table = array, S16, 20464, [8x8], "", 0.1, 0, -100, 100, 1 veBlends1_loadBins = array, U16, 20592, [8], "Load", 1, 0, 0, 1000, 0 veBlends1_rpmBins = array, U16, 20608, [8], "RPM", 1, 0, 0, 18000, 0 veBlends1_blendParameter = bits, U08, 20624, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends1_yAxisOverride = bits, U08, 20625, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends1_blendBins = array, S16, 20626, [8], "", 0.1, 0, -1000, 1000, 1 veBlends1_blendValues = array, U08, 20642, [8], "%", 0.5, 0, 0, 100, 1 veBlends2_table = array, S16, 20652, [8x8], "", 0.1, 0, -100, 100, 1 veBlends2_loadBins = array, U16, 20780, [8], "Load", 1, 0, 0, 1000, 0 veBlends2_rpmBins = array, U16, 20796, [8], "RPM", 1, 0, 0, 18000, 0 veBlends2_blendParameter = bits, U08, 20812, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends2_yAxisOverride = bits, U08, 20813, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends2_blendBins = array, S16, 20814, [8], "", 0.1, 0, -1000, 1000, 1 veBlends2_blendValues = array, U08, 20830, [8], "%", 0.5, 0, 0, 100, 1 veBlends3_table = array, S16, 20840, [8x8], "", 0.1, 0, -100, 100, 1 veBlends3_loadBins = array, U16, 20968, [8], "Load", 1, 0, 0, 1000, 0 veBlends3_rpmBins = array, U16, 20984, [8], "RPM", 1, 0, 0, 18000, 0 veBlends3_blendParameter = bits, U08, 21000, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends3_yAxisOverride = bits, U08, 21001, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends3_blendBins = array, S16, 21002, [8], "", 0.1, 0, -1000, 1000, 1 veBlends3_blendValues = array, U08, 21018, [8], "%", 0.5, 0, 0, 100, 1 veBlends4_table = array, S16, 21028, [8x8], "", 0.1, 0, -100, 100, 1 veBlends4_loadBins = array, U16, 21156, [8], "Load", 1, 0, 0, 1000, 0 veBlends4_rpmBins = array, U16, 21172, [8], "RPM", 1, 0, 0, 18000, 0 veBlends4_blendParameter = bits, U08, 21188, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends4_yAxisOverride = bits, U08, 21189, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends4_blendBins = array, S16, 21190, [8], "", 0.1, 0, -1000, 1000, 1 veBlends4_blendValues = array, U08, 21206, [8], "%", 0.5, 0, 0, 100, 1 throttleEstimateEffectiveAreaBins = array, U16, 21216, [12], "%", 0.1, 0, 0, 100, 1 @@ -1554,24 +1562,28 @@ boostOpenLoopBlends1_table = array, S16, 21264, [8x8], "", 0.1, 0, -100, 100, 1 boostOpenLoopBlends1_loadBins = array, U16, 21392, [8], "Load", 1, 0, 0, 1000, 0 boostOpenLoopBlends1_rpmBins = array, U16, 21408, [8], "RPM", 1, 0, 0, 18000, 0 boostOpenLoopBlends1_blendParameter = bits, U08, 21424, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostOpenLoopBlends1_yAxisOverride = bits, U08, 21425, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostOpenLoopBlends1_blendBins = array, S16, 21426, [8], "", 0.1, 0, -1000, 1000, 1 boostOpenLoopBlends1_blendValues = array, U08, 21442, [8], "%", 0.5, 0, 0, 100, 1 boostOpenLoopBlends2_table = array, S16, 21452, [8x8], "", 0.1, 0, -100, 100, 1 boostOpenLoopBlends2_loadBins = array, U16, 21580, [8], "Load", 1, 0, 0, 1000, 0 boostOpenLoopBlends2_rpmBins = array, U16, 21596, [8], "RPM", 1, 0, 0, 18000, 0 boostOpenLoopBlends2_blendParameter = bits, U08, 21612, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostOpenLoopBlends2_yAxisOverride = bits, U08, 21613, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostOpenLoopBlends2_blendBins = array, S16, 21614, [8], "", 0.1, 0, -1000, 1000, 1 boostOpenLoopBlends2_blendValues = array, U08, 21630, [8], "%", 0.5, 0, 0, 100, 1 boostClosedLoopBlends1_table = array, S16, 21640, [8x8], "", 0.1, 0, -100, 100, 1 boostClosedLoopBlends1_loadBins = array, U16, 21768, [8], "Load", 1, 0, 0, 1000, 0 boostClosedLoopBlends1_rpmBins = array, U16, 21784, [8], "RPM", 1, 0, 0, 18000, 0 boostClosedLoopBlends1_blendParameter = bits, U08, 21800, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostClosedLoopBlends1_yAxisOverride = bits, U08, 21801, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostClosedLoopBlends1_blendBins = array, S16, 21802, [8], "", 0.1, 0, -1000, 1000, 1 boostClosedLoopBlends1_blendValues = array, U08, 21818, [8], "%", 0.5, 0, 0, 100, 1 boostClosedLoopBlends2_table = array, S16, 21828, [8x8], "", 0.1, 0, -100, 100, 1 boostClosedLoopBlends2_loadBins = array, U16, 21956, [8], "Load", 1, 0, 0, 1000, 0 boostClosedLoopBlends2_rpmBins = array, U16, 21972, [8], "RPM", 1, 0, 0, 18000, 0 boostClosedLoopBlends2_blendParameter = bits, U08, 21988, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostClosedLoopBlends2_yAxisOverride = bits, U08, 21989, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostClosedLoopBlends2_blendBins = array, S16, 21990, [8], "", 0.1, 0, -1000, 1000, 1 boostClosedLoopBlends2_blendValues = array, U08, 22006, [8], "%", 0.5, 0, 0, 100, 1 tcu_rangeP = array, U08, 22016, [6], "level", 1, 0, 0, 3, 0 @@ -6897,7 +6909,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends1_blendParameter - panel = ignAdder1Bias + field = "Y axis override (set Zero for no override)", ignBlends1_yAxisOverride, {ignBlends1_blendParameter} + panel = ignAdder1Bias, {ignBlends1_blendParameter} dialog = ignAdder2Cfg, "Ignition adder 2 config" field = "#The bias table controls how much of the blend table" @@ -6907,7 +6920,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends2_blendParameter - panel = ignAdder2Bias + field = "Y axis override (set Zero for no override)", ignBlends2_yAxisOverride, {ignBlends2_blendParameter} + panel = ignAdder2Bias, {ignBlends2_blendParameter} dialog = ignAdder3Cfg, "Ignition adder 3 config" field = "#The bias table controls how much of the blend table" @@ -6917,7 +6931,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends3_blendParameter - panel = ignAdder3Bias + field = "Y axis override (set Zero for no override)", ignBlends3_yAxisOverride, {ignBlends3_blendParameter} + panel = ignAdder3Bias, {ignBlends3_blendParameter} dialog = ignAdder4Cfg, "Ignition adder 4 config" field = "#The bias table controls how much of the blend table" @@ -6927,7 +6942,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends4_blendParameter - panel = ignAdder4Bias + field = "Y axis override (set Zero for no override)", ignBlends4_yAxisOverride, {ignBlends4_blendParameter} + panel = ignAdder4Bias, {ignBlends4_blendParameter} dialog = veBlend1Cfg, "VE blend 1 config" field = "#The bias table controls how much of the blend table" @@ -6938,7 +6954,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends1_blendParameter - panel = veBlend1Bias + field = "Y axis override (set Zero for no override)", veBlends1_yAxisOverride, {veBlends1_blendParameter} + panel = veBlend1Bias, {veBlends1_blendParameter} dialog = veBlend2Cfg, "VE blend 2 config" field = "#The bias table controls how much of the blend table" @@ -6949,7 +6966,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends2_blendParameter - panel = veBlend2Bias + field = "Y axis override (set Zero for no override)", veBlends2_yAxisOverride, {veBlends2_blendParameter} + panel = veBlend2Bias, {veBlends2_blendParameter} dialog = veBlend3Cfg, "VE blend 3 config" field = "#The bias table controls how much of the blend table" @@ -6960,7 +6978,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends3_blendParameter - panel = veBlend3Bias + field = "Y axis override (set Zero for no override)", veBlends3_yAxisOverride, {veBlends3_blendParameter} + panel = veBlend3Bias, {veBlends3_blendParameter} dialog = veBlend4Cfg, "VE blend 4 config" field = "#The bias table controls how much of the blend table" @@ -6971,7 +6990,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends4_blendParameter - panel = veBlend4Bias + field = "Y axis override (set Zero for no override)", veBlends4_yAxisOverride, {veBlends4_blendParameter} + panel = veBlend4Bias, {veBlends4_blendParameter} indicatorPanel = isBoostControlledPanel, 1 indicator = {isBoostControlled}, "No Boost Control", "Boost Control Active" @@ -6985,7 +7005,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#parameter below." panel = isBoostControlledPanel field = "Blend parameter", boostOpenLoopBlends1_blendParameter - panel = boostOpenLoopBlend1Bias + field = "Y axis override (set Zero for no override)", boostOpenLoopBlends1_yAxisOverride, {boostOpenLoopBlends1_blendParameter} + panel = boostOpenLoopBlend1Bias, {boostOpenLoopBlends1_blendParameter} dialog = boostOpenBlend2Cfg, "Boost open loop blend 2 config" field = "#The bias table controls how much of the blend table" @@ -6996,7 +7017,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#parameter below." panel = isBoostControlledPanel field = "Blend parameter", boostOpenLoopBlends2_blendParameter - panel = boostOpenLoopBlend2Bias + field = "Y axis override (set Zero for no override)", boostOpenLoopBlends2_yAxisOverride, {boostOpenLoopBlends2_blendParameter} + panel = boostOpenLoopBlend2Bias, {boostOpenLoopBlends2_blendParameter} dialog = boostClosedBlend1Cfg, "Boost closed loop blend 1 config" field = "#The bias table controls how much of the blend table" @@ -7006,7 +7028,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", boostClosedLoopBlends1_blendParameter - panel = boostClosedLoopBlend1Bias + field = "Y axis override (set Zero for no override)", boostClosedLoopBlends1_yAxisOverride, {boostClosedLoopBlends1_blendParameter} + panel = boostClosedLoopBlend1Bias, {boostClosedLoopBlends1_blendParameter} dialog = boostClosedBlend2Cfg, "Boost closed loop blend 2 config" field = "#The bias table controls how much of the blend table" @@ -7016,7 +7039,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", boostClosedLoopBlends2_blendParameter - panel = boostClosedLoopBlend2Bias + field = "Y axis override (set Zero for no override)", boostClosedLoopBlends2_yAxisOverride, {boostClosedLoopBlends2_blendParameter} + panel = boostClosedLoopBlend2Bias, {boostClosedLoopBlends2_blendParameter} dialog = dwellSettings, "", yAxis panel = dwellCorrection diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index 6fa872ee31..1d7d2e2643 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.2024.01.17.frankenso_na6.2137303335" + signature = "rusEFI master.2024.01.17.frankenso_na6.4090228411" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.01.17.frankenso_na6.2137303335" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.01.17.frankenso_na6.4090228411" ; 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 Wed Jan 17 14:06:15 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:41:46 UTC 2024 pageSize = 22176 page = 1 @@ -1504,48 +1504,56 @@ ignBlends1_table = array, S16, 19712, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends1_loadBins = array, U16, 19840, [8], "Load", 1, 0, 0, 1000, 0 ignBlends1_rpmBins = array, U16, 19856, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends1_blendParameter = bits, U08, 19872, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends1_yAxisOverride = bits, U08, 19873, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends1_blendBins = array, S16, 19874, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends1_blendValues = array, U08, 19890, [8], "%", 0.5, 0, 0, 100, 1 ignBlends2_table = array, S16, 19900, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends2_loadBins = array, U16, 20028, [8], "Load", 1, 0, 0, 1000, 0 ignBlends2_rpmBins = array, U16, 20044, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends2_blendParameter = bits, U08, 20060, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends2_yAxisOverride = bits, U08, 20061, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends2_blendBins = array, S16, 20062, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends2_blendValues = array, U08, 20078, [8], "%", 0.5, 0, 0, 100, 1 ignBlends3_table = array, S16, 20088, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends3_loadBins = array, U16, 20216, [8], "Load", 1, 0, 0, 1000, 0 ignBlends3_rpmBins = array, U16, 20232, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends3_blendParameter = bits, U08, 20248, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends3_yAxisOverride = bits, U08, 20249, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends3_blendBins = array, S16, 20250, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends3_blendValues = array, U08, 20266, [8], "%", 0.5, 0, 0, 100, 1 ignBlends4_table = array, S16, 20276, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends4_loadBins = array, U16, 20404, [8], "Load", 1, 0, 0, 1000, 0 ignBlends4_rpmBins = array, U16, 20420, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends4_blendParameter = bits, U08, 20436, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends4_yAxisOverride = bits, U08, 20437, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends4_blendBins = array, S16, 20438, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends4_blendValues = array, U08, 20454, [8], "%", 0.5, 0, 0, 100, 1 veBlends1_table = array, S16, 20464, [8x8], "", 0.1, 0, -100, 100, 1 veBlends1_loadBins = array, U16, 20592, [8], "Load", 1, 0, 0, 1000, 0 veBlends1_rpmBins = array, U16, 20608, [8], "RPM", 1, 0, 0, 18000, 0 veBlends1_blendParameter = bits, U08, 20624, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends1_yAxisOverride = bits, U08, 20625, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends1_blendBins = array, S16, 20626, [8], "", 0.1, 0, -1000, 1000, 1 veBlends1_blendValues = array, U08, 20642, [8], "%", 0.5, 0, 0, 100, 1 veBlends2_table = array, S16, 20652, [8x8], "", 0.1, 0, -100, 100, 1 veBlends2_loadBins = array, U16, 20780, [8], "Load", 1, 0, 0, 1000, 0 veBlends2_rpmBins = array, U16, 20796, [8], "RPM", 1, 0, 0, 18000, 0 veBlends2_blendParameter = bits, U08, 20812, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends2_yAxisOverride = bits, U08, 20813, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends2_blendBins = array, S16, 20814, [8], "", 0.1, 0, -1000, 1000, 1 veBlends2_blendValues = array, U08, 20830, [8], "%", 0.5, 0, 0, 100, 1 veBlends3_table = array, S16, 20840, [8x8], "", 0.1, 0, -100, 100, 1 veBlends3_loadBins = array, U16, 20968, [8], "Load", 1, 0, 0, 1000, 0 veBlends3_rpmBins = array, U16, 20984, [8], "RPM", 1, 0, 0, 18000, 0 veBlends3_blendParameter = bits, U08, 21000, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends3_yAxisOverride = bits, U08, 21001, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends3_blendBins = array, S16, 21002, [8], "", 0.1, 0, -1000, 1000, 1 veBlends3_blendValues = array, U08, 21018, [8], "%", 0.5, 0, 0, 100, 1 veBlends4_table = array, S16, 21028, [8x8], "", 0.1, 0, -100, 100, 1 veBlends4_loadBins = array, U16, 21156, [8], "Load", 1, 0, 0, 1000, 0 veBlends4_rpmBins = array, U16, 21172, [8], "RPM", 1, 0, 0, 18000, 0 veBlends4_blendParameter = bits, U08, 21188, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends4_yAxisOverride = bits, U08, 21189, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends4_blendBins = array, S16, 21190, [8], "", 0.1, 0, -1000, 1000, 1 veBlends4_blendValues = array, U08, 21206, [8], "%", 0.5, 0, 0, 100, 1 throttleEstimateEffectiveAreaBins = array, U16, 21216, [12], "%", 0.1, 0, 0, 100, 1 @@ -1554,24 +1562,28 @@ boostOpenLoopBlends1_table = array, S16, 21264, [8x8], "", 0.1, 0, -100, 100, 1 boostOpenLoopBlends1_loadBins = array, U16, 21392, [8], "Load", 1, 0, 0, 1000, 0 boostOpenLoopBlends1_rpmBins = array, U16, 21408, [8], "RPM", 1, 0, 0, 18000, 0 boostOpenLoopBlends1_blendParameter = bits, U08, 21424, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostOpenLoopBlends1_yAxisOverride = bits, U08, 21425, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostOpenLoopBlends1_blendBins = array, S16, 21426, [8], "", 0.1, 0, -1000, 1000, 1 boostOpenLoopBlends1_blendValues = array, U08, 21442, [8], "%", 0.5, 0, 0, 100, 1 boostOpenLoopBlends2_table = array, S16, 21452, [8x8], "", 0.1, 0, -100, 100, 1 boostOpenLoopBlends2_loadBins = array, U16, 21580, [8], "Load", 1, 0, 0, 1000, 0 boostOpenLoopBlends2_rpmBins = array, U16, 21596, [8], "RPM", 1, 0, 0, 18000, 0 boostOpenLoopBlends2_blendParameter = bits, U08, 21612, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostOpenLoopBlends2_yAxisOverride = bits, U08, 21613, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostOpenLoopBlends2_blendBins = array, S16, 21614, [8], "", 0.1, 0, -1000, 1000, 1 boostOpenLoopBlends2_blendValues = array, U08, 21630, [8], "%", 0.5, 0, 0, 100, 1 boostClosedLoopBlends1_table = array, S16, 21640, [8x8], "", 0.1, 0, -100, 100, 1 boostClosedLoopBlends1_loadBins = array, U16, 21768, [8], "Load", 1, 0, 0, 1000, 0 boostClosedLoopBlends1_rpmBins = array, U16, 21784, [8], "RPM", 1, 0, 0, 18000, 0 boostClosedLoopBlends1_blendParameter = bits, U08, 21800, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostClosedLoopBlends1_yAxisOverride = bits, U08, 21801, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostClosedLoopBlends1_blendBins = array, S16, 21802, [8], "", 0.1, 0, -1000, 1000, 1 boostClosedLoopBlends1_blendValues = array, U08, 21818, [8], "%", 0.5, 0, 0, 100, 1 boostClosedLoopBlends2_table = array, S16, 21828, [8x8], "", 0.1, 0, -100, 100, 1 boostClosedLoopBlends2_loadBins = array, U16, 21956, [8], "Load", 1, 0, 0, 1000, 0 boostClosedLoopBlends2_rpmBins = array, U16, 21972, [8], "RPM", 1, 0, 0, 18000, 0 boostClosedLoopBlends2_blendParameter = bits, U08, 21988, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostClosedLoopBlends2_yAxisOverride = bits, U08, 21989, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostClosedLoopBlends2_blendBins = array, S16, 21990, [8], "", 0.1, 0, -1000, 1000, 1 boostClosedLoopBlends2_blendValues = array, U08, 22006, [8], "%", 0.5, 0, 0, 100, 1 tcu_rangeP = array, U08, 22016, [6], "level", 1, 0, 0, 3, 0 @@ -6897,7 +6909,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends1_blendParameter - panel = ignAdder1Bias + field = "Y axis override (set Zero for no override)", ignBlends1_yAxisOverride, {ignBlends1_blendParameter} + panel = ignAdder1Bias, {ignBlends1_blendParameter} dialog = ignAdder2Cfg, "Ignition adder 2 config" field = "#The bias table controls how much of the blend table" @@ -6907,7 +6920,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends2_blendParameter - panel = ignAdder2Bias + field = "Y axis override (set Zero for no override)", ignBlends2_yAxisOverride, {ignBlends2_blendParameter} + panel = ignAdder2Bias, {ignBlends2_blendParameter} dialog = ignAdder3Cfg, "Ignition adder 3 config" field = "#The bias table controls how much of the blend table" @@ -6917,7 +6931,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends3_blendParameter - panel = ignAdder3Bias + field = "Y axis override (set Zero for no override)", ignBlends3_yAxisOverride, {ignBlends3_blendParameter} + panel = ignAdder3Bias, {ignBlends3_blendParameter} dialog = ignAdder4Cfg, "Ignition adder 4 config" field = "#The bias table controls how much of the blend table" @@ -6927,7 +6942,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends4_blendParameter - panel = ignAdder4Bias + field = "Y axis override (set Zero for no override)", ignBlends4_yAxisOverride, {ignBlends4_blendParameter} + panel = ignAdder4Bias, {ignBlends4_blendParameter} dialog = veBlend1Cfg, "VE blend 1 config" field = "#The bias table controls how much of the blend table" @@ -6938,7 +6954,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends1_blendParameter - panel = veBlend1Bias + field = "Y axis override (set Zero for no override)", veBlends1_yAxisOverride, {veBlends1_blendParameter} + panel = veBlend1Bias, {veBlends1_blendParameter} dialog = veBlend2Cfg, "VE blend 2 config" field = "#The bias table controls how much of the blend table" @@ -6949,7 +6966,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends2_blendParameter - panel = veBlend2Bias + field = "Y axis override (set Zero for no override)", veBlends2_yAxisOverride, {veBlends2_blendParameter} + panel = veBlend2Bias, {veBlends2_blendParameter} dialog = veBlend3Cfg, "VE blend 3 config" field = "#The bias table controls how much of the blend table" @@ -6960,7 +6978,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends3_blendParameter - panel = veBlend3Bias + field = "Y axis override (set Zero for no override)", veBlends3_yAxisOverride, {veBlends3_blendParameter} + panel = veBlend3Bias, {veBlends3_blendParameter} dialog = veBlend4Cfg, "VE blend 4 config" field = "#The bias table controls how much of the blend table" @@ -6971,7 +6990,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends4_blendParameter - panel = veBlend4Bias + field = "Y axis override (set Zero for no override)", veBlends4_yAxisOverride, {veBlends4_blendParameter} + panel = veBlend4Bias, {veBlends4_blendParameter} indicatorPanel = isBoostControlledPanel, 1 indicator = {isBoostControlled}, "No Boost Control", "Boost Control Active" @@ -6985,7 +7005,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#parameter below." panel = isBoostControlledPanel field = "Blend parameter", boostOpenLoopBlends1_blendParameter - panel = boostOpenLoopBlend1Bias + field = "Y axis override (set Zero for no override)", boostOpenLoopBlends1_yAxisOverride, {boostOpenLoopBlends1_blendParameter} + panel = boostOpenLoopBlend1Bias, {boostOpenLoopBlends1_blendParameter} dialog = boostOpenBlend2Cfg, "Boost open loop blend 2 config" field = "#The bias table controls how much of the blend table" @@ -6996,7 +7017,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#parameter below." panel = isBoostControlledPanel field = "Blend parameter", boostOpenLoopBlends2_blendParameter - panel = boostOpenLoopBlend2Bias + field = "Y axis override (set Zero for no override)", boostOpenLoopBlends2_yAxisOverride, {boostOpenLoopBlends2_blendParameter} + panel = boostOpenLoopBlend2Bias, {boostOpenLoopBlends2_blendParameter} dialog = boostClosedBlend1Cfg, "Boost closed loop blend 1 config" field = "#The bias table controls how much of the blend table" @@ -7006,7 +7028,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", boostClosedLoopBlends1_blendParameter - panel = boostClosedLoopBlend1Bias + field = "Y axis override (set Zero for no override)", boostClosedLoopBlends1_yAxisOverride, {boostClosedLoopBlends1_blendParameter} + panel = boostClosedLoopBlend1Bias, {boostClosedLoopBlends1_blendParameter} dialog = boostClosedBlend2Cfg, "Boost closed loop blend 2 config" field = "#The bias table controls how much of the blend table" @@ -7016,7 +7039,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", boostClosedLoopBlends2_blendParameter - panel = boostClosedLoopBlend2Bias + field = "Y axis override (set Zero for no override)", boostClosedLoopBlends2_yAxisOverride, {boostClosedLoopBlends2_blendParameter} + panel = boostClosedLoopBlend2Bias, {boostClosedLoopBlends2_blendParameter} dialog = dwellSettings, "", yAxis panel = dwellCorrection diff --git a/firmware/tunerstudio/generated/rusefi_hellen-112-17.ini b/firmware/tunerstudio/generated/rusefi_hellen-112-17.ini index 863a572eb1..46af243596 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.2024.01.17.hellen-112-17.3884623866" + signature = "rusEFI master.2024.01.17.hellen-112-17.1797644390" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.01.17.hellen-112-17.3884623866" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.01.17.hellen-112-17.1797644390" ; 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","B20 TPS Throttle Position 2","A14 Analog Input","INVALID","A21 PPS1","B03 TPS Throttle Position 1","INVALID","A07 TODO","A12 Analog Input","A10 Analog Input","INVALID","B19 MAP","A09 Analog Input","B15 CLT","B27 IAT","A11 Analog Input","A19 Analog Input" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:05:43 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:41:13 UTC 2024 pageSize = 22176 page = 1 @@ -1504,48 +1504,56 @@ ignBlends1_table = array, S16, 19712, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends1_loadBins = array, U16, 19840, [8], "Load", 1, 0, 0, 1000, 0 ignBlends1_rpmBins = array, U16, 19856, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends1_blendParameter = bits, U08, 19872, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends1_yAxisOverride = bits, U08, 19873, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends1_blendBins = array, S16, 19874, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends1_blendValues = array, U08, 19890, [8], "%", 0.5, 0, 0, 100, 1 ignBlends2_table = array, S16, 19900, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends2_loadBins = array, U16, 20028, [8], "Load", 1, 0, 0, 1000, 0 ignBlends2_rpmBins = array, U16, 20044, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends2_blendParameter = bits, U08, 20060, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends2_yAxisOverride = bits, U08, 20061, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends2_blendBins = array, S16, 20062, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends2_blendValues = array, U08, 20078, [8], "%", 0.5, 0, 0, 100, 1 ignBlends3_table = array, S16, 20088, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends3_loadBins = array, U16, 20216, [8], "Load", 1, 0, 0, 1000, 0 ignBlends3_rpmBins = array, U16, 20232, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends3_blendParameter = bits, U08, 20248, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends3_yAxisOverride = bits, U08, 20249, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends3_blendBins = array, S16, 20250, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends3_blendValues = array, U08, 20266, [8], "%", 0.5, 0, 0, 100, 1 ignBlends4_table = array, S16, 20276, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends4_loadBins = array, U16, 20404, [8], "Load", 1, 0, 0, 1000, 0 ignBlends4_rpmBins = array, U16, 20420, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends4_blendParameter = bits, U08, 20436, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends4_yAxisOverride = bits, U08, 20437, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends4_blendBins = array, S16, 20438, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends4_blendValues = array, U08, 20454, [8], "%", 0.5, 0, 0, 100, 1 veBlends1_table = array, S16, 20464, [8x8], "", 0.1, 0, -100, 100, 1 veBlends1_loadBins = array, U16, 20592, [8], "Load", 1, 0, 0, 1000, 0 veBlends1_rpmBins = array, U16, 20608, [8], "RPM", 1, 0, 0, 18000, 0 veBlends1_blendParameter = bits, U08, 20624, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends1_yAxisOverride = bits, U08, 20625, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends1_blendBins = array, S16, 20626, [8], "", 0.1, 0, -1000, 1000, 1 veBlends1_blendValues = array, U08, 20642, [8], "%", 0.5, 0, 0, 100, 1 veBlends2_table = array, S16, 20652, [8x8], "", 0.1, 0, -100, 100, 1 veBlends2_loadBins = array, U16, 20780, [8], "Load", 1, 0, 0, 1000, 0 veBlends2_rpmBins = array, U16, 20796, [8], "RPM", 1, 0, 0, 18000, 0 veBlends2_blendParameter = bits, U08, 20812, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends2_yAxisOverride = bits, U08, 20813, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends2_blendBins = array, S16, 20814, [8], "", 0.1, 0, -1000, 1000, 1 veBlends2_blendValues = array, U08, 20830, [8], "%", 0.5, 0, 0, 100, 1 veBlends3_table = array, S16, 20840, [8x8], "", 0.1, 0, -100, 100, 1 veBlends3_loadBins = array, U16, 20968, [8], "Load", 1, 0, 0, 1000, 0 veBlends3_rpmBins = array, U16, 20984, [8], "RPM", 1, 0, 0, 18000, 0 veBlends3_blendParameter = bits, U08, 21000, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends3_yAxisOverride = bits, U08, 21001, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends3_blendBins = array, S16, 21002, [8], "", 0.1, 0, -1000, 1000, 1 veBlends3_blendValues = array, U08, 21018, [8], "%", 0.5, 0, 0, 100, 1 veBlends4_table = array, S16, 21028, [8x8], "", 0.1, 0, -100, 100, 1 veBlends4_loadBins = array, U16, 21156, [8], "Load", 1, 0, 0, 1000, 0 veBlends4_rpmBins = array, U16, 21172, [8], "RPM", 1, 0, 0, 18000, 0 veBlends4_blendParameter = bits, U08, 21188, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends4_yAxisOverride = bits, U08, 21189, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends4_blendBins = array, S16, 21190, [8], "", 0.1, 0, -1000, 1000, 1 veBlends4_blendValues = array, U08, 21206, [8], "%", 0.5, 0, 0, 100, 1 throttleEstimateEffectiveAreaBins = array, U16, 21216, [12], "%", 0.1, 0, 0, 100, 1 @@ -1554,24 +1562,28 @@ boostOpenLoopBlends1_table = array, S16, 21264, [8x8], "", 0.1, 0, -100, 100, 1 boostOpenLoopBlends1_loadBins = array, U16, 21392, [8], "Load", 1, 0, 0, 1000, 0 boostOpenLoopBlends1_rpmBins = array, U16, 21408, [8], "RPM", 1, 0, 0, 18000, 0 boostOpenLoopBlends1_blendParameter = bits, U08, 21424, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostOpenLoopBlends1_yAxisOverride = bits, U08, 21425, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostOpenLoopBlends1_blendBins = array, S16, 21426, [8], "", 0.1, 0, -1000, 1000, 1 boostOpenLoopBlends1_blendValues = array, U08, 21442, [8], "%", 0.5, 0, 0, 100, 1 boostOpenLoopBlends2_table = array, S16, 21452, [8x8], "", 0.1, 0, -100, 100, 1 boostOpenLoopBlends2_loadBins = array, U16, 21580, [8], "Load", 1, 0, 0, 1000, 0 boostOpenLoopBlends2_rpmBins = array, U16, 21596, [8], "RPM", 1, 0, 0, 18000, 0 boostOpenLoopBlends2_blendParameter = bits, U08, 21612, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostOpenLoopBlends2_yAxisOverride = bits, U08, 21613, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostOpenLoopBlends2_blendBins = array, S16, 21614, [8], "", 0.1, 0, -1000, 1000, 1 boostOpenLoopBlends2_blendValues = array, U08, 21630, [8], "%", 0.5, 0, 0, 100, 1 boostClosedLoopBlends1_table = array, S16, 21640, [8x8], "", 0.1, 0, -100, 100, 1 boostClosedLoopBlends1_loadBins = array, U16, 21768, [8], "Load", 1, 0, 0, 1000, 0 boostClosedLoopBlends1_rpmBins = array, U16, 21784, [8], "RPM", 1, 0, 0, 18000, 0 boostClosedLoopBlends1_blendParameter = bits, U08, 21800, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostClosedLoopBlends1_yAxisOverride = bits, U08, 21801, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostClosedLoopBlends1_blendBins = array, S16, 21802, [8], "", 0.1, 0, -1000, 1000, 1 boostClosedLoopBlends1_blendValues = array, U08, 21818, [8], "%", 0.5, 0, 0, 100, 1 boostClosedLoopBlends2_table = array, S16, 21828, [8x8], "", 0.1, 0, -100, 100, 1 boostClosedLoopBlends2_loadBins = array, U16, 21956, [8], "Load", 1, 0, 0, 1000, 0 boostClosedLoopBlends2_rpmBins = array, U16, 21972, [8], "RPM", 1, 0, 0, 18000, 0 boostClosedLoopBlends2_blendParameter = bits, U08, 21988, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostClosedLoopBlends2_yAxisOverride = bits, U08, 21989, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostClosedLoopBlends2_blendBins = array, S16, 21990, [8], "", 0.1, 0, -1000, 1000, 1 boostClosedLoopBlends2_blendValues = array, U08, 22006, [8], "%", 0.5, 0, 0, 100, 1 tcu_rangeP = array, U08, 22016, [6], "level", 1, 0, 0, 3, 0 @@ -6896,7 +6908,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends1_blendParameter - panel = ignAdder1Bias + field = "Y axis override (set Zero for no override)", ignBlends1_yAxisOverride, {ignBlends1_blendParameter} + panel = ignAdder1Bias, {ignBlends1_blendParameter} dialog = ignAdder2Cfg, "Ignition adder 2 config" field = "#The bias table controls how much of the blend table" @@ -6906,7 +6919,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends2_blendParameter - panel = ignAdder2Bias + field = "Y axis override (set Zero for no override)", ignBlends2_yAxisOverride, {ignBlends2_blendParameter} + panel = ignAdder2Bias, {ignBlends2_blendParameter} dialog = ignAdder3Cfg, "Ignition adder 3 config" field = "#The bias table controls how much of the blend table" @@ -6916,7 +6930,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends3_blendParameter - panel = ignAdder3Bias + field = "Y axis override (set Zero for no override)", ignBlends3_yAxisOverride, {ignBlends3_blendParameter} + panel = ignAdder3Bias, {ignBlends3_blendParameter} dialog = ignAdder4Cfg, "Ignition adder 4 config" field = "#The bias table controls how much of the blend table" @@ -6926,7 +6941,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends4_blendParameter - panel = ignAdder4Bias + field = "Y axis override (set Zero for no override)", ignBlends4_yAxisOverride, {ignBlends4_blendParameter} + panel = ignAdder4Bias, {ignBlends4_blendParameter} dialog = veBlend1Cfg, "VE blend 1 config" field = "#The bias table controls how much of the blend table" @@ -6937,7 +6953,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends1_blendParameter - panel = veBlend1Bias + field = "Y axis override (set Zero for no override)", veBlends1_yAxisOverride, {veBlends1_blendParameter} + panel = veBlend1Bias, {veBlends1_blendParameter} dialog = veBlend2Cfg, "VE blend 2 config" field = "#The bias table controls how much of the blend table" @@ -6948,7 +6965,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends2_blendParameter - panel = veBlend2Bias + field = "Y axis override (set Zero for no override)", veBlends2_yAxisOverride, {veBlends2_blendParameter} + panel = veBlend2Bias, {veBlends2_blendParameter} dialog = veBlend3Cfg, "VE blend 3 config" field = "#The bias table controls how much of the blend table" @@ -6959,7 +6977,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends3_blendParameter - panel = veBlend3Bias + field = "Y axis override (set Zero for no override)", veBlends3_yAxisOverride, {veBlends3_blendParameter} + panel = veBlend3Bias, {veBlends3_blendParameter} dialog = veBlend4Cfg, "VE blend 4 config" field = "#The bias table controls how much of the blend table" @@ -6970,7 +6989,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends4_blendParameter - panel = veBlend4Bias + field = "Y axis override (set Zero for no override)", veBlends4_yAxisOverride, {veBlends4_blendParameter} + panel = veBlend4Bias, {veBlends4_blendParameter} indicatorPanel = isBoostControlledPanel, 1 indicator = {isBoostControlled}, "No Boost Control", "Boost Control Active" @@ -6984,7 +7004,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#parameter below." panel = isBoostControlledPanel field = "Blend parameter", boostOpenLoopBlends1_blendParameter - panel = boostOpenLoopBlend1Bias + field = "Y axis override (set Zero for no override)", boostOpenLoopBlends1_yAxisOverride, {boostOpenLoopBlends1_blendParameter} + panel = boostOpenLoopBlend1Bias, {boostOpenLoopBlends1_blendParameter} dialog = boostOpenBlend2Cfg, "Boost open loop blend 2 config" field = "#The bias table controls how much of the blend table" @@ -6995,7 +7016,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#parameter below." panel = isBoostControlledPanel field = "Blend parameter", boostOpenLoopBlends2_blendParameter - panel = boostOpenLoopBlend2Bias + field = "Y axis override (set Zero for no override)", boostOpenLoopBlends2_yAxisOverride, {boostOpenLoopBlends2_blendParameter} + panel = boostOpenLoopBlend2Bias, {boostOpenLoopBlends2_blendParameter} dialog = boostClosedBlend1Cfg, "Boost closed loop blend 1 config" field = "#The bias table controls how much of the blend table" @@ -7005,7 +7027,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", boostClosedLoopBlends1_blendParameter - panel = boostClosedLoopBlend1Bias + field = "Y axis override (set Zero for no override)", boostClosedLoopBlends1_yAxisOverride, {boostClosedLoopBlends1_blendParameter} + panel = boostClosedLoopBlend1Bias, {boostClosedLoopBlends1_blendParameter} dialog = boostClosedBlend2Cfg, "Boost closed loop blend 2 config" field = "#The bias table controls how much of the blend table" @@ -7015,7 +7038,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", boostClosedLoopBlends2_blendParameter - panel = boostClosedLoopBlend2Bias + field = "Y axis override (set Zero for no override)", boostClosedLoopBlends2_yAxisOverride, {boostClosedLoopBlends2_blendParameter} + panel = boostClosedLoopBlend2Bias, {boostClosedLoopBlends2_blendParameter} dialog = dwellSettings, "", yAxis panel = dwellCorrection diff --git a/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini b/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini index 84dbd70c3d..48ace4d6c1 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.2024.01.17.hellen-gm-e67.212776628" + signature = "rusEFI master.2024.01.17.hellen-gm-e67.2147610920" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.01.17.hellen-gm-e67.212776628" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.01.17.hellen-gm-e67.2147610920" ; 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 Wed Jan 17 14:05:53 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:41:24 UTC 2024 pageSize = 22176 page = 1 @@ -1504,48 +1504,56 @@ ignBlends1_table = array, S16, 19712, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends1_loadBins = array, U16, 19840, [8], "Load", 1, 0, 0, 1000, 0 ignBlends1_rpmBins = array, U16, 19856, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends1_blendParameter = bits, U08, 19872, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends1_yAxisOverride = bits, U08, 19873, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends1_blendBins = array, S16, 19874, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends1_blendValues = array, U08, 19890, [8], "%", 0.5, 0, 0, 100, 1 ignBlends2_table = array, S16, 19900, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends2_loadBins = array, U16, 20028, [8], "Load", 1, 0, 0, 1000, 0 ignBlends2_rpmBins = array, U16, 20044, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends2_blendParameter = bits, U08, 20060, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends2_yAxisOverride = bits, U08, 20061, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends2_blendBins = array, S16, 20062, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends2_blendValues = array, U08, 20078, [8], "%", 0.5, 0, 0, 100, 1 ignBlends3_table = array, S16, 20088, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends3_loadBins = array, U16, 20216, [8], "Load", 1, 0, 0, 1000, 0 ignBlends3_rpmBins = array, U16, 20232, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends3_blendParameter = bits, U08, 20248, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends3_yAxisOverride = bits, U08, 20249, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends3_blendBins = array, S16, 20250, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends3_blendValues = array, U08, 20266, [8], "%", 0.5, 0, 0, 100, 1 ignBlends4_table = array, S16, 20276, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends4_loadBins = array, U16, 20404, [8], "Load", 1, 0, 0, 1000, 0 ignBlends4_rpmBins = array, U16, 20420, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends4_blendParameter = bits, U08, 20436, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends4_yAxisOverride = bits, U08, 20437, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends4_blendBins = array, S16, 20438, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends4_blendValues = array, U08, 20454, [8], "%", 0.5, 0, 0, 100, 1 veBlends1_table = array, S16, 20464, [8x8], "", 0.1, 0, -100, 100, 1 veBlends1_loadBins = array, U16, 20592, [8], "Load", 1, 0, 0, 1000, 0 veBlends1_rpmBins = array, U16, 20608, [8], "RPM", 1, 0, 0, 18000, 0 veBlends1_blendParameter = bits, U08, 20624, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends1_yAxisOverride = bits, U08, 20625, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends1_blendBins = array, S16, 20626, [8], "", 0.1, 0, -1000, 1000, 1 veBlends1_blendValues = array, U08, 20642, [8], "%", 0.5, 0, 0, 100, 1 veBlends2_table = array, S16, 20652, [8x8], "", 0.1, 0, -100, 100, 1 veBlends2_loadBins = array, U16, 20780, [8], "Load", 1, 0, 0, 1000, 0 veBlends2_rpmBins = array, U16, 20796, [8], "RPM", 1, 0, 0, 18000, 0 veBlends2_blendParameter = bits, U08, 20812, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends2_yAxisOverride = bits, U08, 20813, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends2_blendBins = array, S16, 20814, [8], "", 0.1, 0, -1000, 1000, 1 veBlends2_blendValues = array, U08, 20830, [8], "%", 0.5, 0, 0, 100, 1 veBlends3_table = array, S16, 20840, [8x8], "", 0.1, 0, -100, 100, 1 veBlends3_loadBins = array, U16, 20968, [8], "Load", 1, 0, 0, 1000, 0 veBlends3_rpmBins = array, U16, 20984, [8], "RPM", 1, 0, 0, 18000, 0 veBlends3_blendParameter = bits, U08, 21000, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends3_yAxisOverride = bits, U08, 21001, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends3_blendBins = array, S16, 21002, [8], "", 0.1, 0, -1000, 1000, 1 veBlends3_blendValues = array, U08, 21018, [8], "%", 0.5, 0, 0, 100, 1 veBlends4_table = array, S16, 21028, [8x8], "", 0.1, 0, -100, 100, 1 veBlends4_loadBins = array, U16, 21156, [8], "Load", 1, 0, 0, 1000, 0 veBlends4_rpmBins = array, U16, 21172, [8], "RPM", 1, 0, 0, 18000, 0 veBlends4_blendParameter = bits, U08, 21188, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends4_yAxisOverride = bits, U08, 21189, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends4_blendBins = array, S16, 21190, [8], "", 0.1, 0, -1000, 1000, 1 veBlends4_blendValues = array, U08, 21206, [8], "%", 0.5, 0, 0, 100, 1 throttleEstimateEffectiveAreaBins = array, U16, 21216, [12], "%", 0.1, 0, 0, 100, 1 @@ -1554,24 +1562,28 @@ boostOpenLoopBlends1_table = array, S16, 21264, [8x8], "", 0.1, 0, -100, 100, 1 boostOpenLoopBlends1_loadBins = array, U16, 21392, [8], "Load", 1, 0, 0, 1000, 0 boostOpenLoopBlends1_rpmBins = array, U16, 21408, [8], "RPM", 1, 0, 0, 18000, 0 boostOpenLoopBlends1_blendParameter = bits, U08, 21424, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostOpenLoopBlends1_yAxisOverride = bits, U08, 21425, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostOpenLoopBlends1_blendBins = array, S16, 21426, [8], "", 0.1, 0, -1000, 1000, 1 boostOpenLoopBlends1_blendValues = array, U08, 21442, [8], "%", 0.5, 0, 0, 100, 1 boostOpenLoopBlends2_table = array, S16, 21452, [8x8], "", 0.1, 0, -100, 100, 1 boostOpenLoopBlends2_loadBins = array, U16, 21580, [8], "Load", 1, 0, 0, 1000, 0 boostOpenLoopBlends2_rpmBins = array, U16, 21596, [8], "RPM", 1, 0, 0, 18000, 0 boostOpenLoopBlends2_blendParameter = bits, U08, 21612, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostOpenLoopBlends2_yAxisOverride = bits, U08, 21613, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostOpenLoopBlends2_blendBins = array, S16, 21614, [8], "", 0.1, 0, -1000, 1000, 1 boostOpenLoopBlends2_blendValues = array, U08, 21630, [8], "%", 0.5, 0, 0, 100, 1 boostClosedLoopBlends1_table = array, S16, 21640, [8x8], "", 0.1, 0, -100, 100, 1 boostClosedLoopBlends1_loadBins = array, U16, 21768, [8], "Load", 1, 0, 0, 1000, 0 boostClosedLoopBlends1_rpmBins = array, U16, 21784, [8], "RPM", 1, 0, 0, 18000, 0 boostClosedLoopBlends1_blendParameter = bits, U08, 21800, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostClosedLoopBlends1_yAxisOverride = bits, U08, 21801, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostClosedLoopBlends1_blendBins = array, S16, 21802, [8], "", 0.1, 0, -1000, 1000, 1 boostClosedLoopBlends1_blendValues = array, U08, 21818, [8], "%", 0.5, 0, 0, 100, 1 boostClosedLoopBlends2_table = array, S16, 21828, [8x8], "", 0.1, 0, -100, 100, 1 boostClosedLoopBlends2_loadBins = array, U16, 21956, [8], "Load", 1, 0, 0, 1000, 0 boostClosedLoopBlends2_rpmBins = array, U16, 21972, [8], "RPM", 1, 0, 0, 18000, 0 boostClosedLoopBlends2_blendParameter = bits, U08, 21988, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostClosedLoopBlends2_yAxisOverride = bits, U08, 21989, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostClosedLoopBlends2_blendBins = array, S16, 21990, [8], "", 0.1, 0, -1000, 1000, 1 boostClosedLoopBlends2_blendValues = array, U08, 22006, [8], "%", 0.5, 0, 0, 100, 1 tcu_rangeP = array, U08, 22016, [6], "level", 1, 0, 0, 3, 0 @@ -6898,7 +6910,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends1_blendParameter - panel = ignAdder1Bias + field = "Y axis override (set Zero for no override)", ignBlends1_yAxisOverride, {ignBlends1_blendParameter} + panel = ignAdder1Bias, {ignBlends1_blendParameter} dialog = ignAdder2Cfg, "Ignition adder 2 config" field = "#The bias table controls how much of the blend table" @@ -6908,7 +6921,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends2_blendParameter - panel = ignAdder2Bias + field = "Y axis override (set Zero for no override)", ignBlends2_yAxisOverride, {ignBlends2_blendParameter} + panel = ignAdder2Bias, {ignBlends2_blendParameter} dialog = ignAdder3Cfg, "Ignition adder 3 config" field = "#The bias table controls how much of the blend table" @@ -6918,7 +6932,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends3_blendParameter - panel = ignAdder3Bias + field = "Y axis override (set Zero for no override)", ignBlends3_yAxisOverride, {ignBlends3_blendParameter} + panel = ignAdder3Bias, {ignBlends3_blendParameter} dialog = ignAdder4Cfg, "Ignition adder 4 config" field = "#The bias table controls how much of the blend table" @@ -6928,7 +6943,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends4_blendParameter - panel = ignAdder4Bias + field = "Y axis override (set Zero for no override)", ignBlends4_yAxisOverride, {ignBlends4_blendParameter} + panel = ignAdder4Bias, {ignBlends4_blendParameter} dialog = veBlend1Cfg, "VE blend 1 config" field = "#The bias table controls how much of the blend table" @@ -6939,7 +6955,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends1_blendParameter - panel = veBlend1Bias + field = "Y axis override (set Zero for no override)", veBlends1_yAxisOverride, {veBlends1_blendParameter} + panel = veBlend1Bias, {veBlends1_blendParameter} dialog = veBlend2Cfg, "VE blend 2 config" field = "#The bias table controls how much of the blend table" @@ -6950,7 +6967,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends2_blendParameter - panel = veBlend2Bias + field = "Y axis override (set Zero for no override)", veBlends2_yAxisOverride, {veBlends2_blendParameter} + panel = veBlend2Bias, {veBlends2_blendParameter} dialog = veBlend3Cfg, "VE blend 3 config" field = "#The bias table controls how much of the blend table" @@ -6961,7 +6979,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends3_blendParameter - panel = veBlend3Bias + field = "Y axis override (set Zero for no override)", veBlends3_yAxisOverride, {veBlends3_blendParameter} + panel = veBlend3Bias, {veBlends3_blendParameter} dialog = veBlend4Cfg, "VE blend 4 config" field = "#The bias table controls how much of the blend table" @@ -6972,7 +6991,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends4_blendParameter - panel = veBlend4Bias + field = "Y axis override (set Zero for no override)", veBlends4_yAxisOverride, {veBlends4_blendParameter} + panel = veBlend4Bias, {veBlends4_blendParameter} indicatorPanel = isBoostControlledPanel, 1 indicator = {isBoostControlled}, "No Boost Control", "Boost Control Active" @@ -6986,7 +7006,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#parameter below." panel = isBoostControlledPanel field = "Blend parameter", boostOpenLoopBlends1_blendParameter - panel = boostOpenLoopBlend1Bias + field = "Y axis override (set Zero for no override)", boostOpenLoopBlends1_yAxisOverride, {boostOpenLoopBlends1_blendParameter} + panel = boostOpenLoopBlend1Bias, {boostOpenLoopBlends1_blendParameter} dialog = boostOpenBlend2Cfg, "Boost open loop blend 2 config" field = "#The bias table controls how much of the blend table" @@ -6997,7 +7018,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#parameter below." panel = isBoostControlledPanel field = "Blend parameter", boostOpenLoopBlends2_blendParameter - panel = boostOpenLoopBlend2Bias + field = "Y axis override (set Zero for no override)", boostOpenLoopBlends2_yAxisOverride, {boostOpenLoopBlends2_blendParameter} + panel = boostOpenLoopBlend2Bias, {boostOpenLoopBlends2_blendParameter} dialog = boostClosedBlend1Cfg, "Boost closed loop blend 1 config" field = "#The bias table controls how much of the blend table" @@ -7007,7 +7029,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", boostClosedLoopBlends1_blendParameter - panel = boostClosedLoopBlend1Bias + field = "Y axis override (set Zero for no override)", boostClosedLoopBlends1_yAxisOverride, {boostClosedLoopBlends1_blendParameter} + panel = boostClosedLoopBlend1Bias, {boostClosedLoopBlends1_blendParameter} dialog = boostClosedBlend2Cfg, "Boost closed loop blend 2 config" field = "#The bias table controls how much of the blend table" @@ -7017,7 +7040,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", boostClosedLoopBlends2_blendParameter - panel = boostClosedLoopBlend2Bias + field = "Y axis override (set Zero for no override)", boostClosedLoopBlends2_yAxisOverride, {boostClosedLoopBlends2_blendParameter} + panel = boostClosedLoopBlend2Bias, {boostClosedLoopBlends2_blendParameter} dialog = dwellSettings, "", yAxis panel = dwellCorrection diff --git a/firmware/tunerstudio/generated/rusefi_hellen-honda-k.ini b/firmware/tunerstudio/generated/rusefi_hellen-honda-k.ini index 0005dd8e52..f4d9b0281a 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.2024.01.17.hellen-honda-k.1756954338" + signature = "rusEFI master.2024.01.17.hellen-honda-k.3826760062" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.01.17.hellen-honda-k.1756954338" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.01.17.hellen-honda-k.3826760062" ; 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","Aux Analog 3","Aux Analog 1","INVALID","A19 - MAP","INVALID","B8 - CLT","B17 IAT","Aux Analog 2" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:05:32 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:41:03 UTC 2024 pageSize = 22848 page = 1 @@ -1504,48 +1504,56 @@ ignBlends1_table = array, S16, 20384, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends1_loadBins = array, U16, 20512, [8], "Load", 1, 0, 0, 1000, 0 ignBlends1_rpmBins = array, U16, 20528, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends1_blendParameter = bits, U08, 20544, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends1_yAxisOverride = bits, U08, 20545, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends1_blendBins = array, S16, 20546, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends1_blendValues = array, U08, 20562, [8], "%", 0.5, 0, 0, 100, 1 ignBlends2_table = array, S16, 20572, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends2_loadBins = array, U16, 20700, [8], "Load", 1, 0, 0, 1000, 0 ignBlends2_rpmBins = array, U16, 20716, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends2_blendParameter = bits, U08, 20732, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends2_yAxisOverride = bits, U08, 20733, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends2_blendBins = array, S16, 20734, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends2_blendValues = array, U08, 20750, [8], "%", 0.5, 0, 0, 100, 1 ignBlends3_table = array, S16, 20760, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends3_loadBins = array, U16, 20888, [8], "Load", 1, 0, 0, 1000, 0 ignBlends3_rpmBins = array, U16, 20904, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends3_blendParameter = bits, U08, 20920, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends3_yAxisOverride = bits, U08, 20921, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends3_blendBins = array, S16, 20922, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends3_blendValues = array, U08, 20938, [8], "%", 0.5, 0, 0, 100, 1 ignBlends4_table = array, S16, 20948, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends4_loadBins = array, U16, 21076, [8], "Load", 1, 0, 0, 1000, 0 ignBlends4_rpmBins = array, U16, 21092, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends4_blendParameter = bits, U08, 21108, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends4_yAxisOverride = bits, U08, 21109, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends4_blendBins = array, S16, 21110, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends4_blendValues = array, U08, 21126, [8], "%", 0.5, 0, 0, 100, 1 veBlends1_table = array, S16, 21136, [8x8], "", 0.1, 0, -100, 100, 1 veBlends1_loadBins = array, U16, 21264, [8], "Load", 1, 0, 0, 1000, 0 veBlends1_rpmBins = array, U16, 21280, [8], "RPM", 1, 0, 0, 18000, 0 veBlends1_blendParameter = bits, U08, 21296, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends1_yAxisOverride = bits, U08, 21297, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends1_blendBins = array, S16, 21298, [8], "", 0.1, 0, -1000, 1000, 1 veBlends1_blendValues = array, U08, 21314, [8], "%", 0.5, 0, 0, 100, 1 veBlends2_table = array, S16, 21324, [8x8], "", 0.1, 0, -100, 100, 1 veBlends2_loadBins = array, U16, 21452, [8], "Load", 1, 0, 0, 1000, 0 veBlends2_rpmBins = array, U16, 21468, [8], "RPM", 1, 0, 0, 18000, 0 veBlends2_blendParameter = bits, U08, 21484, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends2_yAxisOverride = bits, U08, 21485, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends2_blendBins = array, S16, 21486, [8], "", 0.1, 0, -1000, 1000, 1 veBlends2_blendValues = array, U08, 21502, [8], "%", 0.5, 0, 0, 100, 1 veBlends3_table = array, S16, 21512, [8x8], "", 0.1, 0, -100, 100, 1 veBlends3_loadBins = array, U16, 21640, [8], "Load", 1, 0, 0, 1000, 0 veBlends3_rpmBins = array, U16, 21656, [8], "RPM", 1, 0, 0, 18000, 0 veBlends3_blendParameter = bits, U08, 21672, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends3_yAxisOverride = bits, U08, 21673, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends3_blendBins = array, S16, 21674, [8], "", 0.1, 0, -1000, 1000, 1 veBlends3_blendValues = array, U08, 21690, [8], "%", 0.5, 0, 0, 100, 1 veBlends4_table = array, S16, 21700, [8x8], "", 0.1, 0, -100, 100, 1 veBlends4_loadBins = array, U16, 21828, [8], "Load", 1, 0, 0, 1000, 0 veBlends4_rpmBins = array, U16, 21844, [8], "RPM", 1, 0, 0, 18000, 0 veBlends4_blendParameter = bits, U08, 21860, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends4_yAxisOverride = bits, U08, 21861, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends4_blendBins = array, S16, 21862, [8], "", 0.1, 0, -1000, 1000, 1 veBlends4_blendValues = array, U08, 21878, [8], "%", 0.5, 0, 0, 100, 1 throttleEstimateEffectiveAreaBins = array, U16, 21888, [12], "%", 0.1, 0, 0, 100, 1 @@ -1554,24 +1562,28 @@ boostOpenLoopBlends1_table = array, S16, 21936, [8x8], "", 0.1, 0, -100, 100, 1 boostOpenLoopBlends1_loadBins = array, U16, 22064, [8], "Load", 1, 0, 0, 1000, 0 boostOpenLoopBlends1_rpmBins = array, U16, 22080, [8], "RPM", 1, 0, 0, 18000, 0 boostOpenLoopBlends1_blendParameter = bits, U08, 22096, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostOpenLoopBlends1_yAxisOverride = bits, U08, 22097, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostOpenLoopBlends1_blendBins = array, S16, 22098, [8], "", 0.1, 0, -1000, 1000, 1 boostOpenLoopBlends1_blendValues = array, U08, 22114, [8], "%", 0.5, 0, 0, 100, 1 boostOpenLoopBlends2_table = array, S16, 22124, [8x8], "", 0.1, 0, -100, 100, 1 boostOpenLoopBlends2_loadBins = array, U16, 22252, [8], "Load", 1, 0, 0, 1000, 0 boostOpenLoopBlends2_rpmBins = array, U16, 22268, [8], "RPM", 1, 0, 0, 18000, 0 boostOpenLoopBlends2_blendParameter = bits, U08, 22284, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostOpenLoopBlends2_yAxisOverride = bits, U08, 22285, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostOpenLoopBlends2_blendBins = array, S16, 22286, [8], "", 0.1, 0, -1000, 1000, 1 boostOpenLoopBlends2_blendValues = array, U08, 22302, [8], "%", 0.5, 0, 0, 100, 1 boostClosedLoopBlends1_table = array, S16, 22312, [8x8], "", 0.1, 0, -100, 100, 1 boostClosedLoopBlends1_loadBins = array, U16, 22440, [8], "Load", 1, 0, 0, 1000, 0 boostClosedLoopBlends1_rpmBins = array, U16, 22456, [8], "RPM", 1, 0, 0, 18000, 0 boostClosedLoopBlends1_blendParameter = bits, U08, 22472, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostClosedLoopBlends1_yAxisOverride = bits, U08, 22473, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostClosedLoopBlends1_blendBins = array, S16, 22474, [8], "", 0.1, 0, -1000, 1000, 1 boostClosedLoopBlends1_blendValues = array, U08, 22490, [8], "%", 0.5, 0, 0, 100, 1 boostClosedLoopBlends2_table = array, S16, 22500, [8x8], "", 0.1, 0, -100, 100, 1 boostClosedLoopBlends2_loadBins = array, U16, 22628, [8], "Load", 1, 0, 0, 1000, 0 boostClosedLoopBlends2_rpmBins = array, U16, 22644, [8], "RPM", 1, 0, 0, 18000, 0 boostClosedLoopBlends2_blendParameter = bits, U08, 22660, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostClosedLoopBlends2_yAxisOverride = bits, U08, 22661, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostClosedLoopBlends2_blendBins = array, S16, 22662, [8], "", 0.1, 0, -1000, 1000, 1 boostClosedLoopBlends2_blendValues = array, U08, 22678, [8], "%", 0.5, 0, 0, 100, 1 tcu_rangeP = array, U08, 22688, [6], "level", 1, 0, 0, 3, 0 @@ -6895,7 +6907,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends1_blendParameter - panel = ignAdder1Bias + field = "Y axis override (set Zero for no override)", ignBlends1_yAxisOverride, {ignBlends1_blendParameter} + panel = ignAdder1Bias, {ignBlends1_blendParameter} dialog = ignAdder2Cfg, "Ignition adder 2 config" field = "#The bias table controls how much of the blend table" @@ -6905,7 +6918,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends2_blendParameter - panel = ignAdder2Bias + field = "Y axis override (set Zero for no override)", ignBlends2_yAxisOverride, {ignBlends2_blendParameter} + panel = ignAdder2Bias, {ignBlends2_blendParameter} dialog = ignAdder3Cfg, "Ignition adder 3 config" field = "#The bias table controls how much of the blend table" @@ -6915,7 +6929,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends3_blendParameter - panel = ignAdder3Bias + field = "Y axis override (set Zero for no override)", ignBlends3_yAxisOverride, {ignBlends3_blendParameter} + panel = ignAdder3Bias, {ignBlends3_blendParameter} dialog = ignAdder4Cfg, "Ignition adder 4 config" field = "#The bias table controls how much of the blend table" @@ -6925,7 +6940,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends4_blendParameter - panel = ignAdder4Bias + field = "Y axis override (set Zero for no override)", ignBlends4_yAxisOverride, {ignBlends4_blendParameter} + panel = ignAdder4Bias, {ignBlends4_blendParameter} dialog = veBlend1Cfg, "VE blend 1 config" field = "#The bias table controls how much of the blend table" @@ -6936,7 +6952,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends1_blendParameter - panel = veBlend1Bias + field = "Y axis override (set Zero for no override)", veBlends1_yAxisOverride, {veBlends1_blendParameter} + panel = veBlend1Bias, {veBlends1_blendParameter} dialog = veBlend2Cfg, "VE blend 2 config" field = "#The bias table controls how much of the blend table" @@ -6947,7 +6964,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends2_blendParameter - panel = veBlend2Bias + field = "Y axis override (set Zero for no override)", veBlends2_yAxisOverride, {veBlends2_blendParameter} + panel = veBlend2Bias, {veBlends2_blendParameter} dialog = veBlend3Cfg, "VE blend 3 config" field = "#The bias table controls how much of the blend table" @@ -6958,7 +6976,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends3_blendParameter - panel = veBlend3Bias + field = "Y axis override (set Zero for no override)", veBlends3_yAxisOverride, {veBlends3_blendParameter} + panel = veBlend3Bias, {veBlends3_blendParameter} dialog = veBlend4Cfg, "VE blend 4 config" field = "#The bias table controls how much of the blend table" @@ -6969,7 +6988,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends4_blendParameter - panel = veBlend4Bias + field = "Y axis override (set Zero for no override)", veBlends4_yAxisOverride, {veBlends4_blendParameter} + panel = veBlend4Bias, {veBlends4_blendParameter} indicatorPanel = isBoostControlledPanel, 1 indicator = {isBoostControlled}, "No Boost Control", "Boost Control Active" @@ -6983,7 +7003,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#parameter below." panel = isBoostControlledPanel field = "Blend parameter", boostOpenLoopBlends1_blendParameter - panel = boostOpenLoopBlend1Bias + field = "Y axis override (set Zero for no override)", boostOpenLoopBlends1_yAxisOverride, {boostOpenLoopBlends1_blendParameter} + panel = boostOpenLoopBlend1Bias, {boostOpenLoopBlends1_blendParameter} dialog = boostOpenBlend2Cfg, "Boost open loop blend 2 config" field = "#The bias table controls how much of the blend table" @@ -6994,7 +7015,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#parameter below." panel = isBoostControlledPanel field = "Blend parameter", boostOpenLoopBlends2_blendParameter - panel = boostOpenLoopBlend2Bias + field = "Y axis override (set Zero for no override)", boostOpenLoopBlends2_yAxisOverride, {boostOpenLoopBlends2_blendParameter} + panel = boostOpenLoopBlend2Bias, {boostOpenLoopBlends2_blendParameter} dialog = boostClosedBlend1Cfg, "Boost closed loop blend 1 config" field = "#The bias table controls how much of the blend table" @@ -7004,7 +7026,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", boostClosedLoopBlends1_blendParameter - panel = boostClosedLoopBlend1Bias + field = "Y axis override (set Zero for no override)", boostClosedLoopBlends1_yAxisOverride, {boostClosedLoopBlends1_blendParameter} + panel = boostClosedLoopBlend1Bias, {boostClosedLoopBlends1_blendParameter} dialog = boostClosedBlend2Cfg, "Boost closed loop blend 2 config" field = "#The bias table controls how much of the blend table" @@ -7014,7 +7037,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", boostClosedLoopBlends2_blendParameter - panel = boostClosedLoopBlend2Bias + field = "Y axis override (set Zero for no override)", boostClosedLoopBlends2_yAxisOverride, {boostClosedLoopBlends2_blendParameter} + panel = boostClosedLoopBlend2Bias, {boostClosedLoopBlends2_blendParameter} dialog = dwellSettings, "", yAxis panel = dwellCorrection diff --git a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini index be01419246..ca8aa0d560 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.2024.01.17.hellen-nb1.855296709" + signature = "rusEFI master.2024.01.17.hellen-nb1.3193277785" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.01.17.hellen-nb1.855296709" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.01.17.hellen-nb1.3193277785" ; 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 Wed Jan 17 14:05:50 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:41:21 UTC 2024 pageSize = 22176 page = 1 @@ -1504,48 +1504,56 @@ ignBlends1_table = array, S16, 19712, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends1_loadBins = array, U16, 19840, [8], "Load", 1, 0, 0, 1000, 0 ignBlends1_rpmBins = array, U16, 19856, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends1_blendParameter = bits, U08, 19872, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends1_yAxisOverride = bits, U08, 19873, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends1_blendBins = array, S16, 19874, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends1_blendValues = array, U08, 19890, [8], "%", 0.5, 0, 0, 100, 1 ignBlends2_table = array, S16, 19900, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends2_loadBins = array, U16, 20028, [8], "Load", 1, 0, 0, 1000, 0 ignBlends2_rpmBins = array, U16, 20044, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends2_blendParameter = bits, U08, 20060, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends2_yAxisOverride = bits, U08, 20061, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends2_blendBins = array, S16, 20062, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends2_blendValues = array, U08, 20078, [8], "%", 0.5, 0, 0, 100, 1 ignBlends3_table = array, S16, 20088, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends3_loadBins = array, U16, 20216, [8], "Load", 1, 0, 0, 1000, 0 ignBlends3_rpmBins = array, U16, 20232, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends3_blendParameter = bits, U08, 20248, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends3_yAxisOverride = bits, U08, 20249, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends3_blendBins = array, S16, 20250, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends3_blendValues = array, U08, 20266, [8], "%", 0.5, 0, 0, 100, 1 ignBlends4_table = array, S16, 20276, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends4_loadBins = array, U16, 20404, [8], "Load", 1, 0, 0, 1000, 0 ignBlends4_rpmBins = array, U16, 20420, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends4_blendParameter = bits, U08, 20436, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends4_yAxisOverride = bits, U08, 20437, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends4_blendBins = array, S16, 20438, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends4_blendValues = array, U08, 20454, [8], "%", 0.5, 0, 0, 100, 1 veBlends1_table = array, S16, 20464, [8x8], "", 0.1, 0, -100, 100, 1 veBlends1_loadBins = array, U16, 20592, [8], "Load", 1, 0, 0, 1000, 0 veBlends1_rpmBins = array, U16, 20608, [8], "RPM", 1, 0, 0, 18000, 0 veBlends1_blendParameter = bits, U08, 20624, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends1_yAxisOverride = bits, U08, 20625, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends1_blendBins = array, S16, 20626, [8], "", 0.1, 0, -1000, 1000, 1 veBlends1_blendValues = array, U08, 20642, [8], "%", 0.5, 0, 0, 100, 1 veBlends2_table = array, S16, 20652, [8x8], "", 0.1, 0, -100, 100, 1 veBlends2_loadBins = array, U16, 20780, [8], "Load", 1, 0, 0, 1000, 0 veBlends2_rpmBins = array, U16, 20796, [8], "RPM", 1, 0, 0, 18000, 0 veBlends2_blendParameter = bits, U08, 20812, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends2_yAxisOverride = bits, U08, 20813, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends2_blendBins = array, S16, 20814, [8], "", 0.1, 0, -1000, 1000, 1 veBlends2_blendValues = array, U08, 20830, [8], "%", 0.5, 0, 0, 100, 1 veBlends3_table = array, S16, 20840, [8x8], "", 0.1, 0, -100, 100, 1 veBlends3_loadBins = array, U16, 20968, [8], "Load", 1, 0, 0, 1000, 0 veBlends3_rpmBins = array, U16, 20984, [8], "RPM", 1, 0, 0, 18000, 0 veBlends3_blendParameter = bits, U08, 21000, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends3_yAxisOverride = bits, U08, 21001, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends3_blendBins = array, S16, 21002, [8], "", 0.1, 0, -1000, 1000, 1 veBlends3_blendValues = array, U08, 21018, [8], "%", 0.5, 0, 0, 100, 1 veBlends4_table = array, S16, 21028, [8x8], "", 0.1, 0, -100, 100, 1 veBlends4_loadBins = array, U16, 21156, [8], "Load", 1, 0, 0, 1000, 0 veBlends4_rpmBins = array, U16, 21172, [8], "RPM", 1, 0, 0, 18000, 0 veBlends4_blendParameter = bits, U08, 21188, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends4_yAxisOverride = bits, U08, 21189, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends4_blendBins = array, S16, 21190, [8], "", 0.1, 0, -1000, 1000, 1 veBlends4_blendValues = array, U08, 21206, [8], "%", 0.5, 0, 0, 100, 1 throttleEstimateEffectiveAreaBins = array, U16, 21216, [12], "%", 0.1, 0, 0, 100, 1 @@ -1554,24 +1562,28 @@ boostOpenLoopBlends1_table = array, S16, 21264, [8x8], "", 0.1, 0, -100, 100, 1 boostOpenLoopBlends1_loadBins = array, U16, 21392, [8], "Load", 1, 0, 0, 1000, 0 boostOpenLoopBlends1_rpmBins = array, U16, 21408, [8], "RPM", 1, 0, 0, 18000, 0 boostOpenLoopBlends1_blendParameter = bits, U08, 21424, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostOpenLoopBlends1_yAxisOverride = bits, U08, 21425, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostOpenLoopBlends1_blendBins = array, S16, 21426, [8], "", 0.1, 0, -1000, 1000, 1 boostOpenLoopBlends1_blendValues = array, U08, 21442, [8], "%", 0.5, 0, 0, 100, 1 boostOpenLoopBlends2_table = array, S16, 21452, [8x8], "", 0.1, 0, -100, 100, 1 boostOpenLoopBlends2_loadBins = array, U16, 21580, [8], "Load", 1, 0, 0, 1000, 0 boostOpenLoopBlends2_rpmBins = array, U16, 21596, [8], "RPM", 1, 0, 0, 18000, 0 boostOpenLoopBlends2_blendParameter = bits, U08, 21612, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostOpenLoopBlends2_yAxisOverride = bits, U08, 21613, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostOpenLoopBlends2_blendBins = array, S16, 21614, [8], "", 0.1, 0, -1000, 1000, 1 boostOpenLoopBlends2_blendValues = array, U08, 21630, [8], "%", 0.5, 0, 0, 100, 1 boostClosedLoopBlends1_table = array, S16, 21640, [8x8], "", 0.1, 0, -100, 100, 1 boostClosedLoopBlends1_loadBins = array, U16, 21768, [8], "Load", 1, 0, 0, 1000, 0 boostClosedLoopBlends1_rpmBins = array, U16, 21784, [8], "RPM", 1, 0, 0, 18000, 0 boostClosedLoopBlends1_blendParameter = bits, U08, 21800, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostClosedLoopBlends1_yAxisOverride = bits, U08, 21801, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostClosedLoopBlends1_blendBins = array, S16, 21802, [8], "", 0.1, 0, -1000, 1000, 1 boostClosedLoopBlends1_blendValues = array, U08, 21818, [8], "%", 0.5, 0, 0, 100, 1 boostClosedLoopBlends2_table = array, S16, 21828, [8x8], "", 0.1, 0, -100, 100, 1 boostClosedLoopBlends2_loadBins = array, U16, 21956, [8], "Load", 1, 0, 0, 1000, 0 boostClosedLoopBlends2_rpmBins = array, U16, 21972, [8], "RPM", 1, 0, 0, 18000, 0 boostClosedLoopBlends2_blendParameter = bits, U08, 21988, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostClosedLoopBlends2_yAxisOverride = bits, U08, 21989, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostClosedLoopBlends2_blendBins = array, S16, 21990, [8], "", 0.1, 0, -1000, 1000, 1 boostClosedLoopBlends2_blendValues = array, U08, 22006, [8], "%", 0.5, 0, 0, 100, 1 tcu_rangeP = array, U08, 22016, [6], "level", 1, 0, 0, 3, 0 @@ -6898,7 +6910,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends1_blendParameter - panel = ignAdder1Bias + field = "Y axis override (set Zero for no override)", ignBlends1_yAxisOverride, {ignBlends1_blendParameter} + panel = ignAdder1Bias, {ignBlends1_blendParameter} dialog = ignAdder2Cfg, "Ignition adder 2 config" field = "#The bias table controls how much of the blend table" @@ -6908,7 +6921,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends2_blendParameter - panel = ignAdder2Bias + field = "Y axis override (set Zero for no override)", ignBlends2_yAxisOverride, {ignBlends2_blendParameter} + panel = ignAdder2Bias, {ignBlends2_blendParameter} dialog = ignAdder3Cfg, "Ignition adder 3 config" field = "#The bias table controls how much of the blend table" @@ -6918,7 +6932,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends3_blendParameter - panel = ignAdder3Bias + field = "Y axis override (set Zero for no override)", ignBlends3_yAxisOverride, {ignBlends3_blendParameter} + panel = ignAdder3Bias, {ignBlends3_blendParameter} dialog = ignAdder4Cfg, "Ignition adder 4 config" field = "#The bias table controls how much of the blend table" @@ -6928,7 +6943,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends4_blendParameter - panel = ignAdder4Bias + field = "Y axis override (set Zero for no override)", ignBlends4_yAxisOverride, {ignBlends4_blendParameter} + panel = ignAdder4Bias, {ignBlends4_blendParameter} dialog = veBlend1Cfg, "VE blend 1 config" field = "#The bias table controls how much of the blend table" @@ -6939,7 +6955,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends1_blendParameter - panel = veBlend1Bias + field = "Y axis override (set Zero for no override)", veBlends1_yAxisOverride, {veBlends1_blendParameter} + panel = veBlend1Bias, {veBlends1_blendParameter} dialog = veBlend2Cfg, "VE blend 2 config" field = "#The bias table controls how much of the blend table" @@ -6950,7 +6967,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends2_blendParameter - panel = veBlend2Bias + field = "Y axis override (set Zero for no override)", veBlends2_yAxisOverride, {veBlends2_blendParameter} + panel = veBlend2Bias, {veBlends2_blendParameter} dialog = veBlend3Cfg, "VE blend 3 config" field = "#The bias table controls how much of the blend table" @@ -6961,7 +6979,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends3_blendParameter - panel = veBlend3Bias + field = "Y axis override (set Zero for no override)", veBlends3_yAxisOverride, {veBlends3_blendParameter} + panel = veBlend3Bias, {veBlends3_blendParameter} dialog = veBlend4Cfg, "VE blend 4 config" field = "#The bias table controls how much of the blend table" @@ -6972,7 +6991,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends4_blendParameter - panel = veBlend4Bias + field = "Y axis override (set Zero for no override)", veBlends4_yAxisOverride, {veBlends4_blendParameter} + panel = veBlend4Bias, {veBlends4_blendParameter} indicatorPanel = isBoostControlledPanel, 1 indicator = {isBoostControlled}, "No Boost Control", "Boost Control Active" @@ -6986,7 +7006,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#parameter below." panel = isBoostControlledPanel field = "Blend parameter", boostOpenLoopBlends1_blendParameter - panel = boostOpenLoopBlend1Bias + field = "Y axis override (set Zero for no override)", boostOpenLoopBlends1_yAxisOverride, {boostOpenLoopBlends1_blendParameter} + panel = boostOpenLoopBlend1Bias, {boostOpenLoopBlends1_blendParameter} dialog = boostOpenBlend2Cfg, "Boost open loop blend 2 config" field = "#The bias table controls how much of the blend table" @@ -6997,7 +7018,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#parameter below." panel = isBoostControlledPanel field = "Blend parameter", boostOpenLoopBlends2_blendParameter - panel = boostOpenLoopBlend2Bias + field = "Y axis override (set Zero for no override)", boostOpenLoopBlends2_yAxisOverride, {boostOpenLoopBlends2_blendParameter} + panel = boostOpenLoopBlend2Bias, {boostOpenLoopBlends2_blendParameter} dialog = boostClosedBlend1Cfg, "Boost closed loop blend 1 config" field = "#The bias table controls how much of the blend table" @@ -7007,7 +7029,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", boostClosedLoopBlends1_blendParameter - panel = boostClosedLoopBlend1Bias + field = "Y axis override (set Zero for no override)", boostClosedLoopBlends1_yAxisOverride, {boostClosedLoopBlends1_blendParameter} + panel = boostClosedLoopBlend1Bias, {boostClosedLoopBlends1_blendParameter} dialog = boostClosedBlend2Cfg, "Boost closed loop blend 2 config" field = "#The bias table controls how much of the blend table" @@ -7017,7 +7040,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", boostClosedLoopBlends2_blendParameter - panel = boostClosedLoopBlend2Bias + field = "Y axis override (set Zero for no override)", boostClosedLoopBlends2_yAxisOverride, {boostClosedLoopBlends2_blendParameter} + panel = boostClosedLoopBlend2Bias, {boostClosedLoopBlends2_blendParameter} dialog = dwellSettings, "", yAxis panel = dwellCorrection diff --git a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini index 8ae4441854..266d10f240 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.2024.01.17.hellen121nissan.1176766107" + signature = "rusEFI master.2024.01.17.hellen121nissan.3398123783" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.01.17.hellen121nissan.1176766107" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.01.17.hellen121nissan.3398123783" ; 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 Wed Jan 17 14:05:30 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:41:00 UTC 2024 pageSize = 22176 page = 1 @@ -1504,48 +1504,56 @@ ignBlends1_table = array, S16, 19712, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends1_loadBins = array, U16, 19840, [8], "Load", 1, 0, 0, 1000, 0 ignBlends1_rpmBins = array, U16, 19856, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends1_blendParameter = bits, U08, 19872, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends1_yAxisOverride = bits, U08, 19873, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends1_blendBins = array, S16, 19874, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends1_blendValues = array, U08, 19890, [8], "%", 0.5, 0, 0, 100, 1 ignBlends2_table = array, S16, 19900, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends2_loadBins = array, U16, 20028, [8], "Load", 1, 0, 0, 1000, 0 ignBlends2_rpmBins = array, U16, 20044, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends2_blendParameter = bits, U08, 20060, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends2_yAxisOverride = bits, U08, 20061, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends2_blendBins = array, S16, 20062, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends2_blendValues = array, U08, 20078, [8], "%", 0.5, 0, 0, 100, 1 ignBlends3_table = array, S16, 20088, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends3_loadBins = array, U16, 20216, [8], "Load", 1, 0, 0, 1000, 0 ignBlends3_rpmBins = array, U16, 20232, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends3_blendParameter = bits, U08, 20248, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends3_yAxisOverride = bits, U08, 20249, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends3_blendBins = array, S16, 20250, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends3_blendValues = array, U08, 20266, [8], "%", 0.5, 0, 0, 100, 1 ignBlends4_table = array, S16, 20276, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends4_loadBins = array, U16, 20404, [8], "Load", 1, 0, 0, 1000, 0 ignBlends4_rpmBins = array, U16, 20420, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends4_blendParameter = bits, U08, 20436, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends4_yAxisOverride = bits, U08, 20437, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends4_blendBins = array, S16, 20438, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends4_blendValues = array, U08, 20454, [8], "%", 0.5, 0, 0, 100, 1 veBlends1_table = array, S16, 20464, [8x8], "", 0.1, 0, -100, 100, 1 veBlends1_loadBins = array, U16, 20592, [8], "Load", 1, 0, 0, 1000, 0 veBlends1_rpmBins = array, U16, 20608, [8], "RPM", 1, 0, 0, 18000, 0 veBlends1_blendParameter = bits, U08, 20624, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends1_yAxisOverride = bits, U08, 20625, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends1_blendBins = array, S16, 20626, [8], "", 0.1, 0, -1000, 1000, 1 veBlends1_blendValues = array, U08, 20642, [8], "%", 0.5, 0, 0, 100, 1 veBlends2_table = array, S16, 20652, [8x8], "", 0.1, 0, -100, 100, 1 veBlends2_loadBins = array, U16, 20780, [8], "Load", 1, 0, 0, 1000, 0 veBlends2_rpmBins = array, U16, 20796, [8], "RPM", 1, 0, 0, 18000, 0 veBlends2_blendParameter = bits, U08, 20812, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends2_yAxisOverride = bits, U08, 20813, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends2_blendBins = array, S16, 20814, [8], "", 0.1, 0, -1000, 1000, 1 veBlends2_blendValues = array, U08, 20830, [8], "%", 0.5, 0, 0, 100, 1 veBlends3_table = array, S16, 20840, [8x8], "", 0.1, 0, -100, 100, 1 veBlends3_loadBins = array, U16, 20968, [8], "Load", 1, 0, 0, 1000, 0 veBlends3_rpmBins = array, U16, 20984, [8], "RPM", 1, 0, 0, 18000, 0 veBlends3_blendParameter = bits, U08, 21000, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends3_yAxisOverride = bits, U08, 21001, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends3_blendBins = array, S16, 21002, [8], "", 0.1, 0, -1000, 1000, 1 veBlends3_blendValues = array, U08, 21018, [8], "%", 0.5, 0, 0, 100, 1 veBlends4_table = array, S16, 21028, [8x8], "", 0.1, 0, -100, 100, 1 veBlends4_loadBins = array, U16, 21156, [8], "Load", 1, 0, 0, 1000, 0 veBlends4_rpmBins = array, U16, 21172, [8], "RPM", 1, 0, 0, 18000, 0 veBlends4_blendParameter = bits, U08, 21188, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends4_yAxisOverride = bits, U08, 21189, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends4_blendBins = array, S16, 21190, [8], "", 0.1, 0, -1000, 1000, 1 veBlends4_blendValues = array, U08, 21206, [8], "%", 0.5, 0, 0, 100, 1 throttleEstimateEffectiveAreaBins = array, U16, 21216, [12], "%", 0.1, 0, 0, 100, 1 @@ -1554,24 +1562,28 @@ boostOpenLoopBlends1_table = array, S16, 21264, [8x8], "", 0.1, 0, -100, 100, 1 boostOpenLoopBlends1_loadBins = array, U16, 21392, [8], "Load", 1, 0, 0, 1000, 0 boostOpenLoopBlends1_rpmBins = array, U16, 21408, [8], "RPM", 1, 0, 0, 18000, 0 boostOpenLoopBlends1_blendParameter = bits, U08, 21424, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostOpenLoopBlends1_yAxisOverride = bits, U08, 21425, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostOpenLoopBlends1_blendBins = array, S16, 21426, [8], "", 0.1, 0, -1000, 1000, 1 boostOpenLoopBlends1_blendValues = array, U08, 21442, [8], "%", 0.5, 0, 0, 100, 1 boostOpenLoopBlends2_table = array, S16, 21452, [8x8], "", 0.1, 0, -100, 100, 1 boostOpenLoopBlends2_loadBins = array, U16, 21580, [8], "Load", 1, 0, 0, 1000, 0 boostOpenLoopBlends2_rpmBins = array, U16, 21596, [8], "RPM", 1, 0, 0, 18000, 0 boostOpenLoopBlends2_blendParameter = bits, U08, 21612, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostOpenLoopBlends2_yAxisOverride = bits, U08, 21613, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostOpenLoopBlends2_blendBins = array, S16, 21614, [8], "", 0.1, 0, -1000, 1000, 1 boostOpenLoopBlends2_blendValues = array, U08, 21630, [8], "%", 0.5, 0, 0, 100, 1 boostClosedLoopBlends1_table = array, S16, 21640, [8x8], "", 0.1, 0, -100, 100, 1 boostClosedLoopBlends1_loadBins = array, U16, 21768, [8], "Load", 1, 0, 0, 1000, 0 boostClosedLoopBlends1_rpmBins = array, U16, 21784, [8], "RPM", 1, 0, 0, 18000, 0 boostClosedLoopBlends1_blendParameter = bits, U08, 21800, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostClosedLoopBlends1_yAxisOverride = bits, U08, 21801, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostClosedLoopBlends1_blendBins = array, S16, 21802, [8], "", 0.1, 0, -1000, 1000, 1 boostClosedLoopBlends1_blendValues = array, U08, 21818, [8], "%", 0.5, 0, 0, 100, 1 boostClosedLoopBlends2_table = array, S16, 21828, [8x8], "", 0.1, 0, -100, 100, 1 boostClosedLoopBlends2_loadBins = array, U16, 21956, [8], "Load", 1, 0, 0, 1000, 0 boostClosedLoopBlends2_rpmBins = array, U16, 21972, [8], "RPM", 1, 0, 0, 18000, 0 boostClosedLoopBlends2_blendParameter = bits, U08, 21988, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostClosedLoopBlends2_yAxisOverride = bits, U08, 21989, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostClosedLoopBlends2_blendBins = array, S16, 21990, [8], "", 0.1, 0, -1000, 1000, 1 boostClosedLoopBlends2_blendValues = array, U08, 22006, [8], "%", 0.5, 0, 0, 100, 1 tcu_rangeP = array, U08, 22016, [6], "level", 1, 0, 0, 3, 0 @@ -6895,7 +6907,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends1_blendParameter - panel = ignAdder1Bias + field = "Y axis override (set Zero for no override)", ignBlends1_yAxisOverride, {ignBlends1_blendParameter} + panel = ignAdder1Bias, {ignBlends1_blendParameter} dialog = ignAdder2Cfg, "Ignition adder 2 config" field = "#The bias table controls how much of the blend table" @@ -6905,7 +6918,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends2_blendParameter - panel = ignAdder2Bias + field = "Y axis override (set Zero for no override)", ignBlends2_yAxisOverride, {ignBlends2_blendParameter} + panel = ignAdder2Bias, {ignBlends2_blendParameter} dialog = ignAdder3Cfg, "Ignition adder 3 config" field = "#The bias table controls how much of the blend table" @@ -6915,7 +6929,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends3_blendParameter - panel = ignAdder3Bias + field = "Y axis override (set Zero for no override)", ignBlends3_yAxisOverride, {ignBlends3_blendParameter} + panel = ignAdder3Bias, {ignBlends3_blendParameter} dialog = ignAdder4Cfg, "Ignition adder 4 config" field = "#The bias table controls how much of the blend table" @@ -6925,7 +6940,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends4_blendParameter - panel = ignAdder4Bias + field = "Y axis override (set Zero for no override)", ignBlends4_yAxisOverride, {ignBlends4_blendParameter} + panel = ignAdder4Bias, {ignBlends4_blendParameter} dialog = veBlend1Cfg, "VE blend 1 config" field = "#The bias table controls how much of the blend table" @@ -6936,7 +6952,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends1_blendParameter - panel = veBlend1Bias + field = "Y axis override (set Zero for no override)", veBlends1_yAxisOverride, {veBlends1_blendParameter} + panel = veBlend1Bias, {veBlends1_blendParameter} dialog = veBlend2Cfg, "VE blend 2 config" field = "#The bias table controls how much of the blend table" @@ -6947,7 +6964,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends2_blendParameter - panel = veBlend2Bias + field = "Y axis override (set Zero for no override)", veBlends2_yAxisOverride, {veBlends2_blendParameter} + panel = veBlend2Bias, {veBlends2_blendParameter} dialog = veBlend3Cfg, "VE blend 3 config" field = "#The bias table controls how much of the blend table" @@ -6958,7 +6976,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends3_blendParameter - panel = veBlend3Bias + field = "Y axis override (set Zero for no override)", veBlends3_yAxisOverride, {veBlends3_blendParameter} + panel = veBlend3Bias, {veBlends3_blendParameter} dialog = veBlend4Cfg, "VE blend 4 config" field = "#The bias table controls how much of the blend table" @@ -6969,7 +6988,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends4_blendParameter - panel = veBlend4Bias + field = "Y axis override (set Zero for no override)", veBlends4_yAxisOverride, {veBlends4_blendParameter} + panel = veBlend4Bias, {veBlends4_blendParameter} indicatorPanel = isBoostControlledPanel, 1 indicator = {isBoostControlled}, "No Boost Control", "Boost Control Active" @@ -6983,7 +7003,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#parameter below." panel = isBoostControlledPanel field = "Blend parameter", boostOpenLoopBlends1_blendParameter - panel = boostOpenLoopBlend1Bias + field = "Y axis override (set Zero for no override)", boostOpenLoopBlends1_yAxisOverride, {boostOpenLoopBlends1_blendParameter} + panel = boostOpenLoopBlend1Bias, {boostOpenLoopBlends1_blendParameter} dialog = boostOpenBlend2Cfg, "Boost open loop blend 2 config" field = "#The bias table controls how much of the blend table" @@ -6994,7 +7015,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#parameter below." panel = isBoostControlledPanel field = "Blend parameter", boostOpenLoopBlends2_blendParameter - panel = boostOpenLoopBlend2Bias + field = "Y axis override (set Zero for no override)", boostOpenLoopBlends2_yAxisOverride, {boostOpenLoopBlends2_blendParameter} + panel = boostOpenLoopBlend2Bias, {boostOpenLoopBlends2_blendParameter} dialog = boostClosedBlend1Cfg, "Boost closed loop blend 1 config" field = "#The bias table controls how much of the blend table" @@ -7004,7 +7026,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", boostClosedLoopBlends1_blendParameter - panel = boostClosedLoopBlend1Bias + field = "Y axis override (set Zero for no override)", boostClosedLoopBlends1_yAxisOverride, {boostClosedLoopBlends1_blendParameter} + panel = boostClosedLoopBlend1Bias, {boostClosedLoopBlends1_blendParameter} dialog = boostClosedBlend2Cfg, "Boost closed loop blend 2 config" field = "#The bias table controls how much of the blend table" @@ -7014,7 +7037,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", boostClosedLoopBlends2_blendParameter - panel = boostClosedLoopBlend2Bias + field = "Y axis override (set Zero for no override)", boostClosedLoopBlends2_yAxisOverride, {boostClosedLoopBlends2_blendParameter} + panel = boostClosedLoopBlend2Bias, {boostClosedLoopBlends2_blendParameter} dialog = dwellSettings, "", yAxis panel = dwellCorrection diff --git a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini index 074f5f507d..4ddab56646 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.2024.01.17.hellen121vag.518652138" + signature = "rusEFI master.2024.01.17.hellen121vag.2454013814" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.01.17.hellen121vag.518652138" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.01.17.hellen121vag.2454013814" ; 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 Wed Jan 17 14:05:27 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:40:58 UTC 2024 pageSize = 22176 page = 1 @@ -1504,48 +1504,56 @@ ignBlends1_table = array, S16, 19712, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends1_loadBins = array, U16, 19840, [8], "Load", 1, 0, 0, 1000, 0 ignBlends1_rpmBins = array, U16, 19856, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends1_blendParameter = bits, U08, 19872, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends1_yAxisOverride = bits, U08, 19873, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends1_blendBins = array, S16, 19874, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends1_blendValues = array, U08, 19890, [8], "%", 0.5, 0, 0, 100, 1 ignBlends2_table = array, S16, 19900, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends2_loadBins = array, U16, 20028, [8], "Load", 1, 0, 0, 1000, 0 ignBlends2_rpmBins = array, U16, 20044, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends2_blendParameter = bits, U08, 20060, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends2_yAxisOverride = bits, U08, 20061, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends2_blendBins = array, S16, 20062, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends2_blendValues = array, U08, 20078, [8], "%", 0.5, 0, 0, 100, 1 ignBlends3_table = array, S16, 20088, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends3_loadBins = array, U16, 20216, [8], "Load", 1, 0, 0, 1000, 0 ignBlends3_rpmBins = array, U16, 20232, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends3_blendParameter = bits, U08, 20248, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends3_yAxisOverride = bits, U08, 20249, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends3_blendBins = array, S16, 20250, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends3_blendValues = array, U08, 20266, [8], "%", 0.5, 0, 0, 100, 1 ignBlends4_table = array, S16, 20276, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends4_loadBins = array, U16, 20404, [8], "Load", 1, 0, 0, 1000, 0 ignBlends4_rpmBins = array, U16, 20420, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends4_blendParameter = bits, U08, 20436, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends4_yAxisOverride = bits, U08, 20437, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends4_blendBins = array, S16, 20438, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends4_blendValues = array, U08, 20454, [8], "%", 0.5, 0, 0, 100, 1 veBlends1_table = array, S16, 20464, [8x8], "", 0.1, 0, -100, 100, 1 veBlends1_loadBins = array, U16, 20592, [8], "Load", 1, 0, 0, 1000, 0 veBlends1_rpmBins = array, U16, 20608, [8], "RPM", 1, 0, 0, 18000, 0 veBlends1_blendParameter = bits, U08, 20624, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends1_yAxisOverride = bits, U08, 20625, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends1_blendBins = array, S16, 20626, [8], "", 0.1, 0, -1000, 1000, 1 veBlends1_blendValues = array, U08, 20642, [8], "%", 0.5, 0, 0, 100, 1 veBlends2_table = array, S16, 20652, [8x8], "", 0.1, 0, -100, 100, 1 veBlends2_loadBins = array, U16, 20780, [8], "Load", 1, 0, 0, 1000, 0 veBlends2_rpmBins = array, U16, 20796, [8], "RPM", 1, 0, 0, 18000, 0 veBlends2_blendParameter = bits, U08, 20812, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends2_yAxisOverride = bits, U08, 20813, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends2_blendBins = array, S16, 20814, [8], "", 0.1, 0, -1000, 1000, 1 veBlends2_blendValues = array, U08, 20830, [8], "%", 0.5, 0, 0, 100, 1 veBlends3_table = array, S16, 20840, [8x8], "", 0.1, 0, -100, 100, 1 veBlends3_loadBins = array, U16, 20968, [8], "Load", 1, 0, 0, 1000, 0 veBlends3_rpmBins = array, U16, 20984, [8], "RPM", 1, 0, 0, 18000, 0 veBlends3_blendParameter = bits, U08, 21000, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends3_yAxisOverride = bits, U08, 21001, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends3_blendBins = array, S16, 21002, [8], "", 0.1, 0, -1000, 1000, 1 veBlends3_blendValues = array, U08, 21018, [8], "%", 0.5, 0, 0, 100, 1 veBlends4_table = array, S16, 21028, [8x8], "", 0.1, 0, -100, 100, 1 veBlends4_loadBins = array, U16, 21156, [8], "Load", 1, 0, 0, 1000, 0 veBlends4_rpmBins = array, U16, 21172, [8], "RPM", 1, 0, 0, 18000, 0 veBlends4_blendParameter = bits, U08, 21188, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends4_yAxisOverride = bits, U08, 21189, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends4_blendBins = array, S16, 21190, [8], "", 0.1, 0, -1000, 1000, 1 veBlends4_blendValues = array, U08, 21206, [8], "%", 0.5, 0, 0, 100, 1 throttleEstimateEffectiveAreaBins = array, U16, 21216, [12], "%", 0.1, 0, 0, 100, 1 @@ -1554,24 +1562,28 @@ boostOpenLoopBlends1_table = array, S16, 21264, [8x8], "", 0.1, 0, -100, 100, 1 boostOpenLoopBlends1_loadBins = array, U16, 21392, [8], "Load", 1, 0, 0, 1000, 0 boostOpenLoopBlends1_rpmBins = array, U16, 21408, [8], "RPM", 1, 0, 0, 18000, 0 boostOpenLoopBlends1_blendParameter = bits, U08, 21424, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostOpenLoopBlends1_yAxisOverride = bits, U08, 21425, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostOpenLoopBlends1_blendBins = array, S16, 21426, [8], "", 0.1, 0, -1000, 1000, 1 boostOpenLoopBlends1_blendValues = array, U08, 21442, [8], "%", 0.5, 0, 0, 100, 1 boostOpenLoopBlends2_table = array, S16, 21452, [8x8], "", 0.1, 0, -100, 100, 1 boostOpenLoopBlends2_loadBins = array, U16, 21580, [8], "Load", 1, 0, 0, 1000, 0 boostOpenLoopBlends2_rpmBins = array, U16, 21596, [8], "RPM", 1, 0, 0, 18000, 0 boostOpenLoopBlends2_blendParameter = bits, U08, 21612, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostOpenLoopBlends2_yAxisOverride = bits, U08, 21613, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostOpenLoopBlends2_blendBins = array, S16, 21614, [8], "", 0.1, 0, -1000, 1000, 1 boostOpenLoopBlends2_blendValues = array, U08, 21630, [8], "%", 0.5, 0, 0, 100, 1 boostClosedLoopBlends1_table = array, S16, 21640, [8x8], "", 0.1, 0, -100, 100, 1 boostClosedLoopBlends1_loadBins = array, U16, 21768, [8], "Load", 1, 0, 0, 1000, 0 boostClosedLoopBlends1_rpmBins = array, U16, 21784, [8], "RPM", 1, 0, 0, 18000, 0 boostClosedLoopBlends1_blendParameter = bits, U08, 21800, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostClosedLoopBlends1_yAxisOverride = bits, U08, 21801, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostClosedLoopBlends1_blendBins = array, S16, 21802, [8], "", 0.1, 0, -1000, 1000, 1 boostClosedLoopBlends1_blendValues = array, U08, 21818, [8], "%", 0.5, 0, 0, 100, 1 boostClosedLoopBlends2_table = array, S16, 21828, [8x8], "", 0.1, 0, -100, 100, 1 boostClosedLoopBlends2_loadBins = array, U16, 21956, [8], "Load", 1, 0, 0, 1000, 0 boostClosedLoopBlends2_rpmBins = array, U16, 21972, [8], "RPM", 1, 0, 0, 18000, 0 boostClosedLoopBlends2_blendParameter = bits, U08, 21988, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostClosedLoopBlends2_yAxisOverride = bits, U08, 21989, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostClosedLoopBlends2_blendBins = array, S16, 21990, [8], "", 0.1, 0, -1000, 1000, 1 boostClosedLoopBlends2_blendValues = array, U08, 22006, [8], "%", 0.5, 0, 0, 100, 1 tcu_rangeP = array, U08, 22016, [6], "level", 1, 0, 0, 3, 0 @@ -6898,7 +6910,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends1_blendParameter - panel = ignAdder1Bias + field = "Y axis override (set Zero for no override)", ignBlends1_yAxisOverride, {ignBlends1_blendParameter} + panel = ignAdder1Bias, {ignBlends1_blendParameter} dialog = ignAdder2Cfg, "Ignition adder 2 config" field = "#The bias table controls how much of the blend table" @@ -6908,7 +6921,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends2_blendParameter - panel = ignAdder2Bias + field = "Y axis override (set Zero for no override)", ignBlends2_yAxisOverride, {ignBlends2_blendParameter} + panel = ignAdder2Bias, {ignBlends2_blendParameter} dialog = ignAdder3Cfg, "Ignition adder 3 config" field = "#The bias table controls how much of the blend table" @@ -6918,7 +6932,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends3_blendParameter - panel = ignAdder3Bias + field = "Y axis override (set Zero for no override)", ignBlends3_yAxisOverride, {ignBlends3_blendParameter} + panel = ignAdder3Bias, {ignBlends3_blendParameter} dialog = ignAdder4Cfg, "Ignition adder 4 config" field = "#The bias table controls how much of the blend table" @@ -6928,7 +6943,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends4_blendParameter - panel = ignAdder4Bias + field = "Y axis override (set Zero for no override)", ignBlends4_yAxisOverride, {ignBlends4_blendParameter} + panel = ignAdder4Bias, {ignBlends4_blendParameter} dialog = veBlend1Cfg, "VE blend 1 config" field = "#The bias table controls how much of the blend table" @@ -6939,7 +6955,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends1_blendParameter - panel = veBlend1Bias + field = "Y axis override (set Zero for no override)", veBlends1_yAxisOverride, {veBlends1_blendParameter} + panel = veBlend1Bias, {veBlends1_blendParameter} dialog = veBlend2Cfg, "VE blend 2 config" field = "#The bias table controls how much of the blend table" @@ -6950,7 +6967,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends2_blendParameter - panel = veBlend2Bias + field = "Y axis override (set Zero for no override)", veBlends2_yAxisOverride, {veBlends2_blendParameter} + panel = veBlend2Bias, {veBlends2_blendParameter} dialog = veBlend3Cfg, "VE blend 3 config" field = "#The bias table controls how much of the blend table" @@ -6961,7 +6979,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends3_blendParameter - panel = veBlend3Bias + field = "Y axis override (set Zero for no override)", veBlends3_yAxisOverride, {veBlends3_blendParameter} + panel = veBlend3Bias, {veBlends3_blendParameter} dialog = veBlend4Cfg, "VE blend 4 config" field = "#The bias table controls how much of the blend table" @@ -6972,7 +6991,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends4_blendParameter - panel = veBlend4Bias + field = "Y axis override (set Zero for no override)", veBlends4_yAxisOverride, {veBlends4_blendParameter} + panel = veBlend4Bias, {veBlends4_blendParameter} indicatorPanel = isBoostControlledPanel, 1 indicator = {isBoostControlled}, "No Boost Control", "Boost Control Active" @@ -6986,7 +7006,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#parameter below." panel = isBoostControlledPanel field = "Blend parameter", boostOpenLoopBlends1_blendParameter - panel = boostOpenLoopBlend1Bias + field = "Y axis override (set Zero for no override)", boostOpenLoopBlends1_yAxisOverride, {boostOpenLoopBlends1_blendParameter} + panel = boostOpenLoopBlend1Bias, {boostOpenLoopBlends1_blendParameter} dialog = boostOpenBlend2Cfg, "Boost open loop blend 2 config" field = "#The bias table controls how much of the blend table" @@ -6997,7 +7018,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#parameter below." panel = isBoostControlledPanel field = "Blend parameter", boostOpenLoopBlends2_blendParameter - panel = boostOpenLoopBlend2Bias + field = "Y axis override (set Zero for no override)", boostOpenLoopBlends2_yAxisOverride, {boostOpenLoopBlends2_blendParameter} + panel = boostOpenLoopBlend2Bias, {boostOpenLoopBlends2_blendParameter} dialog = boostClosedBlend1Cfg, "Boost closed loop blend 1 config" field = "#The bias table controls how much of the blend table" @@ -7007,7 +7029,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", boostClosedLoopBlends1_blendParameter - panel = boostClosedLoopBlend1Bias + field = "Y axis override (set Zero for no override)", boostClosedLoopBlends1_yAxisOverride, {boostClosedLoopBlends1_blendParameter} + panel = boostClosedLoopBlend1Bias, {boostClosedLoopBlends1_blendParameter} dialog = boostClosedBlend2Cfg, "Boost closed loop blend 2 config" field = "#The bias table controls how much of the blend table" @@ -7017,7 +7040,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", boostClosedLoopBlends2_blendParameter - panel = boostClosedLoopBlend2Bias + field = "Y axis override (set Zero for no override)", boostClosedLoopBlends2_yAxisOverride, {boostClosedLoopBlends2_blendParameter} + panel = boostClosedLoopBlend2Bias, {boostClosedLoopBlends2_blendParameter} dialog = dwellSettings, "", yAxis panel = dwellCorrection diff --git a/firmware/tunerstudio/generated/rusefi_hellen128.ini b/firmware/tunerstudio/generated/rusefi_hellen128.ini index 3d4e335734..f135d493de 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen128.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen128.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.01.17.hellen128.3271636987" + signature = "rusEFI master.2024.01.17.hellen128.1336832103" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.01.17.hellen128.3271636987" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.01.17.hellen128.1336832103" ; 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 Wed Jan 17 14:05:24 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:40:55 UTC 2024 pageSize = 22176 page = 1 @@ -1504,48 +1504,56 @@ ignBlends1_table = array, S16, 19712, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends1_loadBins = array, U16, 19840, [8], "Load", 1, 0, 0, 1000, 0 ignBlends1_rpmBins = array, U16, 19856, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends1_blendParameter = bits, U08, 19872, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends1_yAxisOverride = bits, U08, 19873, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends1_blendBins = array, S16, 19874, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends1_blendValues = array, U08, 19890, [8], "%", 0.5, 0, 0, 100, 1 ignBlends2_table = array, S16, 19900, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends2_loadBins = array, U16, 20028, [8], "Load", 1, 0, 0, 1000, 0 ignBlends2_rpmBins = array, U16, 20044, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends2_blendParameter = bits, U08, 20060, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends2_yAxisOverride = bits, U08, 20061, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends2_blendBins = array, S16, 20062, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends2_blendValues = array, U08, 20078, [8], "%", 0.5, 0, 0, 100, 1 ignBlends3_table = array, S16, 20088, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends3_loadBins = array, U16, 20216, [8], "Load", 1, 0, 0, 1000, 0 ignBlends3_rpmBins = array, U16, 20232, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends3_blendParameter = bits, U08, 20248, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends3_yAxisOverride = bits, U08, 20249, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends3_blendBins = array, S16, 20250, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends3_blendValues = array, U08, 20266, [8], "%", 0.5, 0, 0, 100, 1 ignBlends4_table = array, S16, 20276, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends4_loadBins = array, U16, 20404, [8], "Load", 1, 0, 0, 1000, 0 ignBlends4_rpmBins = array, U16, 20420, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends4_blendParameter = bits, U08, 20436, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends4_yAxisOverride = bits, U08, 20437, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends4_blendBins = array, S16, 20438, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends4_blendValues = array, U08, 20454, [8], "%", 0.5, 0, 0, 100, 1 veBlends1_table = array, S16, 20464, [8x8], "", 0.1, 0, -100, 100, 1 veBlends1_loadBins = array, U16, 20592, [8], "Load", 1, 0, 0, 1000, 0 veBlends1_rpmBins = array, U16, 20608, [8], "RPM", 1, 0, 0, 18000, 0 veBlends1_blendParameter = bits, U08, 20624, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends1_yAxisOverride = bits, U08, 20625, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends1_blendBins = array, S16, 20626, [8], "", 0.1, 0, -1000, 1000, 1 veBlends1_blendValues = array, U08, 20642, [8], "%", 0.5, 0, 0, 100, 1 veBlends2_table = array, S16, 20652, [8x8], "", 0.1, 0, -100, 100, 1 veBlends2_loadBins = array, U16, 20780, [8], "Load", 1, 0, 0, 1000, 0 veBlends2_rpmBins = array, U16, 20796, [8], "RPM", 1, 0, 0, 18000, 0 veBlends2_blendParameter = bits, U08, 20812, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends2_yAxisOverride = bits, U08, 20813, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends2_blendBins = array, S16, 20814, [8], "", 0.1, 0, -1000, 1000, 1 veBlends2_blendValues = array, U08, 20830, [8], "%", 0.5, 0, 0, 100, 1 veBlends3_table = array, S16, 20840, [8x8], "", 0.1, 0, -100, 100, 1 veBlends3_loadBins = array, U16, 20968, [8], "Load", 1, 0, 0, 1000, 0 veBlends3_rpmBins = array, U16, 20984, [8], "RPM", 1, 0, 0, 18000, 0 veBlends3_blendParameter = bits, U08, 21000, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends3_yAxisOverride = bits, U08, 21001, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends3_blendBins = array, S16, 21002, [8], "", 0.1, 0, -1000, 1000, 1 veBlends3_blendValues = array, U08, 21018, [8], "%", 0.5, 0, 0, 100, 1 veBlends4_table = array, S16, 21028, [8x8], "", 0.1, 0, -100, 100, 1 veBlends4_loadBins = array, U16, 21156, [8], "Load", 1, 0, 0, 1000, 0 veBlends4_rpmBins = array, U16, 21172, [8], "RPM", 1, 0, 0, 18000, 0 veBlends4_blendParameter = bits, U08, 21188, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends4_yAxisOverride = bits, U08, 21189, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends4_blendBins = array, S16, 21190, [8], "", 0.1, 0, -1000, 1000, 1 veBlends4_blendValues = array, U08, 21206, [8], "%", 0.5, 0, 0, 100, 1 throttleEstimateEffectiveAreaBins = array, U16, 21216, [12], "%", 0.1, 0, 0, 100, 1 @@ -1554,24 +1562,28 @@ boostOpenLoopBlends1_table = array, S16, 21264, [8x8], "", 0.1, 0, -100, 100, 1 boostOpenLoopBlends1_loadBins = array, U16, 21392, [8], "Load", 1, 0, 0, 1000, 0 boostOpenLoopBlends1_rpmBins = array, U16, 21408, [8], "RPM", 1, 0, 0, 18000, 0 boostOpenLoopBlends1_blendParameter = bits, U08, 21424, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostOpenLoopBlends1_yAxisOverride = bits, U08, 21425, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostOpenLoopBlends1_blendBins = array, S16, 21426, [8], "", 0.1, 0, -1000, 1000, 1 boostOpenLoopBlends1_blendValues = array, U08, 21442, [8], "%", 0.5, 0, 0, 100, 1 boostOpenLoopBlends2_table = array, S16, 21452, [8x8], "", 0.1, 0, -100, 100, 1 boostOpenLoopBlends2_loadBins = array, U16, 21580, [8], "Load", 1, 0, 0, 1000, 0 boostOpenLoopBlends2_rpmBins = array, U16, 21596, [8], "RPM", 1, 0, 0, 18000, 0 boostOpenLoopBlends2_blendParameter = bits, U08, 21612, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostOpenLoopBlends2_yAxisOverride = bits, U08, 21613, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostOpenLoopBlends2_blendBins = array, S16, 21614, [8], "", 0.1, 0, -1000, 1000, 1 boostOpenLoopBlends2_blendValues = array, U08, 21630, [8], "%", 0.5, 0, 0, 100, 1 boostClosedLoopBlends1_table = array, S16, 21640, [8x8], "", 0.1, 0, -100, 100, 1 boostClosedLoopBlends1_loadBins = array, U16, 21768, [8], "Load", 1, 0, 0, 1000, 0 boostClosedLoopBlends1_rpmBins = array, U16, 21784, [8], "RPM", 1, 0, 0, 18000, 0 boostClosedLoopBlends1_blendParameter = bits, U08, 21800, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostClosedLoopBlends1_yAxisOverride = bits, U08, 21801, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostClosedLoopBlends1_blendBins = array, S16, 21802, [8], "", 0.1, 0, -1000, 1000, 1 boostClosedLoopBlends1_blendValues = array, U08, 21818, [8], "%", 0.5, 0, 0, 100, 1 boostClosedLoopBlends2_table = array, S16, 21828, [8x8], "", 0.1, 0, -100, 100, 1 boostClosedLoopBlends2_loadBins = array, U16, 21956, [8], "Load", 1, 0, 0, 1000, 0 boostClosedLoopBlends2_rpmBins = array, U16, 21972, [8], "RPM", 1, 0, 0, 18000, 0 boostClosedLoopBlends2_blendParameter = bits, U08, 21988, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostClosedLoopBlends2_yAxisOverride = bits, U08, 21989, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostClosedLoopBlends2_blendBins = array, S16, 21990, [8], "", 0.1, 0, -1000, 1000, 1 boostClosedLoopBlends2_blendValues = array, U08, 22006, [8], "%", 0.5, 0, 0, 100, 1 tcu_rangeP = array, U08, 22016, [6], "level", 1, 0, 0, 3, 0 @@ -6897,7 +6909,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends1_blendParameter - panel = ignAdder1Bias + field = "Y axis override (set Zero for no override)", ignBlends1_yAxisOverride, {ignBlends1_blendParameter} + panel = ignAdder1Bias, {ignBlends1_blendParameter} dialog = ignAdder2Cfg, "Ignition adder 2 config" field = "#The bias table controls how much of the blend table" @@ -6907,7 +6920,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends2_blendParameter - panel = ignAdder2Bias + field = "Y axis override (set Zero for no override)", ignBlends2_yAxisOverride, {ignBlends2_blendParameter} + panel = ignAdder2Bias, {ignBlends2_blendParameter} dialog = ignAdder3Cfg, "Ignition adder 3 config" field = "#The bias table controls how much of the blend table" @@ -6917,7 +6931,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends3_blendParameter - panel = ignAdder3Bias + field = "Y axis override (set Zero for no override)", ignBlends3_yAxisOverride, {ignBlends3_blendParameter} + panel = ignAdder3Bias, {ignBlends3_blendParameter} dialog = ignAdder4Cfg, "Ignition adder 4 config" field = "#The bias table controls how much of the blend table" @@ -6927,7 +6942,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends4_blendParameter - panel = ignAdder4Bias + field = "Y axis override (set Zero for no override)", ignBlends4_yAxisOverride, {ignBlends4_blendParameter} + panel = ignAdder4Bias, {ignBlends4_blendParameter} dialog = veBlend1Cfg, "VE blend 1 config" field = "#The bias table controls how much of the blend table" @@ -6938,7 +6954,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends1_blendParameter - panel = veBlend1Bias + field = "Y axis override (set Zero for no override)", veBlends1_yAxisOverride, {veBlends1_blendParameter} + panel = veBlend1Bias, {veBlends1_blendParameter} dialog = veBlend2Cfg, "VE blend 2 config" field = "#The bias table controls how much of the blend table" @@ -6949,7 +6966,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends2_blendParameter - panel = veBlend2Bias + field = "Y axis override (set Zero for no override)", veBlends2_yAxisOverride, {veBlends2_blendParameter} + panel = veBlend2Bias, {veBlends2_blendParameter} dialog = veBlend3Cfg, "VE blend 3 config" field = "#The bias table controls how much of the blend table" @@ -6960,7 +6978,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends3_blendParameter - panel = veBlend3Bias + field = "Y axis override (set Zero for no override)", veBlends3_yAxisOverride, {veBlends3_blendParameter} + panel = veBlend3Bias, {veBlends3_blendParameter} dialog = veBlend4Cfg, "VE blend 4 config" field = "#The bias table controls how much of the blend table" @@ -6971,7 +6990,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends4_blendParameter - panel = veBlend4Bias + field = "Y axis override (set Zero for no override)", veBlends4_yAxisOverride, {veBlends4_blendParameter} + panel = veBlend4Bias, {veBlends4_blendParameter} indicatorPanel = isBoostControlledPanel, 1 indicator = {isBoostControlled}, "No Boost Control", "Boost Control Active" @@ -6985,7 +7005,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#parameter below." panel = isBoostControlledPanel field = "Blend parameter", boostOpenLoopBlends1_blendParameter - panel = boostOpenLoopBlend1Bias + field = "Y axis override (set Zero for no override)", boostOpenLoopBlends1_yAxisOverride, {boostOpenLoopBlends1_blendParameter} + panel = boostOpenLoopBlend1Bias, {boostOpenLoopBlends1_blendParameter} dialog = boostOpenBlend2Cfg, "Boost open loop blend 2 config" field = "#The bias table controls how much of the blend table" @@ -6996,7 +7017,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#parameter below." panel = isBoostControlledPanel field = "Blend parameter", boostOpenLoopBlends2_blendParameter - panel = boostOpenLoopBlend2Bias + field = "Y axis override (set Zero for no override)", boostOpenLoopBlends2_yAxisOverride, {boostOpenLoopBlends2_blendParameter} + panel = boostOpenLoopBlend2Bias, {boostOpenLoopBlends2_blendParameter} dialog = boostClosedBlend1Cfg, "Boost closed loop blend 1 config" field = "#The bias table controls how much of the blend table" @@ -7006,7 +7028,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", boostClosedLoopBlends1_blendParameter - panel = boostClosedLoopBlend1Bias + field = "Y axis override (set Zero for no override)", boostClosedLoopBlends1_yAxisOverride, {boostClosedLoopBlends1_blendParameter} + panel = boostClosedLoopBlend1Bias, {boostClosedLoopBlends1_blendParameter} dialog = boostClosedBlend2Cfg, "Boost closed loop blend 2 config" field = "#The bias table controls how much of the blend table" @@ -7016,7 +7039,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", boostClosedLoopBlends2_blendParameter - panel = boostClosedLoopBlend2Bias + field = "Y axis override (set Zero for no override)", boostClosedLoopBlends2_yAxisOverride, {boostClosedLoopBlends2_blendParameter} + panel = boostClosedLoopBlend2Bias, {boostClosedLoopBlends2_blendParameter} dialog = dwellSettings, "", yAxis panel = dwellCorrection diff --git a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini index f036dd65ed..a94fe4e73b 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.2024.01.17.hellen154hyundai.2184010421" + signature = "rusEFI master.2024.01.17.hellen154hyundai.243408169" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.01.17.hellen154hyundai.2184010421" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.01.17.hellen154hyundai.243408169" ; 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 Wed Jan 17 14:05:35 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:41:05 UTC 2024 pageSize = 22176 page = 1 @@ -1504,48 +1504,56 @@ ignBlends1_table = array, S16, 19712, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends1_loadBins = array, U16, 19840, [8], "Load", 1, 0, 0, 1000, 0 ignBlends1_rpmBins = array, U16, 19856, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends1_blendParameter = bits, U08, 19872, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends1_yAxisOverride = bits, U08, 19873, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends1_blendBins = array, S16, 19874, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends1_blendValues = array, U08, 19890, [8], "%", 0.5, 0, 0, 100, 1 ignBlends2_table = array, S16, 19900, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends2_loadBins = array, U16, 20028, [8], "Load", 1, 0, 0, 1000, 0 ignBlends2_rpmBins = array, U16, 20044, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends2_blendParameter = bits, U08, 20060, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends2_yAxisOverride = bits, U08, 20061, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends2_blendBins = array, S16, 20062, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends2_blendValues = array, U08, 20078, [8], "%", 0.5, 0, 0, 100, 1 ignBlends3_table = array, S16, 20088, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends3_loadBins = array, U16, 20216, [8], "Load", 1, 0, 0, 1000, 0 ignBlends3_rpmBins = array, U16, 20232, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends3_blendParameter = bits, U08, 20248, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends3_yAxisOverride = bits, U08, 20249, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends3_blendBins = array, S16, 20250, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends3_blendValues = array, U08, 20266, [8], "%", 0.5, 0, 0, 100, 1 ignBlends4_table = array, S16, 20276, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends4_loadBins = array, U16, 20404, [8], "Load", 1, 0, 0, 1000, 0 ignBlends4_rpmBins = array, U16, 20420, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends4_blendParameter = bits, U08, 20436, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends4_yAxisOverride = bits, U08, 20437, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends4_blendBins = array, S16, 20438, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends4_blendValues = array, U08, 20454, [8], "%", 0.5, 0, 0, 100, 1 veBlends1_table = array, S16, 20464, [8x8], "", 0.1, 0, -100, 100, 1 veBlends1_loadBins = array, U16, 20592, [8], "Load", 1, 0, 0, 1000, 0 veBlends1_rpmBins = array, U16, 20608, [8], "RPM", 1, 0, 0, 18000, 0 veBlends1_blendParameter = bits, U08, 20624, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends1_yAxisOverride = bits, U08, 20625, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends1_blendBins = array, S16, 20626, [8], "", 0.1, 0, -1000, 1000, 1 veBlends1_blendValues = array, U08, 20642, [8], "%", 0.5, 0, 0, 100, 1 veBlends2_table = array, S16, 20652, [8x8], "", 0.1, 0, -100, 100, 1 veBlends2_loadBins = array, U16, 20780, [8], "Load", 1, 0, 0, 1000, 0 veBlends2_rpmBins = array, U16, 20796, [8], "RPM", 1, 0, 0, 18000, 0 veBlends2_blendParameter = bits, U08, 20812, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends2_yAxisOverride = bits, U08, 20813, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends2_blendBins = array, S16, 20814, [8], "", 0.1, 0, -1000, 1000, 1 veBlends2_blendValues = array, U08, 20830, [8], "%", 0.5, 0, 0, 100, 1 veBlends3_table = array, S16, 20840, [8x8], "", 0.1, 0, -100, 100, 1 veBlends3_loadBins = array, U16, 20968, [8], "Load", 1, 0, 0, 1000, 0 veBlends3_rpmBins = array, U16, 20984, [8], "RPM", 1, 0, 0, 18000, 0 veBlends3_blendParameter = bits, U08, 21000, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends3_yAxisOverride = bits, U08, 21001, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends3_blendBins = array, S16, 21002, [8], "", 0.1, 0, -1000, 1000, 1 veBlends3_blendValues = array, U08, 21018, [8], "%", 0.5, 0, 0, 100, 1 veBlends4_table = array, S16, 21028, [8x8], "", 0.1, 0, -100, 100, 1 veBlends4_loadBins = array, U16, 21156, [8], "Load", 1, 0, 0, 1000, 0 veBlends4_rpmBins = array, U16, 21172, [8], "RPM", 1, 0, 0, 18000, 0 veBlends4_blendParameter = bits, U08, 21188, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends4_yAxisOverride = bits, U08, 21189, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends4_blendBins = array, S16, 21190, [8], "", 0.1, 0, -1000, 1000, 1 veBlends4_blendValues = array, U08, 21206, [8], "%", 0.5, 0, 0, 100, 1 throttleEstimateEffectiveAreaBins = array, U16, 21216, [12], "%", 0.1, 0, 0, 100, 1 @@ -1554,24 +1562,28 @@ boostOpenLoopBlends1_table = array, S16, 21264, [8x8], "", 0.1, 0, -100, 100, 1 boostOpenLoopBlends1_loadBins = array, U16, 21392, [8], "Load", 1, 0, 0, 1000, 0 boostOpenLoopBlends1_rpmBins = array, U16, 21408, [8], "RPM", 1, 0, 0, 18000, 0 boostOpenLoopBlends1_blendParameter = bits, U08, 21424, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostOpenLoopBlends1_yAxisOverride = bits, U08, 21425, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostOpenLoopBlends1_blendBins = array, S16, 21426, [8], "", 0.1, 0, -1000, 1000, 1 boostOpenLoopBlends1_blendValues = array, U08, 21442, [8], "%", 0.5, 0, 0, 100, 1 boostOpenLoopBlends2_table = array, S16, 21452, [8x8], "", 0.1, 0, -100, 100, 1 boostOpenLoopBlends2_loadBins = array, U16, 21580, [8], "Load", 1, 0, 0, 1000, 0 boostOpenLoopBlends2_rpmBins = array, U16, 21596, [8], "RPM", 1, 0, 0, 18000, 0 boostOpenLoopBlends2_blendParameter = bits, U08, 21612, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostOpenLoopBlends2_yAxisOverride = bits, U08, 21613, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostOpenLoopBlends2_blendBins = array, S16, 21614, [8], "", 0.1, 0, -1000, 1000, 1 boostOpenLoopBlends2_blendValues = array, U08, 21630, [8], "%", 0.5, 0, 0, 100, 1 boostClosedLoopBlends1_table = array, S16, 21640, [8x8], "", 0.1, 0, -100, 100, 1 boostClosedLoopBlends1_loadBins = array, U16, 21768, [8], "Load", 1, 0, 0, 1000, 0 boostClosedLoopBlends1_rpmBins = array, U16, 21784, [8], "RPM", 1, 0, 0, 18000, 0 boostClosedLoopBlends1_blendParameter = bits, U08, 21800, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostClosedLoopBlends1_yAxisOverride = bits, U08, 21801, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostClosedLoopBlends1_blendBins = array, S16, 21802, [8], "", 0.1, 0, -1000, 1000, 1 boostClosedLoopBlends1_blendValues = array, U08, 21818, [8], "%", 0.5, 0, 0, 100, 1 boostClosedLoopBlends2_table = array, S16, 21828, [8x8], "", 0.1, 0, -100, 100, 1 boostClosedLoopBlends2_loadBins = array, U16, 21956, [8], "Load", 1, 0, 0, 1000, 0 boostClosedLoopBlends2_rpmBins = array, U16, 21972, [8], "RPM", 1, 0, 0, 18000, 0 boostClosedLoopBlends2_blendParameter = bits, U08, 21988, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostClosedLoopBlends2_yAxisOverride = bits, U08, 21989, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostClosedLoopBlends2_blendBins = array, S16, 21990, [8], "", 0.1, 0, -1000, 1000, 1 boostClosedLoopBlends2_blendValues = array, U08, 22006, [8], "%", 0.5, 0, 0, 100, 1 tcu_rangeP = array, U08, 22016, [6], "level", 1, 0, 0, 3, 0 @@ -6895,7 +6907,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends1_blendParameter - panel = ignAdder1Bias + field = "Y axis override (set Zero for no override)", ignBlends1_yAxisOverride, {ignBlends1_blendParameter} + panel = ignAdder1Bias, {ignBlends1_blendParameter} dialog = ignAdder2Cfg, "Ignition adder 2 config" field = "#The bias table controls how much of the blend table" @@ -6905,7 +6918,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends2_blendParameter - panel = ignAdder2Bias + field = "Y axis override (set Zero for no override)", ignBlends2_yAxisOverride, {ignBlends2_blendParameter} + panel = ignAdder2Bias, {ignBlends2_blendParameter} dialog = ignAdder3Cfg, "Ignition adder 3 config" field = "#The bias table controls how much of the blend table" @@ -6915,7 +6929,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends3_blendParameter - panel = ignAdder3Bias + field = "Y axis override (set Zero for no override)", ignBlends3_yAxisOverride, {ignBlends3_blendParameter} + panel = ignAdder3Bias, {ignBlends3_blendParameter} dialog = ignAdder4Cfg, "Ignition adder 4 config" field = "#The bias table controls how much of the blend table" @@ -6925,7 +6940,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends4_blendParameter - panel = ignAdder4Bias + field = "Y axis override (set Zero for no override)", ignBlends4_yAxisOverride, {ignBlends4_blendParameter} + panel = ignAdder4Bias, {ignBlends4_blendParameter} dialog = veBlend1Cfg, "VE blend 1 config" field = "#The bias table controls how much of the blend table" @@ -6936,7 +6952,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends1_blendParameter - panel = veBlend1Bias + field = "Y axis override (set Zero for no override)", veBlends1_yAxisOverride, {veBlends1_blendParameter} + panel = veBlend1Bias, {veBlends1_blendParameter} dialog = veBlend2Cfg, "VE blend 2 config" field = "#The bias table controls how much of the blend table" @@ -6947,7 +6964,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends2_blendParameter - panel = veBlend2Bias + field = "Y axis override (set Zero for no override)", veBlends2_yAxisOverride, {veBlends2_blendParameter} + panel = veBlend2Bias, {veBlends2_blendParameter} dialog = veBlend3Cfg, "VE blend 3 config" field = "#The bias table controls how much of the blend table" @@ -6958,7 +6976,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends3_blendParameter - panel = veBlend3Bias + field = "Y axis override (set Zero for no override)", veBlends3_yAxisOverride, {veBlends3_blendParameter} + panel = veBlend3Bias, {veBlends3_blendParameter} dialog = veBlend4Cfg, "VE blend 4 config" field = "#The bias table controls how much of the blend table" @@ -6969,7 +6988,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends4_blendParameter - panel = veBlend4Bias + field = "Y axis override (set Zero for no override)", veBlends4_yAxisOverride, {veBlends4_blendParameter} + panel = veBlend4Bias, {veBlends4_blendParameter} indicatorPanel = isBoostControlledPanel, 1 indicator = {isBoostControlled}, "No Boost Control", "Boost Control Active" @@ -6983,7 +7003,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#parameter below." panel = isBoostControlledPanel field = "Blend parameter", boostOpenLoopBlends1_blendParameter - panel = boostOpenLoopBlend1Bias + field = "Y axis override (set Zero for no override)", boostOpenLoopBlends1_yAxisOverride, {boostOpenLoopBlends1_blendParameter} + panel = boostOpenLoopBlend1Bias, {boostOpenLoopBlends1_blendParameter} dialog = boostOpenBlend2Cfg, "Boost open loop blend 2 config" field = "#The bias table controls how much of the blend table" @@ -6994,7 +7015,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#parameter below." panel = isBoostControlledPanel field = "Blend parameter", boostOpenLoopBlends2_blendParameter - panel = boostOpenLoopBlend2Bias + field = "Y axis override (set Zero for no override)", boostOpenLoopBlends2_yAxisOverride, {boostOpenLoopBlends2_blendParameter} + panel = boostOpenLoopBlend2Bias, {boostOpenLoopBlends2_blendParameter} dialog = boostClosedBlend1Cfg, "Boost closed loop blend 1 config" field = "#The bias table controls how much of the blend table" @@ -7004,7 +7026,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", boostClosedLoopBlends1_blendParameter - panel = boostClosedLoopBlend1Bias + field = "Y axis override (set Zero for no override)", boostClosedLoopBlends1_yAxisOverride, {boostClosedLoopBlends1_blendParameter} + panel = boostClosedLoopBlend1Bias, {boostClosedLoopBlends1_blendParameter} dialog = boostClosedBlend2Cfg, "Boost closed loop blend 2 config" field = "#The bias table controls how much of the blend table" @@ -7014,7 +7037,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", boostClosedLoopBlends2_blendParameter - panel = boostClosedLoopBlend2Bias + field = "Y axis override (set Zero for no override)", boostClosedLoopBlends2_yAxisOverride, {boostClosedLoopBlends2_blendParameter} + panel = boostClosedLoopBlend2Bias, {boostClosedLoopBlends2_blendParameter} dialog = dwellSettings, "", yAxis panel = dwellCorrection diff --git a/firmware/tunerstudio/generated/rusefi_hellen72.ini b/firmware/tunerstudio/generated/rusefi_hellen72.ini index d87f1345e1..01faaf65a4 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.2024.01.17.hellen72.2926766480" + signature = "rusEFI master.2024.01.17.hellen72.584953356" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.01.17.hellen72.2926766480" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.01.17.hellen72.584953356" ; 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 Wed Jan 17 14:05:45 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:41:16 UTC 2024 pageSize = 22176 page = 1 @@ -1504,48 +1504,56 @@ ignBlends1_table = array, S16, 19712, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends1_loadBins = array, U16, 19840, [8], "Load", 1, 0, 0, 1000, 0 ignBlends1_rpmBins = array, U16, 19856, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends1_blendParameter = bits, U08, 19872, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends1_yAxisOverride = bits, U08, 19873, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends1_blendBins = array, S16, 19874, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends1_blendValues = array, U08, 19890, [8], "%", 0.5, 0, 0, 100, 1 ignBlends2_table = array, S16, 19900, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends2_loadBins = array, U16, 20028, [8], "Load", 1, 0, 0, 1000, 0 ignBlends2_rpmBins = array, U16, 20044, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends2_blendParameter = bits, U08, 20060, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends2_yAxisOverride = bits, U08, 20061, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends2_blendBins = array, S16, 20062, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends2_blendValues = array, U08, 20078, [8], "%", 0.5, 0, 0, 100, 1 ignBlends3_table = array, S16, 20088, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends3_loadBins = array, U16, 20216, [8], "Load", 1, 0, 0, 1000, 0 ignBlends3_rpmBins = array, U16, 20232, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends3_blendParameter = bits, U08, 20248, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends3_yAxisOverride = bits, U08, 20249, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends3_blendBins = array, S16, 20250, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends3_blendValues = array, U08, 20266, [8], "%", 0.5, 0, 0, 100, 1 ignBlends4_table = array, S16, 20276, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends4_loadBins = array, U16, 20404, [8], "Load", 1, 0, 0, 1000, 0 ignBlends4_rpmBins = array, U16, 20420, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends4_blendParameter = bits, U08, 20436, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends4_yAxisOverride = bits, U08, 20437, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends4_blendBins = array, S16, 20438, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends4_blendValues = array, U08, 20454, [8], "%", 0.5, 0, 0, 100, 1 veBlends1_table = array, S16, 20464, [8x8], "", 0.1, 0, -100, 100, 1 veBlends1_loadBins = array, U16, 20592, [8], "Load", 1, 0, 0, 1000, 0 veBlends1_rpmBins = array, U16, 20608, [8], "RPM", 1, 0, 0, 18000, 0 veBlends1_blendParameter = bits, U08, 20624, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends1_yAxisOverride = bits, U08, 20625, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends1_blendBins = array, S16, 20626, [8], "", 0.1, 0, -1000, 1000, 1 veBlends1_blendValues = array, U08, 20642, [8], "%", 0.5, 0, 0, 100, 1 veBlends2_table = array, S16, 20652, [8x8], "", 0.1, 0, -100, 100, 1 veBlends2_loadBins = array, U16, 20780, [8], "Load", 1, 0, 0, 1000, 0 veBlends2_rpmBins = array, U16, 20796, [8], "RPM", 1, 0, 0, 18000, 0 veBlends2_blendParameter = bits, U08, 20812, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends2_yAxisOverride = bits, U08, 20813, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends2_blendBins = array, S16, 20814, [8], "", 0.1, 0, -1000, 1000, 1 veBlends2_blendValues = array, U08, 20830, [8], "%", 0.5, 0, 0, 100, 1 veBlends3_table = array, S16, 20840, [8x8], "", 0.1, 0, -100, 100, 1 veBlends3_loadBins = array, U16, 20968, [8], "Load", 1, 0, 0, 1000, 0 veBlends3_rpmBins = array, U16, 20984, [8], "RPM", 1, 0, 0, 18000, 0 veBlends3_blendParameter = bits, U08, 21000, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends3_yAxisOverride = bits, U08, 21001, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends3_blendBins = array, S16, 21002, [8], "", 0.1, 0, -1000, 1000, 1 veBlends3_blendValues = array, U08, 21018, [8], "%", 0.5, 0, 0, 100, 1 veBlends4_table = array, S16, 21028, [8x8], "", 0.1, 0, -100, 100, 1 veBlends4_loadBins = array, U16, 21156, [8], "Load", 1, 0, 0, 1000, 0 veBlends4_rpmBins = array, U16, 21172, [8], "RPM", 1, 0, 0, 18000, 0 veBlends4_blendParameter = bits, U08, 21188, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends4_yAxisOverride = bits, U08, 21189, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends4_blendBins = array, S16, 21190, [8], "", 0.1, 0, -1000, 1000, 1 veBlends4_blendValues = array, U08, 21206, [8], "%", 0.5, 0, 0, 100, 1 throttleEstimateEffectiveAreaBins = array, U16, 21216, [12], "%", 0.1, 0, 0, 100, 1 @@ -1554,24 +1562,28 @@ boostOpenLoopBlends1_table = array, S16, 21264, [8x8], "", 0.1, 0, -100, 100, 1 boostOpenLoopBlends1_loadBins = array, U16, 21392, [8], "Load", 1, 0, 0, 1000, 0 boostOpenLoopBlends1_rpmBins = array, U16, 21408, [8], "RPM", 1, 0, 0, 18000, 0 boostOpenLoopBlends1_blendParameter = bits, U08, 21424, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostOpenLoopBlends1_yAxisOverride = bits, U08, 21425, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostOpenLoopBlends1_blendBins = array, S16, 21426, [8], "", 0.1, 0, -1000, 1000, 1 boostOpenLoopBlends1_blendValues = array, U08, 21442, [8], "%", 0.5, 0, 0, 100, 1 boostOpenLoopBlends2_table = array, S16, 21452, [8x8], "", 0.1, 0, -100, 100, 1 boostOpenLoopBlends2_loadBins = array, U16, 21580, [8], "Load", 1, 0, 0, 1000, 0 boostOpenLoopBlends2_rpmBins = array, U16, 21596, [8], "RPM", 1, 0, 0, 18000, 0 boostOpenLoopBlends2_blendParameter = bits, U08, 21612, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostOpenLoopBlends2_yAxisOverride = bits, U08, 21613, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostOpenLoopBlends2_blendBins = array, S16, 21614, [8], "", 0.1, 0, -1000, 1000, 1 boostOpenLoopBlends2_blendValues = array, U08, 21630, [8], "%", 0.5, 0, 0, 100, 1 boostClosedLoopBlends1_table = array, S16, 21640, [8x8], "", 0.1, 0, -100, 100, 1 boostClosedLoopBlends1_loadBins = array, U16, 21768, [8], "Load", 1, 0, 0, 1000, 0 boostClosedLoopBlends1_rpmBins = array, U16, 21784, [8], "RPM", 1, 0, 0, 18000, 0 boostClosedLoopBlends1_blendParameter = bits, U08, 21800, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostClosedLoopBlends1_yAxisOverride = bits, U08, 21801, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostClosedLoopBlends1_blendBins = array, S16, 21802, [8], "", 0.1, 0, -1000, 1000, 1 boostClosedLoopBlends1_blendValues = array, U08, 21818, [8], "%", 0.5, 0, 0, 100, 1 boostClosedLoopBlends2_table = array, S16, 21828, [8x8], "", 0.1, 0, -100, 100, 1 boostClosedLoopBlends2_loadBins = array, U16, 21956, [8], "Load", 1, 0, 0, 1000, 0 boostClosedLoopBlends2_rpmBins = array, U16, 21972, [8], "RPM", 1, 0, 0, 18000, 0 boostClosedLoopBlends2_blendParameter = bits, U08, 21988, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostClosedLoopBlends2_yAxisOverride = bits, U08, 21989, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostClosedLoopBlends2_blendBins = array, S16, 21990, [8], "", 0.1, 0, -1000, 1000, 1 boostClosedLoopBlends2_blendValues = array, U08, 22006, [8], "%", 0.5, 0, 0, 100, 1 tcu_rangeP = array, U08, 22016, [6], "level", 1, 0, 0, 3, 0 @@ -6898,7 +6910,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends1_blendParameter - panel = ignAdder1Bias + field = "Y axis override (set Zero for no override)", ignBlends1_yAxisOverride, {ignBlends1_blendParameter} + panel = ignAdder1Bias, {ignBlends1_blendParameter} dialog = ignAdder2Cfg, "Ignition adder 2 config" field = "#The bias table controls how much of the blend table" @@ -6908,7 +6921,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends2_blendParameter - panel = ignAdder2Bias + field = "Y axis override (set Zero for no override)", ignBlends2_yAxisOverride, {ignBlends2_blendParameter} + panel = ignAdder2Bias, {ignBlends2_blendParameter} dialog = ignAdder3Cfg, "Ignition adder 3 config" field = "#The bias table controls how much of the blend table" @@ -6918,7 +6932,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends3_blendParameter - panel = ignAdder3Bias + field = "Y axis override (set Zero for no override)", ignBlends3_yAxisOverride, {ignBlends3_blendParameter} + panel = ignAdder3Bias, {ignBlends3_blendParameter} dialog = ignAdder4Cfg, "Ignition adder 4 config" field = "#The bias table controls how much of the blend table" @@ -6928,7 +6943,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends4_blendParameter - panel = ignAdder4Bias + field = "Y axis override (set Zero for no override)", ignBlends4_yAxisOverride, {ignBlends4_blendParameter} + panel = ignAdder4Bias, {ignBlends4_blendParameter} dialog = veBlend1Cfg, "VE blend 1 config" field = "#The bias table controls how much of the blend table" @@ -6939,7 +6955,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends1_blendParameter - panel = veBlend1Bias + field = "Y axis override (set Zero for no override)", veBlends1_yAxisOverride, {veBlends1_blendParameter} + panel = veBlend1Bias, {veBlends1_blendParameter} dialog = veBlend2Cfg, "VE blend 2 config" field = "#The bias table controls how much of the blend table" @@ -6950,7 +6967,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends2_blendParameter - panel = veBlend2Bias + field = "Y axis override (set Zero for no override)", veBlends2_yAxisOverride, {veBlends2_blendParameter} + panel = veBlend2Bias, {veBlends2_blendParameter} dialog = veBlend3Cfg, "VE blend 3 config" field = "#The bias table controls how much of the blend table" @@ -6961,7 +6979,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends3_blendParameter - panel = veBlend3Bias + field = "Y axis override (set Zero for no override)", veBlends3_yAxisOverride, {veBlends3_blendParameter} + panel = veBlend3Bias, {veBlends3_blendParameter} dialog = veBlend4Cfg, "VE blend 4 config" field = "#The bias table controls how much of the blend table" @@ -6972,7 +6991,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends4_blendParameter - panel = veBlend4Bias + field = "Y axis override (set Zero for no override)", veBlends4_yAxisOverride, {veBlends4_blendParameter} + panel = veBlend4Bias, {veBlends4_blendParameter} indicatorPanel = isBoostControlledPanel, 1 indicator = {isBoostControlled}, "No Boost Control", "Boost Control Active" @@ -6986,7 +7006,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#parameter below." panel = isBoostControlledPanel field = "Blend parameter", boostOpenLoopBlends1_blendParameter - panel = boostOpenLoopBlend1Bias + field = "Y axis override (set Zero for no override)", boostOpenLoopBlends1_yAxisOverride, {boostOpenLoopBlends1_blendParameter} + panel = boostOpenLoopBlend1Bias, {boostOpenLoopBlends1_blendParameter} dialog = boostOpenBlend2Cfg, "Boost open loop blend 2 config" field = "#The bias table controls how much of the blend table" @@ -6997,7 +7018,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#parameter below." panel = isBoostControlledPanel field = "Blend parameter", boostOpenLoopBlends2_blendParameter - panel = boostOpenLoopBlend2Bias + field = "Y axis override (set Zero for no override)", boostOpenLoopBlends2_yAxisOverride, {boostOpenLoopBlends2_blendParameter} + panel = boostOpenLoopBlend2Bias, {boostOpenLoopBlends2_blendParameter} dialog = boostClosedBlend1Cfg, "Boost closed loop blend 1 config" field = "#The bias table controls how much of the blend table" @@ -7007,7 +7029,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", boostClosedLoopBlends1_blendParameter - panel = boostClosedLoopBlend1Bias + field = "Y axis override (set Zero for no override)", boostClosedLoopBlends1_yAxisOverride, {boostClosedLoopBlends1_blendParameter} + panel = boostClosedLoopBlend1Bias, {boostClosedLoopBlends1_blendParameter} dialog = boostClosedBlend2Cfg, "Boost closed loop blend 2 config" field = "#The bias table controls how much of the blend table" @@ -7017,7 +7040,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", boostClosedLoopBlends2_blendParameter - panel = boostClosedLoopBlend2Bias + field = "Y axis override (set Zero for no override)", boostClosedLoopBlends2_yAxisOverride, {boostClosedLoopBlends2_blendParameter} + panel = boostClosedLoopBlend2Bias, {boostClosedLoopBlends2_blendParameter} dialog = dwellSettings, "", yAxis panel = dwellCorrection diff --git a/firmware/tunerstudio/generated/rusefi_hellen81.ini b/firmware/tunerstudio/generated/rusefi_hellen81.ini index 73a2566af6..fba54b64e4 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.2024.01.17.hellen81.1258524138" + signature = "rusEFI master.2024.01.17.hellen81.3349990006" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.01.17.hellen81.1258524138" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.01.17.hellen81.3349990006" ; 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 Wed Jan 17 14:05:48 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:41:19 UTC 2024 pageSize = 22176 page = 1 @@ -1504,48 +1504,56 @@ ignBlends1_table = array, S16, 19712, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends1_loadBins = array, U16, 19840, [8], "Load", 1, 0, 0, 1000, 0 ignBlends1_rpmBins = array, U16, 19856, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends1_blendParameter = bits, U08, 19872, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends1_yAxisOverride = bits, U08, 19873, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends1_blendBins = array, S16, 19874, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends1_blendValues = array, U08, 19890, [8], "%", 0.5, 0, 0, 100, 1 ignBlends2_table = array, S16, 19900, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends2_loadBins = array, U16, 20028, [8], "Load", 1, 0, 0, 1000, 0 ignBlends2_rpmBins = array, U16, 20044, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends2_blendParameter = bits, U08, 20060, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends2_yAxisOverride = bits, U08, 20061, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends2_blendBins = array, S16, 20062, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends2_blendValues = array, U08, 20078, [8], "%", 0.5, 0, 0, 100, 1 ignBlends3_table = array, S16, 20088, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends3_loadBins = array, U16, 20216, [8], "Load", 1, 0, 0, 1000, 0 ignBlends3_rpmBins = array, U16, 20232, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends3_blendParameter = bits, U08, 20248, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends3_yAxisOverride = bits, U08, 20249, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends3_blendBins = array, S16, 20250, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends3_blendValues = array, U08, 20266, [8], "%", 0.5, 0, 0, 100, 1 ignBlends4_table = array, S16, 20276, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends4_loadBins = array, U16, 20404, [8], "Load", 1, 0, 0, 1000, 0 ignBlends4_rpmBins = array, U16, 20420, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends4_blendParameter = bits, U08, 20436, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends4_yAxisOverride = bits, U08, 20437, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends4_blendBins = array, S16, 20438, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends4_blendValues = array, U08, 20454, [8], "%", 0.5, 0, 0, 100, 1 veBlends1_table = array, S16, 20464, [8x8], "", 0.1, 0, -100, 100, 1 veBlends1_loadBins = array, U16, 20592, [8], "Load", 1, 0, 0, 1000, 0 veBlends1_rpmBins = array, U16, 20608, [8], "RPM", 1, 0, 0, 18000, 0 veBlends1_blendParameter = bits, U08, 20624, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends1_yAxisOverride = bits, U08, 20625, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends1_blendBins = array, S16, 20626, [8], "", 0.1, 0, -1000, 1000, 1 veBlends1_blendValues = array, U08, 20642, [8], "%", 0.5, 0, 0, 100, 1 veBlends2_table = array, S16, 20652, [8x8], "", 0.1, 0, -100, 100, 1 veBlends2_loadBins = array, U16, 20780, [8], "Load", 1, 0, 0, 1000, 0 veBlends2_rpmBins = array, U16, 20796, [8], "RPM", 1, 0, 0, 18000, 0 veBlends2_blendParameter = bits, U08, 20812, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends2_yAxisOverride = bits, U08, 20813, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends2_blendBins = array, S16, 20814, [8], "", 0.1, 0, -1000, 1000, 1 veBlends2_blendValues = array, U08, 20830, [8], "%", 0.5, 0, 0, 100, 1 veBlends3_table = array, S16, 20840, [8x8], "", 0.1, 0, -100, 100, 1 veBlends3_loadBins = array, U16, 20968, [8], "Load", 1, 0, 0, 1000, 0 veBlends3_rpmBins = array, U16, 20984, [8], "RPM", 1, 0, 0, 18000, 0 veBlends3_blendParameter = bits, U08, 21000, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends3_yAxisOverride = bits, U08, 21001, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends3_blendBins = array, S16, 21002, [8], "", 0.1, 0, -1000, 1000, 1 veBlends3_blendValues = array, U08, 21018, [8], "%", 0.5, 0, 0, 100, 1 veBlends4_table = array, S16, 21028, [8x8], "", 0.1, 0, -100, 100, 1 veBlends4_loadBins = array, U16, 21156, [8], "Load", 1, 0, 0, 1000, 0 veBlends4_rpmBins = array, U16, 21172, [8], "RPM", 1, 0, 0, 18000, 0 veBlends4_blendParameter = bits, U08, 21188, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends4_yAxisOverride = bits, U08, 21189, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends4_blendBins = array, S16, 21190, [8], "", 0.1, 0, -1000, 1000, 1 veBlends4_blendValues = array, U08, 21206, [8], "%", 0.5, 0, 0, 100, 1 throttleEstimateEffectiveAreaBins = array, U16, 21216, [12], "%", 0.1, 0, 0, 100, 1 @@ -1554,24 +1562,28 @@ boostOpenLoopBlends1_table = array, S16, 21264, [8x8], "", 0.1, 0, -100, 100, 1 boostOpenLoopBlends1_loadBins = array, U16, 21392, [8], "Load", 1, 0, 0, 1000, 0 boostOpenLoopBlends1_rpmBins = array, U16, 21408, [8], "RPM", 1, 0, 0, 18000, 0 boostOpenLoopBlends1_blendParameter = bits, U08, 21424, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostOpenLoopBlends1_yAxisOverride = bits, U08, 21425, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostOpenLoopBlends1_blendBins = array, S16, 21426, [8], "", 0.1, 0, -1000, 1000, 1 boostOpenLoopBlends1_blendValues = array, U08, 21442, [8], "%", 0.5, 0, 0, 100, 1 boostOpenLoopBlends2_table = array, S16, 21452, [8x8], "", 0.1, 0, -100, 100, 1 boostOpenLoopBlends2_loadBins = array, U16, 21580, [8], "Load", 1, 0, 0, 1000, 0 boostOpenLoopBlends2_rpmBins = array, U16, 21596, [8], "RPM", 1, 0, 0, 18000, 0 boostOpenLoopBlends2_blendParameter = bits, U08, 21612, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostOpenLoopBlends2_yAxisOverride = bits, U08, 21613, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostOpenLoopBlends2_blendBins = array, S16, 21614, [8], "", 0.1, 0, -1000, 1000, 1 boostOpenLoopBlends2_blendValues = array, U08, 21630, [8], "%", 0.5, 0, 0, 100, 1 boostClosedLoopBlends1_table = array, S16, 21640, [8x8], "", 0.1, 0, -100, 100, 1 boostClosedLoopBlends1_loadBins = array, U16, 21768, [8], "Load", 1, 0, 0, 1000, 0 boostClosedLoopBlends1_rpmBins = array, U16, 21784, [8], "RPM", 1, 0, 0, 18000, 0 boostClosedLoopBlends1_blendParameter = bits, U08, 21800, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostClosedLoopBlends1_yAxisOverride = bits, U08, 21801, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostClosedLoopBlends1_blendBins = array, S16, 21802, [8], "", 0.1, 0, -1000, 1000, 1 boostClosedLoopBlends1_blendValues = array, U08, 21818, [8], "%", 0.5, 0, 0, 100, 1 boostClosedLoopBlends2_table = array, S16, 21828, [8x8], "", 0.1, 0, -100, 100, 1 boostClosedLoopBlends2_loadBins = array, U16, 21956, [8], "Load", 1, 0, 0, 1000, 0 boostClosedLoopBlends2_rpmBins = array, U16, 21972, [8], "RPM", 1, 0, 0, 18000, 0 boostClosedLoopBlends2_blendParameter = bits, U08, 21988, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostClosedLoopBlends2_yAxisOverride = bits, U08, 21989, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostClosedLoopBlends2_blendBins = array, S16, 21990, [8], "", 0.1, 0, -1000, 1000, 1 boostClosedLoopBlends2_blendValues = array, U08, 22006, [8], "%", 0.5, 0, 0, 100, 1 tcu_rangeP = array, U08, 22016, [6], "level", 1, 0, 0, 3, 0 @@ -6896,7 +6908,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends1_blendParameter - panel = ignAdder1Bias + field = "Y axis override (set Zero for no override)", ignBlends1_yAxisOverride, {ignBlends1_blendParameter} + panel = ignAdder1Bias, {ignBlends1_blendParameter} dialog = ignAdder2Cfg, "Ignition adder 2 config" field = "#The bias table controls how much of the blend table" @@ -6906,7 +6919,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends2_blendParameter - panel = ignAdder2Bias + field = "Y axis override (set Zero for no override)", ignBlends2_yAxisOverride, {ignBlends2_blendParameter} + panel = ignAdder2Bias, {ignBlends2_blendParameter} dialog = ignAdder3Cfg, "Ignition adder 3 config" field = "#The bias table controls how much of the blend table" @@ -6916,7 +6930,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends3_blendParameter - panel = ignAdder3Bias + field = "Y axis override (set Zero for no override)", ignBlends3_yAxisOverride, {ignBlends3_blendParameter} + panel = ignAdder3Bias, {ignBlends3_blendParameter} dialog = ignAdder4Cfg, "Ignition adder 4 config" field = "#The bias table controls how much of the blend table" @@ -6926,7 +6941,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends4_blendParameter - panel = ignAdder4Bias + field = "Y axis override (set Zero for no override)", ignBlends4_yAxisOverride, {ignBlends4_blendParameter} + panel = ignAdder4Bias, {ignBlends4_blendParameter} dialog = veBlend1Cfg, "VE blend 1 config" field = "#The bias table controls how much of the blend table" @@ -6937,7 +6953,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends1_blendParameter - panel = veBlend1Bias + field = "Y axis override (set Zero for no override)", veBlends1_yAxisOverride, {veBlends1_blendParameter} + panel = veBlend1Bias, {veBlends1_blendParameter} dialog = veBlend2Cfg, "VE blend 2 config" field = "#The bias table controls how much of the blend table" @@ -6948,7 +6965,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends2_blendParameter - panel = veBlend2Bias + field = "Y axis override (set Zero for no override)", veBlends2_yAxisOverride, {veBlends2_blendParameter} + panel = veBlend2Bias, {veBlends2_blendParameter} dialog = veBlend3Cfg, "VE blend 3 config" field = "#The bias table controls how much of the blend table" @@ -6959,7 +6977,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends3_blendParameter - panel = veBlend3Bias + field = "Y axis override (set Zero for no override)", veBlends3_yAxisOverride, {veBlends3_blendParameter} + panel = veBlend3Bias, {veBlends3_blendParameter} dialog = veBlend4Cfg, "VE blend 4 config" field = "#The bias table controls how much of the blend table" @@ -6970,7 +6989,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends4_blendParameter - panel = veBlend4Bias + field = "Y axis override (set Zero for no override)", veBlends4_yAxisOverride, {veBlends4_blendParameter} + panel = veBlend4Bias, {veBlends4_blendParameter} indicatorPanel = isBoostControlledPanel, 1 indicator = {isBoostControlled}, "No Boost Control", "Boost Control Active" @@ -6984,7 +7004,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#parameter below." panel = isBoostControlledPanel field = "Blend parameter", boostOpenLoopBlends1_blendParameter - panel = boostOpenLoopBlend1Bias + field = "Y axis override (set Zero for no override)", boostOpenLoopBlends1_yAxisOverride, {boostOpenLoopBlends1_blendParameter} + panel = boostOpenLoopBlend1Bias, {boostOpenLoopBlends1_blendParameter} dialog = boostOpenBlend2Cfg, "Boost open loop blend 2 config" field = "#The bias table controls how much of the blend table" @@ -6995,7 +7016,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#parameter below." panel = isBoostControlledPanel field = "Blend parameter", boostOpenLoopBlends2_blendParameter - panel = boostOpenLoopBlend2Bias + field = "Y axis override (set Zero for no override)", boostOpenLoopBlends2_yAxisOverride, {boostOpenLoopBlends2_blendParameter} + panel = boostOpenLoopBlend2Bias, {boostOpenLoopBlends2_blendParameter} dialog = boostClosedBlend1Cfg, "Boost closed loop blend 1 config" field = "#The bias table controls how much of the blend table" @@ -7005,7 +7027,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", boostClosedLoopBlends1_blendParameter - panel = boostClosedLoopBlend1Bias + field = "Y axis override (set Zero for no override)", boostClosedLoopBlends1_yAxisOverride, {boostClosedLoopBlends1_blendParameter} + panel = boostClosedLoopBlend1Bias, {boostClosedLoopBlends1_blendParameter} dialog = boostClosedBlend2Cfg, "Boost closed loop blend 2 config" field = "#The bias table controls how much of the blend table" @@ -7015,7 +7038,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", boostClosedLoopBlends2_blendParameter - panel = boostClosedLoopBlend2Bias + field = "Y axis override (set Zero for no override)", boostClosedLoopBlends2_yAxisOverride, {boostClosedLoopBlends2_blendParameter} + panel = boostClosedLoopBlend2Bias, {boostClosedLoopBlends2_blendParameter} dialog = dwellSettings, "", yAxis panel = dwellCorrection diff --git a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini index bff9949a0f..9920c24ce0 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.2024.01.17.hellen88bmw.4196147246" + signature = "rusEFI master.2024.01.17.hellen88bmw.1991468978" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.01.17.hellen88bmw.4196147246" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.01.17.hellen88bmw.1991468978" ; 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 Wed Jan 17 14:05:37 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:41:08 UTC 2024 pageSize = 22176 page = 1 @@ -1504,48 +1504,56 @@ ignBlends1_table = array, S16, 19712, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends1_loadBins = array, U16, 19840, [8], "Load", 1, 0, 0, 1000, 0 ignBlends1_rpmBins = array, U16, 19856, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends1_blendParameter = bits, U08, 19872, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends1_yAxisOverride = bits, U08, 19873, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends1_blendBins = array, S16, 19874, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends1_blendValues = array, U08, 19890, [8], "%", 0.5, 0, 0, 100, 1 ignBlends2_table = array, S16, 19900, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends2_loadBins = array, U16, 20028, [8], "Load", 1, 0, 0, 1000, 0 ignBlends2_rpmBins = array, U16, 20044, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends2_blendParameter = bits, U08, 20060, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends2_yAxisOverride = bits, U08, 20061, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends2_blendBins = array, S16, 20062, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends2_blendValues = array, U08, 20078, [8], "%", 0.5, 0, 0, 100, 1 ignBlends3_table = array, S16, 20088, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends3_loadBins = array, U16, 20216, [8], "Load", 1, 0, 0, 1000, 0 ignBlends3_rpmBins = array, U16, 20232, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends3_blendParameter = bits, U08, 20248, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends3_yAxisOverride = bits, U08, 20249, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends3_blendBins = array, S16, 20250, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends3_blendValues = array, U08, 20266, [8], "%", 0.5, 0, 0, 100, 1 ignBlends4_table = array, S16, 20276, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends4_loadBins = array, U16, 20404, [8], "Load", 1, 0, 0, 1000, 0 ignBlends4_rpmBins = array, U16, 20420, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends4_blendParameter = bits, U08, 20436, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends4_yAxisOverride = bits, U08, 20437, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends4_blendBins = array, S16, 20438, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends4_blendValues = array, U08, 20454, [8], "%", 0.5, 0, 0, 100, 1 veBlends1_table = array, S16, 20464, [8x8], "", 0.1, 0, -100, 100, 1 veBlends1_loadBins = array, U16, 20592, [8], "Load", 1, 0, 0, 1000, 0 veBlends1_rpmBins = array, U16, 20608, [8], "RPM", 1, 0, 0, 18000, 0 veBlends1_blendParameter = bits, U08, 20624, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends1_yAxisOverride = bits, U08, 20625, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends1_blendBins = array, S16, 20626, [8], "", 0.1, 0, -1000, 1000, 1 veBlends1_blendValues = array, U08, 20642, [8], "%", 0.5, 0, 0, 100, 1 veBlends2_table = array, S16, 20652, [8x8], "", 0.1, 0, -100, 100, 1 veBlends2_loadBins = array, U16, 20780, [8], "Load", 1, 0, 0, 1000, 0 veBlends2_rpmBins = array, U16, 20796, [8], "RPM", 1, 0, 0, 18000, 0 veBlends2_blendParameter = bits, U08, 20812, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends2_yAxisOverride = bits, U08, 20813, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends2_blendBins = array, S16, 20814, [8], "", 0.1, 0, -1000, 1000, 1 veBlends2_blendValues = array, U08, 20830, [8], "%", 0.5, 0, 0, 100, 1 veBlends3_table = array, S16, 20840, [8x8], "", 0.1, 0, -100, 100, 1 veBlends3_loadBins = array, U16, 20968, [8], "Load", 1, 0, 0, 1000, 0 veBlends3_rpmBins = array, U16, 20984, [8], "RPM", 1, 0, 0, 18000, 0 veBlends3_blendParameter = bits, U08, 21000, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends3_yAxisOverride = bits, U08, 21001, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends3_blendBins = array, S16, 21002, [8], "", 0.1, 0, -1000, 1000, 1 veBlends3_blendValues = array, U08, 21018, [8], "%", 0.5, 0, 0, 100, 1 veBlends4_table = array, S16, 21028, [8x8], "", 0.1, 0, -100, 100, 1 veBlends4_loadBins = array, U16, 21156, [8], "Load", 1, 0, 0, 1000, 0 veBlends4_rpmBins = array, U16, 21172, [8], "RPM", 1, 0, 0, 18000, 0 veBlends4_blendParameter = bits, U08, 21188, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends4_yAxisOverride = bits, U08, 21189, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends4_blendBins = array, S16, 21190, [8], "", 0.1, 0, -1000, 1000, 1 veBlends4_blendValues = array, U08, 21206, [8], "%", 0.5, 0, 0, 100, 1 throttleEstimateEffectiveAreaBins = array, U16, 21216, [12], "%", 0.1, 0, 0, 100, 1 @@ -1554,24 +1562,28 @@ boostOpenLoopBlends1_table = array, S16, 21264, [8x8], "", 0.1, 0, -100, 100, 1 boostOpenLoopBlends1_loadBins = array, U16, 21392, [8], "Load", 1, 0, 0, 1000, 0 boostOpenLoopBlends1_rpmBins = array, U16, 21408, [8], "RPM", 1, 0, 0, 18000, 0 boostOpenLoopBlends1_blendParameter = bits, U08, 21424, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostOpenLoopBlends1_yAxisOverride = bits, U08, 21425, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostOpenLoopBlends1_blendBins = array, S16, 21426, [8], "", 0.1, 0, -1000, 1000, 1 boostOpenLoopBlends1_blendValues = array, U08, 21442, [8], "%", 0.5, 0, 0, 100, 1 boostOpenLoopBlends2_table = array, S16, 21452, [8x8], "", 0.1, 0, -100, 100, 1 boostOpenLoopBlends2_loadBins = array, U16, 21580, [8], "Load", 1, 0, 0, 1000, 0 boostOpenLoopBlends2_rpmBins = array, U16, 21596, [8], "RPM", 1, 0, 0, 18000, 0 boostOpenLoopBlends2_blendParameter = bits, U08, 21612, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostOpenLoopBlends2_yAxisOverride = bits, U08, 21613, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostOpenLoopBlends2_blendBins = array, S16, 21614, [8], "", 0.1, 0, -1000, 1000, 1 boostOpenLoopBlends2_blendValues = array, U08, 21630, [8], "%", 0.5, 0, 0, 100, 1 boostClosedLoopBlends1_table = array, S16, 21640, [8x8], "", 0.1, 0, -100, 100, 1 boostClosedLoopBlends1_loadBins = array, U16, 21768, [8], "Load", 1, 0, 0, 1000, 0 boostClosedLoopBlends1_rpmBins = array, U16, 21784, [8], "RPM", 1, 0, 0, 18000, 0 boostClosedLoopBlends1_blendParameter = bits, U08, 21800, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostClosedLoopBlends1_yAxisOverride = bits, U08, 21801, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostClosedLoopBlends1_blendBins = array, S16, 21802, [8], "", 0.1, 0, -1000, 1000, 1 boostClosedLoopBlends1_blendValues = array, U08, 21818, [8], "%", 0.5, 0, 0, 100, 1 boostClosedLoopBlends2_table = array, S16, 21828, [8x8], "", 0.1, 0, -100, 100, 1 boostClosedLoopBlends2_loadBins = array, U16, 21956, [8], "Load", 1, 0, 0, 1000, 0 boostClosedLoopBlends2_rpmBins = array, U16, 21972, [8], "RPM", 1, 0, 0, 18000, 0 boostClosedLoopBlends2_blendParameter = bits, U08, 21988, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostClosedLoopBlends2_yAxisOverride = bits, U08, 21989, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostClosedLoopBlends2_blendBins = array, S16, 21990, [8], "", 0.1, 0, -1000, 1000, 1 boostClosedLoopBlends2_blendValues = array, U08, 22006, [8], "%", 0.5, 0, 0, 100, 1 tcu_rangeP = array, U08, 22016, [6], "level", 1, 0, 0, 3, 0 @@ -6897,7 +6909,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends1_blendParameter - panel = ignAdder1Bias + field = "Y axis override (set Zero for no override)", ignBlends1_yAxisOverride, {ignBlends1_blendParameter} + panel = ignAdder1Bias, {ignBlends1_blendParameter} dialog = ignAdder2Cfg, "Ignition adder 2 config" field = "#The bias table controls how much of the blend table" @@ -6907,7 +6920,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends2_blendParameter - panel = ignAdder2Bias + field = "Y axis override (set Zero for no override)", ignBlends2_yAxisOverride, {ignBlends2_blendParameter} + panel = ignAdder2Bias, {ignBlends2_blendParameter} dialog = ignAdder3Cfg, "Ignition adder 3 config" field = "#The bias table controls how much of the blend table" @@ -6917,7 +6931,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends3_blendParameter - panel = ignAdder3Bias + field = "Y axis override (set Zero for no override)", ignBlends3_yAxisOverride, {ignBlends3_blendParameter} + panel = ignAdder3Bias, {ignBlends3_blendParameter} dialog = ignAdder4Cfg, "Ignition adder 4 config" field = "#The bias table controls how much of the blend table" @@ -6927,7 +6942,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends4_blendParameter - panel = ignAdder4Bias + field = "Y axis override (set Zero for no override)", ignBlends4_yAxisOverride, {ignBlends4_blendParameter} + panel = ignAdder4Bias, {ignBlends4_blendParameter} dialog = veBlend1Cfg, "VE blend 1 config" field = "#The bias table controls how much of the blend table" @@ -6938,7 +6954,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends1_blendParameter - panel = veBlend1Bias + field = "Y axis override (set Zero for no override)", veBlends1_yAxisOverride, {veBlends1_blendParameter} + panel = veBlend1Bias, {veBlends1_blendParameter} dialog = veBlend2Cfg, "VE blend 2 config" field = "#The bias table controls how much of the blend table" @@ -6949,7 +6966,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends2_blendParameter - panel = veBlend2Bias + field = "Y axis override (set Zero for no override)", veBlends2_yAxisOverride, {veBlends2_blendParameter} + panel = veBlend2Bias, {veBlends2_blendParameter} dialog = veBlend3Cfg, "VE blend 3 config" field = "#The bias table controls how much of the blend table" @@ -6960,7 +6978,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends3_blendParameter - panel = veBlend3Bias + field = "Y axis override (set Zero for no override)", veBlends3_yAxisOverride, {veBlends3_blendParameter} + panel = veBlend3Bias, {veBlends3_blendParameter} dialog = veBlend4Cfg, "VE blend 4 config" field = "#The bias table controls how much of the blend table" @@ -6971,7 +6990,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends4_blendParameter - panel = veBlend4Bias + field = "Y axis override (set Zero for no override)", veBlends4_yAxisOverride, {veBlends4_blendParameter} + panel = veBlend4Bias, {veBlends4_blendParameter} indicatorPanel = isBoostControlledPanel, 1 indicator = {isBoostControlled}, "No Boost Control", "Boost Control Active" @@ -6985,7 +7005,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#parameter below." panel = isBoostControlledPanel field = "Blend parameter", boostOpenLoopBlends1_blendParameter - panel = boostOpenLoopBlend1Bias + field = "Y axis override (set Zero for no override)", boostOpenLoopBlends1_yAxisOverride, {boostOpenLoopBlends1_blendParameter} + panel = boostOpenLoopBlend1Bias, {boostOpenLoopBlends1_blendParameter} dialog = boostOpenBlend2Cfg, "Boost open loop blend 2 config" field = "#The bias table controls how much of the blend table" @@ -6996,7 +7017,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#parameter below." panel = isBoostControlledPanel field = "Blend parameter", boostOpenLoopBlends2_blendParameter - panel = boostOpenLoopBlend2Bias + field = "Y axis override (set Zero for no override)", boostOpenLoopBlends2_yAxisOverride, {boostOpenLoopBlends2_blendParameter} + panel = boostOpenLoopBlend2Bias, {boostOpenLoopBlends2_blendParameter} dialog = boostClosedBlend1Cfg, "Boost closed loop blend 1 config" field = "#The bias table controls how much of the blend table" @@ -7006,7 +7028,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", boostClosedLoopBlends1_blendParameter - panel = boostClosedLoopBlend1Bias + field = "Y axis override (set Zero for no override)", boostClosedLoopBlends1_yAxisOverride, {boostClosedLoopBlends1_blendParameter} + panel = boostClosedLoopBlend1Bias, {boostClosedLoopBlends1_blendParameter} dialog = boostClosedBlend2Cfg, "Boost closed loop blend 2 config" field = "#The bias table controls how much of the blend table" @@ -7016,7 +7039,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", boostClosedLoopBlends2_blendParameter - panel = boostClosedLoopBlend2Bias + field = "Y axis override (set Zero for no override)", boostClosedLoopBlends2_yAxisOverride, {boostClosedLoopBlends2_blendParameter} + panel = boostClosedLoopBlend2Bias, {boostClosedLoopBlends2_blendParameter} dialog = dwellSettings, "", yAxis panel = dwellCorrection diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini index 30561f66b9..4771184b38 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.2024.01.17.hellenNA6.1447185003" + signature = "rusEFI master.2024.01.17.hellenNA6.3672968695" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.01.17.hellenNA6.1447185003" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.01.17.hellenNA6.3672968695" ; 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 Wed Jan 17 14:05:55 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:41:26 UTC 2024 pageSize = 22176 page = 1 @@ -1504,48 +1504,56 @@ ignBlends1_table = array, S16, 19712, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends1_loadBins = array, U16, 19840, [8], "Load", 1, 0, 0, 1000, 0 ignBlends1_rpmBins = array, U16, 19856, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends1_blendParameter = bits, U08, 19872, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends1_yAxisOverride = bits, U08, 19873, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends1_blendBins = array, S16, 19874, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends1_blendValues = array, U08, 19890, [8], "%", 0.5, 0, 0, 100, 1 ignBlends2_table = array, S16, 19900, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends2_loadBins = array, U16, 20028, [8], "Load", 1, 0, 0, 1000, 0 ignBlends2_rpmBins = array, U16, 20044, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends2_blendParameter = bits, U08, 20060, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends2_yAxisOverride = bits, U08, 20061, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends2_blendBins = array, S16, 20062, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends2_blendValues = array, U08, 20078, [8], "%", 0.5, 0, 0, 100, 1 ignBlends3_table = array, S16, 20088, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends3_loadBins = array, U16, 20216, [8], "Load", 1, 0, 0, 1000, 0 ignBlends3_rpmBins = array, U16, 20232, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends3_blendParameter = bits, U08, 20248, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends3_yAxisOverride = bits, U08, 20249, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends3_blendBins = array, S16, 20250, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends3_blendValues = array, U08, 20266, [8], "%", 0.5, 0, 0, 100, 1 ignBlends4_table = array, S16, 20276, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends4_loadBins = array, U16, 20404, [8], "Load", 1, 0, 0, 1000, 0 ignBlends4_rpmBins = array, U16, 20420, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends4_blendParameter = bits, U08, 20436, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends4_yAxisOverride = bits, U08, 20437, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends4_blendBins = array, S16, 20438, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends4_blendValues = array, U08, 20454, [8], "%", 0.5, 0, 0, 100, 1 veBlends1_table = array, S16, 20464, [8x8], "", 0.1, 0, -100, 100, 1 veBlends1_loadBins = array, U16, 20592, [8], "Load", 1, 0, 0, 1000, 0 veBlends1_rpmBins = array, U16, 20608, [8], "RPM", 1, 0, 0, 18000, 0 veBlends1_blendParameter = bits, U08, 20624, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends1_yAxisOverride = bits, U08, 20625, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends1_blendBins = array, S16, 20626, [8], "", 0.1, 0, -1000, 1000, 1 veBlends1_blendValues = array, U08, 20642, [8], "%", 0.5, 0, 0, 100, 1 veBlends2_table = array, S16, 20652, [8x8], "", 0.1, 0, -100, 100, 1 veBlends2_loadBins = array, U16, 20780, [8], "Load", 1, 0, 0, 1000, 0 veBlends2_rpmBins = array, U16, 20796, [8], "RPM", 1, 0, 0, 18000, 0 veBlends2_blendParameter = bits, U08, 20812, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends2_yAxisOverride = bits, U08, 20813, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends2_blendBins = array, S16, 20814, [8], "", 0.1, 0, -1000, 1000, 1 veBlends2_blendValues = array, U08, 20830, [8], "%", 0.5, 0, 0, 100, 1 veBlends3_table = array, S16, 20840, [8x8], "", 0.1, 0, -100, 100, 1 veBlends3_loadBins = array, U16, 20968, [8], "Load", 1, 0, 0, 1000, 0 veBlends3_rpmBins = array, U16, 20984, [8], "RPM", 1, 0, 0, 18000, 0 veBlends3_blendParameter = bits, U08, 21000, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends3_yAxisOverride = bits, U08, 21001, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends3_blendBins = array, S16, 21002, [8], "", 0.1, 0, -1000, 1000, 1 veBlends3_blendValues = array, U08, 21018, [8], "%", 0.5, 0, 0, 100, 1 veBlends4_table = array, S16, 21028, [8x8], "", 0.1, 0, -100, 100, 1 veBlends4_loadBins = array, U16, 21156, [8], "Load", 1, 0, 0, 1000, 0 veBlends4_rpmBins = array, U16, 21172, [8], "RPM", 1, 0, 0, 18000, 0 veBlends4_blendParameter = bits, U08, 21188, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends4_yAxisOverride = bits, U08, 21189, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends4_blendBins = array, S16, 21190, [8], "", 0.1, 0, -1000, 1000, 1 veBlends4_blendValues = array, U08, 21206, [8], "%", 0.5, 0, 0, 100, 1 throttleEstimateEffectiveAreaBins = array, U16, 21216, [12], "%", 0.1, 0, 0, 100, 1 @@ -1554,24 +1562,28 @@ boostOpenLoopBlends1_table = array, S16, 21264, [8x8], "", 0.1, 0, -100, 100, 1 boostOpenLoopBlends1_loadBins = array, U16, 21392, [8], "Load", 1, 0, 0, 1000, 0 boostOpenLoopBlends1_rpmBins = array, U16, 21408, [8], "RPM", 1, 0, 0, 18000, 0 boostOpenLoopBlends1_blendParameter = bits, U08, 21424, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostOpenLoopBlends1_yAxisOverride = bits, U08, 21425, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostOpenLoopBlends1_blendBins = array, S16, 21426, [8], "", 0.1, 0, -1000, 1000, 1 boostOpenLoopBlends1_blendValues = array, U08, 21442, [8], "%", 0.5, 0, 0, 100, 1 boostOpenLoopBlends2_table = array, S16, 21452, [8x8], "", 0.1, 0, -100, 100, 1 boostOpenLoopBlends2_loadBins = array, U16, 21580, [8], "Load", 1, 0, 0, 1000, 0 boostOpenLoopBlends2_rpmBins = array, U16, 21596, [8], "RPM", 1, 0, 0, 18000, 0 boostOpenLoopBlends2_blendParameter = bits, U08, 21612, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostOpenLoopBlends2_yAxisOverride = bits, U08, 21613, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostOpenLoopBlends2_blendBins = array, S16, 21614, [8], "", 0.1, 0, -1000, 1000, 1 boostOpenLoopBlends2_blendValues = array, U08, 21630, [8], "%", 0.5, 0, 0, 100, 1 boostClosedLoopBlends1_table = array, S16, 21640, [8x8], "", 0.1, 0, -100, 100, 1 boostClosedLoopBlends1_loadBins = array, U16, 21768, [8], "Load", 1, 0, 0, 1000, 0 boostClosedLoopBlends1_rpmBins = array, U16, 21784, [8], "RPM", 1, 0, 0, 18000, 0 boostClosedLoopBlends1_blendParameter = bits, U08, 21800, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostClosedLoopBlends1_yAxisOverride = bits, U08, 21801, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostClosedLoopBlends1_blendBins = array, S16, 21802, [8], "", 0.1, 0, -1000, 1000, 1 boostClosedLoopBlends1_blendValues = array, U08, 21818, [8], "%", 0.5, 0, 0, 100, 1 boostClosedLoopBlends2_table = array, S16, 21828, [8x8], "", 0.1, 0, -100, 100, 1 boostClosedLoopBlends2_loadBins = array, U16, 21956, [8], "Load", 1, 0, 0, 1000, 0 boostClosedLoopBlends2_rpmBins = array, U16, 21972, [8], "RPM", 1, 0, 0, 18000, 0 boostClosedLoopBlends2_blendParameter = bits, U08, 21988, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostClosedLoopBlends2_yAxisOverride = bits, U08, 21989, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostClosedLoopBlends2_blendBins = array, S16, 21990, [8], "", 0.1, 0, -1000, 1000, 1 boostClosedLoopBlends2_blendValues = array, U08, 22006, [8], "%", 0.5, 0, 0, 100, 1 tcu_rangeP = array, U08, 22016, [6], "level", 1, 0, 0, 3, 0 @@ -6898,7 +6910,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends1_blendParameter - panel = ignAdder1Bias + field = "Y axis override (set Zero for no override)", ignBlends1_yAxisOverride, {ignBlends1_blendParameter} + panel = ignAdder1Bias, {ignBlends1_blendParameter} dialog = ignAdder2Cfg, "Ignition adder 2 config" field = "#The bias table controls how much of the blend table" @@ -6908,7 +6921,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends2_blendParameter - panel = ignAdder2Bias + field = "Y axis override (set Zero for no override)", ignBlends2_yAxisOverride, {ignBlends2_blendParameter} + panel = ignAdder2Bias, {ignBlends2_blendParameter} dialog = ignAdder3Cfg, "Ignition adder 3 config" field = "#The bias table controls how much of the blend table" @@ -6918,7 +6932,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends3_blendParameter - panel = ignAdder3Bias + field = "Y axis override (set Zero for no override)", ignBlends3_yAxisOverride, {ignBlends3_blendParameter} + panel = ignAdder3Bias, {ignBlends3_blendParameter} dialog = ignAdder4Cfg, "Ignition adder 4 config" field = "#The bias table controls how much of the blend table" @@ -6928,7 +6943,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends4_blendParameter - panel = ignAdder4Bias + field = "Y axis override (set Zero for no override)", ignBlends4_yAxisOverride, {ignBlends4_blendParameter} + panel = ignAdder4Bias, {ignBlends4_blendParameter} dialog = veBlend1Cfg, "VE blend 1 config" field = "#The bias table controls how much of the blend table" @@ -6939,7 +6955,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends1_blendParameter - panel = veBlend1Bias + field = "Y axis override (set Zero for no override)", veBlends1_yAxisOverride, {veBlends1_blendParameter} + panel = veBlend1Bias, {veBlends1_blendParameter} dialog = veBlend2Cfg, "VE blend 2 config" field = "#The bias table controls how much of the blend table" @@ -6950,7 +6967,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends2_blendParameter - panel = veBlend2Bias + field = "Y axis override (set Zero for no override)", veBlends2_yAxisOverride, {veBlends2_blendParameter} + panel = veBlend2Bias, {veBlends2_blendParameter} dialog = veBlend3Cfg, "VE blend 3 config" field = "#The bias table controls how much of the blend table" @@ -6961,7 +6979,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends3_blendParameter - panel = veBlend3Bias + field = "Y axis override (set Zero for no override)", veBlends3_yAxisOverride, {veBlends3_blendParameter} + panel = veBlend3Bias, {veBlends3_blendParameter} dialog = veBlend4Cfg, "VE blend 4 config" field = "#The bias table controls how much of the blend table" @@ -6972,7 +6991,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends4_blendParameter - panel = veBlend4Bias + field = "Y axis override (set Zero for no override)", veBlends4_yAxisOverride, {veBlends4_blendParameter} + panel = veBlend4Bias, {veBlends4_blendParameter} indicatorPanel = isBoostControlledPanel, 1 indicator = {isBoostControlled}, "No Boost Control", "Boost Control Active" @@ -6986,7 +7006,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#parameter below." panel = isBoostControlledPanel field = "Blend parameter", boostOpenLoopBlends1_blendParameter - panel = boostOpenLoopBlend1Bias + field = "Y axis override (set Zero for no override)", boostOpenLoopBlends1_yAxisOverride, {boostOpenLoopBlends1_blendParameter} + panel = boostOpenLoopBlend1Bias, {boostOpenLoopBlends1_blendParameter} dialog = boostOpenBlend2Cfg, "Boost open loop blend 2 config" field = "#The bias table controls how much of the blend table" @@ -6997,7 +7018,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#parameter below." panel = isBoostControlledPanel field = "Blend parameter", boostOpenLoopBlends2_blendParameter - panel = boostOpenLoopBlend2Bias + field = "Y axis override (set Zero for no override)", boostOpenLoopBlends2_yAxisOverride, {boostOpenLoopBlends2_blendParameter} + panel = boostOpenLoopBlend2Bias, {boostOpenLoopBlends2_blendParameter} dialog = boostClosedBlend1Cfg, "Boost closed loop blend 1 config" field = "#The bias table controls how much of the blend table" @@ -7007,7 +7029,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", boostClosedLoopBlends1_blendParameter - panel = boostClosedLoopBlend1Bias + field = "Y axis override (set Zero for no override)", boostClosedLoopBlends1_yAxisOverride, {boostClosedLoopBlends1_blendParameter} + panel = boostClosedLoopBlend1Bias, {boostClosedLoopBlends1_blendParameter} dialog = boostClosedBlend2Cfg, "Boost closed loop blend 2 config" field = "#The bias table controls how much of the blend table" @@ -7017,7 +7040,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", boostClosedLoopBlends2_blendParameter - panel = boostClosedLoopBlend2Bias + field = "Y axis override (set Zero for no override)", boostClosedLoopBlends2_yAxisOverride, {boostClosedLoopBlends2_blendParameter} + panel = boostClosedLoopBlend2Bias, {boostClosedLoopBlends2_blendParameter} dialog = dwellSettings, "", yAxis panel = dwellCorrection diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini b/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini index 3089f53b74..4d95d3e98e 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.2024.01.17.hellenNA8_96.1502342915" + signature = "rusEFI master.2024.01.17.hellenNA8_96.3575949471" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.01.17.hellenNA8_96.1502342915" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.01.17.hellenNA8_96.3575949471" ; 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 Wed Jan 17 14:05:58 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:41:29 UTC 2024 pageSize = 22176 page = 1 @@ -1504,48 +1504,56 @@ ignBlends1_table = array, S16, 19712, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends1_loadBins = array, U16, 19840, [8], "Load", 1, 0, 0, 1000, 0 ignBlends1_rpmBins = array, U16, 19856, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends1_blendParameter = bits, U08, 19872, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends1_yAxisOverride = bits, U08, 19873, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends1_blendBins = array, S16, 19874, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends1_blendValues = array, U08, 19890, [8], "%", 0.5, 0, 0, 100, 1 ignBlends2_table = array, S16, 19900, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends2_loadBins = array, U16, 20028, [8], "Load", 1, 0, 0, 1000, 0 ignBlends2_rpmBins = array, U16, 20044, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends2_blendParameter = bits, U08, 20060, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends2_yAxisOverride = bits, U08, 20061, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends2_blendBins = array, S16, 20062, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends2_blendValues = array, U08, 20078, [8], "%", 0.5, 0, 0, 100, 1 ignBlends3_table = array, S16, 20088, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends3_loadBins = array, U16, 20216, [8], "Load", 1, 0, 0, 1000, 0 ignBlends3_rpmBins = array, U16, 20232, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends3_blendParameter = bits, U08, 20248, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends3_yAxisOverride = bits, U08, 20249, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends3_blendBins = array, S16, 20250, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends3_blendValues = array, U08, 20266, [8], "%", 0.5, 0, 0, 100, 1 ignBlends4_table = array, S16, 20276, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends4_loadBins = array, U16, 20404, [8], "Load", 1, 0, 0, 1000, 0 ignBlends4_rpmBins = array, U16, 20420, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends4_blendParameter = bits, U08, 20436, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends4_yAxisOverride = bits, U08, 20437, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends4_blendBins = array, S16, 20438, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends4_blendValues = array, U08, 20454, [8], "%", 0.5, 0, 0, 100, 1 veBlends1_table = array, S16, 20464, [8x8], "", 0.1, 0, -100, 100, 1 veBlends1_loadBins = array, U16, 20592, [8], "Load", 1, 0, 0, 1000, 0 veBlends1_rpmBins = array, U16, 20608, [8], "RPM", 1, 0, 0, 18000, 0 veBlends1_blendParameter = bits, U08, 20624, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends1_yAxisOverride = bits, U08, 20625, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends1_blendBins = array, S16, 20626, [8], "", 0.1, 0, -1000, 1000, 1 veBlends1_blendValues = array, U08, 20642, [8], "%", 0.5, 0, 0, 100, 1 veBlends2_table = array, S16, 20652, [8x8], "", 0.1, 0, -100, 100, 1 veBlends2_loadBins = array, U16, 20780, [8], "Load", 1, 0, 0, 1000, 0 veBlends2_rpmBins = array, U16, 20796, [8], "RPM", 1, 0, 0, 18000, 0 veBlends2_blendParameter = bits, U08, 20812, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends2_yAxisOverride = bits, U08, 20813, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends2_blendBins = array, S16, 20814, [8], "", 0.1, 0, -1000, 1000, 1 veBlends2_blendValues = array, U08, 20830, [8], "%", 0.5, 0, 0, 100, 1 veBlends3_table = array, S16, 20840, [8x8], "", 0.1, 0, -100, 100, 1 veBlends3_loadBins = array, U16, 20968, [8], "Load", 1, 0, 0, 1000, 0 veBlends3_rpmBins = array, U16, 20984, [8], "RPM", 1, 0, 0, 18000, 0 veBlends3_blendParameter = bits, U08, 21000, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends3_yAxisOverride = bits, U08, 21001, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends3_blendBins = array, S16, 21002, [8], "", 0.1, 0, -1000, 1000, 1 veBlends3_blendValues = array, U08, 21018, [8], "%", 0.5, 0, 0, 100, 1 veBlends4_table = array, S16, 21028, [8x8], "", 0.1, 0, -100, 100, 1 veBlends4_loadBins = array, U16, 21156, [8], "Load", 1, 0, 0, 1000, 0 veBlends4_rpmBins = array, U16, 21172, [8], "RPM", 1, 0, 0, 18000, 0 veBlends4_blendParameter = bits, U08, 21188, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends4_yAxisOverride = bits, U08, 21189, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends4_blendBins = array, S16, 21190, [8], "", 0.1, 0, -1000, 1000, 1 veBlends4_blendValues = array, U08, 21206, [8], "%", 0.5, 0, 0, 100, 1 throttleEstimateEffectiveAreaBins = array, U16, 21216, [12], "%", 0.1, 0, 0, 100, 1 @@ -1554,24 +1562,28 @@ boostOpenLoopBlends1_table = array, S16, 21264, [8x8], "", 0.1, 0, -100, 100, 1 boostOpenLoopBlends1_loadBins = array, U16, 21392, [8], "Load", 1, 0, 0, 1000, 0 boostOpenLoopBlends1_rpmBins = array, U16, 21408, [8], "RPM", 1, 0, 0, 18000, 0 boostOpenLoopBlends1_blendParameter = bits, U08, 21424, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostOpenLoopBlends1_yAxisOverride = bits, U08, 21425, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostOpenLoopBlends1_blendBins = array, S16, 21426, [8], "", 0.1, 0, -1000, 1000, 1 boostOpenLoopBlends1_blendValues = array, U08, 21442, [8], "%", 0.5, 0, 0, 100, 1 boostOpenLoopBlends2_table = array, S16, 21452, [8x8], "", 0.1, 0, -100, 100, 1 boostOpenLoopBlends2_loadBins = array, U16, 21580, [8], "Load", 1, 0, 0, 1000, 0 boostOpenLoopBlends2_rpmBins = array, U16, 21596, [8], "RPM", 1, 0, 0, 18000, 0 boostOpenLoopBlends2_blendParameter = bits, U08, 21612, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostOpenLoopBlends2_yAxisOverride = bits, U08, 21613, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostOpenLoopBlends2_blendBins = array, S16, 21614, [8], "", 0.1, 0, -1000, 1000, 1 boostOpenLoopBlends2_blendValues = array, U08, 21630, [8], "%", 0.5, 0, 0, 100, 1 boostClosedLoopBlends1_table = array, S16, 21640, [8x8], "", 0.1, 0, -100, 100, 1 boostClosedLoopBlends1_loadBins = array, U16, 21768, [8], "Load", 1, 0, 0, 1000, 0 boostClosedLoopBlends1_rpmBins = array, U16, 21784, [8], "RPM", 1, 0, 0, 18000, 0 boostClosedLoopBlends1_blendParameter = bits, U08, 21800, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostClosedLoopBlends1_yAxisOverride = bits, U08, 21801, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostClosedLoopBlends1_blendBins = array, S16, 21802, [8], "", 0.1, 0, -1000, 1000, 1 boostClosedLoopBlends1_blendValues = array, U08, 21818, [8], "%", 0.5, 0, 0, 100, 1 boostClosedLoopBlends2_table = array, S16, 21828, [8x8], "", 0.1, 0, -100, 100, 1 boostClosedLoopBlends2_loadBins = array, U16, 21956, [8], "Load", 1, 0, 0, 1000, 0 boostClosedLoopBlends2_rpmBins = array, U16, 21972, [8], "RPM", 1, 0, 0, 18000, 0 boostClosedLoopBlends2_blendParameter = bits, U08, 21988, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostClosedLoopBlends2_yAxisOverride = bits, U08, 21989, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostClosedLoopBlends2_blendBins = array, S16, 21990, [8], "", 0.1, 0, -1000, 1000, 1 boostClosedLoopBlends2_blendValues = array, U08, 22006, [8], "%", 0.5, 0, 0, 100, 1 tcu_rangeP = array, U08, 22016, [6], "level", 1, 0, 0, 3, 0 @@ -6898,7 +6910,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends1_blendParameter - panel = ignAdder1Bias + field = "Y axis override (set Zero for no override)", ignBlends1_yAxisOverride, {ignBlends1_blendParameter} + panel = ignAdder1Bias, {ignBlends1_blendParameter} dialog = ignAdder2Cfg, "Ignition adder 2 config" field = "#The bias table controls how much of the blend table" @@ -6908,7 +6921,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends2_blendParameter - panel = ignAdder2Bias + field = "Y axis override (set Zero for no override)", ignBlends2_yAxisOverride, {ignBlends2_blendParameter} + panel = ignAdder2Bias, {ignBlends2_blendParameter} dialog = ignAdder3Cfg, "Ignition adder 3 config" field = "#The bias table controls how much of the blend table" @@ -6918,7 +6932,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends3_blendParameter - panel = ignAdder3Bias + field = "Y axis override (set Zero for no override)", ignBlends3_yAxisOverride, {ignBlends3_blendParameter} + panel = ignAdder3Bias, {ignBlends3_blendParameter} dialog = ignAdder4Cfg, "Ignition adder 4 config" field = "#The bias table controls how much of the blend table" @@ -6928,7 +6943,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends4_blendParameter - panel = ignAdder4Bias + field = "Y axis override (set Zero for no override)", ignBlends4_yAxisOverride, {ignBlends4_blendParameter} + panel = ignAdder4Bias, {ignBlends4_blendParameter} dialog = veBlend1Cfg, "VE blend 1 config" field = "#The bias table controls how much of the blend table" @@ -6939,7 +6955,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends1_blendParameter - panel = veBlend1Bias + field = "Y axis override (set Zero for no override)", veBlends1_yAxisOverride, {veBlends1_blendParameter} + panel = veBlend1Bias, {veBlends1_blendParameter} dialog = veBlend2Cfg, "VE blend 2 config" field = "#The bias table controls how much of the blend table" @@ -6950,7 +6967,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends2_blendParameter - panel = veBlend2Bias + field = "Y axis override (set Zero for no override)", veBlends2_yAxisOverride, {veBlends2_blendParameter} + panel = veBlend2Bias, {veBlends2_blendParameter} dialog = veBlend3Cfg, "VE blend 3 config" field = "#The bias table controls how much of the blend table" @@ -6961,7 +6979,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends3_blendParameter - panel = veBlend3Bias + field = "Y axis override (set Zero for no override)", veBlends3_yAxisOverride, {veBlends3_blendParameter} + panel = veBlend3Bias, {veBlends3_blendParameter} dialog = veBlend4Cfg, "VE blend 4 config" field = "#The bias table controls how much of the blend table" @@ -6972,7 +6991,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends4_blendParameter - panel = veBlend4Bias + field = "Y axis override (set Zero for no override)", veBlends4_yAxisOverride, {veBlends4_blendParameter} + panel = veBlend4Bias, {veBlends4_blendParameter} indicatorPanel = isBoostControlledPanel, 1 indicator = {isBoostControlled}, "No Boost Control", "Boost Control Active" @@ -6986,7 +7006,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#parameter below." panel = isBoostControlledPanel field = "Blend parameter", boostOpenLoopBlends1_blendParameter - panel = boostOpenLoopBlend1Bias + field = "Y axis override (set Zero for no override)", boostOpenLoopBlends1_yAxisOverride, {boostOpenLoopBlends1_blendParameter} + panel = boostOpenLoopBlend1Bias, {boostOpenLoopBlends1_blendParameter} dialog = boostOpenBlend2Cfg, "Boost open loop blend 2 config" field = "#The bias table controls how much of the blend table" @@ -6997,7 +7018,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#parameter below." panel = isBoostControlledPanel field = "Blend parameter", boostOpenLoopBlends2_blendParameter - panel = boostOpenLoopBlend2Bias + field = "Y axis override (set Zero for no override)", boostOpenLoopBlends2_yAxisOverride, {boostOpenLoopBlends2_blendParameter} + panel = boostOpenLoopBlend2Bias, {boostOpenLoopBlends2_blendParameter} dialog = boostClosedBlend1Cfg, "Boost closed loop blend 1 config" field = "#The bias table controls how much of the blend table" @@ -7007,7 +7029,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", boostClosedLoopBlends1_blendParameter - panel = boostClosedLoopBlend1Bias + field = "Y axis override (set Zero for no override)", boostClosedLoopBlends1_yAxisOverride, {boostClosedLoopBlends1_blendParameter} + panel = boostClosedLoopBlend1Bias, {boostClosedLoopBlends1_blendParameter} dialog = boostClosedBlend2Cfg, "Boost closed loop blend 2 config" field = "#The bias table controls how much of the blend table" @@ -7017,7 +7040,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", boostClosedLoopBlends2_blendParameter - panel = boostClosedLoopBlend2Bias + field = "Y axis override (set Zero for no override)", boostClosedLoopBlends2_yAxisOverride, {boostClosedLoopBlends2_blendParameter} + panel = boostClosedLoopBlend2Bias, {boostClosedLoopBlends2_blendParameter} dialog = dwellSettings, "", yAxis panel = dwellCorrection diff --git a/firmware/tunerstudio/generated/rusefi_kin.ini b/firmware/tunerstudio/generated/rusefi_kin.ini index 2ed8220391..b7595cf3d9 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.2024.01.17.kin.1816320674" + signature = "rusEFI master.2024.01.17.kin.3773668670" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.01.17.kin.1816320674" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.01.17.kin.3773668670" ; 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 Wed Jan 17 14:05:04 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:40:34 UTC 2024 pageSize = 20800 page = 1 @@ -1504,48 +1504,56 @@ ignBlends1_table = array, S16, 18336, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends1_loadBins = array, U16, 18464, [8], "Load", 1, 0, 0, 1000, 0 ignBlends1_rpmBins = array, U16, 18480, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends1_blendParameter = bits, U08, 18496, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends1_yAxisOverride = bits, U08, 18497, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends1_blendBins = array, S16, 18498, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends1_blendValues = array, U08, 18514, [8], "%", 0.5, 0, 0, 100, 1 ignBlends2_table = array, S16, 18524, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends2_loadBins = array, U16, 18652, [8], "Load", 1, 0, 0, 1000, 0 ignBlends2_rpmBins = array, U16, 18668, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends2_blendParameter = bits, U08, 18684, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends2_yAxisOverride = bits, U08, 18685, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends2_blendBins = array, S16, 18686, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends2_blendValues = array, U08, 18702, [8], "%", 0.5, 0, 0, 100, 1 ignBlends3_table = array, S16, 18712, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends3_loadBins = array, U16, 18840, [8], "Load", 1, 0, 0, 1000, 0 ignBlends3_rpmBins = array, U16, 18856, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends3_blendParameter = bits, U08, 18872, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends3_yAxisOverride = bits, U08, 18873, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends3_blendBins = array, S16, 18874, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends3_blendValues = array, U08, 18890, [8], "%", 0.5, 0, 0, 100, 1 ignBlends4_table = array, S16, 18900, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends4_loadBins = array, U16, 19028, [8], "Load", 1, 0, 0, 1000, 0 ignBlends4_rpmBins = array, U16, 19044, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends4_blendParameter = bits, U08, 19060, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends4_yAxisOverride = bits, U08, 19061, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends4_blendBins = array, S16, 19062, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends4_blendValues = array, U08, 19078, [8], "%", 0.5, 0, 0, 100, 1 veBlends1_table = array, S16, 19088, [8x8], "", 0.1, 0, -100, 100, 1 veBlends1_loadBins = array, U16, 19216, [8], "Load", 1, 0, 0, 1000, 0 veBlends1_rpmBins = array, U16, 19232, [8], "RPM", 1, 0, 0, 18000, 0 veBlends1_blendParameter = bits, U08, 19248, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends1_yAxisOverride = bits, U08, 19249, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends1_blendBins = array, S16, 19250, [8], "", 0.1, 0, -1000, 1000, 1 veBlends1_blendValues = array, U08, 19266, [8], "%", 0.5, 0, 0, 100, 1 veBlends2_table = array, S16, 19276, [8x8], "", 0.1, 0, -100, 100, 1 veBlends2_loadBins = array, U16, 19404, [8], "Load", 1, 0, 0, 1000, 0 veBlends2_rpmBins = array, U16, 19420, [8], "RPM", 1, 0, 0, 18000, 0 veBlends2_blendParameter = bits, U08, 19436, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends2_yAxisOverride = bits, U08, 19437, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends2_blendBins = array, S16, 19438, [8], "", 0.1, 0, -1000, 1000, 1 veBlends2_blendValues = array, U08, 19454, [8], "%", 0.5, 0, 0, 100, 1 veBlends3_table = array, S16, 19464, [8x8], "", 0.1, 0, -100, 100, 1 veBlends3_loadBins = array, U16, 19592, [8], "Load", 1, 0, 0, 1000, 0 veBlends3_rpmBins = array, U16, 19608, [8], "RPM", 1, 0, 0, 18000, 0 veBlends3_blendParameter = bits, U08, 19624, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends3_yAxisOverride = bits, U08, 19625, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends3_blendBins = array, S16, 19626, [8], "", 0.1, 0, -1000, 1000, 1 veBlends3_blendValues = array, U08, 19642, [8], "%", 0.5, 0, 0, 100, 1 veBlends4_table = array, S16, 19652, [8x8], "", 0.1, 0, -100, 100, 1 veBlends4_loadBins = array, U16, 19780, [8], "Load", 1, 0, 0, 1000, 0 veBlends4_rpmBins = array, U16, 19796, [8], "RPM", 1, 0, 0, 18000, 0 veBlends4_blendParameter = bits, U08, 19812, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends4_yAxisOverride = bits, U08, 19813, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends4_blendBins = array, S16, 19814, [8], "", 0.1, 0, -1000, 1000, 1 veBlends4_blendValues = array, U08, 19830, [8], "%", 0.5, 0, 0, 100, 1 throttleEstimateEffectiveAreaBins = array, U16, 19840, [12], "%", 0.1, 0, 0, 100, 1 @@ -1554,24 +1562,28 @@ boostOpenLoopBlends1_table = array, S16, 19888, [8x8], "", 0.1, 0, -100, 100, 1 boostOpenLoopBlends1_loadBins = array, U16, 20016, [8], "Load", 1, 0, 0, 1000, 0 boostOpenLoopBlends1_rpmBins = array, U16, 20032, [8], "RPM", 1, 0, 0, 18000, 0 boostOpenLoopBlends1_blendParameter = bits, U08, 20048, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostOpenLoopBlends1_yAxisOverride = bits, U08, 20049, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostOpenLoopBlends1_blendBins = array, S16, 20050, [8], "", 0.1, 0, -1000, 1000, 1 boostOpenLoopBlends1_blendValues = array, U08, 20066, [8], "%", 0.5, 0, 0, 100, 1 boostOpenLoopBlends2_table = array, S16, 20076, [8x8], "", 0.1, 0, -100, 100, 1 boostOpenLoopBlends2_loadBins = array, U16, 20204, [8], "Load", 1, 0, 0, 1000, 0 boostOpenLoopBlends2_rpmBins = array, U16, 20220, [8], "RPM", 1, 0, 0, 18000, 0 boostOpenLoopBlends2_blendParameter = bits, U08, 20236, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostOpenLoopBlends2_yAxisOverride = bits, U08, 20237, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostOpenLoopBlends2_blendBins = array, S16, 20238, [8], "", 0.1, 0, -1000, 1000, 1 boostOpenLoopBlends2_blendValues = array, U08, 20254, [8], "%", 0.5, 0, 0, 100, 1 boostClosedLoopBlends1_table = array, S16, 20264, [8x8], "", 0.1, 0, -100, 100, 1 boostClosedLoopBlends1_loadBins = array, U16, 20392, [8], "Load", 1, 0, 0, 1000, 0 boostClosedLoopBlends1_rpmBins = array, U16, 20408, [8], "RPM", 1, 0, 0, 18000, 0 boostClosedLoopBlends1_blendParameter = bits, U08, 20424, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostClosedLoopBlends1_yAxisOverride = bits, U08, 20425, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostClosedLoopBlends1_blendBins = array, S16, 20426, [8], "", 0.1, 0, -1000, 1000, 1 boostClosedLoopBlends1_blendValues = array, U08, 20442, [8], "%", 0.5, 0, 0, 100, 1 boostClosedLoopBlends2_table = array, S16, 20452, [8x8], "", 0.1, 0, -100, 100, 1 boostClosedLoopBlends2_loadBins = array, U16, 20580, [8], "Load", 1, 0, 0, 1000, 0 boostClosedLoopBlends2_rpmBins = array, U16, 20596, [8], "RPM", 1, 0, 0, 18000, 0 boostClosedLoopBlends2_blendParameter = bits, U08, 20612, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostClosedLoopBlends2_yAxisOverride = bits, U08, 20613, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostClosedLoopBlends2_blendBins = array, S16, 20614, [8], "", 0.1, 0, -1000, 1000, 1 boostClosedLoopBlends2_blendValues = array, U08, 20630, [8], "%", 0.5, 0, 0, 100, 1 tcu_rangeP = array, U08, 20640, [6], "level", 1, 0, 0, 3, 0 @@ -6898,7 +6910,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends1_blendParameter - panel = ignAdder1Bias + field = "Y axis override (set Zero for no override)", ignBlends1_yAxisOverride, {ignBlends1_blendParameter} + panel = ignAdder1Bias, {ignBlends1_blendParameter} dialog = ignAdder2Cfg, "Ignition adder 2 config" field = "#The bias table controls how much of the blend table" @@ -6908,7 +6921,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends2_blendParameter - panel = ignAdder2Bias + field = "Y axis override (set Zero for no override)", ignBlends2_yAxisOverride, {ignBlends2_blendParameter} + panel = ignAdder2Bias, {ignBlends2_blendParameter} dialog = ignAdder3Cfg, "Ignition adder 3 config" field = "#The bias table controls how much of the blend table" @@ -6918,7 +6932,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends3_blendParameter - panel = ignAdder3Bias + field = "Y axis override (set Zero for no override)", ignBlends3_yAxisOverride, {ignBlends3_blendParameter} + panel = ignAdder3Bias, {ignBlends3_blendParameter} dialog = ignAdder4Cfg, "Ignition adder 4 config" field = "#The bias table controls how much of the blend table" @@ -6928,7 +6943,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends4_blendParameter - panel = ignAdder4Bias + field = "Y axis override (set Zero for no override)", ignBlends4_yAxisOverride, {ignBlends4_blendParameter} + panel = ignAdder4Bias, {ignBlends4_blendParameter} dialog = veBlend1Cfg, "VE blend 1 config" field = "#The bias table controls how much of the blend table" @@ -6939,7 +6955,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends1_blendParameter - panel = veBlend1Bias + field = "Y axis override (set Zero for no override)", veBlends1_yAxisOverride, {veBlends1_blendParameter} + panel = veBlend1Bias, {veBlends1_blendParameter} dialog = veBlend2Cfg, "VE blend 2 config" field = "#The bias table controls how much of the blend table" @@ -6950,7 +6967,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends2_blendParameter - panel = veBlend2Bias + field = "Y axis override (set Zero for no override)", veBlends2_yAxisOverride, {veBlends2_blendParameter} + panel = veBlend2Bias, {veBlends2_blendParameter} dialog = veBlend3Cfg, "VE blend 3 config" field = "#The bias table controls how much of the blend table" @@ -6961,7 +6979,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends3_blendParameter - panel = veBlend3Bias + field = "Y axis override (set Zero for no override)", veBlends3_yAxisOverride, {veBlends3_blendParameter} + panel = veBlend3Bias, {veBlends3_blendParameter} dialog = veBlend4Cfg, "VE blend 4 config" field = "#The bias table controls how much of the blend table" @@ -6972,7 +6991,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends4_blendParameter - panel = veBlend4Bias + field = "Y axis override (set Zero for no override)", veBlends4_yAxisOverride, {veBlends4_blendParameter} + panel = veBlend4Bias, {veBlends4_blendParameter} indicatorPanel = isBoostControlledPanel, 1 indicator = {isBoostControlled}, "No Boost Control", "Boost Control Active" @@ -6986,7 +7006,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#parameter below." panel = isBoostControlledPanel field = "Blend parameter", boostOpenLoopBlends1_blendParameter - panel = boostOpenLoopBlend1Bias + field = "Y axis override (set Zero for no override)", boostOpenLoopBlends1_yAxisOverride, {boostOpenLoopBlends1_blendParameter} + panel = boostOpenLoopBlend1Bias, {boostOpenLoopBlends1_blendParameter} dialog = boostOpenBlend2Cfg, "Boost open loop blend 2 config" field = "#The bias table controls how much of the blend table" @@ -6997,7 +7018,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#parameter below." panel = isBoostControlledPanel field = "Blend parameter", boostOpenLoopBlends2_blendParameter - panel = boostOpenLoopBlend2Bias + field = "Y axis override (set Zero for no override)", boostOpenLoopBlends2_yAxisOverride, {boostOpenLoopBlends2_blendParameter} + panel = boostOpenLoopBlend2Bias, {boostOpenLoopBlends2_blendParameter} dialog = boostClosedBlend1Cfg, "Boost closed loop blend 1 config" field = "#The bias table controls how much of the blend table" @@ -7007,7 +7029,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", boostClosedLoopBlends1_blendParameter - panel = boostClosedLoopBlend1Bias + field = "Y axis override (set Zero for no override)", boostClosedLoopBlends1_yAxisOverride, {boostClosedLoopBlends1_blendParameter} + panel = boostClosedLoopBlend1Bias, {boostClosedLoopBlends1_blendParameter} dialog = boostClosedBlend2Cfg, "Boost closed loop blend 2 config" field = "#The bias table controls how much of the blend table" @@ -7017,7 +7040,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", boostClosedLoopBlends2_blendParameter - panel = boostClosedLoopBlend2Bias + field = "Y axis override (set Zero for no override)", boostClosedLoopBlends2_yAxisOverride, {boostClosedLoopBlends2_blendParameter} + panel = boostClosedLoopBlend2Bias, {boostClosedLoopBlends2_blendParameter} dialog = dwellSettings, "", yAxis panel = dwellCorrection diff --git a/firmware/tunerstudio/generated/rusefi_m74_9.ini b/firmware/tunerstudio/generated/rusefi_m74_9.ini index aedf4c2f2e..69d725dd52 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.2024.01.17.m74_9.1142092327" + signature = "rusEFI master.2024.01.17.m74_9.3367876027" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.01.17.m74_9.1142092327" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.01.17.m74_9.3367876027" ; 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","MAF/MAP sensor signal","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","Pedal position sensor 1 signal PPS1","Pedal position sensor 2 signal PPS2","ETB TPS position sensor 1 signal","ETB TPS 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 Wed Jan 17 14:06:08 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:41:39 UTC 2024 pageSize = 22176 page = 1 @@ -1504,48 +1504,56 @@ ignBlends1_table = array, S16, 19712, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends1_loadBins = array, U16, 19840, [8], "Load", 1, 0, 0, 1000, 0 ignBlends1_rpmBins = array, U16, 19856, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends1_blendParameter = bits, U08, 19872, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends1_yAxisOverride = bits, U08, 19873, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends1_blendBins = array, S16, 19874, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends1_blendValues = array, U08, 19890, [8], "%", 0.5, 0, 0, 100, 1 ignBlends2_table = array, S16, 19900, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends2_loadBins = array, U16, 20028, [8], "Load", 1, 0, 0, 1000, 0 ignBlends2_rpmBins = array, U16, 20044, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends2_blendParameter = bits, U08, 20060, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends2_yAxisOverride = bits, U08, 20061, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends2_blendBins = array, S16, 20062, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends2_blendValues = array, U08, 20078, [8], "%", 0.5, 0, 0, 100, 1 ignBlends3_table = array, S16, 20088, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends3_loadBins = array, U16, 20216, [8], "Load", 1, 0, 0, 1000, 0 ignBlends3_rpmBins = array, U16, 20232, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends3_blendParameter = bits, U08, 20248, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends3_yAxisOverride = bits, U08, 20249, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends3_blendBins = array, S16, 20250, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends3_blendValues = array, U08, 20266, [8], "%", 0.5, 0, 0, 100, 1 ignBlends4_table = array, S16, 20276, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends4_loadBins = array, U16, 20404, [8], "Load", 1, 0, 0, 1000, 0 ignBlends4_rpmBins = array, U16, 20420, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends4_blendParameter = bits, U08, 20436, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends4_yAxisOverride = bits, U08, 20437, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends4_blendBins = array, S16, 20438, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends4_blendValues = array, U08, 20454, [8], "%", 0.5, 0, 0, 100, 1 veBlends1_table = array, S16, 20464, [8x8], "", 0.1, 0, -100, 100, 1 veBlends1_loadBins = array, U16, 20592, [8], "Load", 1, 0, 0, 1000, 0 veBlends1_rpmBins = array, U16, 20608, [8], "RPM", 1, 0, 0, 18000, 0 veBlends1_blendParameter = bits, U08, 20624, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends1_yAxisOverride = bits, U08, 20625, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends1_blendBins = array, S16, 20626, [8], "", 0.1, 0, -1000, 1000, 1 veBlends1_blendValues = array, U08, 20642, [8], "%", 0.5, 0, 0, 100, 1 veBlends2_table = array, S16, 20652, [8x8], "", 0.1, 0, -100, 100, 1 veBlends2_loadBins = array, U16, 20780, [8], "Load", 1, 0, 0, 1000, 0 veBlends2_rpmBins = array, U16, 20796, [8], "RPM", 1, 0, 0, 18000, 0 veBlends2_blendParameter = bits, U08, 20812, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends2_yAxisOverride = bits, U08, 20813, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends2_blendBins = array, S16, 20814, [8], "", 0.1, 0, -1000, 1000, 1 veBlends2_blendValues = array, U08, 20830, [8], "%", 0.5, 0, 0, 100, 1 veBlends3_table = array, S16, 20840, [8x8], "", 0.1, 0, -100, 100, 1 veBlends3_loadBins = array, U16, 20968, [8], "Load", 1, 0, 0, 1000, 0 veBlends3_rpmBins = array, U16, 20984, [8], "RPM", 1, 0, 0, 18000, 0 veBlends3_blendParameter = bits, U08, 21000, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends3_yAxisOverride = bits, U08, 21001, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends3_blendBins = array, S16, 21002, [8], "", 0.1, 0, -1000, 1000, 1 veBlends3_blendValues = array, U08, 21018, [8], "%", 0.5, 0, 0, 100, 1 veBlends4_table = array, S16, 21028, [8x8], "", 0.1, 0, -100, 100, 1 veBlends4_loadBins = array, U16, 21156, [8], "Load", 1, 0, 0, 1000, 0 veBlends4_rpmBins = array, U16, 21172, [8], "RPM", 1, 0, 0, 18000, 0 veBlends4_blendParameter = bits, U08, 21188, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends4_yAxisOverride = bits, U08, 21189, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends4_blendBins = array, S16, 21190, [8], "", 0.1, 0, -1000, 1000, 1 veBlends4_blendValues = array, U08, 21206, [8], "%", 0.5, 0, 0, 100, 1 throttleEstimateEffectiveAreaBins = array, U16, 21216, [12], "%", 0.1, 0, 0, 100, 1 @@ -1554,24 +1562,28 @@ boostOpenLoopBlends1_table = array, S16, 21264, [8x8], "", 0.1, 0, -100, 100, 1 boostOpenLoopBlends1_loadBins = array, U16, 21392, [8], "Load", 1, 0, 0, 1000, 0 boostOpenLoopBlends1_rpmBins = array, U16, 21408, [8], "RPM", 1, 0, 0, 18000, 0 boostOpenLoopBlends1_blendParameter = bits, U08, 21424, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostOpenLoopBlends1_yAxisOverride = bits, U08, 21425, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostOpenLoopBlends1_blendBins = array, S16, 21426, [8], "", 0.1, 0, -1000, 1000, 1 boostOpenLoopBlends1_blendValues = array, U08, 21442, [8], "%", 0.5, 0, 0, 100, 1 boostOpenLoopBlends2_table = array, S16, 21452, [8x8], "", 0.1, 0, -100, 100, 1 boostOpenLoopBlends2_loadBins = array, U16, 21580, [8], "Load", 1, 0, 0, 1000, 0 boostOpenLoopBlends2_rpmBins = array, U16, 21596, [8], "RPM", 1, 0, 0, 18000, 0 boostOpenLoopBlends2_blendParameter = bits, U08, 21612, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostOpenLoopBlends2_yAxisOverride = bits, U08, 21613, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostOpenLoopBlends2_blendBins = array, S16, 21614, [8], "", 0.1, 0, -1000, 1000, 1 boostOpenLoopBlends2_blendValues = array, U08, 21630, [8], "%", 0.5, 0, 0, 100, 1 boostClosedLoopBlends1_table = array, S16, 21640, [8x8], "", 0.1, 0, -100, 100, 1 boostClosedLoopBlends1_loadBins = array, U16, 21768, [8], "Load", 1, 0, 0, 1000, 0 boostClosedLoopBlends1_rpmBins = array, U16, 21784, [8], "RPM", 1, 0, 0, 18000, 0 boostClosedLoopBlends1_blendParameter = bits, U08, 21800, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostClosedLoopBlends1_yAxisOverride = bits, U08, 21801, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostClosedLoopBlends1_blendBins = array, S16, 21802, [8], "", 0.1, 0, -1000, 1000, 1 boostClosedLoopBlends1_blendValues = array, U08, 21818, [8], "%", 0.5, 0, 0, 100, 1 boostClosedLoopBlends2_table = array, S16, 21828, [8x8], "", 0.1, 0, -100, 100, 1 boostClosedLoopBlends2_loadBins = array, U16, 21956, [8], "Load", 1, 0, 0, 1000, 0 boostClosedLoopBlends2_rpmBins = array, U16, 21972, [8], "RPM", 1, 0, 0, 18000, 0 boostClosedLoopBlends2_blendParameter = bits, U08, 21988, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostClosedLoopBlends2_yAxisOverride = bits, U08, 21989, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostClosedLoopBlends2_blendBins = array, S16, 21990, [8], "", 0.1, 0, -1000, 1000, 1 boostClosedLoopBlends2_blendValues = array, U08, 22006, [8], "%", 0.5, 0, 0, 100, 1 tcu_rangeP = array, U08, 22016, [6], "level", 1, 0, 0, 3, 0 @@ -6900,7 +6912,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends1_blendParameter - panel = ignAdder1Bias + field = "Y axis override (set Zero for no override)", ignBlends1_yAxisOverride, {ignBlends1_blendParameter} + panel = ignAdder1Bias, {ignBlends1_blendParameter} dialog = ignAdder2Cfg, "Ignition adder 2 config" field = "#The bias table controls how much of the blend table" @@ -6910,7 +6923,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends2_blendParameter - panel = ignAdder2Bias + field = "Y axis override (set Zero for no override)", ignBlends2_yAxisOverride, {ignBlends2_blendParameter} + panel = ignAdder2Bias, {ignBlends2_blendParameter} dialog = ignAdder3Cfg, "Ignition adder 3 config" field = "#The bias table controls how much of the blend table" @@ -6920,7 +6934,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends3_blendParameter - panel = ignAdder3Bias + field = "Y axis override (set Zero for no override)", ignBlends3_yAxisOverride, {ignBlends3_blendParameter} + panel = ignAdder3Bias, {ignBlends3_blendParameter} dialog = ignAdder4Cfg, "Ignition adder 4 config" field = "#The bias table controls how much of the blend table" @@ -6930,7 +6945,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends4_blendParameter - panel = ignAdder4Bias + field = "Y axis override (set Zero for no override)", ignBlends4_yAxisOverride, {ignBlends4_blendParameter} + panel = ignAdder4Bias, {ignBlends4_blendParameter} dialog = veBlend1Cfg, "VE blend 1 config" field = "#The bias table controls how much of the blend table" @@ -6941,7 +6957,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends1_blendParameter - panel = veBlend1Bias + field = "Y axis override (set Zero for no override)", veBlends1_yAxisOverride, {veBlends1_blendParameter} + panel = veBlend1Bias, {veBlends1_blendParameter} dialog = veBlend2Cfg, "VE blend 2 config" field = "#The bias table controls how much of the blend table" @@ -6952,7 +6969,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends2_blendParameter - panel = veBlend2Bias + field = "Y axis override (set Zero for no override)", veBlends2_yAxisOverride, {veBlends2_blendParameter} + panel = veBlend2Bias, {veBlends2_blendParameter} dialog = veBlend3Cfg, "VE blend 3 config" field = "#The bias table controls how much of the blend table" @@ -6963,7 +6981,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends3_blendParameter - panel = veBlend3Bias + field = "Y axis override (set Zero for no override)", veBlends3_yAxisOverride, {veBlends3_blendParameter} + panel = veBlend3Bias, {veBlends3_blendParameter} dialog = veBlend4Cfg, "VE blend 4 config" field = "#The bias table controls how much of the blend table" @@ -6974,7 +6993,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends4_blendParameter - panel = veBlend4Bias + field = "Y axis override (set Zero for no override)", veBlends4_yAxisOverride, {veBlends4_blendParameter} + panel = veBlend4Bias, {veBlends4_blendParameter} indicatorPanel = isBoostControlledPanel, 1 indicator = {isBoostControlled}, "No Boost Control", "Boost Control Active" @@ -6988,7 +7008,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#parameter below." panel = isBoostControlledPanel field = "Blend parameter", boostOpenLoopBlends1_blendParameter - panel = boostOpenLoopBlend1Bias + field = "Y axis override (set Zero for no override)", boostOpenLoopBlends1_yAxisOverride, {boostOpenLoopBlends1_blendParameter} + panel = boostOpenLoopBlend1Bias, {boostOpenLoopBlends1_blendParameter} dialog = boostOpenBlend2Cfg, "Boost open loop blend 2 config" field = "#The bias table controls how much of the blend table" @@ -6999,7 +7020,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#parameter below." panel = isBoostControlledPanel field = "Blend parameter", boostOpenLoopBlends2_blendParameter - panel = boostOpenLoopBlend2Bias + field = "Y axis override (set Zero for no override)", boostOpenLoopBlends2_yAxisOverride, {boostOpenLoopBlends2_blendParameter} + panel = boostOpenLoopBlend2Bias, {boostOpenLoopBlends2_blendParameter} dialog = boostClosedBlend1Cfg, "Boost closed loop blend 1 config" field = "#The bias table controls how much of the blend table" @@ -7009,7 +7031,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", boostClosedLoopBlends1_blendParameter - panel = boostClosedLoopBlend1Bias + field = "Y axis override (set Zero for no override)", boostClosedLoopBlends1_yAxisOverride, {boostClosedLoopBlends1_blendParameter} + panel = boostClosedLoopBlend1Bias, {boostClosedLoopBlends1_blendParameter} dialog = boostClosedBlend2Cfg, "Boost closed loop blend 2 config" field = "#The bias table controls how much of the blend table" @@ -7019,7 +7042,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", boostClosedLoopBlends2_blendParameter - panel = boostClosedLoopBlend2Bias + field = "Y axis override (set Zero for no override)", boostClosedLoopBlends2_yAxisOverride, {boostClosedLoopBlends2_blendParameter} + panel = boostClosedLoopBlend2Bias, {boostClosedLoopBlends2_blendParameter} dialog = dwellSettings, "", yAxis panel = dwellCorrection diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index 727c6a0c7f..b6de93d47f 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.2024.01.17.mre_f4.1669972886" + signature = "rusEFI master.2024.01.17.mre_f4.4012278794" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.01.17.mre_f4.1669972886" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.01.17.mre_f4.4012278794" ; 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 Wed Jan 17 14:06:06 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:41:36 UTC 2024 pageSize = 22176 page = 1 @@ -1504,48 +1504,56 @@ ignBlends1_table = array, S16, 19712, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends1_loadBins = array, U16, 19840, [8], "Load", 1, 0, 0, 1000, 0 ignBlends1_rpmBins = array, U16, 19856, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends1_blendParameter = bits, U08, 19872, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends1_yAxisOverride = bits, U08, 19873, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends1_blendBins = array, S16, 19874, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends1_blendValues = array, U08, 19890, [8], "%", 0.5, 0, 0, 100, 1 ignBlends2_table = array, S16, 19900, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends2_loadBins = array, U16, 20028, [8], "Load", 1, 0, 0, 1000, 0 ignBlends2_rpmBins = array, U16, 20044, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends2_blendParameter = bits, U08, 20060, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends2_yAxisOverride = bits, U08, 20061, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends2_blendBins = array, S16, 20062, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends2_blendValues = array, U08, 20078, [8], "%", 0.5, 0, 0, 100, 1 ignBlends3_table = array, S16, 20088, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends3_loadBins = array, U16, 20216, [8], "Load", 1, 0, 0, 1000, 0 ignBlends3_rpmBins = array, U16, 20232, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends3_blendParameter = bits, U08, 20248, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends3_yAxisOverride = bits, U08, 20249, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends3_blendBins = array, S16, 20250, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends3_blendValues = array, U08, 20266, [8], "%", 0.5, 0, 0, 100, 1 ignBlends4_table = array, S16, 20276, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends4_loadBins = array, U16, 20404, [8], "Load", 1, 0, 0, 1000, 0 ignBlends4_rpmBins = array, U16, 20420, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends4_blendParameter = bits, U08, 20436, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends4_yAxisOverride = bits, U08, 20437, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends4_blendBins = array, S16, 20438, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends4_blendValues = array, U08, 20454, [8], "%", 0.5, 0, 0, 100, 1 veBlends1_table = array, S16, 20464, [8x8], "", 0.1, 0, -100, 100, 1 veBlends1_loadBins = array, U16, 20592, [8], "Load", 1, 0, 0, 1000, 0 veBlends1_rpmBins = array, U16, 20608, [8], "RPM", 1, 0, 0, 18000, 0 veBlends1_blendParameter = bits, U08, 20624, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends1_yAxisOverride = bits, U08, 20625, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends1_blendBins = array, S16, 20626, [8], "", 0.1, 0, -1000, 1000, 1 veBlends1_blendValues = array, U08, 20642, [8], "%", 0.5, 0, 0, 100, 1 veBlends2_table = array, S16, 20652, [8x8], "", 0.1, 0, -100, 100, 1 veBlends2_loadBins = array, U16, 20780, [8], "Load", 1, 0, 0, 1000, 0 veBlends2_rpmBins = array, U16, 20796, [8], "RPM", 1, 0, 0, 18000, 0 veBlends2_blendParameter = bits, U08, 20812, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends2_yAxisOverride = bits, U08, 20813, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends2_blendBins = array, S16, 20814, [8], "", 0.1, 0, -1000, 1000, 1 veBlends2_blendValues = array, U08, 20830, [8], "%", 0.5, 0, 0, 100, 1 veBlends3_table = array, S16, 20840, [8x8], "", 0.1, 0, -100, 100, 1 veBlends3_loadBins = array, U16, 20968, [8], "Load", 1, 0, 0, 1000, 0 veBlends3_rpmBins = array, U16, 20984, [8], "RPM", 1, 0, 0, 18000, 0 veBlends3_blendParameter = bits, U08, 21000, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends3_yAxisOverride = bits, U08, 21001, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends3_blendBins = array, S16, 21002, [8], "", 0.1, 0, -1000, 1000, 1 veBlends3_blendValues = array, U08, 21018, [8], "%", 0.5, 0, 0, 100, 1 veBlends4_table = array, S16, 21028, [8x8], "", 0.1, 0, -100, 100, 1 veBlends4_loadBins = array, U16, 21156, [8], "Load", 1, 0, 0, 1000, 0 veBlends4_rpmBins = array, U16, 21172, [8], "RPM", 1, 0, 0, 18000, 0 veBlends4_blendParameter = bits, U08, 21188, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends4_yAxisOverride = bits, U08, 21189, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends4_blendBins = array, S16, 21190, [8], "", 0.1, 0, -1000, 1000, 1 veBlends4_blendValues = array, U08, 21206, [8], "%", 0.5, 0, 0, 100, 1 throttleEstimateEffectiveAreaBins = array, U16, 21216, [12], "%", 0.1, 0, 0, 100, 1 @@ -1554,24 +1562,28 @@ boostOpenLoopBlends1_table = array, S16, 21264, [8x8], "", 0.1, 0, -100, 100, 1 boostOpenLoopBlends1_loadBins = array, U16, 21392, [8], "Load", 1, 0, 0, 1000, 0 boostOpenLoopBlends1_rpmBins = array, U16, 21408, [8], "RPM", 1, 0, 0, 18000, 0 boostOpenLoopBlends1_blendParameter = bits, U08, 21424, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostOpenLoopBlends1_yAxisOverride = bits, U08, 21425, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostOpenLoopBlends1_blendBins = array, S16, 21426, [8], "", 0.1, 0, -1000, 1000, 1 boostOpenLoopBlends1_blendValues = array, U08, 21442, [8], "%", 0.5, 0, 0, 100, 1 boostOpenLoopBlends2_table = array, S16, 21452, [8x8], "", 0.1, 0, -100, 100, 1 boostOpenLoopBlends2_loadBins = array, U16, 21580, [8], "Load", 1, 0, 0, 1000, 0 boostOpenLoopBlends2_rpmBins = array, U16, 21596, [8], "RPM", 1, 0, 0, 18000, 0 boostOpenLoopBlends2_blendParameter = bits, U08, 21612, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostOpenLoopBlends2_yAxisOverride = bits, U08, 21613, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostOpenLoopBlends2_blendBins = array, S16, 21614, [8], "", 0.1, 0, -1000, 1000, 1 boostOpenLoopBlends2_blendValues = array, U08, 21630, [8], "%", 0.5, 0, 0, 100, 1 boostClosedLoopBlends1_table = array, S16, 21640, [8x8], "", 0.1, 0, -100, 100, 1 boostClosedLoopBlends1_loadBins = array, U16, 21768, [8], "Load", 1, 0, 0, 1000, 0 boostClosedLoopBlends1_rpmBins = array, U16, 21784, [8], "RPM", 1, 0, 0, 18000, 0 boostClosedLoopBlends1_blendParameter = bits, U08, 21800, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostClosedLoopBlends1_yAxisOverride = bits, U08, 21801, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostClosedLoopBlends1_blendBins = array, S16, 21802, [8], "", 0.1, 0, -1000, 1000, 1 boostClosedLoopBlends1_blendValues = array, U08, 21818, [8], "%", 0.5, 0, 0, 100, 1 boostClosedLoopBlends2_table = array, S16, 21828, [8x8], "", 0.1, 0, -100, 100, 1 boostClosedLoopBlends2_loadBins = array, U16, 21956, [8], "Load", 1, 0, 0, 1000, 0 boostClosedLoopBlends2_rpmBins = array, U16, 21972, [8], "RPM", 1, 0, 0, 18000, 0 boostClosedLoopBlends2_blendParameter = bits, U08, 21988, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostClosedLoopBlends2_yAxisOverride = bits, U08, 21989, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostClosedLoopBlends2_blendBins = array, S16, 21990, [8], "", 0.1, 0, -1000, 1000, 1 boostClosedLoopBlends2_blendValues = array, U08, 22006, [8], "%", 0.5, 0, 0, 100, 1 tcu_rangeP = array, U08, 22016, [6], "level", 1, 0, 0, 3, 0 @@ -6902,7 +6914,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends1_blendParameter - panel = ignAdder1Bias + field = "Y axis override (set Zero for no override)", ignBlends1_yAxisOverride, {ignBlends1_blendParameter} + panel = ignAdder1Bias, {ignBlends1_blendParameter} dialog = ignAdder2Cfg, "Ignition adder 2 config" field = "#The bias table controls how much of the blend table" @@ -6912,7 +6925,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends2_blendParameter - panel = ignAdder2Bias + field = "Y axis override (set Zero for no override)", ignBlends2_yAxisOverride, {ignBlends2_blendParameter} + panel = ignAdder2Bias, {ignBlends2_blendParameter} dialog = ignAdder3Cfg, "Ignition adder 3 config" field = "#The bias table controls how much of the blend table" @@ -6922,7 +6936,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends3_blendParameter - panel = ignAdder3Bias + field = "Y axis override (set Zero for no override)", ignBlends3_yAxisOverride, {ignBlends3_blendParameter} + panel = ignAdder3Bias, {ignBlends3_blendParameter} dialog = ignAdder4Cfg, "Ignition adder 4 config" field = "#The bias table controls how much of the blend table" @@ -6932,7 +6947,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends4_blendParameter - panel = ignAdder4Bias + field = "Y axis override (set Zero for no override)", ignBlends4_yAxisOverride, {ignBlends4_blendParameter} + panel = ignAdder4Bias, {ignBlends4_blendParameter} dialog = veBlend1Cfg, "VE blend 1 config" field = "#The bias table controls how much of the blend table" @@ -6943,7 +6959,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends1_blendParameter - panel = veBlend1Bias + field = "Y axis override (set Zero for no override)", veBlends1_yAxisOverride, {veBlends1_blendParameter} + panel = veBlend1Bias, {veBlends1_blendParameter} dialog = veBlend2Cfg, "VE blend 2 config" field = "#The bias table controls how much of the blend table" @@ -6954,7 +6971,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends2_blendParameter - panel = veBlend2Bias + field = "Y axis override (set Zero for no override)", veBlends2_yAxisOverride, {veBlends2_blendParameter} + panel = veBlend2Bias, {veBlends2_blendParameter} dialog = veBlend3Cfg, "VE blend 3 config" field = "#The bias table controls how much of the blend table" @@ -6965,7 +6983,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends3_blendParameter - panel = veBlend3Bias + field = "Y axis override (set Zero for no override)", veBlends3_yAxisOverride, {veBlends3_blendParameter} + panel = veBlend3Bias, {veBlends3_blendParameter} dialog = veBlend4Cfg, "VE blend 4 config" field = "#The bias table controls how much of the blend table" @@ -6976,7 +6995,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends4_blendParameter - panel = veBlend4Bias + field = "Y axis override (set Zero for no override)", veBlends4_yAxisOverride, {veBlends4_blendParameter} + panel = veBlend4Bias, {veBlends4_blendParameter} indicatorPanel = isBoostControlledPanel, 1 indicator = {isBoostControlled}, "No Boost Control", "Boost Control Active" @@ -6990,7 +7010,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#parameter below." panel = isBoostControlledPanel field = "Blend parameter", boostOpenLoopBlends1_blendParameter - panel = boostOpenLoopBlend1Bias + field = "Y axis override (set Zero for no override)", boostOpenLoopBlends1_yAxisOverride, {boostOpenLoopBlends1_blendParameter} + panel = boostOpenLoopBlend1Bias, {boostOpenLoopBlends1_blendParameter} dialog = boostOpenBlend2Cfg, "Boost open loop blend 2 config" field = "#The bias table controls how much of the blend table" @@ -7001,7 +7022,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#parameter below." panel = isBoostControlledPanel field = "Blend parameter", boostOpenLoopBlends2_blendParameter - panel = boostOpenLoopBlend2Bias + field = "Y axis override (set Zero for no override)", boostOpenLoopBlends2_yAxisOverride, {boostOpenLoopBlends2_blendParameter} + panel = boostOpenLoopBlend2Bias, {boostOpenLoopBlends2_blendParameter} dialog = boostClosedBlend1Cfg, "Boost closed loop blend 1 config" field = "#The bias table controls how much of the blend table" @@ -7011,7 +7033,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", boostClosedLoopBlends1_blendParameter - panel = boostClosedLoopBlend1Bias + field = "Y axis override (set Zero for no override)", boostClosedLoopBlends1_yAxisOverride, {boostClosedLoopBlends1_blendParameter} + panel = boostClosedLoopBlend1Bias, {boostClosedLoopBlends1_blendParameter} dialog = boostClosedBlend2Cfg, "Boost closed loop blend 2 config" field = "#The bias table controls how much of the blend table" @@ -7021,7 +7044,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", boostClosedLoopBlends2_blendParameter - panel = boostClosedLoopBlend2Bias + field = "Y axis override (set Zero for no override)", boostClosedLoopBlends2_yAxisOverride, {boostClosedLoopBlends2_blendParameter} + panel = boostClosedLoopBlend2Bias, {boostClosedLoopBlends2_blendParameter} dialog = dwellSettings, "", yAxis panel = dwellCorrection diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index 42f1748cad..27221c1911 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.2024.01.17.mre_f7.1669972886" + signature = "rusEFI master.2024.01.17.mre_f7.4012278794" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.01.17.mre_f7.1669972886" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.01.17.mre_f7.4012278794" ; 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 Wed Jan 17 14:06:03 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:41:34 UTC 2024 pageSize = 22176 page = 1 @@ -1504,48 +1504,56 @@ ignBlends1_table = array, S16, 19712, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends1_loadBins = array, U16, 19840, [8], "Load", 1, 0, 0, 1000, 0 ignBlends1_rpmBins = array, U16, 19856, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends1_blendParameter = bits, U08, 19872, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends1_yAxisOverride = bits, U08, 19873, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends1_blendBins = array, S16, 19874, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends1_blendValues = array, U08, 19890, [8], "%", 0.5, 0, 0, 100, 1 ignBlends2_table = array, S16, 19900, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends2_loadBins = array, U16, 20028, [8], "Load", 1, 0, 0, 1000, 0 ignBlends2_rpmBins = array, U16, 20044, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends2_blendParameter = bits, U08, 20060, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends2_yAxisOverride = bits, U08, 20061, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends2_blendBins = array, S16, 20062, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends2_blendValues = array, U08, 20078, [8], "%", 0.5, 0, 0, 100, 1 ignBlends3_table = array, S16, 20088, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends3_loadBins = array, U16, 20216, [8], "Load", 1, 0, 0, 1000, 0 ignBlends3_rpmBins = array, U16, 20232, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends3_blendParameter = bits, U08, 20248, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends3_yAxisOverride = bits, U08, 20249, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends3_blendBins = array, S16, 20250, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends3_blendValues = array, U08, 20266, [8], "%", 0.5, 0, 0, 100, 1 ignBlends4_table = array, S16, 20276, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends4_loadBins = array, U16, 20404, [8], "Load", 1, 0, 0, 1000, 0 ignBlends4_rpmBins = array, U16, 20420, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends4_blendParameter = bits, U08, 20436, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends4_yAxisOverride = bits, U08, 20437, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends4_blendBins = array, S16, 20438, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends4_blendValues = array, U08, 20454, [8], "%", 0.5, 0, 0, 100, 1 veBlends1_table = array, S16, 20464, [8x8], "", 0.1, 0, -100, 100, 1 veBlends1_loadBins = array, U16, 20592, [8], "Load", 1, 0, 0, 1000, 0 veBlends1_rpmBins = array, U16, 20608, [8], "RPM", 1, 0, 0, 18000, 0 veBlends1_blendParameter = bits, U08, 20624, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends1_yAxisOverride = bits, U08, 20625, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends1_blendBins = array, S16, 20626, [8], "", 0.1, 0, -1000, 1000, 1 veBlends1_blendValues = array, U08, 20642, [8], "%", 0.5, 0, 0, 100, 1 veBlends2_table = array, S16, 20652, [8x8], "", 0.1, 0, -100, 100, 1 veBlends2_loadBins = array, U16, 20780, [8], "Load", 1, 0, 0, 1000, 0 veBlends2_rpmBins = array, U16, 20796, [8], "RPM", 1, 0, 0, 18000, 0 veBlends2_blendParameter = bits, U08, 20812, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends2_yAxisOverride = bits, U08, 20813, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends2_blendBins = array, S16, 20814, [8], "", 0.1, 0, -1000, 1000, 1 veBlends2_blendValues = array, U08, 20830, [8], "%", 0.5, 0, 0, 100, 1 veBlends3_table = array, S16, 20840, [8x8], "", 0.1, 0, -100, 100, 1 veBlends3_loadBins = array, U16, 20968, [8], "Load", 1, 0, 0, 1000, 0 veBlends3_rpmBins = array, U16, 20984, [8], "RPM", 1, 0, 0, 18000, 0 veBlends3_blendParameter = bits, U08, 21000, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends3_yAxisOverride = bits, U08, 21001, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends3_blendBins = array, S16, 21002, [8], "", 0.1, 0, -1000, 1000, 1 veBlends3_blendValues = array, U08, 21018, [8], "%", 0.5, 0, 0, 100, 1 veBlends4_table = array, S16, 21028, [8x8], "", 0.1, 0, -100, 100, 1 veBlends4_loadBins = array, U16, 21156, [8], "Load", 1, 0, 0, 1000, 0 veBlends4_rpmBins = array, U16, 21172, [8], "RPM", 1, 0, 0, 18000, 0 veBlends4_blendParameter = bits, U08, 21188, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends4_yAxisOverride = bits, U08, 21189, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends4_blendBins = array, S16, 21190, [8], "", 0.1, 0, -1000, 1000, 1 veBlends4_blendValues = array, U08, 21206, [8], "%", 0.5, 0, 0, 100, 1 throttleEstimateEffectiveAreaBins = array, U16, 21216, [12], "%", 0.1, 0, 0, 100, 1 @@ -1554,24 +1562,28 @@ boostOpenLoopBlends1_table = array, S16, 21264, [8x8], "", 0.1, 0, -100, 100, 1 boostOpenLoopBlends1_loadBins = array, U16, 21392, [8], "Load", 1, 0, 0, 1000, 0 boostOpenLoopBlends1_rpmBins = array, U16, 21408, [8], "RPM", 1, 0, 0, 18000, 0 boostOpenLoopBlends1_blendParameter = bits, U08, 21424, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostOpenLoopBlends1_yAxisOverride = bits, U08, 21425, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostOpenLoopBlends1_blendBins = array, S16, 21426, [8], "", 0.1, 0, -1000, 1000, 1 boostOpenLoopBlends1_blendValues = array, U08, 21442, [8], "%", 0.5, 0, 0, 100, 1 boostOpenLoopBlends2_table = array, S16, 21452, [8x8], "", 0.1, 0, -100, 100, 1 boostOpenLoopBlends2_loadBins = array, U16, 21580, [8], "Load", 1, 0, 0, 1000, 0 boostOpenLoopBlends2_rpmBins = array, U16, 21596, [8], "RPM", 1, 0, 0, 18000, 0 boostOpenLoopBlends2_blendParameter = bits, U08, 21612, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostOpenLoopBlends2_yAxisOverride = bits, U08, 21613, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostOpenLoopBlends2_blendBins = array, S16, 21614, [8], "", 0.1, 0, -1000, 1000, 1 boostOpenLoopBlends2_blendValues = array, U08, 21630, [8], "%", 0.5, 0, 0, 100, 1 boostClosedLoopBlends1_table = array, S16, 21640, [8x8], "", 0.1, 0, -100, 100, 1 boostClosedLoopBlends1_loadBins = array, U16, 21768, [8], "Load", 1, 0, 0, 1000, 0 boostClosedLoopBlends1_rpmBins = array, U16, 21784, [8], "RPM", 1, 0, 0, 18000, 0 boostClosedLoopBlends1_blendParameter = bits, U08, 21800, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostClosedLoopBlends1_yAxisOverride = bits, U08, 21801, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostClosedLoopBlends1_blendBins = array, S16, 21802, [8], "", 0.1, 0, -1000, 1000, 1 boostClosedLoopBlends1_blendValues = array, U08, 21818, [8], "%", 0.5, 0, 0, 100, 1 boostClosedLoopBlends2_table = array, S16, 21828, [8x8], "", 0.1, 0, -100, 100, 1 boostClosedLoopBlends2_loadBins = array, U16, 21956, [8], "Load", 1, 0, 0, 1000, 0 boostClosedLoopBlends2_rpmBins = array, U16, 21972, [8], "RPM", 1, 0, 0, 18000, 0 boostClosedLoopBlends2_blendParameter = bits, U08, 21988, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostClosedLoopBlends2_yAxisOverride = bits, U08, 21989, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostClosedLoopBlends2_blendBins = array, S16, 21990, [8], "", 0.1, 0, -1000, 1000, 1 boostClosedLoopBlends2_blendValues = array, U08, 22006, [8], "%", 0.5, 0, 0, 100, 1 tcu_rangeP = array, U08, 22016, [6], "level", 1, 0, 0, 3, 0 @@ -6902,7 +6914,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends1_blendParameter - panel = ignAdder1Bias + field = "Y axis override (set Zero for no override)", ignBlends1_yAxisOverride, {ignBlends1_blendParameter} + panel = ignAdder1Bias, {ignBlends1_blendParameter} dialog = ignAdder2Cfg, "Ignition adder 2 config" field = "#The bias table controls how much of the blend table" @@ -6912,7 +6925,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends2_blendParameter - panel = ignAdder2Bias + field = "Y axis override (set Zero for no override)", ignBlends2_yAxisOverride, {ignBlends2_blendParameter} + panel = ignAdder2Bias, {ignBlends2_blendParameter} dialog = ignAdder3Cfg, "Ignition adder 3 config" field = "#The bias table controls how much of the blend table" @@ -6922,7 +6936,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends3_blendParameter - panel = ignAdder3Bias + field = "Y axis override (set Zero for no override)", ignBlends3_yAxisOverride, {ignBlends3_blendParameter} + panel = ignAdder3Bias, {ignBlends3_blendParameter} dialog = ignAdder4Cfg, "Ignition adder 4 config" field = "#The bias table controls how much of the blend table" @@ -6932,7 +6947,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends4_blendParameter - panel = ignAdder4Bias + field = "Y axis override (set Zero for no override)", ignBlends4_yAxisOverride, {ignBlends4_blendParameter} + panel = ignAdder4Bias, {ignBlends4_blendParameter} dialog = veBlend1Cfg, "VE blend 1 config" field = "#The bias table controls how much of the blend table" @@ -6943,7 +6959,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends1_blendParameter - panel = veBlend1Bias + field = "Y axis override (set Zero for no override)", veBlends1_yAxisOverride, {veBlends1_blendParameter} + panel = veBlend1Bias, {veBlends1_blendParameter} dialog = veBlend2Cfg, "VE blend 2 config" field = "#The bias table controls how much of the blend table" @@ -6954,7 +6971,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends2_blendParameter - panel = veBlend2Bias + field = "Y axis override (set Zero for no override)", veBlends2_yAxisOverride, {veBlends2_blendParameter} + panel = veBlend2Bias, {veBlends2_blendParameter} dialog = veBlend3Cfg, "VE blend 3 config" field = "#The bias table controls how much of the blend table" @@ -6965,7 +6983,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends3_blendParameter - panel = veBlend3Bias + field = "Y axis override (set Zero for no override)", veBlends3_yAxisOverride, {veBlends3_blendParameter} + panel = veBlend3Bias, {veBlends3_blendParameter} dialog = veBlend4Cfg, "VE blend 4 config" field = "#The bias table controls how much of the blend table" @@ -6976,7 +6995,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends4_blendParameter - panel = veBlend4Bias + field = "Y axis override (set Zero for no override)", veBlends4_yAxisOverride, {veBlends4_blendParameter} + panel = veBlend4Bias, {veBlends4_blendParameter} indicatorPanel = isBoostControlledPanel, 1 indicator = {isBoostControlled}, "No Boost Control", "Boost Control Active" @@ -6990,7 +7010,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#parameter below." panel = isBoostControlledPanel field = "Blend parameter", boostOpenLoopBlends1_blendParameter - panel = boostOpenLoopBlend1Bias + field = "Y axis override (set Zero for no override)", boostOpenLoopBlends1_yAxisOverride, {boostOpenLoopBlends1_blendParameter} + panel = boostOpenLoopBlend1Bias, {boostOpenLoopBlends1_blendParameter} dialog = boostOpenBlend2Cfg, "Boost open loop blend 2 config" field = "#The bias table controls how much of the blend table" @@ -7001,7 +7022,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#parameter below." panel = isBoostControlledPanel field = "Blend parameter", boostOpenLoopBlends2_blendParameter - panel = boostOpenLoopBlend2Bias + field = "Y axis override (set Zero for no override)", boostOpenLoopBlends2_yAxisOverride, {boostOpenLoopBlends2_blendParameter} + panel = boostOpenLoopBlend2Bias, {boostOpenLoopBlends2_blendParameter} dialog = boostClosedBlend1Cfg, "Boost closed loop blend 1 config" field = "#The bias table controls how much of the blend table" @@ -7011,7 +7033,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", boostClosedLoopBlends1_blendParameter - panel = boostClosedLoopBlend1Bias + field = "Y axis override (set Zero for no override)", boostClosedLoopBlends1_yAxisOverride, {boostClosedLoopBlends1_blendParameter} + panel = boostClosedLoopBlend1Bias, {boostClosedLoopBlends1_blendParameter} dialog = boostClosedBlend2Cfg, "Boost closed loop blend 2 config" field = "#The bias table controls how much of the blend table" @@ -7021,7 +7044,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", boostClosedLoopBlends2_blendParameter - panel = boostClosedLoopBlend2Bias + field = "Y axis override (set Zero for no override)", boostClosedLoopBlends2_yAxisOverride, {boostClosedLoopBlends2_blendParameter} + panel = boostClosedLoopBlend2Bias, {boostClosedLoopBlends2_blendParameter} dialog = dwellSettings, "", yAxis panel = dwellCorrection diff --git a/firmware/tunerstudio/generated/rusefi_nucleo_h743.ini b/firmware/tunerstudio/generated/rusefi_nucleo_h743.ini index db7f5ac126..d4ad742da6 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.2024.01.17.nucleo_h743.781393164" + signature = "rusEFI master.2024.01.17.nucleo_h743.2721864336" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.01.17.nucleo_h743.781393164" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.01.17.nucleo_h743.2721864336" ; 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 Wed Jan 17 14:06:42 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:42:12 UTC 2024 pageSize = 22176 page = 1 @@ -1504,48 +1504,56 @@ ignBlends1_table = array, S16, 19712, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends1_loadBins = array, U16, 19840, [8], "Load", 1, 0, 0, 1000, 0 ignBlends1_rpmBins = array, U16, 19856, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends1_blendParameter = bits, U08, 19872, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends1_yAxisOverride = bits, U08, 19873, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends1_blendBins = array, S16, 19874, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends1_blendValues = array, U08, 19890, [8], "%", 0.5, 0, 0, 100, 1 ignBlends2_table = array, S16, 19900, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends2_loadBins = array, U16, 20028, [8], "Load", 1, 0, 0, 1000, 0 ignBlends2_rpmBins = array, U16, 20044, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends2_blendParameter = bits, U08, 20060, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends2_yAxisOverride = bits, U08, 20061, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends2_blendBins = array, S16, 20062, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends2_blendValues = array, U08, 20078, [8], "%", 0.5, 0, 0, 100, 1 ignBlends3_table = array, S16, 20088, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends3_loadBins = array, U16, 20216, [8], "Load", 1, 0, 0, 1000, 0 ignBlends3_rpmBins = array, U16, 20232, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends3_blendParameter = bits, U08, 20248, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends3_yAxisOverride = bits, U08, 20249, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends3_blendBins = array, S16, 20250, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends3_blendValues = array, U08, 20266, [8], "%", 0.5, 0, 0, 100, 1 ignBlends4_table = array, S16, 20276, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends4_loadBins = array, U16, 20404, [8], "Load", 1, 0, 0, 1000, 0 ignBlends4_rpmBins = array, U16, 20420, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends4_blendParameter = bits, U08, 20436, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends4_yAxisOverride = bits, U08, 20437, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends4_blendBins = array, S16, 20438, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends4_blendValues = array, U08, 20454, [8], "%", 0.5, 0, 0, 100, 1 veBlends1_table = array, S16, 20464, [8x8], "", 0.1, 0, -100, 100, 1 veBlends1_loadBins = array, U16, 20592, [8], "Load", 1, 0, 0, 1000, 0 veBlends1_rpmBins = array, U16, 20608, [8], "RPM", 1, 0, 0, 18000, 0 veBlends1_blendParameter = bits, U08, 20624, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends1_yAxisOverride = bits, U08, 20625, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends1_blendBins = array, S16, 20626, [8], "", 0.1, 0, -1000, 1000, 1 veBlends1_blendValues = array, U08, 20642, [8], "%", 0.5, 0, 0, 100, 1 veBlends2_table = array, S16, 20652, [8x8], "", 0.1, 0, -100, 100, 1 veBlends2_loadBins = array, U16, 20780, [8], "Load", 1, 0, 0, 1000, 0 veBlends2_rpmBins = array, U16, 20796, [8], "RPM", 1, 0, 0, 18000, 0 veBlends2_blendParameter = bits, U08, 20812, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends2_yAxisOverride = bits, U08, 20813, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends2_blendBins = array, S16, 20814, [8], "", 0.1, 0, -1000, 1000, 1 veBlends2_blendValues = array, U08, 20830, [8], "%", 0.5, 0, 0, 100, 1 veBlends3_table = array, S16, 20840, [8x8], "", 0.1, 0, -100, 100, 1 veBlends3_loadBins = array, U16, 20968, [8], "Load", 1, 0, 0, 1000, 0 veBlends3_rpmBins = array, U16, 20984, [8], "RPM", 1, 0, 0, 18000, 0 veBlends3_blendParameter = bits, U08, 21000, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends3_yAxisOverride = bits, U08, 21001, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends3_blendBins = array, S16, 21002, [8], "", 0.1, 0, -1000, 1000, 1 veBlends3_blendValues = array, U08, 21018, [8], "%", 0.5, 0, 0, 100, 1 veBlends4_table = array, S16, 21028, [8x8], "", 0.1, 0, -100, 100, 1 veBlends4_loadBins = array, U16, 21156, [8], "Load", 1, 0, 0, 1000, 0 veBlends4_rpmBins = array, U16, 21172, [8], "RPM", 1, 0, 0, 18000, 0 veBlends4_blendParameter = bits, U08, 21188, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends4_yAxisOverride = bits, U08, 21189, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends4_blendBins = array, S16, 21190, [8], "", 0.1, 0, -1000, 1000, 1 veBlends4_blendValues = array, U08, 21206, [8], "%", 0.5, 0, 0, 100, 1 throttleEstimateEffectiveAreaBins = array, U16, 21216, [12], "%", 0.1, 0, 0, 100, 1 @@ -1554,24 +1562,28 @@ boostOpenLoopBlends1_table = array, S16, 21264, [8x8], "", 0.1, 0, -100, 100, 1 boostOpenLoopBlends1_loadBins = array, U16, 21392, [8], "Load", 1, 0, 0, 1000, 0 boostOpenLoopBlends1_rpmBins = array, U16, 21408, [8], "RPM", 1, 0, 0, 18000, 0 boostOpenLoopBlends1_blendParameter = bits, U08, 21424, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostOpenLoopBlends1_yAxisOverride = bits, U08, 21425, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostOpenLoopBlends1_blendBins = array, S16, 21426, [8], "", 0.1, 0, -1000, 1000, 1 boostOpenLoopBlends1_blendValues = array, U08, 21442, [8], "%", 0.5, 0, 0, 100, 1 boostOpenLoopBlends2_table = array, S16, 21452, [8x8], "", 0.1, 0, -100, 100, 1 boostOpenLoopBlends2_loadBins = array, U16, 21580, [8], "Load", 1, 0, 0, 1000, 0 boostOpenLoopBlends2_rpmBins = array, U16, 21596, [8], "RPM", 1, 0, 0, 18000, 0 boostOpenLoopBlends2_blendParameter = bits, U08, 21612, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostOpenLoopBlends2_yAxisOverride = bits, U08, 21613, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostOpenLoopBlends2_blendBins = array, S16, 21614, [8], "", 0.1, 0, -1000, 1000, 1 boostOpenLoopBlends2_blendValues = array, U08, 21630, [8], "%", 0.5, 0, 0, 100, 1 boostClosedLoopBlends1_table = array, S16, 21640, [8x8], "", 0.1, 0, -100, 100, 1 boostClosedLoopBlends1_loadBins = array, U16, 21768, [8], "Load", 1, 0, 0, 1000, 0 boostClosedLoopBlends1_rpmBins = array, U16, 21784, [8], "RPM", 1, 0, 0, 18000, 0 boostClosedLoopBlends1_blendParameter = bits, U08, 21800, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostClosedLoopBlends1_yAxisOverride = bits, U08, 21801, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostClosedLoopBlends1_blendBins = array, S16, 21802, [8], "", 0.1, 0, -1000, 1000, 1 boostClosedLoopBlends1_blendValues = array, U08, 21818, [8], "%", 0.5, 0, 0, 100, 1 boostClosedLoopBlends2_table = array, S16, 21828, [8x8], "", 0.1, 0, -100, 100, 1 boostClosedLoopBlends2_loadBins = array, U16, 21956, [8], "Load", 1, 0, 0, 1000, 0 boostClosedLoopBlends2_rpmBins = array, U16, 21972, [8], "RPM", 1, 0, 0, 18000, 0 boostClosedLoopBlends2_blendParameter = bits, U08, 21988, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostClosedLoopBlends2_yAxisOverride = bits, U08, 21989, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostClosedLoopBlends2_blendBins = array, S16, 21990, [8], "", 0.1, 0, -1000, 1000, 1 boostClosedLoopBlends2_blendValues = array, U08, 22006, [8], "%", 0.5, 0, 0, 100, 1 tcu_rangeP = array, U08, 22016, [6], "level", 1, 0, 0, 3, 0 @@ -6897,7 +6909,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends1_blendParameter - panel = ignAdder1Bias + field = "Y axis override (set Zero for no override)", ignBlends1_yAxisOverride, {ignBlends1_blendParameter} + panel = ignAdder1Bias, {ignBlends1_blendParameter} dialog = ignAdder2Cfg, "Ignition adder 2 config" field = "#The bias table controls how much of the blend table" @@ -6907,7 +6920,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends2_blendParameter - panel = ignAdder2Bias + field = "Y axis override (set Zero for no override)", ignBlends2_yAxisOverride, {ignBlends2_blendParameter} + panel = ignAdder2Bias, {ignBlends2_blendParameter} dialog = ignAdder3Cfg, "Ignition adder 3 config" field = "#The bias table controls how much of the blend table" @@ -6917,7 +6931,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends3_blendParameter - panel = ignAdder3Bias + field = "Y axis override (set Zero for no override)", ignBlends3_yAxisOverride, {ignBlends3_blendParameter} + panel = ignAdder3Bias, {ignBlends3_blendParameter} dialog = ignAdder4Cfg, "Ignition adder 4 config" field = "#The bias table controls how much of the blend table" @@ -6927,7 +6942,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends4_blendParameter - panel = ignAdder4Bias + field = "Y axis override (set Zero for no override)", ignBlends4_yAxisOverride, {ignBlends4_blendParameter} + panel = ignAdder4Bias, {ignBlends4_blendParameter} dialog = veBlend1Cfg, "VE blend 1 config" field = "#The bias table controls how much of the blend table" @@ -6938,7 +6954,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends1_blendParameter - panel = veBlend1Bias + field = "Y axis override (set Zero for no override)", veBlends1_yAxisOverride, {veBlends1_blendParameter} + panel = veBlend1Bias, {veBlends1_blendParameter} dialog = veBlend2Cfg, "VE blend 2 config" field = "#The bias table controls how much of the blend table" @@ -6949,7 +6966,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends2_blendParameter - panel = veBlend2Bias + field = "Y axis override (set Zero for no override)", veBlends2_yAxisOverride, {veBlends2_blendParameter} + panel = veBlend2Bias, {veBlends2_blendParameter} dialog = veBlend3Cfg, "VE blend 3 config" field = "#The bias table controls how much of the blend table" @@ -6960,7 +6978,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends3_blendParameter - panel = veBlend3Bias + field = "Y axis override (set Zero for no override)", veBlends3_yAxisOverride, {veBlends3_blendParameter} + panel = veBlend3Bias, {veBlends3_blendParameter} dialog = veBlend4Cfg, "VE blend 4 config" field = "#The bias table controls how much of the blend table" @@ -6971,7 +6990,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends4_blendParameter - panel = veBlend4Bias + field = "Y axis override (set Zero for no override)", veBlends4_yAxisOverride, {veBlends4_blendParameter} + panel = veBlend4Bias, {veBlends4_blendParameter} indicatorPanel = isBoostControlledPanel, 1 indicator = {isBoostControlled}, "No Boost Control", "Boost Control Active" @@ -6985,7 +7005,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#parameter below." panel = isBoostControlledPanel field = "Blend parameter", boostOpenLoopBlends1_blendParameter - panel = boostOpenLoopBlend1Bias + field = "Y axis override (set Zero for no override)", boostOpenLoopBlends1_yAxisOverride, {boostOpenLoopBlends1_blendParameter} + panel = boostOpenLoopBlend1Bias, {boostOpenLoopBlends1_blendParameter} dialog = boostOpenBlend2Cfg, "Boost open loop blend 2 config" field = "#The bias table controls how much of the blend table" @@ -6996,7 +7017,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#parameter below." panel = isBoostControlledPanel field = "Blend parameter", boostOpenLoopBlends2_blendParameter - panel = boostOpenLoopBlend2Bias + field = "Y axis override (set Zero for no override)", boostOpenLoopBlends2_yAxisOverride, {boostOpenLoopBlends2_blendParameter} + panel = boostOpenLoopBlend2Bias, {boostOpenLoopBlends2_blendParameter} dialog = boostClosedBlend1Cfg, "Boost closed loop blend 1 config" field = "#The bias table controls how much of the blend table" @@ -7006,7 +7028,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", boostClosedLoopBlends1_blendParameter - panel = boostClosedLoopBlend1Bias + field = "Y axis override (set Zero for no override)", boostClosedLoopBlends1_yAxisOverride, {boostClosedLoopBlends1_blendParameter} + panel = boostClosedLoopBlend1Bias, {boostClosedLoopBlends1_blendParameter} dialog = boostClosedBlend2Cfg, "Boost closed loop blend 2 config" field = "#The bias table controls how much of the blend table" @@ -7016,7 +7039,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", boostClosedLoopBlends2_blendParameter - panel = boostClosedLoopBlend2Bias + field = "Y axis override (set Zero for no override)", boostClosedLoopBlends2_yAxisOverride, {boostClosedLoopBlends2_blendParameter} + panel = boostClosedLoopBlend2Bias, {boostClosedLoopBlends2_blendParameter} dialog = dwellSettings, "", yAxis panel = dwellCorrection diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index f773809c16..8e06c4e2a6 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.2024.01.17.prometheus_405.503828636" + signature = "rusEFI master.2024.01.17.prometheus_405.2460522240" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.01.17.prometheus_405.503828636" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.01.17.prometheus_405.2460522240" ; 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 Wed Jan 17 14:06:20 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:41:51 UTC 2024 pageSize = 22176 page = 1 @@ -1504,48 +1504,56 @@ ignBlends1_table = array, S16, 19712, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends1_loadBins = array, U16, 19840, [8], "Load", 1, 0, 0, 1000, 0 ignBlends1_rpmBins = array, U16, 19856, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends1_blendParameter = bits, U08, 19872, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends1_yAxisOverride = bits, U08, 19873, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends1_blendBins = array, S16, 19874, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends1_blendValues = array, U08, 19890, [8], "%", 0.5, 0, 0, 100, 1 ignBlends2_table = array, S16, 19900, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends2_loadBins = array, U16, 20028, [8], "Load", 1, 0, 0, 1000, 0 ignBlends2_rpmBins = array, U16, 20044, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends2_blendParameter = bits, U08, 20060, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends2_yAxisOverride = bits, U08, 20061, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends2_blendBins = array, S16, 20062, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends2_blendValues = array, U08, 20078, [8], "%", 0.5, 0, 0, 100, 1 ignBlends3_table = array, S16, 20088, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends3_loadBins = array, U16, 20216, [8], "Load", 1, 0, 0, 1000, 0 ignBlends3_rpmBins = array, U16, 20232, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends3_blendParameter = bits, U08, 20248, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends3_yAxisOverride = bits, U08, 20249, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends3_blendBins = array, S16, 20250, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends3_blendValues = array, U08, 20266, [8], "%", 0.5, 0, 0, 100, 1 ignBlends4_table = array, S16, 20276, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends4_loadBins = array, U16, 20404, [8], "Load", 1, 0, 0, 1000, 0 ignBlends4_rpmBins = array, U16, 20420, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends4_blendParameter = bits, U08, 20436, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends4_yAxisOverride = bits, U08, 20437, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends4_blendBins = array, S16, 20438, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends4_blendValues = array, U08, 20454, [8], "%", 0.5, 0, 0, 100, 1 veBlends1_table = array, S16, 20464, [8x8], "", 0.1, 0, -100, 100, 1 veBlends1_loadBins = array, U16, 20592, [8], "Load", 1, 0, 0, 1000, 0 veBlends1_rpmBins = array, U16, 20608, [8], "RPM", 1, 0, 0, 18000, 0 veBlends1_blendParameter = bits, U08, 20624, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends1_yAxisOverride = bits, U08, 20625, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends1_blendBins = array, S16, 20626, [8], "", 0.1, 0, -1000, 1000, 1 veBlends1_blendValues = array, U08, 20642, [8], "%", 0.5, 0, 0, 100, 1 veBlends2_table = array, S16, 20652, [8x8], "", 0.1, 0, -100, 100, 1 veBlends2_loadBins = array, U16, 20780, [8], "Load", 1, 0, 0, 1000, 0 veBlends2_rpmBins = array, U16, 20796, [8], "RPM", 1, 0, 0, 18000, 0 veBlends2_blendParameter = bits, U08, 20812, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends2_yAxisOverride = bits, U08, 20813, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends2_blendBins = array, S16, 20814, [8], "", 0.1, 0, -1000, 1000, 1 veBlends2_blendValues = array, U08, 20830, [8], "%", 0.5, 0, 0, 100, 1 veBlends3_table = array, S16, 20840, [8x8], "", 0.1, 0, -100, 100, 1 veBlends3_loadBins = array, U16, 20968, [8], "Load", 1, 0, 0, 1000, 0 veBlends3_rpmBins = array, U16, 20984, [8], "RPM", 1, 0, 0, 18000, 0 veBlends3_blendParameter = bits, U08, 21000, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends3_yAxisOverride = bits, U08, 21001, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends3_blendBins = array, S16, 21002, [8], "", 0.1, 0, -1000, 1000, 1 veBlends3_blendValues = array, U08, 21018, [8], "%", 0.5, 0, 0, 100, 1 veBlends4_table = array, S16, 21028, [8x8], "", 0.1, 0, -100, 100, 1 veBlends4_loadBins = array, U16, 21156, [8], "Load", 1, 0, 0, 1000, 0 veBlends4_rpmBins = array, U16, 21172, [8], "RPM", 1, 0, 0, 18000, 0 veBlends4_blendParameter = bits, U08, 21188, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends4_yAxisOverride = bits, U08, 21189, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends4_blendBins = array, S16, 21190, [8], "", 0.1, 0, -1000, 1000, 1 veBlends4_blendValues = array, U08, 21206, [8], "%", 0.5, 0, 0, 100, 1 throttleEstimateEffectiveAreaBins = array, U16, 21216, [12], "%", 0.1, 0, 0, 100, 1 @@ -1554,24 +1562,28 @@ boostOpenLoopBlends1_table = array, S16, 21264, [8x8], "", 0.1, 0, -100, 100, 1 boostOpenLoopBlends1_loadBins = array, U16, 21392, [8], "Load", 1, 0, 0, 1000, 0 boostOpenLoopBlends1_rpmBins = array, U16, 21408, [8], "RPM", 1, 0, 0, 18000, 0 boostOpenLoopBlends1_blendParameter = bits, U08, 21424, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostOpenLoopBlends1_yAxisOverride = bits, U08, 21425, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostOpenLoopBlends1_blendBins = array, S16, 21426, [8], "", 0.1, 0, -1000, 1000, 1 boostOpenLoopBlends1_blendValues = array, U08, 21442, [8], "%", 0.5, 0, 0, 100, 1 boostOpenLoopBlends2_table = array, S16, 21452, [8x8], "", 0.1, 0, -100, 100, 1 boostOpenLoopBlends2_loadBins = array, U16, 21580, [8], "Load", 1, 0, 0, 1000, 0 boostOpenLoopBlends2_rpmBins = array, U16, 21596, [8], "RPM", 1, 0, 0, 18000, 0 boostOpenLoopBlends2_blendParameter = bits, U08, 21612, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostOpenLoopBlends2_yAxisOverride = bits, U08, 21613, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostOpenLoopBlends2_blendBins = array, S16, 21614, [8], "", 0.1, 0, -1000, 1000, 1 boostOpenLoopBlends2_blendValues = array, U08, 21630, [8], "%", 0.5, 0, 0, 100, 1 boostClosedLoopBlends1_table = array, S16, 21640, [8x8], "", 0.1, 0, -100, 100, 1 boostClosedLoopBlends1_loadBins = array, U16, 21768, [8], "Load", 1, 0, 0, 1000, 0 boostClosedLoopBlends1_rpmBins = array, U16, 21784, [8], "RPM", 1, 0, 0, 18000, 0 boostClosedLoopBlends1_blendParameter = bits, U08, 21800, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostClosedLoopBlends1_yAxisOverride = bits, U08, 21801, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostClosedLoopBlends1_blendBins = array, S16, 21802, [8], "", 0.1, 0, -1000, 1000, 1 boostClosedLoopBlends1_blendValues = array, U08, 21818, [8], "%", 0.5, 0, 0, 100, 1 boostClosedLoopBlends2_table = array, S16, 21828, [8x8], "", 0.1, 0, -100, 100, 1 boostClosedLoopBlends2_loadBins = array, U16, 21956, [8], "Load", 1, 0, 0, 1000, 0 boostClosedLoopBlends2_rpmBins = array, U16, 21972, [8], "RPM", 1, 0, 0, 18000, 0 boostClosedLoopBlends2_blendParameter = bits, U08, 21988, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostClosedLoopBlends2_yAxisOverride = bits, U08, 21989, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostClosedLoopBlends2_blendBins = array, S16, 21990, [8], "", 0.1, 0, -1000, 1000, 1 boostClosedLoopBlends2_blendValues = array, U08, 22006, [8], "%", 0.5, 0, 0, 100, 1 tcu_rangeP = array, U08, 22016, [6], "level", 1, 0, 0, 3, 0 @@ -6892,7 +6904,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends1_blendParameter - panel = ignAdder1Bias + field = "Y axis override (set Zero for no override)", ignBlends1_yAxisOverride, {ignBlends1_blendParameter} + panel = ignAdder1Bias, {ignBlends1_blendParameter} dialog = ignAdder2Cfg, "Ignition adder 2 config" field = "#The bias table controls how much of the blend table" @@ -6902,7 +6915,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends2_blendParameter - panel = ignAdder2Bias + field = "Y axis override (set Zero for no override)", ignBlends2_yAxisOverride, {ignBlends2_blendParameter} + panel = ignAdder2Bias, {ignBlends2_blendParameter} dialog = ignAdder3Cfg, "Ignition adder 3 config" field = "#The bias table controls how much of the blend table" @@ -6912,7 +6926,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends3_blendParameter - panel = ignAdder3Bias + field = "Y axis override (set Zero for no override)", ignBlends3_yAxisOverride, {ignBlends3_blendParameter} + panel = ignAdder3Bias, {ignBlends3_blendParameter} dialog = ignAdder4Cfg, "Ignition adder 4 config" field = "#The bias table controls how much of the blend table" @@ -6922,7 +6937,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends4_blendParameter - panel = ignAdder4Bias + field = "Y axis override (set Zero for no override)", ignBlends4_yAxisOverride, {ignBlends4_blendParameter} + panel = ignAdder4Bias, {ignBlends4_blendParameter} dialog = veBlend1Cfg, "VE blend 1 config" field = "#The bias table controls how much of the blend table" @@ -6933,7 +6949,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends1_blendParameter - panel = veBlend1Bias + field = "Y axis override (set Zero for no override)", veBlends1_yAxisOverride, {veBlends1_blendParameter} + panel = veBlend1Bias, {veBlends1_blendParameter} dialog = veBlend2Cfg, "VE blend 2 config" field = "#The bias table controls how much of the blend table" @@ -6944,7 +6961,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends2_blendParameter - panel = veBlend2Bias + field = "Y axis override (set Zero for no override)", veBlends2_yAxisOverride, {veBlends2_blendParameter} + panel = veBlend2Bias, {veBlends2_blendParameter} dialog = veBlend3Cfg, "VE blend 3 config" field = "#The bias table controls how much of the blend table" @@ -6955,7 +6973,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends3_blendParameter - panel = veBlend3Bias + field = "Y axis override (set Zero for no override)", veBlends3_yAxisOverride, {veBlends3_blendParameter} + panel = veBlend3Bias, {veBlends3_blendParameter} dialog = veBlend4Cfg, "VE blend 4 config" field = "#The bias table controls how much of the blend table" @@ -6966,7 +6985,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends4_blendParameter - panel = veBlend4Bias + field = "Y axis override (set Zero for no override)", veBlends4_yAxisOverride, {veBlends4_blendParameter} + panel = veBlend4Bias, {veBlends4_blendParameter} indicatorPanel = isBoostControlledPanel, 1 indicator = {isBoostControlled}, "No Boost Control", "Boost Control Active" @@ -6980,7 +7000,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#parameter below." panel = isBoostControlledPanel field = "Blend parameter", boostOpenLoopBlends1_blendParameter - panel = boostOpenLoopBlend1Bias + field = "Y axis override (set Zero for no override)", boostOpenLoopBlends1_yAxisOverride, {boostOpenLoopBlends1_blendParameter} + panel = boostOpenLoopBlend1Bias, {boostOpenLoopBlends1_blendParameter} dialog = boostOpenBlend2Cfg, "Boost open loop blend 2 config" field = "#The bias table controls how much of the blend table" @@ -6991,7 +7012,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#parameter below." panel = isBoostControlledPanel field = "Blend parameter", boostOpenLoopBlends2_blendParameter - panel = boostOpenLoopBlend2Bias + field = "Y axis override (set Zero for no override)", boostOpenLoopBlends2_yAxisOverride, {boostOpenLoopBlends2_blendParameter} + panel = boostOpenLoopBlend2Bias, {boostOpenLoopBlends2_blendParameter} dialog = boostClosedBlend1Cfg, "Boost closed loop blend 1 config" field = "#The bias table controls how much of the blend table" @@ -7001,7 +7023,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", boostClosedLoopBlends1_blendParameter - panel = boostClosedLoopBlend1Bias + field = "Y axis override (set Zero for no override)", boostClosedLoopBlends1_yAxisOverride, {boostClosedLoopBlends1_blendParameter} + panel = boostClosedLoopBlend1Bias, {boostClosedLoopBlends1_blendParameter} dialog = boostClosedBlend2Cfg, "Boost closed loop blend 2 config" field = "#The bias table controls how much of the blend table" @@ -7011,7 +7034,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", boostClosedLoopBlends2_blendParameter - panel = boostClosedLoopBlend2Bias + field = "Y axis override (set Zero for no override)", boostClosedLoopBlends2_yAxisOverride, {boostClosedLoopBlends2_blendParameter} + panel = boostClosedLoopBlend2Bias, {boostClosedLoopBlends2_blendParameter} dialog = dwellSettings, "", yAxis panel = dwellCorrection diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index 651ecb4acb..f9b6b74c3b 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.2024.01.17.prometheus_469.503828636" + signature = "rusEFI master.2024.01.17.prometheus_469.2460522240" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.01.17.prometheus_469.503828636" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.01.17.prometheus_469.2460522240" ; 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 Wed Jan 17 14:06:18 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:41:48 UTC 2024 pageSize = 22176 page = 1 @@ -1504,48 +1504,56 @@ ignBlends1_table = array, S16, 19712, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends1_loadBins = array, U16, 19840, [8], "Load", 1, 0, 0, 1000, 0 ignBlends1_rpmBins = array, U16, 19856, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends1_blendParameter = bits, U08, 19872, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends1_yAxisOverride = bits, U08, 19873, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends1_blendBins = array, S16, 19874, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends1_blendValues = array, U08, 19890, [8], "%", 0.5, 0, 0, 100, 1 ignBlends2_table = array, S16, 19900, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends2_loadBins = array, U16, 20028, [8], "Load", 1, 0, 0, 1000, 0 ignBlends2_rpmBins = array, U16, 20044, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends2_blendParameter = bits, U08, 20060, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends2_yAxisOverride = bits, U08, 20061, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends2_blendBins = array, S16, 20062, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends2_blendValues = array, U08, 20078, [8], "%", 0.5, 0, 0, 100, 1 ignBlends3_table = array, S16, 20088, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends3_loadBins = array, U16, 20216, [8], "Load", 1, 0, 0, 1000, 0 ignBlends3_rpmBins = array, U16, 20232, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends3_blendParameter = bits, U08, 20248, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends3_yAxisOverride = bits, U08, 20249, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends3_blendBins = array, S16, 20250, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends3_blendValues = array, U08, 20266, [8], "%", 0.5, 0, 0, 100, 1 ignBlends4_table = array, S16, 20276, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends4_loadBins = array, U16, 20404, [8], "Load", 1, 0, 0, 1000, 0 ignBlends4_rpmBins = array, U16, 20420, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends4_blendParameter = bits, U08, 20436, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends4_yAxisOverride = bits, U08, 20437, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends4_blendBins = array, S16, 20438, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends4_blendValues = array, U08, 20454, [8], "%", 0.5, 0, 0, 100, 1 veBlends1_table = array, S16, 20464, [8x8], "", 0.1, 0, -100, 100, 1 veBlends1_loadBins = array, U16, 20592, [8], "Load", 1, 0, 0, 1000, 0 veBlends1_rpmBins = array, U16, 20608, [8], "RPM", 1, 0, 0, 18000, 0 veBlends1_blendParameter = bits, U08, 20624, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends1_yAxisOverride = bits, U08, 20625, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends1_blendBins = array, S16, 20626, [8], "", 0.1, 0, -1000, 1000, 1 veBlends1_blendValues = array, U08, 20642, [8], "%", 0.5, 0, 0, 100, 1 veBlends2_table = array, S16, 20652, [8x8], "", 0.1, 0, -100, 100, 1 veBlends2_loadBins = array, U16, 20780, [8], "Load", 1, 0, 0, 1000, 0 veBlends2_rpmBins = array, U16, 20796, [8], "RPM", 1, 0, 0, 18000, 0 veBlends2_blendParameter = bits, U08, 20812, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends2_yAxisOverride = bits, U08, 20813, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends2_blendBins = array, S16, 20814, [8], "", 0.1, 0, -1000, 1000, 1 veBlends2_blendValues = array, U08, 20830, [8], "%", 0.5, 0, 0, 100, 1 veBlends3_table = array, S16, 20840, [8x8], "", 0.1, 0, -100, 100, 1 veBlends3_loadBins = array, U16, 20968, [8], "Load", 1, 0, 0, 1000, 0 veBlends3_rpmBins = array, U16, 20984, [8], "RPM", 1, 0, 0, 18000, 0 veBlends3_blendParameter = bits, U08, 21000, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends3_yAxisOverride = bits, U08, 21001, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends3_blendBins = array, S16, 21002, [8], "", 0.1, 0, -1000, 1000, 1 veBlends3_blendValues = array, U08, 21018, [8], "%", 0.5, 0, 0, 100, 1 veBlends4_table = array, S16, 21028, [8x8], "", 0.1, 0, -100, 100, 1 veBlends4_loadBins = array, U16, 21156, [8], "Load", 1, 0, 0, 1000, 0 veBlends4_rpmBins = array, U16, 21172, [8], "RPM", 1, 0, 0, 18000, 0 veBlends4_blendParameter = bits, U08, 21188, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends4_yAxisOverride = bits, U08, 21189, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends4_blendBins = array, S16, 21190, [8], "", 0.1, 0, -1000, 1000, 1 veBlends4_blendValues = array, U08, 21206, [8], "%", 0.5, 0, 0, 100, 1 throttleEstimateEffectiveAreaBins = array, U16, 21216, [12], "%", 0.1, 0, 0, 100, 1 @@ -1554,24 +1562,28 @@ boostOpenLoopBlends1_table = array, S16, 21264, [8x8], "", 0.1, 0, -100, 100, 1 boostOpenLoopBlends1_loadBins = array, U16, 21392, [8], "Load", 1, 0, 0, 1000, 0 boostOpenLoopBlends1_rpmBins = array, U16, 21408, [8], "RPM", 1, 0, 0, 18000, 0 boostOpenLoopBlends1_blendParameter = bits, U08, 21424, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostOpenLoopBlends1_yAxisOverride = bits, U08, 21425, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostOpenLoopBlends1_blendBins = array, S16, 21426, [8], "", 0.1, 0, -1000, 1000, 1 boostOpenLoopBlends1_blendValues = array, U08, 21442, [8], "%", 0.5, 0, 0, 100, 1 boostOpenLoopBlends2_table = array, S16, 21452, [8x8], "", 0.1, 0, -100, 100, 1 boostOpenLoopBlends2_loadBins = array, U16, 21580, [8], "Load", 1, 0, 0, 1000, 0 boostOpenLoopBlends2_rpmBins = array, U16, 21596, [8], "RPM", 1, 0, 0, 18000, 0 boostOpenLoopBlends2_blendParameter = bits, U08, 21612, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostOpenLoopBlends2_yAxisOverride = bits, U08, 21613, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostOpenLoopBlends2_blendBins = array, S16, 21614, [8], "", 0.1, 0, -1000, 1000, 1 boostOpenLoopBlends2_blendValues = array, U08, 21630, [8], "%", 0.5, 0, 0, 100, 1 boostClosedLoopBlends1_table = array, S16, 21640, [8x8], "", 0.1, 0, -100, 100, 1 boostClosedLoopBlends1_loadBins = array, U16, 21768, [8], "Load", 1, 0, 0, 1000, 0 boostClosedLoopBlends1_rpmBins = array, U16, 21784, [8], "RPM", 1, 0, 0, 18000, 0 boostClosedLoopBlends1_blendParameter = bits, U08, 21800, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostClosedLoopBlends1_yAxisOverride = bits, U08, 21801, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostClosedLoopBlends1_blendBins = array, S16, 21802, [8], "", 0.1, 0, -1000, 1000, 1 boostClosedLoopBlends1_blendValues = array, U08, 21818, [8], "%", 0.5, 0, 0, 100, 1 boostClosedLoopBlends2_table = array, S16, 21828, [8x8], "", 0.1, 0, -100, 100, 1 boostClosedLoopBlends2_loadBins = array, U16, 21956, [8], "Load", 1, 0, 0, 1000, 0 boostClosedLoopBlends2_rpmBins = array, U16, 21972, [8], "RPM", 1, 0, 0, 18000, 0 boostClosedLoopBlends2_blendParameter = bits, U08, 21988, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostClosedLoopBlends2_yAxisOverride = bits, U08, 21989, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostClosedLoopBlends2_blendBins = array, S16, 21990, [8], "", 0.1, 0, -1000, 1000, 1 boostClosedLoopBlends2_blendValues = array, U08, 22006, [8], "%", 0.5, 0, 0, 100, 1 tcu_rangeP = array, U08, 22016, [6], "level", 1, 0, 0, 3, 0 @@ -6892,7 +6904,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends1_blendParameter - panel = ignAdder1Bias + field = "Y axis override (set Zero for no override)", ignBlends1_yAxisOverride, {ignBlends1_blendParameter} + panel = ignAdder1Bias, {ignBlends1_blendParameter} dialog = ignAdder2Cfg, "Ignition adder 2 config" field = "#The bias table controls how much of the blend table" @@ -6902,7 +6915,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends2_blendParameter - panel = ignAdder2Bias + field = "Y axis override (set Zero for no override)", ignBlends2_yAxisOverride, {ignBlends2_blendParameter} + panel = ignAdder2Bias, {ignBlends2_blendParameter} dialog = ignAdder3Cfg, "Ignition adder 3 config" field = "#The bias table controls how much of the blend table" @@ -6912,7 +6926,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends3_blendParameter - panel = ignAdder3Bias + field = "Y axis override (set Zero for no override)", ignBlends3_yAxisOverride, {ignBlends3_blendParameter} + panel = ignAdder3Bias, {ignBlends3_blendParameter} dialog = ignAdder4Cfg, "Ignition adder 4 config" field = "#The bias table controls how much of the blend table" @@ -6922,7 +6937,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends4_blendParameter - panel = ignAdder4Bias + field = "Y axis override (set Zero for no override)", ignBlends4_yAxisOverride, {ignBlends4_blendParameter} + panel = ignAdder4Bias, {ignBlends4_blendParameter} dialog = veBlend1Cfg, "VE blend 1 config" field = "#The bias table controls how much of the blend table" @@ -6933,7 +6949,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends1_blendParameter - panel = veBlend1Bias + field = "Y axis override (set Zero for no override)", veBlends1_yAxisOverride, {veBlends1_blendParameter} + panel = veBlend1Bias, {veBlends1_blendParameter} dialog = veBlend2Cfg, "VE blend 2 config" field = "#The bias table controls how much of the blend table" @@ -6944,7 +6961,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends2_blendParameter - panel = veBlend2Bias + field = "Y axis override (set Zero for no override)", veBlends2_yAxisOverride, {veBlends2_blendParameter} + panel = veBlend2Bias, {veBlends2_blendParameter} dialog = veBlend3Cfg, "VE blend 3 config" field = "#The bias table controls how much of the blend table" @@ -6955,7 +6973,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends3_blendParameter - panel = veBlend3Bias + field = "Y axis override (set Zero for no override)", veBlends3_yAxisOverride, {veBlends3_blendParameter} + panel = veBlend3Bias, {veBlends3_blendParameter} dialog = veBlend4Cfg, "VE blend 4 config" field = "#The bias table controls how much of the blend table" @@ -6966,7 +6985,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends4_blendParameter - panel = veBlend4Bias + field = "Y axis override (set Zero for no override)", veBlends4_yAxisOverride, {veBlends4_blendParameter} + panel = veBlend4Bias, {veBlends4_blendParameter} indicatorPanel = isBoostControlledPanel, 1 indicator = {isBoostControlled}, "No Boost Control", "Boost Control Active" @@ -6980,7 +7000,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#parameter below." panel = isBoostControlledPanel field = "Blend parameter", boostOpenLoopBlends1_blendParameter - panel = boostOpenLoopBlend1Bias + field = "Y axis override (set Zero for no override)", boostOpenLoopBlends1_yAxisOverride, {boostOpenLoopBlends1_blendParameter} + panel = boostOpenLoopBlend1Bias, {boostOpenLoopBlends1_blendParameter} dialog = boostOpenBlend2Cfg, "Boost open loop blend 2 config" field = "#The bias table controls how much of the blend table" @@ -6991,7 +7012,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#parameter below." panel = isBoostControlledPanel field = "Blend parameter", boostOpenLoopBlends2_blendParameter - panel = boostOpenLoopBlend2Bias + field = "Y axis override (set Zero for no override)", boostOpenLoopBlends2_yAxisOverride, {boostOpenLoopBlends2_blendParameter} + panel = boostOpenLoopBlend2Bias, {boostOpenLoopBlends2_blendParameter} dialog = boostClosedBlend1Cfg, "Boost closed loop blend 1 config" field = "#The bias table controls how much of the blend table" @@ -7001,7 +7023,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", boostClosedLoopBlends1_blendParameter - panel = boostClosedLoopBlend1Bias + field = "Y axis override (set Zero for no override)", boostClosedLoopBlends1_yAxisOverride, {boostClosedLoopBlends1_blendParameter} + panel = boostClosedLoopBlend1Bias, {boostClosedLoopBlends1_blendParameter} dialog = boostClosedBlend2Cfg, "Boost closed loop blend 2 config" field = "#The bias table controls how much of the blend table" @@ -7011,7 +7034,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", boostClosedLoopBlends2_blendParameter - panel = boostClosedLoopBlend2Bias + field = "Y axis override (set Zero for no override)", boostClosedLoopBlends2_yAxisOverride, {boostClosedLoopBlends2_blendParameter} + panel = boostClosedLoopBlend2Bias, {boostClosedLoopBlends2_blendParameter} dialog = dwellSettings, "", yAxis panel = dwellCorrection diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index bc2670969b..dfc8f5448c 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.2024.01.17.proteus_f4.1173530770" + signature = "rusEFI master.2024.01.17.proteus_f4.3378376462" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.01.17.proteus_f4.1173530770" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.01.17.proteus_f4.3378376462" ; 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 Wed Jan 17 14:06:25 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:41:56 UTC 2024 pageSize = 26176 page = 1 @@ -1504,48 +1504,56 @@ ignBlends1_table = array, S16, 23712, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends1_loadBins = array, U16, 23840, [8], "Load", 1, 0, 0, 1000, 0 ignBlends1_rpmBins = array, U16, 23856, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends1_blendParameter = bits, U08, 23872, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends1_yAxisOverride = bits, U08, 23873, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends1_blendBins = array, S16, 23874, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends1_blendValues = array, U08, 23890, [8], "%", 0.5, 0, 0, 100, 1 ignBlends2_table = array, S16, 23900, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends2_loadBins = array, U16, 24028, [8], "Load", 1, 0, 0, 1000, 0 ignBlends2_rpmBins = array, U16, 24044, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends2_blendParameter = bits, U08, 24060, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends2_yAxisOverride = bits, U08, 24061, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends2_blendBins = array, S16, 24062, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends2_blendValues = array, U08, 24078, [8], "%", 0.5, 0, 0, 100, 1 ignBlends3_table = array, S16, 24088, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends3_loadBins = array, U16, 24216, [8], "Load", 1, 0, 0, 1000, 0 ignBlends3_rpmBins = array, U16, 24232, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends3_blendParameter = bits, U08, 24248, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends3_yAxisOverride = bits, U08, 24249, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends3_blendBins = array, S16, 24250, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends3_blendValues = array, U08, 24266, [8], "%", 0.5, 0, 0, 100, 1 ignBlends4_table = array, S16, 24276, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends4_loadBins = array, U16, 24404, [8], "Load", 1, 0, 0, 1000, 0 ignBlends4_rpmBins = array, U16, 24420, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends4_blendParameter = bits, U08, 24436, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends4_yAxisOverride = bits, U08, 24437, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends4_blendBins = array, S16, 24438, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends4_blendValues = array, U08, 24454, [8], "%", 0.5, 0, 0, 100, 1 veBlends1_table = array, S16, 24464, [8x8], "", 0.1, 0, -100, 100, 1 veBlends1_loadBins = array, U16, 24592, [8], "Load", 1, 0, 0, 1000, 0 veBlends1_rpmBins = array, U16, 24608, [8], "RPM", 1, 0, 0, 18000, 0 veBlends1_blendParameter = bits, U08, 24624, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends1_yAxisOverride = bits, U08, 24625, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends1_blendBins = array, S16, 24626, [8], "", 0.1, 0, -1000, 1000, 1 veBlends1_blendValues = array, U08, 24642, [8], "%", 0.5, 0, 0, 100, 1 veBlends2_table = array, S16, 24652, [8x8], "", 0.1, 0, -100, 100, 1 veBlends2_loadBins = array, U16, 24780, [8], "Load", 1, 0, 0, 1000, 0 veBlends2_rpmBins = array, U16, 24796, [8], "RPM", 1, 0, 0, 18000, 0 veBlends2_blendParameter = bits, U08, 24812, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends2_yAxisOverride = bits, U08, 24813, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends2_blendBins = array, S16, 24814, [8], "", 0.1, 0, -1000, 1000, 1 veBlends2_blendValues = array, U08, 24830, [8], "%", 0.5, 0, 0, 100, 1 veBlends3_table = array, S16, 24840, [8x8], "", 0.1, 0, -100, 100, 1 veBlends3_loadBins = array, U16, 24968, [8], "Load", 1, 0, 0, 1000, 0 veBlends3_rpmBins = array, U16, 24984, [8], "RPM", 1, 0, 0, 18000, 0 veBlends3_blendParameter = bits, U08, 25000, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends3_yAxisOverride = bits, U08, 25001, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends3_blendBins = array, S16, 25002, [8], "", 0.1, 0, -1000, 1000, 1 veBlends3_blendValues = array, U08, 25018, [8], "%", 0.5, 0, 0, 100, 1 veBlends4_table = array, S16, 25028, [8x8], "", 0.1, 0, -100, 100, 1 veBlends4_loadBins = array, U16, 25156, [8], "Load", 1, 0, 0, 1000, 0 veBlends4_rpmBins = array, U16, 25172, [8], "RPM", 1, 0, 0, 18000, 0 veBlends4_blendParameter = bits, U08, 25188, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends4_yAxisOverride = bits, U08, 25189, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends4_blendBins = array, S16, 25190, [8], "", 0.1, 0, -1000, 1000, 1 veBlends4_blendValues = array, U08, 25206, [8], "%", 0.5, 0, 0, 100, 1 throttleEstimateEffectiveAreaBins = array, U16, 25216, [12], "%", 0.1, 0, 0, 100, 1 @@ -1554,24 +1562,28 @@ boostOpenLoopBlends1_table = array, S16, 25264, [8x8], "", 0.1, 0, -100, 100, 1 boostOpenLoopBlends1_loadBins = array, U16, 25392, [8], "Load", 1, 0, 0, 1000, 0 boostOpenLoopBlends1_rpmBins = array, U16, 25408, [8], "RPM", 1, 0, 0, 18000, 0 boostOpenLoopBlends1_blendParameter = bits, U08, 25424, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostOpenLoopBlends1_yAxisOverride = bits, U08, 25425, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostOpenLoopBlends1_blendBins = array, S16, 25426, [8], "", 0.1, 0, -1000, 1000, 1 boostOpenLoopBlends1_blendValues = array, U08, 25442, [8], "%", 0.5, 0, 0, 100, 1 boostOpenLoopBlends2_table = array, S16, 25452, [8x8], "", 0.1, 0, -100, 100, 1 boostOpenLoopBlends2_loadBins = array, U16, 25580, [8], "Load", 1, 0, 0, 1000, 0 boostOpenLoopBlends2_rpmBins = array, U16, 25596, [8], "RPM", 1, 0, 0, 18000, 0 boostOpenLoopBlends2_blendParameter = bits, U08, 25612, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostOpenLoopBlends2_yAxisOverride = bits, U08, 25613, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostOpenLoopBlends2_blendBins = array, S16, 25614, [8], "", 0.1, 0, -1000, 1000, 1 boostOpenLoopBlends2_blendValues = array, U08, 25630, [8], "%", 0.5, 0, 0, 100, 1 boostClosedLoopBlends1_table = array, S16, 25640, [8x8], "", 0.1, 0, -100, 100, 1 boostClosedLoopBlends1_loadBins = array, U16, 25768, [8], "Load", 1, 0, 0, 1000, 0 boostClosedLoopBlends1_rpmBins = array, U16, 25784, [8], "RPM", 1, 0, 0, 18000, 0 boostClosedLoopBlends1_blendParameter = bits, U08, 25800, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostClosedLoopBlends1_yAxisOverride = bits, U08, 25801, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostClosedLoopBlends1_blendBins = array, S16, 25802, [8], "", 0.1, 0, -1000, 1000, 1 boostClosedLoopBlends1_blendValues = array, U08, 25818, [8], "%", 0.5, 0, 0, 100, 1 boostClosedLoopBlends2_table = array, S16, 25828, [8x8], "", 0.1, 0, -100, 100, 1 boostClosedLoopBlends2_loadBins = array, U16, 25956, [8], "Load", 1, 0, 0, 1000, 0 boostClosedLoopBlends2_rpmBins = array, U16, 25972, [8], "RPM", 1, 0, 0, 18000, 0 boostClosedLoopBlends2_blendParameter = bits, U08, 25988, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostClosedLoopBlends2_yAxisOverride = bits, U08, 25989, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostClosedLoopBlends2_blendBins = array, S16, 25990, [8], "", 0.1, 0, -1000, 1000, 1 boostClosedLoopBlends2_blendValues = array, U08, 26006, [8], "%", 0.5, 0, 0, 100, 1 tcu_rangeP = array, U08, 26016, [6], "level", 1, 0, 0, 3, 0 @@ -6907,7 +6919,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends1_blendParameter - panel = ignAdder1Bias + field = "Y axis override (set Zero for no override)", ignBlends1_yAxisOverride, {ignBlends1_blendParameter} + panel = ignAdder1Bias, {ignBlends1_blendParameter} dialog = ignAdder2Cfg, "Ignition adder 2 config" field = "#The bias table controls how much of the blend table" @@ -6917,7 +6930,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends2_blendParameter - panel = ignAdder2Bias + field = "Y axis override (set Zero for no override)", ignBlends2_yAxisOverride, {ignBlends2_blendParameter} + panel = ignAdder2Bias, {ignBlends2_blendParameter} dialog = ignAdder3Cfg, "Ignition adder 3 config" field = "#The bias table controls how much of the blend table" @@ -6927,7 +6941,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends3_blendParameter - panel = ignAdder3Bias + field = "Y axis override (set Zero for no override)", ignBlends3_yAxisOverride, {ignBlends3_blendParameter} + panel = ignAdder3Bias, {ignBlends3_blendParameter} dialog = ignAdder4Cfg, "Ignition adder 4 config" field = "#The bias table controls how much of the blend table" @@ -6937,7 +6952,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends4_blendParameter - panel = ignAdder4Bias + field = "Y axis override (set Zero for no override)", ignBlends4_yAxisOverride, {ignBlends4_blendParameter} + panel = ignAdder4Bias, {ignBlends4_blendParameter} dialog = veBlend1Cfg, "VE blend 1 config" field = "#The bias table controls how much of the blend table" @@ -6948,7 +6964,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends1_blendParameter - panel = veBlend1Bias + field = "Y axis override (set Zero for no override)", veBlends1_yAxisOverride, {veBlends1_blendParameter} + panel = veBlend1Bias, {veBlends1_blendParameter} dialog = veBlend2Cfg, "VE blend 2 config" field = "#The bias table controls how much of the blend table" @@ -6959,7 +6976,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends2_blendParameter - panel = veBlend2Bias + field = "Y axis override (set Zero for no override)", veBlends2_yAxisOverride, {veBlends2_blendParameter} + panel = veBlend2Bias, {veBlends2_blendParameter} dialog = veBlend3Cfg, "VE blend 3 config" field = "#The bias table controls how much of the blend table" @@ -6970,7 +6988,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends3_blendParameter - panel = veBlend3Bias + field = "Y axis override (set Zero for no override)", veBlends3_yAxisOverride, {veBlends3_blendParameter} + panel = veBlend3Bias, {veBlends3_blendParameter} dialog = veBlend4Cfg, "VE blend 4 config" field = "#The bias table controls how much of the blend table" @@ -6981,7 +7000,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends4_blendParameter - panel = veBlend4Bias + field = "Y axis override (set Zero for no override)", veBlends4_yAxisOverride, {veBlends4_blendParameter} + panel = veBlend4Bias, {veBlends4_blendParameter} indicatorPanel = isBoostControlledPanel, 1 indicator = {isBoostControlled}, "No Boost Control", "Boost Control Active" @@ -6995,7 +7015,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#parameter below." panel = isBoostControlledPanel field = "Blend parameter", boostOpenLoopBlends1_blendParameter - panel = boostOpenLoopBlend1Bias + field = "Y axis override (set Zero for no override)", boostOpenLoopBlends1_yAxisOverride, {boostOpenLoopBlends1_blendParameter} + panel = boostOpenLoopBlend1Bias, {boostOpenLoopBlends1_blendParameter} dialog = boostOpenBlend2Cfg, "Boost open loop blend 2 config" field = "#The bias table controls how much of the blend table" @@ -7006,7 +7027,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#parameter below." panel = isBoostControlledPanel field = "Blend parameter", boostOpenLoopBlends2_blendParameter - panel = boostOpenLoopBlend2Bias + field = "Y axis override (set Zero for no override)", boostOpenLoopBlends2_yAxisOverride, {boostOpenLoopBlends2_blendParameter} + panel = boostOpenLoopBlend2Bias, {boostOpenLoopBlends2_blendParameter} dialog = boostClosedBlend1Cfg, "Boost closed loop blend 1 config" field = "#The bias table controls how much of the blend table" @@ -7016,7 +7038,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", boostClosedLoopBlends1_blendParameter - panel = boostClosedLoopBlend1Bias + field = "Y axis override (set Zero for no override)", boostClosedLoopBlends1_yAxisOverride, {boostClosedLoopBlends1_blendParameter} + panel = boostClosedLoopBlend1Bias, {boostClosedLoopBlends1_blendParameter} dialog = boostClosedBlend2Cfg, "Boost closed loop blend 2 config" field = "#The bias table controls how much of the blend table" @@ -7026,7 +7049,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", boostClosedLoopBlends2_blendParameter - panel = boostClosedLoopBlend2Bias + field = "Y axis override (set Zero for no override)", boostClosedLoopBlends2_yAxisOverride, {boostClosedLoopBlends2_blendParameter} + panel = boostClosedLoopBlend2Bias, {boostClosedLoopBlends2_blendParameter} dialog = dwellSettings, "", yAxis panel = dwellCorrection diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index c4ad68247f..ceb7761885 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.2024.01.17.proteus_f7.1173530770" + signature = "rusEFI master.2024.01.17.proteus_f7.3378376462" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.01.17.proteus_f7.1173530770" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.01.17.proteus_f7.3378376462" ; 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 Wed Jan 17 14:06:23 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:41:53 UTC 2024 pageSize = 26176 page = 1 @@ -1504,48 +1504,56 @@ ignBlends1_table = array, S16, 23712, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends1_loadBins = array, U16, 23840, [8], "Load", 1, 0, 0, 1000, 0 ignBlends1_rpmBins = array, U16, 23856, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends1_blendParameter = bits, U08, 23872, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends1_yAxisOverride = bits, U08, 23873, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends1_blendBins = array, S16, 23874, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends1_blendValues = array, U08, 23890, [8], "%", 0.5, 0, 0, 100, 1 ignBlends2_table = array, S16, 23900, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends2_loadBins = array, U16, 24028, [8], "Load", 1, 0, 0, 1000, 0 ignBlends2_rpmBins = array, U16, 24044, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends2_blendParameter = bits, U08, 24060, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends2_yAxisOverride = bits, U08, 24061, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends2_blendBins = array, S16, 24062, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends2_blendValues = array, U08, 24078, [8], "%", 0.5, 0, 0, 100, 1 ignBlends3_table = array, S16, 24088, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends3_loadBins = array, U16, 24216, [8], "Load", 1, 0, 0, 1000, 0 ignBlends3_rpmBins = array, U16, 24232, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends3_blendParameter = bits, U08, 24248, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends3_yAxisOverride = bits, U08, 24249, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends3_blendBins = array, S16, 24250, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends3_blendValues = array, U08, 24266, [8], "%", 0.5, 0, 0, 100, 1 ignBlends4_table = array, S16, 24276, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends4_loadBins = array, U16, 24404, [8], "Load", 1, 0, 0, 1000, 0 ignBlends4_rpmBins = array, U16, 24420, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends4_blendParameter = bits, U08, 24436, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends4_yAxisOverride = bits, U08, 24437, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends4_blendBins = array, S16, 24438, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends4_blendValues = array, U08, 24454, [8], "%", 0.5, 0, 0, 100, 1 veBlends1_table = array, S16, 24464, [8x8], "", 0.1, 0, -100, 100, 1 veBlends1_loadBins = array, U16, 24592, [8], "Load", 1, 0, 0, 1000, 0 veBlends1_rpmBins = array, U16, 24608, [8], "RPM", 1, 0, 0, 18000, 0 veBlends1_blendParameter = bits, U08, 24624, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends1_yAxisOverride = bits, U08, 24625, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends1_blendBins = array, S16, 24626, [8], "", 0.1, 0, -1000, 1000, 1 veBlends1_blendValues = array, U08, 24642, [8], "%", 0.5, 0, 0, 100, 1 veBlends2_table = array, S16, 24652, [8x8], "", 0.1, 0, -100, 100, 1 veBlends2_loadBins = array, U16, 24780, [8], "Load", 1, 0, 0, 1000, 0 veBlends2_rpmBins = array, U16, 24796, [8], "RPM", 1, 0, 0, 18000, 0 veBlends2_blendParameter = bits, U08, 24812, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends2_yAxisOverride = bits, U08, 24813, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends2_blendBins = array, S16, 24814, [8], "", 0.1, 0, -1000, 1000, 1 veBlends2_blendValues = array, U08, 24830, [8], "%", 0.5, 0, 0, 100, 1 veBlends3_table = array, S16, 24840, [8x8], "", 0.1, 0, -100, 100, 1 veBlends3_loadBins = array, U16, 24968, [8], "Load", 1, 0, 0, 1000, 0 veBlends3_rpmBins = array, U16, 24984, [8], "RPM", 1, 0, 0, 18000, 0 veBlends3_blendParameter = bits, U08, 25000, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends3_yAxisOverride = bits, U08, 25001, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends3_blendBins = array, S16, 25002, [8], "", 0.1, 0, -1000, 1000, 1 veBlends3_blendValues = array, U08, 25018, [8], "%", 0.5, 0, 0, 100, 1 veBlends4_table = array, S16, 25028, [8x8], "", 0.1, 0, -100, 100, 1 veBlends4_loadBins = array, U16, 25156, [8], "Load", 1, 0, 0, 1000, 0 veBlends4_rpmBins = array, U16, 25172, [8], "RPM", 1, 0, 0, 18000, 0 veBlends4_blendParameter = bits, U08, 25188, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends4_yAxisOverride = bits, U08, 25189, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends4_blendBins = array, S16, 25190, [8], "", 0.1, 0, -1000, 1000, 1 veBlends4_blendValues = array, U08, 25206, [8], "%", 0.5, 0, 0, 100, 1 throttleEstimateEffectiveAreaBins = array, U16, 25216, [12], "%", 0.1, 0, 0, 100, 1 @@ -1554,24 +1562,28 @@ boostOpenLoopBlends1_table = array, S16, 25264, [8x8], "", 0.1, 0, -100, 100, 1 boostOpenLoopBlends1_loadBins = array, U16, 25392, [8], "Load", 1, 0, 0, 1000, 0 boostOpenLoopBlends1_rpmBins = array, U16, 25408, [8], "RPM", 1, 0, 0, 18000, 0 boostOpenLoopBlends1_blendParameter = bits, U08, 25424, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostOpenLoopBlends1_yAxisOverride = bits, U08, 25425, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostOpenLoopBlends1_blendBins = array, S16, 25426, [8], "", 0.1, 0, -1000, 1000, 1 boostOpenLoopBlends1_blendValues = array, U08, 25442, [8], "%", 0.5, 0, 0, 100, 1 boostOpenLoopBlends2_table = array, S16, 25452, [8x8], "", 0.1, 0, -100, 100, 1 boostOpenLoopBlends2_loadBins = array, U16, 25580, [8], "Load", 1, 0, 0, 1000, 0 boostOpenLoopBlends2_rpmBins = array, U16, 25596, [8], "RPM", 1, 0, 0, 18000, 0 boostOpenLoopBlends2_blendParameter = bits, U08, 25612, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostOpenLoopBlends2_yAxisOverride = bits, U08, 25613, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostOpenLoopBlends2_blendBins = array, S16, 25614, [8], "", 0.1, 0, -1000, 1000, 1 boostOpenLoopBlends2_blendValues = array, U08, 25630, [8], "%", 0.5, 0, 0, 100, 1 boostClosedLoopBlends1_table = array, S16, 25640, [8x8], "", 0.1, 0, -100, 100, 1 boostClosedLoopBlends1_loadBins = array, U16, 25768, [8], "Load", 1, 0, 0, 1000, 0 boostClosedLoopBlends1_rpmBins = array, U16, 25784, [8], "RPM", 1, 0, 0, 18000, 0 boostClosedLoopBlends1_blendParameter = bits, U08, 25800, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostClosedLoopBlends1_yAxisOverride = bits, U08, 25801, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostClosedLoopBlends1_blendBins = array, S16, 25802, [8], "", 0.1, 0, -1000, 1000, 1 boostClosedLoopBlends1_blendValues = array, U08, 25818, [8], "%", 0.5, 0, 0, 100, 1 boostClosedLoopBlends2_table = array, S16, 25828, [8x8], "", 0.1, 0, -100, 100, 1 boostClosedLoopBlends2_loadBins = array, U16, 25956, [8], "Load", 1, 0, 0, 1000, 0 boostClosedLoopBlends2_rpmBins = array, U16, 25972, [8], "RPM", 1, 0, 0, 18000, 0 boostClosedLoopBlends2_blendParameter = bits, U08, 25988, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostClosedLoopBlends2_yAxisOverride = bits, U08, 25989, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostClosedLoopBlends2_blendBins = array, S16, 25990, [8], "", 0.1, 0, -1000, 1000, 1 boostClosedLoopBlends2_blendValues = array, U08, 26006, [8], "%", 0.5, 0, 0, 100, 1 tcu_rangeP = array, U08, 26016, [6], "level", 1, 0, 0, 3, 0 @@ -6907,7 +6919,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends1_blendParameter - panel = ignAdder1Bias + field = "Y axis override (set Zero for no override)", ignBlends1_yAxisOverride, {ignBlends1_blendParameter} + panel = ignAdder1Bias, {ignBlends1_blendParameter} dialog = ignAdder2Cfg, "Ignition adder 2 config" field = "#The bias table controls how much of the blend table" @@ -6917,7 +6930,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends2_blendParameter - panel = ignAdder2Bias + field = "Y axis override (set Zero for no override)", ignBlends2_yAxisOverride, {ignBlends2_blendParameter} + panel = ignAdder2Bias, {ignBlends2_blendParameter} dialog = ignAdder3Cfg, "Ignition adder 3 config" field = "#The bias table controls how much of the blend table" @@ -6927,7 +6941,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends3_blendParameter - panel = ignAdder3Bias + field = "Y axis override (set Zero for no override)", ignBlends3_yAxisOverride, {ignBlends3_blendParameter} + panel = ignAdder3Bias, {ignBlends3_blendParameter} dialog = ignAdder4Cfg, "Ignition adder 4 config" field = "#The bias table controls how much of the blend table" @@ -6937,7 +6952,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends4_blendParameter - panel = ignAdder4Bias + field = "Y axis override (set Zero for no override)", ignBlends4_yAxisOverride, {ignBlends4_blendParameter} + panel = ignAdder4Bias, {ignBlends4_blendParameter} dialog = veBlend1Cfg, "VE blend 1 config" field = "#The bias table controls how much of the blend table" @@ -6948,7 +6964,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends1_blendParameter - panel = veBlend1Bias + field = "Y axis override (set Zero for no override)", veBlends1_yAxisOverride, {veBlends1_blendParameter} + panel = veBlend1Bias, {veBlends1_blendParameter} dialog = veBlend2Cfg, "VE blend 2 config" field = "#The bias table controls how much of the blend table" @@ -6959,7 +6976,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends2_blendParameter - panel = veBlend2Bias + field = "Y axis override (set Zero for no override)", veBlends2_yAxisOverride, {veBlends2_blendParameter} + panel = veBlend2Bias, {veBlends2_blendParameter} dialog = veBlend3Cfg, "VE blend 3 config" field = "#The bias table controls how much of the blend table" @@ -6970,7 +6988,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends3_blendParameter - panel = veBlend3Bias + field = "Y axis override (set Zero for no override)", veBlends3_yAxisOverride, {veBlends3_blendParameter} + panel = veBlend3Bias, {veBlends3_blendParameter} dialog = veBlend4Cfg, "VE blend 4 config" field = "#The bias table controls how much of the blend table" @@ -6981,7 +7000,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends4_blendParameter - panel = veBlend4Bias + field = "Y axis override (set Zero for no override)", veBlends4_yAxisOverride, {veBlends4_blendParameter} + panel = veBlend4Bias, {veBlends4_blendParameter} indicatorPanel = isBoostControlledPanel, 1 indicator = {isBoostControlled}, "No Boost Control", "Boost Control Active" @@ -6995,7 +7015,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#parameter below." panel = isBoostControlledPanel field = "Blend parameter", boostOpenLoopBlends1_blendParameter - panel = boostOpenLoopBlend1Bias + field = "Y axis override (set Zero for no override)", boostOpenLoopBlends1_yAxisOverride, {boostOpenLoopBlends1_blendParameter} + panel = boostOpenLoopBlend1Bias, {boostOpenLoopBlends1_blendParameter} dialog = boostOpenBlend2Cfg, "Boost open loop blend 2 config" field = "#The bias table controls how much of the blend table" @@ -7006,7 +7027,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#parameter below." panel = isBoostControlledPanel field = "Blend parameter", boostOpenLoopBlends2_blendParameter - panel = boostOpenLoopBlend2Bias + field = "Y axis override (set Zero for no override)", boostOpenLoopBlends2_yAxisOverride, {boostOpenLoopBlends2_blendParameter} + panel = boostOpenLoopBlend2Bias, {boostOpenLoopBlends2_blendParameter} dialog = boostClosedBlend1Cfg, "Boost closed loop blend 1 config" field = "#The bias table controls how much of the blend table" @@ -7016,7 +7038,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", boostClosedLoopBlends1_blendParameter - panel = boostClosedLoopBlend1Bias + field = "Y axis override (set Zero for no override)", boostClosedLoopBlends1_yAxisOverride, {boostClosedLoopBlends1_blendParameter} + panel = boostClosedLoopBlend1Bias, {boostClosedLoopBlends1_blendParameter} dialog = boostClosedBlend2Cfg, "Boost closed loop blend 2 config" field = "#The bias table controls how much of the blend table" @@ -7026,7 +7049,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", boostClosedLoopBlends2_blendParameter - panel = boostClosedLoopBlend2Bias + field = "Y axis override (set Zero for no override)", boostClosedLoopBlends2_yAxisOverride, {boostClosedLoopBlends2_blendParameter} + panel = boostClosedLoopBlend2Bias, {boostClosedLoopBlends2_blendParameter} dialog = dwellSettings, "", yAxis panel = dwellCorrection diff --git a/firmware/tunerstudio/generated/rusefi_proteus_h7.ini b/firmware/tunerstudio/generated/rusefi_proteus_h7.ini index eb02dff1de..bc091657d4 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.2024.01.17.proteus_h7.1173530770" + signature = "rusEFI master.2024.01.17.proteus_h7.3378376462" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.01.17.proteus_h7.1173530770" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.01.17.proteus_h7.3378376462" ; 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 Wed Jan 17 14:06:28 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:41:58 UTC 2024 pageSize = 26176 page = 1 @@ -1504,48 +1504,56 @@ ignBlends1_table = array, S16, 23712, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends1_loadBins = array, U16, 23840, [8], "Load", 1, 0, 0, 1000, 0 ignBlends1_rpmBins = array, U16, 23856, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends1_blendParameter = bits, U08, 23872, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends1_yAxisOverride = bits, U08, 23873, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends1_blendBins = array, S16, 23874, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends1_blendValues = array, U08, 23890, [8], "%", 0.5, 0, 0, 100, 1 ignBlends2_table = array, S16, 23900, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends2_loadBins = array, U16, 24028, [8], "Load", 1, 0, 0, 1000, 0 ignBlends2_rpmBins = array, U16, 24044, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends2_blendParameter = bits, U08, 24060, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends2_yAxisOverride = bits, U08, 24061, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends2_blendBins = array, S16, 24062, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends2_blendValues = array, U08, 24078, [8], "%", 0.5, 0, 0, 100, 1 ignBlends3_table = array, S16, 24088, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends3_loadBins = array, U16, 24216, [8], "Load", 1, 0, 0, 1000, 0 ignBlends3_rpmBins = array, U16, 24232, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends3_blendParameter = bits, U08, 24248, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends3_yAxisOverride = bits, U08, 24249, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends3_blendBins = array, S16, 24250, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends3_blendValues = array, U08, 24266, [8], "%", 0.5, 0, 0, 100, 1 ignBlends4_table = array, S16, 24276, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends4_loadBins = array, U16, 24404, [8], "Load", 1, 0, 0, 1000, 0 ignBlends4_rpmBins = array, U16, 24420, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends4_blendParameter = bits, U08, 24436, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends4_yAxisOverride = bits, U08, 24437, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends4_blendBins = array, S16, 24438, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends4_blendValues = array, U08, 24454, [8], "%", 0.5, 0, 0, 100, 1 veBlends1_table = array, S16, 24464, [8x8], "", 0.1, 0, -100, 100, 1 veBlends1_loadBins = array, U16, 24592, [8], "Load", 1, 0, 0, 1000, 0 veBlends1_rpmBins = array, U16, 24608, [8], "RPM", 1, 0, 0, 18000, 0 veBlends1_blendParameter = bits, U08, 24624, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends1_yAxisOverride = bits, U08, 24625, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends1_blendBins = array, S16, 24626, [8], "", 0.1, 0, -1000, 1000, 1 veBlends1_blendValues = array, U08, 24642, [8], "%", 0.5, 0, 0, 100, 1 veBlends2_table = array, S16, 24652, [8x8], "", 0.1, 0, -100, 100, 1 veBlends2_loadBins = array, U16, 24780, [8], "Load", 1, 0, 0, 1000, 0 veBlends2_rpmBins = array, U16, 24796, [8], "RPM", 1, 0, 0, 18000, 0 veBlends2_blendParameter = bits, U08, 24812, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends2_yAxisOverride = bits, U08, 24813, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends2_blendBins = array, S16, 24814, [8], "", 0.1, 0, -1000, 1000, 1 veBlends2_blendValues = array, U08, 24830, [8], "%", 0.5, 0, 0, 100, 1 veBlends3_table = array, S16, 24840, [8x8], "", 0.1, 0, -100, 100, 1 veBlends3_loadBins = array, U16, 24968, [8], "Load", 1, 0, 0, 1000, 0 veBlends3_rpmBins = array, U16, 24984, [8], "RPM", 1, 0, 0, 18000, 0 veBlends3_blendParameter = bits, U08, 25000, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends3_yAxisOverride = bits, U08, 25001, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends3_blendBins = array, S16, 25002, [8], "", 0.1, 0, -1000, 1000, 1 veBlends3_blendValues = array, U08, 25018, [8], "%", 0.5, 0, 0, 100, 1 veBlends4_table = array, S16, 25028, [8x8], "", 0.1, 0, -100, 100, 1 veBlends4_loadBins = array, U16, 25156, [8], "Load", 1, 0, 0, 1000, 0 veBlends4_rpmBins = array, U16, 25172, [8], "RPM", 1, 0, 0, 18000, 0 veBlends4_blendParameter = bits, U08, 25188, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends4_yAxisOverride = bits, U08, 25189, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends4_blendBins = array, S16, 25190, [8], "", 0.1, 0, -1000, 1000, 1 veBlends4_blendValues = array, U08, 25206, [8], "%", 0.5, 0, 0, 100, 1 throttleEstimateEffectiveAreaBins = array, U16, 25216, [12], "%", 0.1, 0, 0, 100, 1 @@ -1554,24 +1562,28 @@ boostOpenLoopBlends1_table = array, S16, 25264, [8x8], "", 0.1, 0, -100, 100, 1 boostOpenLoopBlends1_loadBins = array, U16, 25392, [8], "Load", 1, 0, 0, 1000, 0 boostOpenLoopBlends1_rpmBins = array, U16, 25408, [8], "RPM", 1, 0, 0, 18000, 0 boostOpenLoopBlends1_blendParameter = bits, U08, 25424, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostOpenLoopBlends1_yAxisOverride = bits, U08, 25425, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostOpenLoopBlends1_blendBins = array, S16, 25426, [8], "", 0.1, 0, -1000, 1000, 1 boostOpenLoopBlends1_blendValues = array, U08, 25442, [8], "%", 0.5, 0, 0, 100, 1 boostOpenLoopBlends2_table = array, S16, 25452, [8x8], "", 0.1, 0, -100, 100, 1 boostOpenLoopBlends2_loadBins = array, U16, 25580, [8], "Load", 1, 0, 0, 1000, 0 boostOpenLoopBlends2_rpmBins = array, U16, 25596, [8], "RPM", 1, 0, 0, 18000, 0 boostOpenLoopBlends2_blendParameter = bits, U08, 25612, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostOpenLoopBlends2_yAxisOverride = bits, U08, 25613, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostOpenLoopBlends2_blendBins = array, S16, 25614, [8], "", 0.1, 0, -1000, 1000, 1 boostOpenLoopBlends2_blendValues = array, U08, 25630, [8], "%", 0.5, 0, 0, 100, 1 boostClosedLoopBlends1_table = array, S16, 25640, [8x8], "", 0.1, 0, -100, 100, 1 boostClosedLoopBlends1_loadBins = array, U16, 25768, [8], "Load", 1, 0, 0, 1000, 0 boostClosedLoopBlends1_rpmBins = array, U16, 25784, [8], "RPM", 1, 0, 0, 18000, 0 boostClosedLoopBlends1_blendParameter = bits, U08, 25800, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostClosedLoopBlends1_yAxisOverride = bits, U08, 25801, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostClosedLoopBlends1_blendBins = array, S16, 25802, [8], "", 0.1, 0, -1000, 1000, 1 boostClosedLoopBlends1_blendValues = array, U08, 25818, [8], "%", 0.5, 0, 0, 100, 1 boostClosedLoopBlends2_table = array, S16, 25828, [8x8], "", 0.1, 0, -100, 100, 1 boostClosedLoopBlends2_loadBins = array, U16, 25956, [8], "Load", 1, 0, 0, 1000, 0 boostClosedLoopBlends2_rpmBins = array, U16, 25972, [8], "RPM", 1, 0, 0, 18000, 0 boostClosedLoopBlends2_blendParameter = bits, U08, 25988, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostClosedLoopBlends2_yAxisOverride = bits, U08, 25989, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostClosedLoopBlends2_blendBins = array, S16, 25990, [8], "", 0.1, 0, -1000, 1000, 1 boostClosedLoopBlends2_blendValues = array, U08, 26006, [8], "%", 0.5, 0, 0, 100, 1 tcu_rangeP = array, U08, 26016, [6], "level", 1, 0, 0, 3, 0 @@ -6907,7 +6919,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends1_blendParameter - panel = ignAdder1Bias + field = "Y axis override (set Zero for no override)", ignBlends1_yAxisOverride, {ignBlends1_blendParameter} + panel = ignAdder1Bias, {ignBlends1_blendParameter} dialog = ignAdder2Cfg, "Ignition adder 2 config" field = "#The bias table controls how much of the blend table" @@ -6917,7 +6930,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends2_blendParameter - panel = ignAdder2Bias + field = "Y axis override (set Zero for no override)", ignBlends2_yAxisOverride, {ignBlends2_blendParameter} + panel = ignAdder2Bias, {ignBlends2_blendParameter} dialog = ignAdder3Cfg, "Ignition adder 3 config" field = "#The bias table controls how much of the blend table" @@ -6927,7 +6941,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends3_blendParameter - panel = ignAdder3Bias + field = "Y axis override (set Zero for no override)", ignBlends3_yAxisOverride, {ignBlends3_blendParameter} + panel = ignAdder3Bias, {ignBlends3_blendParameter} dialog = ignAdder4Cfg, "Ignition adder 4 config" field = "#The bias table controls how much of the blend table" @@ -6937,7 +6952,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends4_blendParameter - panel = ignAdder4Bias + field = "Y axis override (set Zero for no override)", ignBlends4_yAxisOverride, {ignBlends4_blendParameter} + panel = ignAdder4Bias, {ignBlends4_blendParameter} dialog = veBlend1Cfg, "VE blend 1 config" field = "#The bias table controls how much of the blend table" @@ -6948,7 +6964,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends1_blendParameter - panel = veBlend1Bias + field = "Y axis override (set Zero for no override)", veBlends1_yAxisOverride, {veBlends1_blendParameter} + panel = veBlend1Bias, {veBlends1_blendParameter} dialog = veBlend2Cfg, "VE blend 2 config" field = "#The bias table controls how much of the blend table" @@ -6959,7 +6976,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends2_blendParameter - panel = veBlend2Bias + field = "Y axis override (set Zero for no override)", veBlends2_yAxisOverride, {veBlends2_blendParameter} + panel = veBlend2Bias, {veBlends2_blendParameter} dialog = veBlend3Cfg, "VE blend 3 config" field = "#The bias table controls how much of the blend table" @@ -6970,7 +6988,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends3_blendParameter - panel = veBlend3Bias + field = "Y axis override (set Zero for no override)", veBlends3_yAxisOverride, {veBlends3_blendParameter} + panel = veBlend3Bias, {veBlends3_blendParameter} dialog = veBlend4Cfg, "VE blend 4 config" field = "#The bias table controls how much of the blend table" @@ -6981,7 +7000,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends4_blendParameter - panel = veBlend4Bias + field = "Y axis override (set Zero for no override)", veBlends4_yAxisOverride, {veBlends4_blendParameter} + panel = veBlend4Bias, {veBlends4_blendParameter} indicatorPanel = isBoostControlledPanel, 1 indicator = {isBoostControlled}, "No Boost Control", "Boost Control Active" @@ -6995,7 +7015,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#parameter below." panel = isBoostControlledPanel field = "Blend parameter", boostOpenLoopBlends1_blendParameter - panel = boostOpenLoopBlend1Bias + field = "Y axis override (set Zero for no override)", boostOpenLoopBlends1_yAxisOverride, {boostOpenLoopBlends1_blendParameter} + panel = boostOpenLoopBlend1Bias, {boostOpenLoopBlends1_blendParameter} dialog = boostOpenBlend2Cfg, "Boost open loop blend 2 config" field = "#The bias table controls how much of the blend table" @@ -7006,7 +7027,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#parameter below." panel = isBoostControlledPanel field = "Blend parameter", boostOpenLoopBlends2_blendParameter - panel = boostOpenLoopBlend2Bias + field = "Y axis override (set Zero for no override)", boostOpenLoopBlends2_yAxisOverride, {boostOpenLoopBlends2_blendParameter} + panel = boostOpenLoopBlend2Bias, {boostOpenLoopBlends2_blendParameter} dialog = boostClosedBlend1Cfg, "Boost closed loop blend 1 config" field = "#The bias table controls how much of the blend table" @@ -7016,7 +7038,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", boostClosedLoopBlends1_blendParameter - panel = boostClosedLoopBlend1Bias + field = "Y axis override (set Zero for no override)", boostClosedLoopBlends1_yAxisOverride, {boostClosedLoopBlends1_blendParameter} + panel = boostClosedLoopBlend1Bias, {boostClosedLoopBlends1_blendParameter} dialog = boostClosedBlend2Cfg, "Boost closed loop blend 2 config" field = "#The bias table controls how much of the blend table" @@ -7026,7 +7049,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", boostClosedLoopBlends2_blendParameter - panel = boostClosedLoopBlend2Bias + field = "Y axis override (set Zero for no override)", boostClosedLoopBlends2_yAxisOverride, {boostClosedLoopBlends2_blendParameter} + panel = boostClosedLoopBlend2Bias, {boostClosedLoopBlends2_blendParameter} dialog = dwellSettings, "", yAxis panel = dwellCorrection diff --git a/firmware/tunerstudio/generated/rusefi_s105.ini b/firmware/tunerstudio/generated/rusefi_s105.ini index 893750045b..056b7b1913 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.2024.01.17.s105.2270432330" + signature = "rusEFI master.2024.01.17.s105.201018326" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.01.17.s105.2270432330" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.01.17.s105.201018326" ; 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 Wed Jan 17 14:06:11 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:41:41 UTC 2024 pageSize = 22176 page = 1 @@ -1504,48 +1504,56 @@ ignBlends1_table = array, S16, 19712, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends1_loadBins = array, U16, 19840, [8], "Load", 1, 0, 0, 1000, 0 ignBlends1_rpmBins = array, U16, 19856, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends1_blendParameter = bits, U08, 19872, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends1_yAxisOverride = bits, U08, 19873, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends1_blendBins = array, S16, 19874, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends1_blendValues = array, U08, 19890, [8], "%", 0.5, 0, 0, 100, 1 ignBlends2_table = array, S16, 19900, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends2_loadBins = array, U16, 20028, [8], "Load", 1, 0, 0, 1000, 0 ignBlends2_rpmBins = array, U16, 20044, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends2_blendParameter = bits, U08, 20060, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends2_yAxisOverride = bits, U08, 20061, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends2_blendBins = array, S16, 20062, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends2_blendValues = array, U08, 20078, [8], "%", 0.5, 0, 0, 100, 1 ignBlends3_table = array, S16, 20088, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends3_loadBins = array, U16, 20216, [8], "Load", 1, 0, 0, 1000, 0 ignBlends3_rpmBins = array, U16, 20232, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends3_blendParameter = bits, U08, 20248, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends3_yAxisOverride = bits, U08, 20249, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends3_blendBins = array, S16, 20250, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends3_blendValues = array, U08, 20266, [8], "%", 0.5, 0, 0, 100, 1 ignBlends4_table = array, S16, 20276, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends4_loadBins = array, U16, 20404, [8], "Load", 1, 0, 0, 1000, 0 ignBlends4_rpmBins = array, U16, 20420, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends4_blendParameter = bits, U08, 20436, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends4_yAxisOverride = bits, U08, 20437, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends4_blendBins = array, S16, 20438, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends4_blendValues = array, U08, 20454, [8], "%", 0.5, 0, 0, 100, 1 veBlends1_table = array, S16, 20464, [8x8], "", 0.1, 0, -100, 100, 1 veBlends1_loadBins = array, U16, 20592, [8], "Load", 1, 0, 0, 1000, 0 veBlends1_rpmBins = array, U16, 20608, [8], "RPM", 1, 0, 0, 18000, 0 veBlends1_blendParameter = bits, U08, 20624, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends1_yAxisOverride = bits, U08, 20625, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends1_blendBins = array, S16, 20626, [8], "", 0.1, 0, -1000, 1000, 1 veBlends1_blendValues = array, U08, 20642, [8], "%", 0.5, 0, 0, 100, 1 veBlends2_table = array, S16, 20652, [8x8], "", 0.1, 0, -100, 100, 1 veBlends2_loadBins = array, U16, 20780, [8], "Load", 1, 0, 0, 1000, 0 veBlends2_rpmBins = array, U16, 20796, [8], "RPM", 1, 0, 0, 18000, 0 veBlends2_blendParameter = bits, U08, 20812, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends2_yAxisOverride = bits, U08, 20813, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends2_blendBins = array, S16, 20814, [8], "", 0.1, 0, -1000, 1000, 1 veBlends2_blendValues = array, U08, 20830, [8], "%", 0.5, 0, 0, 100, 1 veBlends3_table = array, S16, 20840, [8x8], "", 0.1, 0, -100, 100, 1 veBlends3_loadBins = array, U16, 20968, [8], "Load", 1, 0, 0, 1000, 0 veBlends3_rpmBins = array, U16, 20984, [8], "RPM", 1, 0, 0, 18000, 0 veBlends3_blendParameter = bits, U08, 21000, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends3_yAxisOverride = bits, U08, 21001, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends3_blendBins = array, S16, 21002, [8], "", 0.1, 0, -1000, 1000, 1 veBlends3_blendValues = array, U08, 21018, [8], "%", 0.5, 0, 0, 100, 1 veBlends4_table = array, S16, 21028, [8x8], "", 0.1, 0, -100, 100, 1 veBlends4_loadBins = array, U16, 21156, [8], "Load", 1, 0, 0, 1000, 0 veBlends4_rpmBins = array, U16, 21172, [8], "RPM", 1, 0, 0, 18000, 0 veBlends4_blendParameter = bits, U08, 21188, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends4_yAxisOverride = bits, U08, 21189, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends4_blendBins = array, S16, 21190, [8], "", 0.1, 0, -1000, 1000, 1 veBlends4_blendValues = array, U08, 21206, [8], "%", 0.5, 0, 0, 100, 1 throttleEstimateEffectiveAreaBins = array, U16, 21216, [12], "%", 0.1, 0, 0, 100, 1 @@ -1554,24 +1562,28 @@ boostOpenLoopBlends1_table = array, S16, 21264, [8x8], "", 0.1, 0, -100, 100, 1 boostOpenLoopBlends1_loadBins = array, U16, 21392, [8], "Load", 1, 0, 0, 1000, 0 boostOpenLoopBlends1_rpmBins = array, U16, 21408, [8], "RPM", 1, 0, 0, 18000, 0 boostOpenLoopBlends1_blendParameter = bits, U08, 21424, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostOpenLoopBlends1_yAxisOverride = bits, U08, 21425, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostOpenLoopBlends1_blendBins = array, S16, 21426, [8], "", 0.1, 0, -1000, 1000, 1 boostOpenLoopBlends1_blendValues = array, U08, 21442, [8], "%", 0.5, 0, 0, 100, 1 boostOpenLoopBlends2_table = array, S16, 21452, [8x8], "", 0.1, 0, -100, 100, 1 boostOpenLoopBlends2_loadBins = array, U16, 21580, [8], "Load", 1, 0, 0, 1000, 0 boostOpenLoopBlends2_rpmBins = array, U16, 21596, [8], "RPM", 1, 0, 0, 18000, 0 boostOpenLoopBlends2_blendParameter = bits, U08, 21612, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostOpenLoopBlends2_yAxisOverride = bits, U08, 21613, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostOpenLoopBlends2_blendBins = array, S16, 21614, [8], "", 0.1, 0, -1000, 1000, 1 boostOpenLoopBlends2_blendValues = array, U08, 21630, [8], "%", 0.5, 0, 0, 100, 1 boostClosedLoopBlends1_table = array, S16, 21640, [8x8], "", 0.1, 0, -100, 100, 1 boostClosedLoopBlends1_loadBins = array, U16, 21768, [8], "Load", 1, 0, 0, 1000, 0 boostClosedLoopBlends1_rpmBins = array, U16, 21784, [8], "RPM", 1, 0, 0, 18000, 0 boostClosedLoopBlends1_blendParameter = bits, U08, 21800, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostClosedLoopBlends1_yAxisOverride = bits, U08, 21801, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostClosedLoopBlends1_blendBins = array, S16, 21802, [8], "", 0.1, 0, -1000, 1000, 1 boostClosedLoopBlends1_blendValues = array, U08, 21818, [8], "%", 0.5, 0, 0, 100, 1 boostClosedLoopBlends2_table = array, S16, 21828, [8x8], "", 0.1, 0, -100, 100, 1 boostClosedLoopBlends2_loadBins = array, U16, 21956, [8], "Load", 1, 0, 0, 1000, 0 boostClosedLoopBlends2_rpmBins = array, U16, 21972, [8], "RPM", 1, 0, 0, 18000, 0 boostClosedLoopBlends2_blendParameter = bits, U08, 21988, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostClosedLoopBlends2_yAxisOverride = bits, U08, 21989, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostClosedLoopBlends2_blendBins = array, S16, 21990, [8], "", 0.1, 0, -1000, 1000, 1 boostClosedLoopBlends2_blendValues = array, U08, 22006, [8], "%", 0.5, 0, 0, 100, 1 tcu_rangeP = array, U08, 22016, [6], "level", 1, 0, 0, 3, 0 @@ -6898,7 +6910,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends1_blendParameter - panel = ignAdder1Bias + field = "Y axis override (set Zero for no override)", ignBlends1_yAxisOverride, {ignBlends1_blendParameter} + panel = ignAdder1Bias, {ignBlends1_blendParameter} dialog = ignAdder2Cfg, "Ignition adder 2 config" field = "#The bias table controls how much of the blend table" @@ -6908,7 +6921,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends2_blendParameter - panel = ignAdder2Bias + field = "Y axis override (set Zero for no override)", ignBlends2_yAxisOverride, {ignBlends2_blendParameter} + panel = ignAdder2Bias, {ignBlends2_blendParameter} dialog = ignAdder3Cfg, "Ignition adder 3 config" field = "#The bias table controls how much of the blend table" @@ -6918,7 +6932,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends3_blendParameter - panel = ignAdder3Bias + field = "Y axis override (set Zero for no override)", ignBlends3_yAxisOverride, {ignBlends3_blendParameter} + panel = ignAdder3Bias, {ignBlends3_blendParameter} dialog = ignAdder4Cfg, "Ignition adder 4 config" field = "#The bias table controls how much of the blend table" @@ -6928,7 +6943,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends4_blendParameter - panel = ignAdder4Bias + field = "Y axis override (set Zero for no override)", ignBlends4_yAxisOverride, {ignBlends4_blendParameter} + panel = ignAdder4Bias, {ignBlends4_blendParameter} dialog = veBlend1Cfg, "VE blend 1 config" field = "#The bias table controls how much of the blend table" @@ -6939,7 +6955,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends1_blendParameter - panel = veBlend1Bias + field = "Y axis override (set Zero for no override)", veBlends1_yAxisOverride, {veBlends1_blendParameter} + panel = veBlend1Bias, {veBlends1_blendParameter} dialog = veBlend2Cfg, "VE blend 2 config" field = "#The bias table controls how much of the blend table" @@ -6950,7 +6967,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends2_blendParameter - panel = veBlend2Bias + field = "Y axis override (set Zero for no override)", veBlends2_yAxisOverride, {veBlends2_blendParameter} + panel = veBlend2Bias, {veBlends2_blendParameter} dialog = veBlend3Cfg, "VE blend 3 config" field = "#The bias table controls how much of the blend table" @@ -6961,7 +6979,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends3_blendParameter - panel = veBlend3Bias + field = "Y axis override (set Zero for no override)", veBlends3_yAxisOverride, {veBlends3_blendParameter} + panel = veBlend3Bias, {veBlends3_blendParameter} dialog = veBlend4Cfg, "VE blend 4 config" field = "#The bias table controls how much of the blend table" @@ -6972,7 +6991,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends4_blendParameter - panel = veBlend4Bias + field = "Y axis override (set Zero for no override)", veBlends4_yAxisOverride, {veBlends4_blendParameter} + panel = veBlend4Bias, {veBlends4_blendParameter} indicatorPanel = isBoostControlledPanel, 1 indicator = {isBoostControlled}, "No Boost Control", "Boost Control Active" @@ -6986,7 +7006,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#parameter below." panel = isBoostControlledPanel field = "Blend parameter", boostOpenLoopBlends1_blendParameter - panel = boostOpenLoopBlend1Bias + field = "Y axis override (set Zero for no override)", boostOpenLoopBlends1_yAxisOverride, {boostOpenLoopBlends1_blendParameter} + panel = boostOpenLoopBlend1Bias, {boostOpenLoopBlends1_blendParameter} dialog = boostOpenBlend2Cfg, "Boost open loop blend 2 config" field = "#The bias table controls how much of the blend table" @@ -6997,7 +7018,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#parameter below." panel = isBoostControlledPanel field = "Blend parameter", boostOpenLoopBlends2_blendParameter - panel = boostOpenLoopBlend2Bias + field = "Y axis override (set Zero for no override)", boostOpenLoopBlends2_yAxisOverride, {boostOpenLoopBlends2_blendParameter} + panel = boostOpenLoopBlend2Bias, {boostOpenLoopBlends2_blendParameter} dialog = boostClosedBlend1Cfg, "Boost closed loop blend 1 config" field = "#The bias table controls how much of the blend table" @@ -7007,7 +7029,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", boostClosedLoopBlends1_blendParameter - panel = boostClosedLoopBlend1Bias + field = "Y axis override (set Zero for no override)", boostClosedLoopBlends1_yAxisOverride, {boostClosedLoopBlends1_blendParameter} + panel = boostClosedLoopBlend1Bias, {boostClosedLoopBlends1_blendParameter} dialog = boostClosedBlend2Cfg, "Boost closed loop blend 2 config" field = "#The bias table controls how much of the blend table" @@ -7017,7 +7040,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", boostClosedLoopBlends2_blendParameter - panel = boostClosedLoopBlend2Bias + field = "Y axis override (set Zero for no override)", boostClosedLoopBlends2_yAxisOverride, {boostClosedLoopBlends2_blendParameter} + panel = boostClosedLoopBlend2Bias, {boostClosedLoopBlends2_blendParameter} dialog = dwellSettings, "", yAxis panel = dwellCorrection diff --git a/firmware/tunerstudio/generated/rusefi_small-can-board.ini b/firmware/tunerstudio/generated/rusefi_small-can-board.ini index 0458c42772..b0175a3f26 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.2024.01.17.small-can-board.271765893" + signature = "rusEFI master.2024.01.17.small-can-board.2627573273" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.01.17.small-can-board.271765893" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.01.17.small-can-board.2627573273" ; 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 6","INVALID","INVALID","INVALID","A2 Battery Sense","INVALID","INVALID","C2 - Analog/Digital Input 7","C4 - Analog/Digital Input 8" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:06:00 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:41:31 UTC 2024 pageSize = 22176 page = 1 @@ -1504,48 +1504,56 @@ ignBlends1_table = array, S16, 19712, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends1_loadBins = array, U16, 19840, [8], "Load", 1, 0, 0, 1000, 0 ignBlends1_rpmBins = array, U16, 19856, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends1_blendParameter = bits, U08, 19872, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends1_yAxisOverride = bits, U08, 19873, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends1_blendBins = array, S16, 19874, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends1_blendValues = array, U08, 19890, [8], "%", 0.5, 0, 0, 100, 1 ignBlends2_table = array, S16, 19900, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends2_loadBins = array, U16, 20028, [8], "Load", 1, 0, 0, 1000, 0 ignBlends2_rpmBins = array, U16, 20044, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends2_blendParameter = bits, U08, 20060, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends2_yAxisOverride = bits, U08, 20061, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends2_blendBins = array, S16, 20062, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends2_blendValues = array, U08, 20078, [8], "%", 0.5, 0, 0, 100, 1 ignBlends3_table = array, S16, 20088, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends3_loadBins = array, U16, 20216, [8], "Load", 1, 0, 0, 1000, 0 ignBlends3_rpmBins = array, U16, 20232, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends3_blendParameter = bits, U08, 20248, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends3_yAxisOverride = bits, U08, 20249, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends3_blendBins = array, S16, 20250, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends3_blendValues = array, U08, 20266, [8], "%", 0.5, 0, 0, 100, 1 ignBlends4_table = array, S16, 20276, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends4_loadBins = array, U16, 20404, [8], "Load", 1, 0, 0, 1000, 0 ignBlends4_rpmBins = array, U16, 20420, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends4_blendParameter = bits, U08, 20436, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends4_yAxisOverride = bits, U08, 20437, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends4_blendBins = array, S16, 20438, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends4_blendValues = array, U08, 20454, [8], "%", 0.5, 0, 0, 100, 1 veBlends1_table = array, S16, 20464, [8x8], "", 0.1, 0, -100, 100, 1 veBlends1_loadBins = array, U16, 20592, [8], "Load", 1, 0, 0, 1000, 0 veBlends1_rpmBins = array, U16, 20608, [8], "RPM", 1, 0, 0, 18000, 0 veBlends1_blendParameter = bits, U08, 20624, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends1_yAxisOverride = bits, U08, 20625, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends1_blendBins = array, S16, 20626, [8], "", 0.1, 0, -1000, 1000, 1 veBlends1_blendValues = array, U08, 20642, [8], "%", 0.5, 0, 0, 100, 1 veBlends2_table = array, S16, 20652, [8x8], "", 0.1, 0, -100, 100, 1 veBlends2_loadBins = array, U16, 20780, [8], "Load", 1, 0, 0, 1000, 0 veBlends2_rpmBins = array, U16, 20796, [8], "RPM", 1, 0, 0, 18000, 0 veBlends2_blendParameter = bits, U08, 20812, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends2_yAxisOverride = bits, U08, 20813, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends2_blendBins = array, S16, 20814, [8], "", 0.1, 0, -1000, 1000, 1 veBlends2_blendValues = array, U08, 20830, [8], "%", 0.5, 0, 0, 100, 1 veBlends3_table = array, S16, 20840, [8x8], "", 0.1, 0, -100, 100, 1 veBlends3_loadBins = array, U16, 20968, [8], "Load", 1, 0, 0, 1000, 0 veBlends3_rpmBins = array, U16, 20984, [8], "RPM", 1, 0, 0, 18000, 0 veBlends3_blendParameter = bits, U08, 21000, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends3_yAxisOverride = bits, U08, 21001, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends3_blendBins = array, S16, 21002, [8], "", 0.1, 0, -1000, 1000, 1 veBlends3_blendValues = array, U08, 21018, [8], "%", 0.5, 0, 0, 100, 1 veBlends4_table = array, S16, 21028, [8x8], "", 0.1, 0, -100, 100, 1 veBlends4_loadBins = array, U16, 21156, [8], "Load", 1, 0, 0, 1000, 0 veBlends4_rpmBins = array, U16, 21172, [8], "RPM", 1, 0, 0, 18000, 0 veBlends4_blendParameter = bits, U08, 21188, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends4_yAxisOverride = bits, U08, 21189, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends4_blendBins = array, S16, 21190, [8], "", 0.1, 0, -1000, 1000, 1 veBlends4_blendValues = array, U08, 21206, [8], "%", 0.5, 0, 0, 100, 1 throttleEstimateEffectiveAreaBins = array, U16, 21216, [12], "%", 0.1, 0, 0, 100, 1 @@ -1554,24 +1562,28 @@ boostOpenLoopBlends1_table = array, S16, 21264, [8x8], "", 0.1, 0, -100, 100, 1 boostOpenLoopBlends1_loadBins = array, U16, 21392, [8], "Load", 1, 0, 0, 1000, 0 boostOpenLoopBlends1_rpmBins = array, U16, 21408, [8], "RPM", 1, 0, 0, 18000, 0 boostOpenLoopBlends1_blendParameter = bits, U08, 21424, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostOpenLoopBlends1_yAxisOverride = bits, U08, 21425, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostOpenLoopBlends1_blendBins = array, S16, 21426, [8], "", 0.1, 0, -1000, 1000, 1 boostOpenLoopBlends1_blendValues = array, U08, 21442, [8], "%", 0.5, 0, 0, 100, 1 boostOpenLoopBlends2_table = array, S16, 21452, [8x8], "", 0.1, 0, -100, 100, 1 boostOpenLoopBlends2_loadBins = array, U16, 21580, [8], "Load", 1, 0, 0, 1000, 0 boostOpenLoopBlends2_rpmBins = array, U16, 21596, [8], "RPM", 1, 0, 0, 18000, 0 boostOpenLoopBlends2_blendParameter = bits, U08, 21612, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostOpenLoopBlends2_yAxisOverride = bits, U08, 21613, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostOpenLoopBlends2_blendBins = array, S16, 21614, [8], "", 0.1, 0, -1000, 1000, 1 boostOpenLoopBlends2_blendValues = array, U08, 21630, [8], "%", 0.5, 0, 0, 100, 1 boostClosedLoopBlends1_table = array, S16, 21640, [8x8], "", 0.1, 0, -100, 100, 1 boostClosedLoopBlends1_loadBins = array, U16, 21768, [8], "Load", 1, 0, 0, 1000, 0 boostClosedLoopBlends1_rpmBins = array, U16, 21784, [8], "RPM", 1, 0, 0, 18000, 0 boostClosedLoopBlends1_blendParameter = bits, U08, 21800, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostClosedLoopBlends1_yAxisOverride = bits, U08, 21801, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostClosedLoopBlends1_blendBins = array, S16, 21802, [8], "", 0.1, 0, -1000, 1000, 1 boostClosedLoopBlends1_blendValues = array, U08, 21818, [8], "%", 0.5, 0, 0, 100, 1 boostClosedLoopBlends2_table = array, S16, 21828, [8x8], "", 0.1, 0, -100, 100, 1 boostClosedLoopBlends2_loadBins = array, U16, 21956, [8], "Load", 1, 0, 0, 1000, 0 boostClosedLoopBlends2_rpmBins = array, U16, 21972, [8], "RPM", 1, 0, 0, 18000, 0 boostClosedLoopBlends2_blendParameter = bits, U08, 21988, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostClosedLoopBlends2_yAxisOverride = bits, U08, 21989, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostClosedLoopBlends2_blendBins = array, S16, 21990, [8], "", 0.1, 0, -1000, 1000, 1 boostClosedLoopBlends2_blendValues = array, U08, 22006, [8], "%", 0.5, 0, 0, 100, 1 tcu_rangeP = array, U08, 22016, [6], "level", 1, 0, 0, 3, 0 @@ -6897,7 +6909,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends1_blendParameter - panel = ignAdder1Bias + field = "Y axis override (set Zero for no override)", ignBlends1_yAxisOverride, {ignBlends1_blendParameter} + panel = ignAdder1Bias, {ignBlends1_blendParameter} dialog = ignAdder2Cfg, "Ignition adder 2 config" field = "#The bias table controls how much of the blend table" @@ -6907,7 +6920,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends2_blendParameter - panel = ignAdder2Bias + field = "Y axis override (set Zero for no override)", ignBlends2_yAxisOverride, {ignBlends2_blendParameter} + panel = ignAdder2Bias, {ignBlends2_blendParameter} dialog = ignAdder3Cfg, "Ignition adder 3 config" field = "#The bias table controls how much of the blend table" @@ -6917,7 +6931,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends3_blendParameter - panel = ignAdder3Bias + field = "Y axis override (set Zero for no override)", ignBlends3_yAxisOverride, {ignBlends3_blendParameter} + panel = ignAdder3Bias, {ignBlends3_blendParameter} dialog = ignAdder4Cfg, "Ignition adder 4 config" field = "#The bias table controls how much of the blend table" @@ -6927,7 +6942,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends4_blendParameter - panel = ignAdder4Bias + field = "Y axis override (set Zero for no override)", ignBlends4_yAxisOverride, {ignBlends4_blendParameter} + panel = ignAdder4Bias, {ignBlends4_blendParameter} dialog = veBlend1Cfg, "VE blend 1 config" field = "#The bias table controls how much of the blend table" @@ -6938,7 +6954,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends1_blendParameter - panel = veBlend1Bias + field = "Y axis override (set Zero for no override)", veBlends1_yAxisOverride, {veBlends1_blendParameter} + panel = veBlend1Bias, {veBlends1_blendParameter} dialog = veBlend2Cfg, "VE blend 2 config" field = "#The bias table controls how much of the blend table" @@ -6949,7 +6966,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends2_blendParameter - panel = veBlend2Bias + field = "Y axis override (set Zero for no override)", veBlends2_yAxisOverride, {veBlends2_blendParameter} + panel = veBlend2Bias, {veBlends2_blendParameter} dialog = veBlend3Cfg, "VE blend 3 config" field = "#The bias table controls how much of the blend table" @@ -6960,7 +6978,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends3_blendParameter - panel = veBlend3Bias + field = "Y axis override (set Zero for no override)", veBlends3_yAxisOverride, {veBlends3_blendParameter} + panel = veBlend3Bias, {veBlends3_blendParameter} dialog = veBlend4Cfg, "VE blend 4 config" field = "#The bias table controls how much of the blend table" @@ -6971,7 +6990,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends4_blendParameter - panel = veBlend4Bias + field = "Y axis override (set Zero for no override)", veBlends4_yAxisOverride, {veBlends4_blendParameter} + panel = veBlend4Bias, {veBlends4_blendParameter} indicatorPanel = isBoostControlledPanel, 1 indicator = {isBoostControlled}, "No Boost Control", "Boost Control Active" @@ -6985,7 +7005,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#parameter below." panel = isBoostControlledPanel field = "Blend parameter", boostOpenLoopBlends1_blendParameter - panel = boostOpenLoopBlend1Bias + field = "Y axis override (set Zero for no override)", boostOpenLoopBlends1_yAxisOverride, {boostOpenLoopBlends1_blendParameter} + panel = boostOpenLoopBlend1Bias, {boostOpenLoopBlends1_blendParameter} dialog = boostOpenBlend2Cfg, "Boost open loop blend 2 config" field = "#The bias table controls how much of the blend table" @@ -6996,7 +7017,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#parameter below." panel = isBoostControlledPanel field = "Blend parameter", boostOpenLoopBlends2_blendParameter - panel = boostOpenLoopBlend2Bias + field = "Y axis override (set Zero for no override)", boostOpenLoopBlends2_yAxisOverride, {boostOpenLoopBlends2_blendParameter} + panel = boostOpenLoopBlend2Bias, {boostOpenLoopBlends2_blendParameter} dialog = boostClosedBlend1Cfg, "Boost closed loop blend 1 config" field = "#The bias table controls how much of the blend table" @@ -7006,7 +7028,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", boostClosedLoopBlends1_blendParameter - panel = boostClosedLoopBlend1Bias + field = "Y axis override (set Zero for no override)", boostClosedLoopBlends1_yAxisOverride, {boostClosedLoopBlends1_blendParameter} + panel = boostClosedLoopBlend1Bias, {boostClosedLoopBlends1_blendParameter} dialog = boostClosedBlend2Cfg, "Boost closed loop blend 2 config" field = "#The bias table controls how much of the blend table" @@ -7016,7 +7039,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", boostClosedLoopBlends2_blendParameter - panel = boostClosedLoopBlend2Bias + field = "Y axis override (set Zero for no override)", boostClosedLoopBlends2_yAxisOverride, {boostClosedLoopBlends2_blendParameter} + panel = boostClosedLoopBlend2Bias, {boostClosedLoopBlends2_blendParameter} dialog = dwellSettings, "", yAxis panel = dwellCorrection diff --git a/firmware/tunerstudio/generated/rusefi_stm32f413_nucleo.ini b/firmware/tunerstudio/generated/rusefi_stm32f413_nucleo.ini index 0f51b36db4..47d2e39086 100644 --- a/firmware/tunerstudio/generated/rusefi_stm32f413_nucleo.ini +++ b/firmware/tunerstudio/generated/rusefi_stm32f413_nucleo.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.01.17.stm32f413_nucleo.781393164" + signature = "rusEFI master.2024.01.17.stm32f413_nucleo.2721864336" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.01.17.stm32f413_nucleo.781393164" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.01.17.stm32f413_nucleo.2721864336" ; 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 Wed Jan 17 14:06:35 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:42:05 UTC 2024 pageSize = 22176 page = 1 @@ -1504,48 +1504,56 @@ ignBlends1_table = array, S16, 19712, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends1_loadBins = array, U16, 19840, [8], "Load", 1, 0, 0, 1000, 0 ignBlends1_rpmBins = array, U16, 19856, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends1_blendParameter = bits, U08, 19872, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends1_yAxisOverride = bits, U08, 19873, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends1_blendBins = array, S16, 19874, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends1_blendValues = array, U08, 19890, [8], "%", 0.5, 0, 0, 100, 1 ignBlends2_table = array, S16, 19900, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends2_loadBins = array, U16, 20028, [8], "Load", 1, 0, 0, 1000, 0 ignBlends2_rpmBins = array, U16, 20044, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends2_blendParameter = bits, U08, 20060, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends2_yAxisOverride = bits, U08, 20061, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends2_blendBins = array, S16, 20062, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends2_blendValues = array, U08, 20078, [8], "%", 0.5, 0, 0, 100, 1 ignBlends3_table = array, S16, 20088, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends3_loadBins = array, U16, 20216, [8], "Load", 1, 0, 0, 1000, 0 ignBlends3_rpmBins = array, U16, 20232, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends3_blendParameter = bits, U08, 20248, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends3_yAxisOverride = bits, U08, 20249, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends3_blendBins = array, S16, 20250, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends3_blendValues = array, U08, 20266, [8], "%", 0.5, 0, 0, 100, 1 ignBlends4_table = array, S16, 20276, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends4_loadBins = array, U16, 20404, [8], "Load", 1, 0, 0, 1000, 0 ignBlends4_rpmBins = array, U16, 20420, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends4_blendParameter = bits, U08, 20436, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends4_yAxisOverride = bits, U08, 20437, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends4_blendBins = array, S16, 20438, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends4_blendValues = array, U08, 20454, [8], "%", 0.5, 0, 0, 100, 1 veBlends1_table = array, S16, 20464, [8x8], "", 0.1, 0, -100, 100, 1 veBlends1_loadBins = array, U16, 20592, [8], "Load", 1, 0, 0, 1000, 0 veBlends1_rpmBins = array, U16, 20608, [8], "RPM", 1, 0, 0, 18000, 0 veBlends1_blendParameter = bits, U08, 20624, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends1_yAxisOverride = bits, U08, 20625, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends1_blendBins = array, S16, 20626, [8], "", 0.1, 0, -1000, 1000, 1 veBlends1_blendValues = array, U08, 20642, [8], "%", 0.5, 0, 0, 100, 1 veBlends2_table = array, S16, 20652, [8x8], "", 0.1, 0, -100, 100, 1 veBlends2_loadBins = array, U16, 20780, [8], "Load", 1, 0, 0, 1000, 0 veBlends2_rpmBins = array, U16, 20796, [8], "RPM", 1, 0, 0, 18000, 0 veBlends2_blendParameter = bits, U08, 20812, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends2_yAxisOverride = bits, U08, 20813, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends2_blendBins = array, S16, 20814, [8], "", 0.1, 0, -1000, 1000, 1 veBlends2_blendValues = array, U08, 20830, [8], "%", 0.5, 0, 0, 100, 1 veBlends3_table = array, S16, 20840, [8x8], "", 0.1, 0, -100, 100, 1 veBlends3_loadBins = array, U16, 20968, [8], "Load", 1, 0, 0, 1000, 0 veBlends3_rpmBins = array, U16, 20984, [8], "RPM", 1, 0, 0, 18000, 0 veBlends3_blendParameter = bits, U08, 21000, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends3_yAxisOverride = bits, U08, 21001, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends3_blendBins = array, S16, 21002, [8], "", 0.1, 0, -1000, 1000, 1 veBlends3_blendValues = array, U08, 21018, [8], "%", 0.5, 0, 0, 100, 1 veBlends4_table = array, S16, 21028, [8x8], "", 0.1, 0, -100, 100, 1 veBlends4_loadBins = array, U16, 21156, [8], "Load", 1, 0, 0, 1000, 0 veBlends4_rpmBins = array, U16, 21172, [8], "RPM", 1, 0, 0, 18000, 0 veBlends4_blendParameter = bits, U08, 21188, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends4_yAxisOverride = bits, U08, 21189, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends4_blendBins = array, S16, 21190, [8], "", 0.1, 0, -1000, 1000, 1 veBlends4_blendValues = array, U08, 21206, [8], "%", 0.5, 0, 0, 100, 1 throttleEstimateEffectiveAreaBins = array, U16, 21216, [12], "%", 0.1, 0, 0, 100, 1 @@ -1554,24 +1562,28 @@ boostOpenLoopBlends1_table = array, S16, 21264, [8x8], "", 0.1, 0, -100, 100, 1 boostOpenLoopBlends1_loadBins = array, U16, 21392, [8], "Load", 1, 0, 0, 1000, 0 boostOpenLoopBlends1_rpmBins = array, U16, 21408, [8], "RPM", 1, 0, 0, 18000, 0 boostOpenLoopBlends1_blendParameter = bits, U08, 21424, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostOpenLoopBlends1_yAxisOverride = bits, U08, 21425, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostOpenLoopBlends1_blendBins = array, S16, 21426, [8], "", 0.1, 0, -1000, 1000, 1 boostOpenLoopBlends1_blendValues = array, U08, 21442, [8], "%", 0.5, 0, 0, 100, 1 boostOpenLoopBlends2_table = array, S16, 21452, [8x8], "", 0.1, 0, -100, 100, 1 boostOpenLoopBlends2_loadBins = array, U16, 21580, [8], "Load", 1, 0, 0, 1000, 0 boostOpenLoopBlends2_rpmBins = array, U16, 21596, [8], "RPM", 1, 0, 0, 18000, 0 boostOpenLoopBlends2_blendParameter = bits, U08, 21612, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostOpenLoopBlends2_yAxisOverride = bits, U08, 21613, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostOpenLoopBlends2_blendBins = array, S16, 21614, [8], "", 0.1, 0, -1000, 1000, 1 boostOpenLoopBlends2_blendValues = array, U08, 21630, [8], "%", 0.5, 0, 0, 100, 1 boostClosedLoopBlends1_table = array, S16, 21640, [8x8], "", 0.1, 0, -100, 100, 1 boostClosedLoopBlends1_loadBins = array, U16, 21768, [8], "Load", 1, 0, 0, 1000, 0 boostClosedLoopBlends1_rpmBins = array, U16, 21784, [8], "RPM", 1, 0, 0, 18000, 0 boostClosedLoopBlends1_blendParameter = bits, U08, 21800, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostClosedLoopBlends1_yAxisOverride = bits, U08, 21801, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostClosedLoopBlends1_blendBins = array, S16, 21802, [8], "", 0.1, 0, -1000, 1000, 1 boostClosedLoopBlends1_blendValues = array, U08, 21818, [8], "%", 0.5, 0, 0, 100, 1 boostClosedLoopBlends2_table = array, S16, 21828, [8x8], "", 0.1, 0, -100, 100, 1 boostClosedLoopBlends2_loadBins = array, U16, 21956, [8], "Load", 1, 0, 0, 1000, 0 boostClosedLoopBlends2_rpmBins = array, U16, 21972, [8], "RPM", 1, 0, 0, 18000, 0 boostClosedLoopBlends2_blendParameter = bits, U08, 21988, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostClosedLoopBlends2_yAxisOverride = bits, U08, 21989, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostClosedLoopBlends2_blendBins = array, S16, 21990, [8], "", 0.1, 0, -1000, 1000, 1 boostClosedLoopBlends2_blendValues = array, U08, 22006, [8], "%", 0.5, 0, 0, 100, 1 tcu_rangeP = array, U08, 22016, [6], "level", 1, 0, 0, 3, 0 @@ -6897,7 +6909,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends1_blendParameter - panel = ignAdder1Bias + field = "Y axis override (set Zero for no override)", ignBlends1_yAxisOverride, {ignBlends1_blendParameter} + panel = ignAdder1Bias, {ignBlends1_blendParameter} dialog = ignAdder2Cfg, "Ignition adder 2 config" field = "#The bias table controls how much of the blend table" @@ -6907,7 +6920,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends2_blendParameter - panel = ignAdder2Bias + field = "Y axis override (set Zero for no override)", ignBlends2_yAxisOverride, {ignBlends2_blendParameter} + panel = ignAdder2Bias, {ignBlends2_blendParameter} dialog = ignAdder3Cfg, "Ignition adder 3 config" field = "#The bias table controls how much of the blend table" @@ -6917,7 +6931,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends3_blendParameter - panel = ignAdder3Bias + field = "Y axis override (set Zero for no override)", ignBlends3_yAxisOverride, {ignBlends3_blendParameter} + panel = ignAdder3Bias, {ignBlends3_blendParameter} dialog = ignAdder4Cfg, "Ignition adder 4 config" field = "#The bias table controls how much of the blend table" @@ -6927,7 +6942,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends4_blendParameter - panel = ignAdder4Bias + field = "Y axis override (set Zero for no override)", ignBlends4_yAxisOverride, {ignBlends4_blendParameter} + panel = ignAdder4Bias, {ignBlends4_blendParameter} dialog = veBlend1Cfg, "VE blend 1 config" field = "#The bias table controls how much of the blend table" @@ -6938,7 +6954,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends1_blendParameter - panel = veBlend1Bias + field = "Y axis override (set Zero for no override)", veBlends1_yAxisOverride, {veBlends1_blendParameter} + panel = veBlend1Bias, {veBlends1_blendParameter} dialog = veBlend2Cfg, "VE blend 2 config" field = "#The bias table controls how much of the blend table" @@ -6949,7 +6966,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends2_blendParameter - panel = veBlend2Bias + field = "Y axis override (set Zero for no override)", veBlends2_yAxisOverride, {veBlends2_blendParameter} + panel = veBlend2Bias, {veBlends2_blendParameter} dialog = veBlend3Cfg, "VE blend 3 config" field = "#The bias table controls how much of the blend table" @@ -6960,7 +6978,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends3_blendParameter - panel = veBlend3Bias + field = "Y axis override (set Zero for no override)", veBlends3_yAxisOverride, {veBlends3_blendParameter} + panel = veBlend3Bias, {veBlends3_blendParameter} dialog = veBlend4Cfg, "VE blend 4 config" field = "#The bias table controls how much of the blend table" @@ -6971,7 +6990,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends4_blendParameter - panel = veBlend4Bias + field = "Y axis override (set Zero for no override)", veBlends4_yAxisOverride, {veBlends4_blendParameter} + panel = veBlend4Bias, {veBlends4_blendParameter} indicatorPanel = isBoostControlledPanel, 1 indicator = {isBoostControlled}, "No Boost Control", "Boost Control Active" @@ -6985,7 +7005,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#parameter below." panel = isBoostControlledPanel field = "Blend parameter", boostOpenLoopBlends1_blendParameter - panel = boostOpenLoopBlend1Bias + field = "Y axis override (set Zero for no override)", boostOpenLoopBlends1_yAxisOverride, {boostOpenLoopBlends1_blendParameter} + panel = boostOpenLoopBlend1Bias, {boostOpenLoopBlends1_blendParameter} dialog = boostOpenBlend2Cfg, "Boost open loop blend 2 config" field = "#The bias table controls how much of the blend table" @@ -6996,7 +7017,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#parameter below." panel = isBoostControlledPanel field = "Blend parameter", boostOpenLoopBlends2_blendParameter - panel = boostOpenLoopBlend2Bias + field = "Y axis override (set Zero for no override)", boostOpenLoopBlends2_yAxisOverride, {boostOpenLoopBlends2_blendParameter} + panel = boostOpenLoopBlend2Bias, {boostOpenLoopBlends2_blendParameter} dialog = boostClosedBlend1Cfg, "Boost closed loop blend 1 config" field = "#The bias table controls how much of the blend table" @@ -7006,7 +7028,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", boostClosedLoopBlends1_blendParameter - panel = boostClosedLoopBlend1Bias + field = "Y axis override (set Zero for no override)", boostClosedLoopBlends1_yAxisOverride, {boostClosedLoopBlends1_blendParameter} + panel = boostClosedLoopBlend1Bias, {boostClosedLoopBlends1_blendParameter} dialog = boostClosedBlend2Cfg, "Boost closed loop blend 2 config" field = "#The bias table controls how much of the blend table" @@ -7016,7 +7039,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", boostClosedLoopBlends2_blendParameter - panel = boostClosedLoopBlend2Bias + field = "Y axis override (set Zero for no override)", boostClosedLoopBlends2_yAxisOverride, {boostClosedLoopBlends2_blendParameter} + panel = boostClosedLoopBlend2Bias, {boostClosedLoopBlends2_blendParameter} dialog = dwellSettings, "", yAxis panel = dwellCorrection diff --git a/firmware/tunerstudio/generated/rusefi_stm32f429_nucleo.ini b/firmware/tunerstudio/generated/rusefi_stm32f429_nucleo.ini index e44dd2b016..fa7df92c95 100644 --- a/firmware/tunerstudio/generated/rusefi_stm32f429_nucleo.ini +++ b/firmware/tunerstudio/generated/rusefi_stm32f429_nucleo.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.01.17.stm32f429_nucleo.781393164" + signature = "rusEFI master.2024.01.17.stm32f429_nucleo.2721864336" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.01.17.stm32f429_nucleo.781393164" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.01.17.stm32f429_nucleo.2721864336" ; 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 Wed Jan 17 14:06:38 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:42:08 UTC 2024 pageSize = 22176 page = 1 @@ -1504,48 +1504,56 @@ ignBlends1_table = array, S16, 19712, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends1_loadBins = array, U16, 19840, [8], "Load", 1, 0, 0, 1000, 0 ignBlends1_rpmBins = array, U16, 19856, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends1_blendParameter = bits, U08, 19872, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends1_yAxisOverride = bits, U08, 19873, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends1_blendBins = array, S16, 19874, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends1_blendValues = array, U08, 19890, [8], "%", 0.5, 0, 0, 100, 1 ignBlends2_table = array, S16, 19900, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends2_loadBins = array, U16, 20028, [8], "Load", 1, 0, 0, 1000, 0 ignBlends2_rpmBins = array, U16, 20044, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends2_blendParameter = bits, U08, 20060, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends2_yAxisOverride = bits, U08, 20061, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends2_blendBins = array, S16, 20062, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends2_blendValues = array, U08, 20078, [8], "%", 0.5, 0, 0, 100, 1 ignBlends3_table = array, S16, 20088, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends3_loadBins = array, U16, 20216, [8], "Load", 1, 0, 0, 1000, 0 ignBlends3_rpmBins = array, U16, 20232, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends3_blendParameter = bits, U08, 20248, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends3_yAxisOverride = bits, U08, 20249, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends3_blendBins = array, S16, 20250, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends3_blendValues = array, U08, 20266, [8], "%", 0.5, 0, 0, 100, 1 ignBlends4_table = array, S16, 20276, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends4_loadBins = array, U16, 20404, [8], "Load", 1, 0, 0, 1000, 0 ignBlends4_rpmBins = array, U16, 20420, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends4_blendParameter = bits, U08, 20436, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends4_yAxisOverride = bits, U08, 20437, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends4_blendBins = array, S16, 20438, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends4_blendValues = array, U08, 20454, [8], "%", 0.5, 0, 0, 100, 1 veBlends1_table = array, S16, 20464, [8x8], "", 0.1, 0, -100, 100, 1 veBlends1_loadBins = array, U16, 20592, [8], "Load", 1, 0, 0, 1000, 0 veBlends1_rpmBins = array, U16, 20608, [8], "RPM", 1, 0, 0, 18000, 0 veBlends1_blendParameter = bits, U08, 20624, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends1_yAxisOverride = bits, U08, 20625, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends1_blendBins = array, S16, 20626, [8], "", 0.1, 0, -1000, 1000, 1 veBlends1_blendValues = array, U08, 20642, [8], "%", 0.5, 0, 0, 100, 1 veBlends2_table = array, S16, 20652, [8x8], "", 0.1, 0, -100, 100, 1 veBlends2_loadBins = array, U16, 20780, [8], "Load", 1, 0, 0, 1000, 0 veBlends2_rpmBins = array, U16, 20796, [8], "RPM", 1, 0, 0, 18000, 0 veBlends2_blendParameter = bits, U08, 20812, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends2_yAxisOverride = bits, U08, 20813, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends2_blendBins = array, S16, 20814, [8], "", 0.1, 0, -1000, 1000, 1 veBlends2_blendValues = array, U08, 20830, [8], "%", 0.5, 0, 0, 100, 1 veBlends3_table = array, S16, 20840, [8x8], "", 0.1, 0, -100, 100, 1 veBlends3_loadBins = array, U16, 20968, [8], "Load", 1, 0, 0, 1000, 0 veBlends3_rpmBins = array, U16, 20984, [8], "RPM", 1, 0, 0, 18000, 0 veBlends3_blendParameter = bits, U08, 21000, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends3_yAxisOverride = bits, U08, 21001, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends3_blendBins = array, S16, 21002, [8], "", 0.1, 0, -1000, 1000, 1 veBlends3_blendValues = array, U08, 21018, [8], "%", 0.5, 0, 0, 100, 1 veBlends4_table = array, S16, 21028, [8x8], "", 0.1, 0, -100, 100, 1 veBlends4_loadBins = array, U16, 21156, [8], "Load", 1, 0, 0, 1000, 0 veBlends4_rpmBins = array, U16, 21172, [8], "RPM", 1, 0, 0, 18000, 0 veBlends4_blendParameter = bits, U08, 21188, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends4_yAxisOverride = bits, U08, 21189, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends4_blendBins = array, S16, 21190, [8], "", 0.1, 0, -1000, 1000, 1 veBlends4_blendValues = array, U08, 21206, [8], "%", 0.5, 0, 0, 100, 1 throttleEstimateEffectiveAreaBins = array, U16, 21216, [12], "%", 0.1, 0, 0, 100, 1 @@ -1554,24 +1562,28 @@ boostOpenLoopBlends1_table = array, S16, 21264, [8x8], "", 0.1, 0, -100, 100, 1 boostOpenLoopBlends1_loadBins = array, U16, 21392, [8], "Load", 1, 0, 0, 1000, 0 boostOpenLoopBlends1_rpmBins = array, U16, 21408, [8], "RPM", 1, 0, 0, 18000, 0 boostOpenLoopBlends1_blendParameter = bits, U08, 21424, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostOpenLoopBlends1_yAxisOverride = bits, U08, 21425, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostOpenLoopBlends1_blendBins = array, S16, 21426, [8], "", 0.1, 0, -1000, 1000, 1 boostOpenLoopBlends1_blendValues = array, U08, 21442, [8], "%", 0.5, 0, 0, 100, 1 boostOpenLoopBlends2_table = array, S16, 21452, [8x8], "", 0.1, 0, -100, 100, 1 boostOpenLoopBlends2_loadBins = array, U16, 21580, [8], "Load", 1, 0, 0, 1000, 0 boostOpenLoopBlends2_rpmBins = array, U16, 21596, [8], "RPM", 1, 0, 0, 18000, 0 boostOpenLoopBlends2_blendParameter = bits, U08, 21612, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostOpenLoopBlends2_yAxisOverride = bits, U08, 21613, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostOpenLoopBlends2_blendBins = array, S16, 21614, [8], "", 0.1, 0, -1000, 1000, 1 boostOpenLoopBlends2_blendValues = array, U08, 21630, [8], "%", 0.5, 0, 0, 100, 1 boostClosedLoopBlends1_table = array, S16, 21640, [8x8], "", 0.1, 0, -100, 100, 1 boostClosedLoopBlends1_loadBins = array, U16, 21768, [8], "Load", 1, 0, 0, 1000, 0 boostClosedLoopBlends1_rpmBins = array, U16, 21784, [8], "RPM", 1, 0, 0, 18000, 0 boostClosedLoopBlends1_blendParameter = bits, U08, 21800, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostClosedLoopBlends1_yAxisOverride = bits, U08, 21801, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostClosedLoopBlends1_blendBins = array, S16, 21802, [8], "", 0.1, 0, -1000, 1000, 1 boostClosedLoopBlends1_blendValues = array, U08, 21818, [8], "%", 0.5, 0, 0, 100, 1 boostClosedLoopBlends2_table = array, S16, 21828, [8x8], "", 0.1, 0, -100, 100, 1 boostClosedLoopBlends2_loadBins = array, U16, 21956, [8], "Load", 1, 0, 0, 1000, 0 boostClosedLoopBlends2_rpmBins = array, U16, 21972, [8], "RPM", 1, 0, 0, 18000, 0 boostClosedLoopBlends2_blendParameter = bits, U08, 21988, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostClosedLoopBlends2_yAxisOverride = bits, U08, 21989, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostClosedLoopBlends2_blendBins = array, S16, 21990, [8], "", 0.1, 0, -1000, 1000, 1 boostClosedLoopBlends2_blendValues = array, U08, 22006, [8], "%", 0.5, 0, 0, 100, 1 tcu_rangeP = array, U08, 22016, [6], "level", 1, 0, 0, 3, 0 @@ -6897,7 +6909,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends1_blendParameter - panel = ignAdder1Bias + field = "Y axis override (set Zero for no override)", ignBlends1_yAxisOverride, {ignBlends1_blendParameter} + panel = ignAdder1Bias, {ignBlends1_blendParameter} dialog = ignAdder2Cfg, "Ignition adder 2 config" field = "#The bias table controls how much of the blend table" @@ -6907,7 +6920,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends2_blendParameter - panel = ignAdder2Bias + field = "Y axis override (set Zero for no override)", ignBlends2_yAxisOverride, {ignBlends2_blendParameter} + panel = ignAdder2Bias, {ignBlends2_blendParameter} dialog = ignAdder3Cfg, "Ignition adder 3 config" field = "#The bias table controls how much of the blend table" @@ -6917,7 +6931,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends3_blendParameter - panel = ignAdder3Bias + field = "Y axis override (set Zero for no override)", ignBlends3_yAxisOverride, {ignBlends3_blendParameter} + panel = ignAdder3Bias, {ignBlends3_blendParameter} dialog = ignAdder4Cfg, "Ignition adder 4 config" field = "#The bias table controls how much of the blend table" @@ -6927,7 +6942,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends4_blendParameter - panel = ignAdder4Bias + field = "Y axis override (set Zero for no override)", ignBlends4_yAxisOverride, {ignBlends4_blendParameter} + panel = ignAdder4Bias, {ignBlends4_blendParameter} dialog = veBlend1Cfg, "VE blend 1 config" field = "#The bias table controls how much of the blend table" @@ -6938,7 +6954,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends1_blendParameter - panel = veBlend1Bias + field = "Y axis override (set Zero for no override)", veBlends1_yAxisOverride, {veBlends1_blendParameter} + panel = veBlend1Bias, {veBlends1_blendParameter} dialog = veBlend2Cfg, "VE blend 2 config" field = "#The bias table controls how much of the blend table" @@ -6949,7 +6966,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends2_blendParameter - panel = veBlend2Bias + field = "Y axis override (set Zero for no override)", veBlends2_yAxisOverride, {veBlends2_blendParameter} + panel = veBlend2Bias, {veBlends2_blendParameter} dialog = veBlend3Cfg, "VE blend 3 config" field = "#The bias table controls how much of the blend table" @@ -6960,7 +6978,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends3_blendParameter - panel = veBlend3Bias + field = "Y axis override (set Zero for no override)", veBlends3_yAxisOverride, {veBlends3_blendParameter} + panel = veBlend3Bias, {veBlends3_blendParameter} dialog = veBlend4Cfg, "VE blend 4 config" field = "#The bias table controls how much of the blend table" @@ -6971,7 +6990,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends4_blendParameter - panel = veBlend4Bias + field = "Y axis override (set Zero for no override)", veBlends4_yAxisOverride, {veBlends4_blendParameter} + panel = veBlend4Bias, {veBlends4_blendParameter} indicatorPanel = isBoostControlledPanel, 1 indicator = {isBoostControlled}, "No Boost Control", "Boost Control Active" @@ -6985,7 +7005,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#parameter below." panel = isBoostControlledPanel field = "Blend parameter", boostOpenLoopBlends1_blendParameter - panel = boostOpenLoopBlend1Bias + field = "Y axis override (set Zero for no override)", boostOpenLoopBlends1_yAxisOverride, {boostOpenLoopBlends1_blendParameter} + panel = boostOpenLoopBlend1Bias, {boostOpenLoopBlends1_blendParameter} dialog = boostOpenBlend2Cfg, "Boost open loop blend 2 config" field = "#The bias table controls how much of the blend table" @@ -6996,7 +7017,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#parameter below." panel = isBoostControlledPanel field = "Blend parameter", boostOpenLoopBlends2_blendParameter - panel = boostOpenLoopBlend2Bias + field = "Y axis override (set Zero for no override)", boostOpenLoopBlends2_yAxisOverride, {boostOpenLoopBlends2_blendParameter} + panel = boostOpenLoopBlend2Bias, {boostOpenLoopBlends2_blendParameter} dialog = boostClosedBlend1Cfg, "Boost closed loop blend 1 config" field = "#The bias table controls how much of the blend table" @@ -7006,7 +7028,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", boostClosedLoopBlends1_blendParameter - panel = boostClosedLoopBlend1Bias + field = "Y axis override (set Zero for no override)", boostClosedLoopBlends1_yAxisOverride, {boostClosedLoopBlends1_blendParameter} + panel = boostClosedLoopBlend1Bias, {boostClosedLoopBlends1_blendParameter} dialog = boostClosedBlend2Cfg, "Boost closed loop blend 2 config" field = "#The bias table controls how much of the blend table" @@ -7016,7 +7039,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", boostClosedLoopBlends2_blendParameter - panel = boostClosedLoopBlend2Bias + field = "Y axis override (set Zero for no override)", boostClosedLoopBlends2_yAxisOverride, {boostClosedLoopBlends2_blendParameter} + panel = boostClosedLoopBlend2Bias, {boostClosedLoopBlends2_blendParameter} dialog = dwellSettings, "", yAxis panel = dwellCorrection diff --git a/firmware/tunerstudio/generated/rusefi_stm32f767_nucleo.ini b/firmware/tunerstudio/generated/rusefi_stm32f767_nucleo.ini index 0f3b8f0555..b62840d818 100644 --- a/firmware/tunerstudio/generated/rusefi_stm32f767_nucleo.ini +++ b/firmware/tunerstudio/generated/rusefi_stm32f767_nucleo.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.01.17.stm32f767_nucleo.781393164" + signature = "rusEFI master.2024.01.17.stm32f767_nucleo.2721864336" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.01.17.stm32f767_nucleo.781393164" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.01.17.stm32f767_nucleo.2721864336" ; 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 Wed Jan 17 14:06:40 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:42:10 UTC 2024 pageSize = 22176 page = 1 @@ -1504,48 +1504,56 @@ ignBlends1_table = array, S16, 19712, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends1_loadBins = array, U16, 19840, [8], "Load", 1, 0, 0, 1000, 0 ignBlends1_rpmBins = array, U16, 19856, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends1_blendParameter = bits, U08, 19872, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends1_yAxisOverride = bits, U08, 19873, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends1_blendBins = array, S16, 19874, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends1_blendValues = array, U08, 19890, [8], "%", 0.5, 0, 0, 100, 1 ignBlends2_table = array, S16, 19900, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends2_loadBins = array, U16, 20028, [8], "Load", 1, 0, 0, 1000, 0 ignBlends2_rpmBins = array, U16, 20044, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends2_blendParameter = bits, U08, 20060, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends2_yAxisOverride = bits, U08, 20061, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends2_blendBins = array, S16, 20062, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends2_blendValues = array, U08, 20078, [8], "%", 0.5, 0, 0, 100, 1 ignBlends3_table = array, S16, 20088, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends3_loadBins = array, U16, 20216, [8], "Load", 1, 0, 0, 1000, 0 ignBlends3_rpmBins = array, U16, 20232, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends3_blendParameter = bits, U08, 20248, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends3_yAxisOverride = bits, U08, 20249, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends3_blendBins = array, S16, 20250, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends3_blendValues = array, U08, 20266, [8], "%", 0.5, 0, 0, 100, 1 ignBlends4_table = array, S16, 20276, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends4_loadBins = array, U16, 20404, [8], "Load", 1, 0, 0, 1000, 0 ignBlends4_rpmBins = array, U16, 20420, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends4_blendParameter = bits, U08, 20436, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends4_yAxisOverride = bits, U08, 20437, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends4_blendBins = array, S16, 20438, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends4_blendValues = array, U08, 20454, [8], "%", 0.5, 0, 0, 100, 1 veBlends1_table = array, S16, 20464, [8x8], "", 0.1, 0, -100, 100, 1 veBlends1_loadBins = array, U16, 20592, [8], "Load", 1, 0, 0, 1000, 0 veBlends1_rpmBins = array, U16, 20608, [8], "RPM", 1, 0, 0, 18000, 0 veBlends1_blendParameter = bits, U08, 20624, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends1_yAxisOverride = bits, U08, 20625, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends1_blendBins = array, S16, 20626, [8], "", 0.1, 0, -1000, 1000, 1 veBlends1_blendValues = array, U08, 20642, [8], "%", 0.5, 0, 0, 100, 1 veBlends2_table = array, S16, 20652, [8x8], "", 0.1, 0, -100, 100, 1 veBlends2_loadBins = array, U16, 20780, [8], "Load", 1, 0, 0, 1000, 0 veBlends2_rpmBins = array, U16, 20796, [8], "RPM", 1, 0, 0, 18000, 0 veBlends2_blendParameter = bits, U08, 20812, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends2_yAxisOverride = bits, U08, 20813, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends2_blendBins = array, S16, 20814, [8], "", 0.1, 0, -1000, 1000, 1 veBlends2_blendValues = array, U08, 20830, [8], "%", 0.5, 0, 0, 100, 1 veBlends3_table = array, S16, 20840, [8x8], "", 0.1, 0, -100, 100, 1 veBlends3_loadBins = array, U16, 20968, [8], "Load", 1, 0, 0, 1000, 0 veBlends3_rpmBins = array, U16, 20984, [8], "RPM", 1, 0, 0, 18000, 0 veBlends3_blendParameter = bits, U08, 21000, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends3_yAxisOverride = bits, U08, 21001, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends3_blendBins = array, S16, 21002, [8], "", 0.1, 0, -1000, 1000, 1 veBlends3_blendValues = array, U08, 21018, [8], "%", 0.5, 0, 0, 100, 1 veBlends4_table = array, S16, 21028, [8x8], "", 0.1, 0, -100, 100, 1 veBlends4_loadBins = array, U16, 21156, [8], "Load", 1, 0, 0, 1000, 0 veBlends4_rpmBins = array, U16, 21172, [8], "RPM", 1, 0, 0, 18000, 0 veBlends4_blendParameter = bits, U08, 21188, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends4_yAxisOverride = bits, U08, 21189, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends4_blendBins = array, S16, 21190, [8], "", 0.1, 0, -1000, 1000, 1 veBlends4_blendValues = array, U08, 21206, [8], "%", 0.5, 0, 0, 100, 1 throttleEstimateEffectiveAreaBins = array, U16, 21216, [12], "%", 0.1, 0, 0, 100, 1 @@ -1554,24 +1562,28 @@ boostOpenLoopBlends1_table = array, S16, 21264, [8x8], "", 0.1, 0, -100, 100, 1 boostOpenLoopBlends1_loadBins = array, U16, 21392, [8], "Load", 1, 0, 0, 1000, 0 boostOpenLoopBlends1_rpmBins = array, U16, 21408, [8], "RPM", 1, 0, 0, 18000, 0 boostOpenLoopBlends1_blendParameter = bits, U08, 21424, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostOpenLoopBlends1_yAxisOverride = bits, U08, 21425, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostOpenLoopBlends1_blendBins = array, S16, 21426, [8], "", 0.1, 0, -1000, 1000, 1 boostOpenLoopBlends1_blendValues = array, U08, 21442, [8], "%", 0.5, 0, 0, 100, 1 boostOpenLoopBlends2_table = array, S16, 21452, [8x8], "", 0.1, 0, -100, 100, 1 boostOpenLoopBlends2_loadBins = array, U16, 21580, [8], "Load", 1, 0, 0, 1000, 0 boostOpenLoopBlends2_rpmBins = array, U16, 21596, [8], "RPM", 1, 0, 0, 18000, 0 boostOpenLoopBlends2_blendParameter = bits, U08, 21612, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostOpenLoopBlends2_yAxisOverride = bits, U08, 21613, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostOpenLoopBlends2_blendBins = array, S16, 21614, [8], "", 0.1, 0, -1000, 1000, 1 boostOpenLoopBlends2_blendValues = array, U08, 21630, [8], "%", 0.5, 0, 0, 100, 1 boostClosedLoopBlends1_table = array, S16, 21640, [8x8], "", 0.1, 0, -100, 100, 1 boostClosedLoopBlends1_loadBins = array, U16, 21768, [8], "Load", 1, 0, 0, 1000, 0 boostClosedLoopBlends1_rpmBins = array, U16, 21784, [8], "RPM", 1, 0, 0, 18000, 0 boostClosedLoopBlends1_blendParameter = bits, U08, 21800, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostClosedLoopBlends1_yAxisOverride = bits, U08, 21801, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostClosedLoopBlends1_blendBins = array, S16, 21802, [8], "", 0.1, 0, -1000, 1000, 1 boostClosedLoopBlends1_blendValues = array, U08, 21818, [8], "%", 0.5, 0, 0, 100, 1 boostClosedLoopBlends2_table = array, S16, 21828, [8x8], "", 0.1, 0, -100, 100, 1 boostClosedLoopBlends2_loadBins = array, U16, 21956, [8], "Load", 1, 0, 0, 1000, 0 boostClosedLoopBlends2_rpmBins = array, U16, 21972, [8], "RPM", 1, 0, 0, 18000, 0 boostClosedLoopBlends2_blendParameter = bits, U08, 21988, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostClosedLoopBlends2_yAxisOverride = bits, U08, 21989, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostClosedLoopBlends2_blendBins = array, S16, 21990, [8], "", 0.1, 0, -1000, 1000, 1 boostClosedLoopBlends2_blendValues = array, U08, 22006, [8], "%", 0.5, 0, 0, 100, 1 tcu_rangeP = array, U08, 22016, [6], "level", 1, 0, 0, 3, 0 @@ -6897,7 +6909,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends1_blendParameter - panel = ignAdder1Bias + field = "Y axis override (set Zero for no override)", ignBlends1_yAxisOverride, {ignBlends1_blendParameter} + panel = ignAdder1Bias, {ignBlends1_blendParameter} dialog = ignAdder2Cfg, "Ignition adder 2 config" field = "#The bias table controls how much of the blend table" @@ -6907,7 +6920,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends2_blendParameter - panel = ignAdder2Bias + field = "Y axis override (set Zero for no override)", ignBlends2_yAxisOverride, {ignBlends2_blendParameter} + panel = ignAdder2Bias, {ignBlends2_blendParameter} dialog = ignAdder3Cfg, "Ignition adder 3 config" field = "#The bias table controls how much of the blend table" @@ -6917,7 +6931,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends3_blendParameter - panel = ignAdder3Bias + field = "Y axis override (set Zero for no override)", ignBlends3_yAxisOverride, {ignBlends3_blendParameter} + panel = ignAdder3Bias, {ignBlends3_blendParameter} dialog = ignAdder4Cfg, "Ignition adder 4 config" field = "#The bias table controls how much of the blend table" @@ -6927,7 +6942,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends4_blendParameter - panel = ignAdder4Bias + field = "Y axis override (set Zero for no override)", ignBlends4_yAxisOverride, {ignBlends4_blendParameter} + panel = ignAdder4Bias, {ignBlends4_blendParameter} dialog = veBlend1Cfg, "VE blend 1 config" field = "#The bias table controls how much of the blend table" @@ -6938,7 +6954,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends1_blendParameter - panel = veBlend1Bias + field = "Y axis override (set Zero for no override)", veBlends1_yAxisOverride, {veBlends1_blendParameter} + panel = veBlend1Bias, {veBlends1_blendParameter} dialog = veBlend2Cfg, "VE blend 2 config" field = "#The bias table controls how much of the blend table" @@ -6949,7 +6966,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends2_blendParameter - panel = veBlend2Bias + field = "Y axis override (set Zero for no override)", veBlends2_yAxisOverride, {veBlends2_blendParameter} + panel = veBlend2Bias, {veBlends2_blendParameter} dialog = veBlend3Cfg, "VE blend 3 config" field = "#The bias table controls how much of the blend table" @@ -6960,7 +6978,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends3_blendParameter - panel = veBlend3Bias + field = "Y axis override (set Zero for no override)", veBlends3_yAxisOverride, {veBlends3_blendParameter} + panel = veBlend3Bias, {veBlends3_blendParameter} dialog = veBlend4Cfg, "VE blend 4 config" field = "#The bias table controls how much of the blend table" @@ -6971,7 +6990,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends4_blendParameter - panel = veBlend4Bias + field = "Y axis override (set Zero for no override)", veBlends4_yAxisOverride, {veBlends4_blendParameter} + panel = veBlend4Bias, {veBlends4_blendParameter} indicatorPanel = isBoostControlledPanel, 1 indicator = {isBoostControlled}, "No Boost Control", "Boost Control Active" @@ -6985,7 +7005,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#parameter below." panel = isBoostControlledPanel field = "Blend parameter", boostOpenLoopBlends1_blendParameter - panel = boostOpenLoopBlend1Bias + field = "Y axis override (set Zero for no override)", boostOpenLoopBlends1_yAxisOverride, {boostOpenLoopBlends1_blendParameter} + panel = boostOpenLoopBlend1Bias, {boostOpenLoopBlends1_blendParameter} dialog = boostOpenBlend2Cfg, "Boost open loop blend 2 config" field = "#The bias table controls how much of the blend table" @@ -6996,7 +7017,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#parameter below." panel = isBoostControlledPanel field = "Blend parameter", boostOpenLoopBlends2_blendParameter - panel = boostOpenLoopBlend2Bias + field = "Y axis override (set Zero for no override)", boostOpenLoopBlends2_yAxisOverride, {boostOpenLoopBlends2_blendParameter} + panel = boostOpenLoopBlend2Bias, {boostOpenLoopBlends2_blendParameter} dialog = boostClosedBlend1Cfg, "Boost closed loop blend 1 config" field = "#The bias table controls how much of the blend table" @@ -7006,7 +7028,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", boostClosedLoopBlends1_blendParameter - panel = boostClosedLoopBlend1Bias + field = "Y axis override (set Zero for no override)", boostClosedLoopBlends1_yAxisOverride, {boostClosedLoopBlends1_blendParameter} + panel = boostClosedLoopBlend1Bias, {boostClosedLoopBlends1_blendParameter} dialog = boostClosedBlend2Cfg, "Boost closed loop blend 2 config" field = "#The bias table controls how much of the blend table" @@ -7016,7 +7039,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", boostClosedLoopBlends2_blendParameter - panel = boostClosedLoopBlend2Bias + field = "Y axis override (set Zero for no override)", boostClosedLoopBlends2_yAxisOverride, {boostClosedLoopBlends2_blendParameter} + panel = boostClosedLoopBlend2Bias, {boostClosedLoopBlends2_blendParameter} dialog = dwellSettings, "", yAxis panel = dwellCorrection diff --git a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini index d563d519a7..0d414ce286 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.2024.01.17.subaru_eg33_f7.2641693668" + signature = "rusEFI master.2024.01.17.subaru_eg33_f7.299519096" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.01.17.subaru_eg33_f7.2641693668" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.01.17.subaru_eg33_f7.299519096" ; 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 Wed Jan 17 14:05:06 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:40:36 UTC 2024 pageSize = 22176 page = 1 @@ -1504,48 +1504,56 @@ ignBlends1_table = array, S16, 19712, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends1_loadBins = array, U16, 19840, [8], "Load", 1, 0, 0, 1000, 0 ignBlends1_rpmBins = array, U16, 19856, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends1_blendParameter = bits, U08, 19872, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends1_yAxisOverride = bits, U08, 19873, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends1_blendBins = array, S16, 19874, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends1_blendValues = array, U08, 19890, [8], "%", 0.5, 0, 0, 100, 1 ignBlends2_table = array, S16, 19900, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends2_loadBins = array, U16, 20028, [8], "Load", 1, 0, 0, 1000, 0 ignBlends2_rpmBins = array, U16, 20044, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends2_blendParameter = bits, U08, 20060, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends2_yAxisOverride = bits, U08, 20061, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends2_blendBins = array, S16, 20062, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends2_blendValues = array, U08, 20078, [8], "%", 0.5, 0, 0, 100, 1 ignBlends3_table = array, S16, 20088, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends3_loadBins = array, U16, 20216, [8], "Load", 1, 0, 0, 1000, 0 ignBlends3_rpmBins = array, U16, 20232, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends3_blendParameter = bits, U08, 20248, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends3_yAxisOverride = bits, U08, 20249, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends3_blendBins = array, S16, 20250, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends3_blendValues = array, U08, 20266, [8], "%", 0.5, 0, 0, 100, 1 ignBlends4_table = array, S16, 20276, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends4_loadBins = array, U16, 20404, [8], "Load", 1, 0, 0, 1000, 0 ignBlends4_rpmBins = array, U16, 20420, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends4_blendParameter = bits, U08, 20436, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends4_yAxisOverride = bits, U08, 20437, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends4_blendBins = array, S16, 20438, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends4_blendValues = array, U08, 20454, [8], "%", 0.5, 0, 0, 100, 1 veBlends1_table = array, S16, 20464, [8x8], "", 0.1, 0, -100, 100, 1 veBlends1_loadBins = array, U16, 20592, [8], "Load", 1, 0, 0, 1000, 0 veBlends1_rpmBins = array, U16, 20608, [8], "RPM", 1, 0, 0, 18000, 0 veBlends1_blendParameter = bits, U08, 20624, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends1_yAxisOverride = bits, U08, 20625, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends1_blendBins = array, S16, 20626, [8], "", 0.1, 0, -1000, 1000, 1 veBlends1_blendValues = array, U08, 20642, [8], "%", 0.5, 0, 0, 100, 1 veBlends2_table = array, S16, 20652, [8x8], "", 0.1, 0, -100, 100, 1 veBlends2_loadBins = array, U16, 20780, [8], "Load", 1, 0, 0, 1000, 0 veBlends2_rpmBins = array, U16, 20796, [8], "RPM", 1, 0, 0, 18000, 0 veBlends2_blendParameter = bits, U08, 20812, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends2_yAxisOverride = bits, U08, 20813, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends2_blendBins = array, S16, 20814, [8], "", 0.1, 0, -1000, 1000, 1 veBlends2_blendValues = array, U08, 20830, [8], "%", 0.5, 0, 0, 100, 1 veBlends3_table = array, S16, 20840, [8x8], "", 0.1, 0, -100, 100, 1 veBlends3_loadBins = array, U16, 20968, [8], "Load", 1, 0, 0, 1000, 0 veBlends3_rpmBins = array, U16, 20984, [8], "RPM", 1, 0, 0, 18000, 0 veBlends3_blendParameter = bits, U08, 21000, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends3_yAxisOverride = bits, U08, 21001, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends3_blendBins = array, S16, 21002, [8], "", 0.1, 0, -1000, 1000, 1 veBlends3_blendValues = array, U08, 21018, [8], "%", 0.5, 0, 0, 100, 1 veBlends4_table = array, S16, 21028, [8x8], "", 0.1, 0, -100, 100, 1 veBlends4_loadBins = array, U16, 21156, [8], "Load", 1, 0, 0, 1000, 0 veBlends4_rpmBins = array, U16, 21172, [8], "RPM", 1, 0, 0, 18000, 0 veBlends4_blendParameter = bits, U08, 21188, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends4_yAxisOverride = bits, U08, 21189, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends4_blendBins = array, S16, 21190, [8], "", 0.1, 0, -1000, 1000, 1 veBlends4_blendValues = array, U08, 21206, [8], "%", 0.5, 0, 0, 100, 1 throttleEstimateEffectiveAreaBins = array, U16, 21216, [12], "%", 0.1, 0, 0, 100, 1 @@ -1554,24 +1562,28 @@ boostOpenLoopBlends1_table = array, S16, 21264, [8x8], "", 0.1, 0, -100, 100, 1 boostOpenLoopBlends1_loadBins = array, U16, 21392, [8], "Load", 1, 0, 0, 1000, 0 boostOpenLoopBlends1_rpmBins = array, U16, 21408, [8], "RPM", 1, 0, 0, 18000, 0 boostOpenLoopBlends1_blendParameter = bits, U08, 21424, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostOpenLoopBlends1_yAxisOverride = bits, U08, 21425, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostOpenLoopBlends1_blendBins = array, S16, 21426, [8], "", 0.1, 0, -1000, 1000, 1 boostOpenLoopBlends1_blendValues = array, U08, 21442, [8], "%", 0.5, 0, 0, 100, 1 boostOpenLoopBlends2_table = array, S16, 21452, [8x8], "", 0.1, 0, -100, 100, 1 boostOpenLoopBlends2_loadBins = array, U16, 21580, [8], "Load", 1, 0, 0, 1000, 0 boostOpenLoopBlends2_rpmBins = array, U16, 21596, [8], "RPM", 1, 0, 0, 18000, 0 boostOpenLoopBlends2_blendParameter = bits, U08, 21612, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostOpenLoopBlends2_yAxisOverride = bits, U08, 21613, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostOpenLoopBlends2_blendBins = array, S16, 21614, [8], "", 0.1, 0, -1000, 1000, 1 boostOpenLoopBlends2_blendValues = array, U08, 21630, [8], "%", 0.5, 0, 0, 100, 1 boostClosedLoopBlends1_table = array, S16, 21640, [8x8], "", 0.1, 0, -100, 100, 1 boostClosedLoopBlends1_loadBins = array, U16, 21768, [8], "Load", 1, 0, 0, 1000, 0 boostClosedLoopBlends1_rpmBins = array, U16, 21784, [8], "RPM", 1, 0, 0, 18000, 0 boostClosedLoopBlends1_blendParameter = bits, U08, 21800, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostClosedLoopBlends1_yAxisOverride = bits, U08, 21801, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostClosedLoopBlends1_blendBins = array, S16, 21802, [8], "", 0.1, 0, -1000, 1000, 1 boostClosedLoopBlends1_blendValues = array, U08, 21818, [8], "%", 0.5, 0, 0, 100, 1 boostClosedLoopBlends2_table = array, S16, 21828, [8x8], "", 0.1, 0, -100, 100, 1 boostClosedLoopBlends2_loadBins = array, U16, 21956, [8], "Load", 1, 0, 0, 1000, 0 boostClosedLoopBlends2_rpmBins = array, U16, 21972, [8], "RPM", 1, 0, 0, 18000, 0 boostClosedLoopBlends2_blendParameter = bits, U08, 21988, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostClosedLoopBlends2_yAxisOverride = bits, U08, 21989, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostClosedLoopBlends2_blendBins = array, S16, 21990, [8], "", 0.1, 0, -1000, 1000, 1 boostClosedLoopBlends2_blendValues = array, U08, 22006, [8], "%", 0.5, 0, 0, 100, 1 tcu_rangeP = array, U08, 22016, [6], "level", 1, 0, 0, 3, 0 @@ -6899,7 +6911,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends1_blendParameter - panel = ignAdder1Bias + field = "Y axis override (set Zero for no override)", ignBlends1_yAxisOverride, {ignBlends1_blendParameter} + panel = ignAdder1Bias, {ignBlends1_blendParameter} dialog = ignAdder2Cfg, "Ignition adder 2 config" field = "#The bias table controls how much of the blend table" @@ -6909,7 +6922,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends2_blendParameter - panel = ignAdder2Bias + field = "Y axis override (set Zero for no override)", ignBlends2_yAxisOverride, {ignBlends2_blendParameter} + panel = ignAdder2Bias, {ignBlends2_blendParameter} dialog = ignAdder3Cfg, "Ignition adder 3 config" field = "#The bias table controls how much of the blend table" @@ -6919,7 +6933,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends3_blendParameter - panel = ignAdder3Bias + field = "Y axis override (set Zero for no override)", ignBlends3_yAxisOverride, {ignBlends3_blendParameter} + panel = ignAdder3Bias, {ignBlends3_blendParameter} dialog = ignAdder4Cfg, "Ignition adder 4 config" field = "#The bias table controls how much of the blend table" @@ -6929,7 +6944,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends4_blendParameter - panel = ignAdder4Bias + field = "Y axis override (set Zero for no override)", ignBlends4_yAxisOverride, {ignBlends4_blendParameter} + panel = ignAdder4Bias, {ignBlends4_blendParameter} dialog = veBlend1Cfg, "VE blend 1 config" field = "#The bias table controls how much of the blend table" @@ -6940,7 +6956,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends1_blendParameter - panel = veBlend1Bias + field = "Y axis override (set Zero for no override)", veBlends1_yAxisOverride, {veBlends1_blendParameter} + panel = veBlend1Bias, {veBlends1_blendParameter} dialog = veBlend2Cfg, "VE blend 2 config" field = "#The bias table controls how much of the blend table" @@ -6951,7 +6968,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends2_blendParameter - panel = veBlend2Bias + field = "Y axis override (set Zero for no override)", veBlends2_yAxisOverride, {veBlends2_blendParameter} + panel = veBlend2Bias, {veBlends2_blendParameter} dialog = veBlend3Cfg, "VE blend 3 config" field = "#The bias table controls how much of the blend table" @@ -6962,7 +6980,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends3_blendParameter - panel = veBlend3Bias + field = "Y axis override (set Zero for no override)", veBlends3_yAxisOverride, {veBlends3_blendParameter} + panel = veBlend3Bias, {veBlends3_blendParameter} dialog = veBlend4Cfg, "VE blend 4 config" field = "#The bias table controls how much of the blend table" @@ -6973,7 +6992,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends4_blendParameter - panel = veBlend4Bias + field = "Y axis override (set Zero for no override)", veBlends4_yAxisOverride, {veBlends4_blendParameter} + panel = veBlend4Bias, {veBlends4_blendParameter} indicatorPanel = isBoostControlledPanel, 1 indicator = {isBoostControlled}, "No Boost Control", "Boost Control Active" @@ -6987,7 +7007,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#parameter below." panel = isBoostControlledPanel field = "Blend parameter", boostOpenLoopBlends1_blendParameter - panel = boostOpenLoopBlend1Bias + field = "Y axis override (set Zero for no override)", boostOpenLoopBlends1_yAxisOverride, {boostOpenLoopBlends1_blendParameter} + panel = boostOpenLoopBlend1Bias, {boostOpenLoopBlends1_blendParameter} dialog = boostOpenBlend2Cfg, "Boost open loop blend 2 config" field = "#The bias table controls how much of the blend table" @@ -6998,7 +7019,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#parameter below." panel = isBoostControlledPanel field = "Blend parameter", boostOpenLoopBlends2_blendParameter - panel = boostOpenLoopBlend2Bias + field = "Y axis override (set Zero for no override)", boostOpenLoopBlends2_yAxisOverride, {boostOpenLoopBlends2_blendParameter} + panel = boostOpenLoopBlend2Bias, {boostOpenLoopBlends2_blendParameter} dialog = boostClosedBlend1Cfg, "Boost closed loop blend 1 config" field = "#The bias table controls how much of the blend table" @@ -7008,7 +7030,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", boostClosedLoopBlends1_blendParameter - panel = boostClosedLoopBlend1Bias + field = "Y axis override (set Zero for no override)", boostClosedLoopBlends1_yAxisOverride, {boostClosedLoopBlends1_blendParameter} + panel = boostClosedLoopBlend1Bias, {boostClosedLoopBlends1_blendParameter} dialog = boostClosedBlend2Cfg, "Boost closed loop blend 2 config" field = "#The bias table controls how much of the blend table" @@ -7018,7 +7041,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", boostClosedLoopBlends2_blendParameter - panel = boostClosedLoopBlend2Bias + field = "Y axis override (set Zero for no override)", boostClosedLoopBlends2_yAxisOverride, {boostClosedLoopBlends2_blendParameter} + panel = boostClosedLoopBlend2Bias, {boostClosedLoopBlends2_blendParameter} dialog = dwellSettings, "", yAxis panel = dwellCorrection diff --git a/firmware/tunerstudio/generated/rusefi_t-b-g.ini b/firmware/tunerstudio/generated/rusefi_t-b-g.ini index 6fb3246301..e9f45cc75d 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.2024.01.17.t-b-g.781393164" + signature = "rusEFI master.2024.01.17.t-b-g.2721864336" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.01.17.t-b-g.781393164" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.01.17.t-b-g.2721864336" ; 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 Wed Jan 17 14:06:13 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:41:44 UTC 2024 pageSize = 22176 page = 1 @@ -1504,48 +1504,56 @@ ignBlends1_table = array, S16, 19712, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends1_loadBins = array, U16, 19840, [8], "Load", 1, 0, 0, 1000, 0 ignBlends1_rpmBins = array, U16, 19856, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends1_blendParameter = bits, U08, 19872, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends1_yAxisOverride = bits, U08, 19873, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends1_blendBins = array, S16, 19874, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends1_blendValues = array, U08, 19890, [8], "%", 0.5, 0, 0, 100, 1 ignBlends2_table = array, S16, 19900, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends2_loadBins = array, U16, 20028, [8], "Load", 1, 0, 0, 1000, 0 ignBlends2_rpmBins = array, U16, 20044, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends2_blendParameter = bits, U08, 20060, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends2_yAxisOverride = bits, U08, 20061, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends2_blendBins = array, S16, 20062, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends2_blendValues = array, U08, 20078, [8], "%", 0.5, 0, 0, 100, 1 ignBlends3_table = array, S16, 20088, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends3_loadBins = array, U16, 20216, [8], "Load", 1, 0, 0, 1000, 0 ignBlends3_rpmBins = array, U16, 20232, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends3_blendParameter = bits, U08, 20248, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends3_yAxisOverride = bits, U08, 20249, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends3_blendBins = array, S16, 20250, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends3_blendValues = array, U08, 20266, [8], "%", 0.5, 0, 0, 100, 1 ignBlends4_table = array, S16, 20276, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends4_loadBins = array, U16, 20404, [8], "Load", 1, 0, 0, 1000, 0 ignBlends4_rpmBins = array, U16, 20420, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends4_blendParameter = bits, U08, 20436, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends4_yAxisOverride = bits, U08, 20437, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends4_blendBins = array, S16, 20438, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends4_blendValues = array, U08, 20454, [8], "%", 0.5, 0, 0, 100, 1 veBlends1_table = array, S16, 20464, [8x8], "", 0.1, 0, -100, 100, 1 veBlends1_loadBins = array, U16, 20592, [8], "Load", 1, 0, 0, 1000, 0 veBlends1_rpmBins = array, U16, 20608, [8], "RPM", 1, 0, 0, 18000, 0 veBlends1_blendParameter = bits, U08, 20624, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends1_yAxisOverride = bits, U08, 20625, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends1_blendBins = array, S16, 20626, [8], "", 0.1, 0, -1000, 1000, 1 veBlends1_blendValues = array, U08, 20642, [8], "%", 0.5, 0, 0, 100, 1 veBlends2_table = array, S16, 20652, [8x8], "", 0.1, 0, -100, 100, 1 veBlends2_loadBins = array, U16, 20780, [8], "Load", 1, 0, 0, 1000, 0 veBlends2_rpmBins = array, U16, 20796, [8], "RPM", 1, 0, 0, 18000, 0 veBlends2_blendParameter = bits, U08, 20812, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends2_yAxisOverride = bits, U08, 20813, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends2_blendBins = array, S16, 20814, [8], "", 0.1, 0, -1000, 1000, 1 veBlends2_blendValues = array, U08, 20830, [8], "%", 0.5, 0, 0, 100, 1 veBlends3_table = array, S16, 20840, [8x8], "", 0.1, 0, -100, 100, 1 veBlends3_loadBins = array, U16, 20968, [8], "Load", 1, 0, 0, 1000, 0 veBlends3_rpmBins = array, U16, 20984, [8], "RPM", 1, 0, 0, 18000, 0 veBlends3_blendParameter = bits, U08, 21000, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends3_yAxisOverride = bits, U08, 21001, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends3_blendBins = array, S16, 21002, [8], "", 0.1, 0, -1000, 1000, 1 veBlends3_blendValues = array, U08, 21018, [8], "%", 0.5, 0, 0, 100, 1 veBlends4_table = array, S16, 21028, [8x8], "", 0.1, 0, -100, 100, 1 veBlends4_loadBins = array, U16, 21156, [8], "Load", 1, 0, 0, 1000, 0 veBlends4_rpmBins = array, U16, 21172, [8], "RPM", 1, 0, 0, 18000, 0 veBlends4_blendParameter = bits, U08, 21188, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends4_yAxisOverride = bits, U08, 21189, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends4_blendBins = array, S16, 21190, [8], "", 0.1, 0, -1000, 1000, 1 veBlends4_blendValues = array, U08, 21206, [8], "%", 0.5, 0, 0, 100, 1 throttleEstimateEffectiveAreaBins = array, U16, 21216, [12], "%", 0.1, 0, 0, 100, 1 @@ -1554,24 +1562,28 @@ boostOpenLoopBlends1_table = array, S16, 21264, [8x8], "", 0.1, 0, -100, 100, 1 boostOpenLoopBlends1_loadBins = array, U16, 21392, [8], "Load", 1, 0, 0, 1000, 0 boostOpenLoopBlends1_rpmBins = array, U16, 21408, [8], "RPM", 1, 0, 0, 18000, 0 boostOpenLoopBlends1_blendParameter = bits, U08, 21424, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostOpenLoopBlends1_yAxisOverride = bits, U08, 21425, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostOpenLoopBlends1_blendBins = array, S16, 21426, [8], "", 0.1, 0, -1000, 1000, 1 boostOpenLoopBlends1_blendValues = array, U08, 21442, [8], "%", 0.5, 0, 0, 100, 1 boostOpenLoopBlends2_table = array, S16, 21452, [8x8], "", 0.1, 0, -100, 100, 1 boostOpenLoopBlends2_loadBins = array, U16, 21580, [8], "Load", 1, 0, 0, 1000, 0 boostOpenLoopBlends2_rpmBins = array, U16, 21596, [8], "RPM", 1, 0, 0, 18000, 0 boostOpenLoopBlends2_blendParameter = bits, U08, 21612, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostOpenLoopBlends2_yAxisOverride = bits, U08, 21613, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostOpenLoopBlends2_blendBins = array, S16, 21614, [8], "", 0.1, 0, -1000, 1000, 1 boostOpenLoopBlends2_blendValues = array, U08, 21630, [8], "%", 0.5, 0, 0, 100, 1 boostClosedLoopBlends1_table = array, S16, 21640, [8x8], "", 0.1, 0, -100, 100, 1 boostClosedLoopBlends1_loadBins = array, U16, 21768, [8], "Load", 1, 0, 0, 1000, 0 boostClosedLoopBlends1_rpmBins = array, U16, 21784, [8], "RPM", 1, 0, 0, 18000, 0 boostClosedLoopBlends1_blendParameter = bits, U08, 21800, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostClosedLoopBlends1_yAxisOverride = bits, U08, 21801, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostClosedLoopBlends1_blendBins = array, S16, 21802, [8], "", 0.1, 0, -1000, 1000, 1 boostClosedLoopBlends1_blendValues = array, U08, 21818, [8], "%", 0.5, 0, 0, 100, 1 boostClosedLoopBlends2_table = array, S16, 21828, [8x8], "", 0.1, 0, -100, 100, 1 boostClosedLoopBlends2_loadBins = array, U16, 21956, [8], "Load", 1, 0, 0, 1000, 0 boostClosedLoopBlends2_rpmBins = array, U16, 21972, [8], "RPM", 1, 0, 0, 18000, 0 boostClosedLoopBlends2_blendParameter = bits, U08, 21988, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostClosedLoopBlends2_yAxisOverride = bits, U08, 21989, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostClosedLoopBlends2_blendBins = array, S16, 21990, [8], "", 0.1, 0, -1000, 1000, 1 boostClosedLoopBlends2_blendValues = array, U08, 22006, [8], "%", 0.5, 0, 0, 100, 1 tcu_rangeP = array, U08, 22016, [6], "level", 1, 0, 0, 3, 0 @@ -6897,7 +6909,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends1_blendParameter - panel = ignAdder1Bias + field = "Y axis override (set Zero for no override)", ignBlends1_yAxisOverride, {ignBlends1_blendParameter} + panel = ignAdder1Bias, {ignBlends1_blendParameter} dialog = ignAdder2Cfg, "Ignition adder 2 config" field = "#The bias table controls how much of the blend table" @@ -6907,7 +6920,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends2_blendParameter - panel = ignAdder2Bias + field = "Y axis override (set Zero for no override)", ignBlends2_yAxisOverride, {ignBlends2_blendParameter} + panel = ignAdder2Bias, {ignBlends2_blendParameter} dialog = ignAdder3Cfg, "Ignition adder 3 config" field = "#The bias table controls how much of the blend table" @@ -6917,7 +6931,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends3_blendParameter - panel = ignAdder3Bias + field = "Y axis override (set Zero for no override)", ignBlends3_yAxisOverride, {ignBlends3_blendParameter} + panel = ignAdder3Bias, {ignBlends3_blendParameter} dialog = ignAdder4Cfg, "Ignition adder 4 config" field = "#The bias table controls how much of the blend table" @@ -6927,7 +6942,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends4_blendParameter - panel = ignAdder4Bias + field = "Y axis override (set Zero for no override)", ignBlends4_yAxisOverride, {ignBlends4_blendParameter} + panel = ignAdder4Bias, {ignBlends4_blendParameter} dialog = veBlend1Cfg, "VE blend 1 config" field = "#The bias table controls how much of the blend table" @@ -6938,7 +6954,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends1_blendParameter - panel = veBlend1Bias + field = "Y axis override (set Zero for no override)", veBlends1_yAxisOverride, {veBlends1_blendParameter} + panel = veBlend1Bias, {veBlends1_blendParameter} dialog = veBlend2Cfg, "VE blend 2 config" field = "#The bias table controls how much of the blend table" @@ -6949,7 +6966,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends2_blendParameter - panel = veBlend2Bias + field = "Y axis override (set Zero for no override)", veBlends2_yAxisOverride, {veBlends2_blendParameter} + panel = veBlend2Bias, {veBlends2_blendParameter} dialog = veBlend3Cfg, "VE blend 3 config" field = "#The bias table controls how much of the blend table" @@ -6960,7 +6978,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends3_blendParameter - panel = veBlend3Bias + field = "Y axis override (set Zero for no override)", veBlends3_yAxisOverride, {veBlends3_blendParameter} + panel = veBlend3Bias, {veBlends3_blendParameter} dialog = veBlend4Cfg, "VE blend 4 config" field = "#The bias table controls how much of the blend table" @@ -6971,7 +6990,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends4_blendParameter - panel = veBlend4Bias + field = "Y axis override (set Zero for no override)", veBlends4_yAxisOverride, {veBlends4_blendParameter} + panel = veBlend4Bias, {veBlends4_blendParameter} indicatorPanel = isBoostControlledPanel, 1 indicator = {isBoostControlled}, "No Boost Control", "Boost Control Active" @@ -6985,7 +7005,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#parameter below." panel = isBoostControlledPanel field = "Blend parameter", boostOpenLoopBlends1_blendParameter - panel = boostOpenLoopBlend1Bias + field = "Y axis override (set Zero for no override)", boostOpenLoopBlends1_yAxisOverride, {boostOpenLoopBlends1_blendParameter} + panel = boostOpenLoopBlend1Bias, {boostOpenLoopBlends1_blendParameter} dialog = boostOpenBlend2Cfg, "Boost open loop blend 2 config" field = "#The bias table controls how much of the blend table" @@ -6996,7 +7017,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#parameter below." panel = isBoostControlledPanel field = "Blend parameter", boostOpenLoopBlends2_blendParameter - panel = boostOpenLoopBlend2Bias + field = "Y axis override (set Zero for no override)", boostOpenLoopBlends2_yAxisOverride, {boostOpenLoopBlends2_blendParameter} + panel = boostOpenLoopBlend2Bias, {boostOpenLoopBlends2_blendParameter} dialog = boostClosedBlend1Cfg, "Boost closed loop blend 1 config" field = "#The bias table controls how much of the blend table" @@ -7006,7 +7028,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", boostClosedLoopBlends1_blendParameter - panel = boostClosedLoopBlend1Bias + field = "Y axis override (set Zero for no override)", boostClosedLoopBlends1_yAxisOverride, {boostClosedLoopBlends1_blendParameter} + panel = boostClosedLoopBlend1Bias, {boostClosedLoopBlends1_blendParameter} dialog = boostClosedBlend2Cfg, "Boost closed loop blend 2 config" field = "#The bias table controls how much of the blend table" @@ -7016,7 +7039,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", boostClosedLoopBlends2_blendParameter - panel = boostClosedLoopBlend2Bias + field = "Y axis override (set Zero for no override)", boostClosedLoopBlends2_yAxisOverride, {boostClosedLoopBlends2_blendParameter} + panel = boostClosedLoopBlend2Bias, {boostClosedLoopBlends2_blendParameter} dialog = dwellSettings, "", yAxis panel = dwellCorrection diff --git a/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini b/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini index 3fb9547cbd..d028634614 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.2024.01.17.tdg-pdm8.2755473710" + signature = "rusEFI master.2024.01.17.tdg-pdm8.680687282" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.01.17.tdg-pdm8.2755473710" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.01.17.tdg-pdm8.680687282" ; 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 Wed Jan 17 14:06:47 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:42:17 UTC 2024 pageSize = 22176 page = 1 @@ -1504,48 +1504,56 @@ ignBlends1_table = array, S16, 19712, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends1_loadBins = array, U16, 19840, [8], "Load", 1, 0, 0, 1000, 0 ignBlends1_rpmBins = array, U16, 19856, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends1_blendParameter = bits, U08, 19872, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends1_yAxisOverride = bits, U08, 19873, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends1_blendBins = array, S16, 19874, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends1_blendValues = array, U08, 19890, [8], "%", 0.5, 0, 0, 100, 1 ignBlends2_table = array, S16, 19900, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends2_loadBins = array, U16, 20028, [8], "Load", 1, 0, 0, 1000, 0 ignBlends2_rpmBins = array, U16, 20044, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends2_blendParameter = bits, U08, 20060, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends2_yAxisOverride = bits, U08, 20061, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends2_blendBins = array, S16, 20062, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends2_blendValues = array, U08, 20078, [8], "%", 0.5, 0, 0, 100, 1 ignBlends3_table = array, S16, 20088, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends3_loadBins = array, U16, 20216, [8], "Load", 1, 0, 0, 1000, 0 ignBlends3_rpmBins = array, U16, 20232, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends3_blendParameter = bits, U08, 20248, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends3_yAxisOverride = bits, U08, 20249, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends3_blendBins = array, S16, 20250, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends3_blendValues = array, U08, 20266, [8], "%", 0.5, 0, 0, 100, 1 ignBlends4_table = array, S16, 20276, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends4_loadBins = array, U16, 20404, [8], "Load", 1, 0, 0, 1000, 0 ignBlends4_rpmBins = array, U16, 20420, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends4_blendParameter = bits, U08, 20436, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends4_yAxisOverride = bits, U08, 20437, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends4_blendBins = array, S16, 20438, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends4_blendValues = array, U08, 20454, [8], "%", 0.5, 0, 0, 100, 1 veBlends1_table = array, S16, 20464, [8x8], "", 0.1, 0, -100, 100, 1 veBlends1_loadBins = array, U16, 20592, [8], "Load", 1, 0, 0, 1000, 0 veBlends1_rpmBins = array, U16, 20608, [8], "RPM", 1, 0, 0, 18000, 0 veBlends1_blendParameter = bits, U08, 20624, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends1_yAxisOverride = bits, U08, 20625, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends1_blendBins = array, S16, 20626, [8], "", 0.1, 0, -1000, 1000, 1 veBlends1_blendValues = array, U08, 20642, [8], "%", 0.5, 0, 0, 100, 1 veBlends2_table = array, S16, 20652, [8x8], "", 0.1, 0, -100, 100, 1 veBlends2_loadBins = array, U16, 20780, [8], "Load", 1, 0, 0, 1000, 0 veBlends2_rpmBins = array, U16, 20796, [8], "RPM", 1, 0, 0, 18000, 0 veBlends2_blendParameter = bits, U08, 20812, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends2_yAxisOverride = bits, U08, 20813, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends2_blendBins = array, S16, 20814, [8], "", 0.1, 0, -1000, 1000, 1 veBlends2_blendValues = array, U08, 20830, [8], "%", 0.5, 0, 0, 100, 1 veBlends3_table = array, S16, 20840, [8x8], "", 0.1, 0, -100, 100, 1 veBlends3_loadBins = array, U16, 20968, [8], "Load", 1, 0, 0, 1000, 0 veBlends3_rpmBins = array, U16, 20984, [8], "RPM", 1, 0, 0, 18000, 0 veBlends3_blendParameter = bits, U08, 21000, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends3_yAxisOverride = bits, U08, 21001, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends3_blendBins = array, S16, 21002, [8], "", 0.1, 0, -1000, 1000, 1 veBlends3_blendValues = array, U08, 21018, [8], "%", 0.5, 0, 0, 100, 1 veBlends4_table = array, S16, 21028, [8x8], "", 0.1, 0, -100, 100, 1 veBlends4_loadBins = array, U16, 21156, [8], "Load", 1, 0, 0, 1000, 0 veBlends4_rpmBins = array, U16, 21172, [8], "RPM", 1, 0, 0, 18000, 0 veBlends4_blendParameter = bits, U08, 21188, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends4_yAxisOverride = bits, U08, 21189, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends4_blendBins = array, S16, 21190, [8], "", 0.1, 0, -1000, 1000, 1 veBlends4_blendValues = array, U08, 21206, [8], "%", 0.5, 0, 0, 100, 1 throttleEstimateEffectiveAreaBins = array, U16, 21216, [12], "%", 0.1, 0, 0, 100, 1 @@ -1554,24 +1562,28 @@ boostOpenLoopBlends1_table = array, S16, 21264, [8x8], "", 0.1, 0, -100, 100, 1 boostOpenLoopBlends1_loadBins = array, U16, 21392, [8], "Load", 1, 0, 0, 1000, 0 boostOpenLoopBlends1_rpmBins = array, U16, 21408, [8], "RPM", 1, 0, 0, 18000, 0 boostOpenLoopBlends1_blendParameter = bits, U08, 21424, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostOpenLoopBlends1_yAxisOverride = bits, U08, 21425, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostOpenLoopBlends1_blendBins = array, S16, 21426, [8], "", 0.1, 0, -1000, 1000, 1 boostOpenLoopBlends1_blendValues = array, U08, 21442, [8], "%", 0.5, 0, 0, 100, 1 boostOpenLoopBlends2_table = array, S16, 21452, [8x8], "", 0.1, 0, -100, 100, 1 boostOpenLoopBlends2_loadBins = array, U16, 21580, [8], "Load", 1, 0, 0, 1000, 0 boostOpenLoopBlends2_rpmBins = array, U16, 21596, [8], "RPM", 1, 0, 0, 18000, 0 boostOpenLoopBlends2_blendParameter = bits, U08, 21612, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostOpenLoopBlends2_yAxisOverride = bits, U08, 21613, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostOpenLoopBlends2_blendBins = array, S16, 21614, [8], "", 0.1, 0, -1000, 1000, 1 boostOpenLoopBlends2_blendValues = array, U08, 21630, [8], "%", 0.5, 0, 0, 100, 1 boostClosedLoopBlends1_table = array, S16, 21640, [8x8], "", 0.1, 0, -100, 100, 1 boostClosedLoopBlends1_loadBins = array, U16, 21768, [8], "Load", 1, 0, 0, 1000, 0 boostClosedLoopBlends1_rpmBins = array, U16, 21784, [8], "RPM", 1, 0, 0, 18000, 0 boostClosedLoopBlends1_blendParameter = bits, U08, 21800, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostClosedLoopBlends1_yAxisOverride = bits, U08, 21801, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostClosedLoopBlends1_blendBins = array, S16, 21802, [8], "", 0.1, 0, -1000, 1000, 1 boostClosedLoopBlends1_blendValues = array, U08, 21818, [8], "%", 0.5, 0, 0, 100, 1 boostClosedLoopBlends2_table = array, S16, 21828, [8x8], "", 0.1, 0, -100, 100, 1 boostClosedLoopBlends2_loadBins = array, U16, 21956, [8], "Load", 1, 0, 0, 1000, 0 boostClosedLoopBlends2_rpmBins = array, U16, 21972, [8], "RPM", 1, 0, 0, 18000, 0 boostClosedLoopBlends2_blendParameter = bits, U08, 21988, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostClosedLoopBlends2_yAxisOverride = bits, U08, 21989, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostClosedLoopBlends2_blendBins = array, S16, 21990, [8], "", 0.1, 0, -1000, 1000, 1 boostClosedLoopBlends2_blendValues = array, U08, 22006, [8], "%", 0.5, 0, 0, 100, 1 tcu_rangeP = array, U08, 22016, [6], "level", 1, 0, 0, 3, 0 @@ -6897,7 +6909,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends1_blendParameter - panel = ignAdder1Bias + field = "Y axis override (set Zero for no override)", ignBlends1_yAxisOverride, {ignBlends1_blendParameter} + panel = ignAdder1Bias, {ignBlends1_blendParameter} dialog = ignAdder2Cfg, "Ignition adder 2 config" field = "#The bias table controls how much of the blend table" @@ -6907,7 +6920,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends2_blendParameter - panel = ignAdder2Bias + field = "Y axis override (set Zero for no override)", ignBlends2_yAxisOverride, {ignBlends2_blendParameter} + panel = ignAdder2Bias, {ignBlends2_blendParameter} dialog = ignAdder3Cfg, "Ignition adder 3 config" field = "#The bias table controls how much of the blend table" @@ -6917,7 +6931,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends3_blendParameter - panel = ignAdder3Bias + field = "Y axis override (set Zero for no override)", ignBlends3_yAxisOverride, {ignBlends3_blendParameter} + panel = ignAdder3Bias, {ignBlends3_blendParameter} dialog = ignAdder4Cfg, "Ignition adder 4 config" field = "#The bias table controls how much of the blend table" @@ -6927,7 +6942,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends4_blendParameter - panel = ignAdder4Bias + field = "Y axis override (set Zero for no override)", ignBlends4_yAxisOverride, {ignBlends4_blendParameter} + panel = ignAdder4Bias, {ignBlends4_blendParameter} dialog = veBlend1Cfg, "VE blend 1 config" field = "#The bias table controls how much of the blend table" @@ -6938,7 +6954,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends1_blendParameter - panel = veBlend1Bias + field = "Y axis override (set Zero for no override)", veBlends1_yAxisOverride, {veBlends1_blendParameter} + panel = veBlend1Bias, {veBlends1_blendParameter} dialog = veBlend2Cfg, "VE blend 2 config" field = "#The bias table controls how much of the blend table" @@ -6949,7 +6966,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends2_blendParameter - panel = veBlend2Bias + field = "Y axis override (set Zero for no override)", veBlends2_yAxisOverride, {veBlends2_blendParameter} + panel = veBlend2Bias, {veBlends2_blendParameter} dialog = veBlend3Cfg, "VE blend 3 config" field = "#The bias table controls how much of the blend table" @@ -6960,7 +6978,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends3_blendParameter - panel = veBlend3Bias + field = "Y axis override (set Zero for no override)", veBlends3_yAxisOverride, {veBlends3_blendParameter} + panel = veBlend3Bias, {veBlends3_blendParameter} dialog = veBlend4Cfg, "VE blend 4 config" field = "#The bias table controls how much of the blend table" @@ -6971,7 +6990,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends4_blendParameter - panel = veBlend4Bias + field = "Y axis override (set Zero for no override)", veBlends4_yAxisOverride, {veBlends4_blendParameter} + panel = veBlend4Bias, {veBlends4_blendParameter} indicatorPanel = isBoostControlledPanel, 1 indicator = {isBoostControlled}, "No Boost Control", "Boost Control Active" @@ -6985,7 +7005,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#parameter below." panel = isBoostControlledPanel field = "Blend parameter", boostOpenLoopBlends1_blendParameter - panel = boostOpenLoopBlend1Bias + field = "Y axis override (set Zero for no override)", boostOpenLoopBlends1_yAxisOverride, {boostOpenLoopBlends1_blendParameter} + panel = boostOpenLoopBlend1Bias, {boostOpenLoopBlends1_blendParameter} dialog = boostOpenBlend2Cfg, "Boost open loop blend 2 config" field = "#The bias table controls how much of the blend table" @@ -6996,7 +7017,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#parameter below." panel = isBoostControlledPanel field = "Blend parameter", boostOpenLoopBlends2_blendParameter - panel = boostOpenLoopBlend2Bias + field = "Y axis override (set Zero for no override)", boostOpenLoopBlends2_yAxisOverride, {boostOpenLoopBlends2_blendParameter} + panel = boostOpenLoopBlend2Bias, {boostOpenLoopBlends2_blendParameter} dialog = boostClosedBlend1Cfg, "Boost closed loop blend 1 config" field = "#The bias table controls how much of the blend table" @@ -7006,7 +7028,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", boostClosedLoopBlends1_blendParameter - panel = boostClosedLoopBlend1Bias + field = "Y axis override (set Zero for no override)", boostClosedLoopBlends1_yAxisOverride, {boostClosedLoopBlends1_blendParameter} + panel = boostClosedLoopBlend1Bias, {boostClosedLoopBlends1_blendParameter} dialog = boostClosedBlend2Cfg, "Boost closed loop blend 2 config" field = "#The bias table controls how much of the blend table" @@ -7016,7 +7039,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", boostClosedLoopBlends2_blendParameter - panel = boostClosedLoopBlend2Bias + field = "Y axis override (set Zero for no override)", boostClosedLoopBlends2_yAxisOverride, {boostClosedLoopBlends2_blendParameter} + panel = boostClosedLoopBlend2Bias, {boostClosedLoopBlends2_blendParameter} dialog = dwellSettings, "", yAxis panel = dwellCorrection diff --git a/firmware/tunerstudio/generated/rusefi_uaefi.ini b/firmware/tunerstudio/generated/rusefi_uaefi.ini index fe33bd35c1..38987df5d6 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.2024.01.17.uaefi.3527289219" + signature = "rusEFI master.2024.01.17.uaefi.1586589215" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.01.17.uaefi.3527289219" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.01.17.uaefi.1586589215" ; 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","D1 AUX1","C3 AUX2","INVALID","D6 PPS1","D13 TPS1","A7 Voltage From Key","INVALID","C15 AUX3","C14 TPS2","INVALID","D9 MAP","INVALID","D16 CLT Coolant","D15 IAT","C4 PPS2" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:05:40 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:41:11 UTC 2024 pageSize = 22176 page = 1 @@ -1504,48 +1504,56 @@ ignBlends1_table = array, S16, 19712, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends1_loadBins = array, U16, 19840, [8], "Load", 1, 0, 0, 1000, 0 ignBlends1_rpmBins = array, U16, 19856, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends1_blendParameter = bits, U08, 19872, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends1_yAxisOverride = bits, U08, 19873, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends1_blendBins = array, S16, 19874, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends1_blendValues = array, U08, 19890, [8], "%", 0.5, 0, 0, 100, 1 ignBlends2_table = array, S16, 19900, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends2_loadBins = array, U16, 20028, [8], "Load", 1, 0, 0, 1000, 0 ignBlends2_rpmBins = array, U16, 20044, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends2_blendParameter = bits, U08, 20060, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends2_yAxisOverride = bits, U08, 20061, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends2_blendBins = array, S16, 20062, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends2_blendValues = array, U08, 20078, [8], "%", 0.5, 0, 0, 100, 1 ignBlends3_table = array, S16, 20088, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends3_loadBins = array, U16, 20216, [8], "Load", 1, 0, 0, 1000, 0 ignBlends3_rpmBins = array, U16, 20232, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends3_blendParameter = bits, U08, 20248, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends3_yAxisOverride = bits, U08, 20249, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends3_blendBins = array, S16, 20250, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends3_blendValues = array, U08, 20266, [8], "%", 0.5, 0, 0, 100, 1 ignBlends4_table = array, S16, 20276, [8x8], "", 0.1, 0, -100, 100, 1 ignBlends4_loadBins = array, U16, 20404, [8], "Load", 1, 0, 0, 1000, 0 ignBlends4_rpmBins = array, U16, 20420, [8], "RPM", 1, 0, 0, 18000, 0 ignBlends4_blendParameter = bits, U08, 20436, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +ignBlends4_yAxisOverride = bits, U08, 20437, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" ignBlends4_blendBins = array, S16, 20438, [8], "", 0.1, 0, -1000, 1000, 1 ignBlends4_blendValues = array, U08, 20454, [8], "%", 0.5, 0, 0, 100, 1 veBlends1_table = array, S16, 20464, [8x8], "", 0.1, 0, -100, 100, 1 veBlends1_loadBins = array, U16, 20592, [8], "Load", 1, 0, 0, 1000, 0 veBlends1_rpmBins = array, U16, 20608, [8], "RPM", 1, 0, 0, 18000, 0 veBlends1_blendParameter = bits, U08, 20624, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends1_yAxisOverride = bits, U08, 20625, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends1_blendBins = array, S16, 20626, [8], "", 0.1, 0, -1000, 1000, 1 veBlends1_blendValues = array, U08, 20642, [8], "%", 0.5, 0, 0, 100, 1 veBlends2_table = array, S16, 20652, [8x8], "", 0.1, 0, -100, 100, 1 veBlends2_loadBins = array, U16, 20780, [8], "Load", 1, 0, 0, 1000, 0 veBlends2_rpmBins = array, U16, 20796, [8], "RPM", 1, 0, 0, 18000, 0 veBlends2_blendParameter = bits, U08, 20812, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends2_yAxisOverride = bits, U08, 20813, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends2_blendBins = array, S16, 20814, [8], "", 0.1, 0, -1000, 1000, 1 veBlends2_blendValues = array, U08, 20830, [8], "%", 0.5, 0, 0, 100, 1 veBlends3_table = array, S16, 20840, [8x8], "", 0.1, 0, -100, 100, 1 veBlends3_loadBins = array, U16, 20968, [8], "Load", 1, 0, 0, 1000, 0 veBlends3_rpmBins = array, U16, 20984, [8], "RPM", 1, 0, 0, 18000, 0 veBlends3_blendParameter = bits, U08, 21000, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends3_yAxisOverride = bits, U08, 21001, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends3_blendBins = array, S16, 21002, [8], "", 0.1, 0, -1000, 1000, 1 veBlends3_blendValues = array, U08, 21018, [8], "%", 0.5, 0, 0, 100, 1 veBlends4_table = array, S16, 21028, [8x8], "", 0.1, 0, -100, 100, 1 veBlends4_loadBins = array, U16, 21156, [8], "Load", 1, 0, 0, 1000, 0 veBlends4_rpmBins = array, U16, 21172, [8], "RPM", 1, 0, 0, 18000, 0 veBlends4_blendParameter = bits, U08, 21188, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +veBlends4_yAxisOverride = bits, U08, 21189, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" veBlends4_blendBins = array, S16, 21190, [8], "", 0.1, 0, -1000, 1000, 1 veBlends4_blendValues = array, U08, 21206, [8], "%", 0.5, 0, 0, 100, 1 throttleEstimateEffectiveAreaBins = array, U16, 21216, [12], "%", 0.1, 0, 0, 100, 1 @@ -1554,24 +1562,28 @@ boostOpenLoopBlends1_table = array, S16, 21264, [8x8], "", 0.1, 0, -100, 100, 1 boostOpenLoopBlends1_loadBins = array, U16, 21392, [8], "Load", 1, 0, 0, 1000, 0 boostOpenLoopBlends1_rpmBins = array, U16, 21408, [8], "RPM", 1, 0, 0, 18000, 0 boostOpenLoopBlends1_blendParameter = bits, U08, 21424, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostOpenLoopBlends1_yAxisOverride = bits, U08, 21425, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostOpenLoopBlends1_blendBins = array, S16, 21426, [8], "", 0.1, 0, -1000, 1000, 1 boostOpenLoopBlends1_blendValues = array, U08, 21442, [8], "%", 0.5, 0, 0, 100, 1 boostOpenLoopBlends2_table = array, S16, 21452, [8x8], "", 0.1, 0, -100, 100, 1 boostOpenLoopBlends2_loadBins = array, U16, 21580, [8], "Load", 1, 0, 0, 1000, 0 boostOpenLoopBlends2_rpmBins = array, U16, 21596, [8], "RPM", 1, 0, 0, 18000, 0 boostOpenLoopBlends2_blendParameter = bits, U08, 21612, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostOpenLoopBlends2_yAxisOverride = bits, U08, 21613, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostOpenLoopBlends2_blendBins = array, S16, 21614, [8], "", 0.1, 0, -1000, 1000, 1 boostOpenLoopBlends2_blendValues = array, U08, 21630, [8], "%", 0.5, 0, 0, 100, 1 boostClosedLoopBlends1_table = array, S16, 21640, [8x8], "", 0.1, 0, -100, 100, 1 boostClosedLoopBlends1_loadBins = array, U16, 21768, [8], "Load", 1, 0, 0, 1000, 0 boostClosedLoopBlends1_rpmBins = array, U16, 21784, [8], "RPM", 1, 0, 0, 18000, 0 boostClosedLoopBlends1_blendParameter = bits, U08, 21800, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostClosedLoopBlends1_yAxisOverride = bits, U08, 21801, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostClosedLoopBlends1_blendBins = array, S16, 21802, [8], "", 0.1, 0, -1000, 1000, 1 boostClosedLoopBlends1_blendValues = array, U08, 21818, [8], "%", 0.5, 0, 0, 100, 1 boostClosedLoopBlends2_table = array, S16, 21828, [8x8], "", 0.1, 0, -100, 100, 1 boostClosedLoopBlends2_loadBins = array, U16, 21956, [8], "Load", 1, 0, 0, 1000, 0 boostClosedLoopBlends2_rpmBins = array, U16, 21972, [8], "RPM", 1, 0, 0, 18000, 0 boostClosedLoopBlends2_blendParameter = bits, U08, 21988, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" +boostClosedLoopBlends2_yAxisOverride = bits, U08, 21989, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)" boostClosedLoopBlends2_blendBins = array, S16, 21990, [8], "", 0.1, 0, -1000, 1000, 1 boostClosedLoopBlends2_blendValues = array, U08, 22006, [8], "%", 0.5, 0, 0, 100, 1 tcu_rangeP = array, U08, 22016, [6], "level", 1, 0, 0, 3, 0 @@ -6896,7 +6908,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends1_blendParameter - panel = ignAdder1Bias + field = "Y axis override (set Zero for no override)", ignBlends1_yAxisOverride, {ignBlends1_blendParameter} + panel = ignAdder1Bias, {ignBlends1_blendParameter} dialog = ignAdder2Cfg, "Ignition adder 2 config" field = "#The bias table controls how much of the blend table" @@ -6906,7 +6919,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends2_blendParameter - panel = ignAdder2Bias + field = "Y axis override (set Zero for no override)", ignBlends2_yAxisOverride, {ignBlends2_blendParameter} + panel = ignAdder2Bias, {ignBlends2_blendParameter} dialog = ignAdder3Cfg, "Ignition adder 3 config" field = "#The bias table controls how much of the blend table" @@ -6916,7 +6930,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends3_blendParameter - panel = ignAdder3Bias + field = "Y axis override (set Zero for no override)", ignBlends3_yAxisOverride, {ignBlends3_blendParameter} + panel = ignAdder3Bias, {ignBlends3_blendParameter} dialog = ignAdder4Cfg, "Ignition adder 4 config" field = "#The bias table controls how much of the blend table" @@ -6926,7 +6941,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", ignBlends4_blendParameter - panel = ignAdder4Bias + field = "Y axis override (set Zero for no override)", ignBlends4_yAxisOverride, {ignBlends4_blendParameter} + panel = ignAdder4Bias, {ignBlends4_blendParameter} dialog = veBlend1Cfg, "VE blend 1 config" field = "#The bias table controls how much of the blend table" @@ -6937,7 +6953,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends1_blendParameter - panel = veBlend1Bias + field = "Y axis override (set Zero for no override)", veBlends1_yAxisOverride, {veBlends1_blendParameter} + panel = veBlend1Bias, {veBlends1_blendParameter} dialog = veBlend2Cfg, "VE blend 2 config" field = "#The bias table controls how much of the blend table" @@ -6948,7 +6965,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends2_blendParameter - panel = veBlend2Bias + field = "Y axis override (set Zero for no override)", veBlends2_yAxisOverride, {veBlends2_blendParameter} + panel = veBlend2Bias, {veBlends2_blendParameter} dialog = veBlend3Cfg, "VE blend 3 config" field = "#The bias table controls how much of the blend table" @@ -6959,7 +6977,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends3_blendParameter - panel = veBlend3Bias + field = "Y axis override (set Zero for no override)", veBlends3_yAxisOverride, {veBlends3_blendParameter} + panel = veBlend3Bias, {veBlends3_blendParameter} dialog = veBlend4Cfg, "VE blend 4 config" field = "#The bias table controls how much of the blend table" @@ -6970,7 +6989,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", veBlends4_blendParameter - panel = veBlend4Bias + field = "Y axis override (set Zero for no override)", veBlends4_yAxisOverride, {veBlends4_blendParameter} + panel = veBlend4Bias, {veBlends4_blendParameter} indicatorPanel = isBoostControlledPanel, 1 indicator = {isBoostControlled}, "No Boost Control", "Boost Control Active" @@ -6984,7 +7004,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#parameter below." panel = isBoostControlledPanel field = "Blend parameter", boostOpenLoopBlends1_blendParameter - panel = boostOpenLoopBlend1Bias + field = "Y axis override (set Zero for no override)", boostOpenLoopBlends1_yAxisOverride, {boostOpenLoopBlends1_blendParameter} + panel = boostOpenLoopBlend1Bias, {boostOpenLoopBlends1_blendParameter} dialog = boostOpenBlend2Cfg, "Boost open loop blend 2 config" field = "#The bias table controls how much of the blend table" @@ -6995,7 +7016,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#parameter below." panel = isBoostControlledPanel field = "Blend parameter", boostOpenLoopBlends2_blendParameter - panel = boostOpenLoopBlend2Bias + field = "Y axis override (set Zero for no override)", boostOpenLoopBlends2_yAxisOverride, {boostOpenLoopBlends2_blendParameter} + panel = boostOpenLoopBlend2Bias, {boostOpenLoopBlends2_blendParameter} dialog = boostClosedBlend1Cfg, "Boost closed loop blend 1 config" field = "#The bias table controls how much of the blend table" @@ -7005,7 +7027,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", boostClosedLoopBlends1_blendParameter - panel = boostClosedLoopBlend1Bias + field = "Y axis override (set Zero for no override)", boostClosedLoopBlends1_yAxisOverride, {boostClosedLoopBlends1_blendParameter} + panel = boostClosedLoopBlend1Bias, {boostClosedLoopBlends1_blendParameter} dialog = boostClosedBlend2Cfg, "Boost closed loop blend 2 config" field = "#The bias table controls how much of the blend table" @@ -7015,7 +7038,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "#The X axis of the bias table is controlled by the selected blend" field = "#parameter below." field = "Blend parameter", boostClosedLoopBlends2_blendParameter - panel = boostClosedLoopBlend2Bias + field = "Y axis override (set Zero for no override)", boostClosedLoopBlends2_yAxisOverride, {boostClosedLoopBlends2_blendParameter} + panel = boostClosedLoopBlend2Bias, {boostClosedLoopBlends2_blendParameter} dialog = dwellSettings, "", yAxis panel = dwellCorrection 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 62625ee9d6..b0b70d5988 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 Wed Jan 17 14:06:57 UTC 2024 +// this file was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 17 14:42:26 UTC 2024 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -1094,6 +1094,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 = 1076535952; 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"; @@ -1334,7 +1335,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.2024.01.17.f407-discovery.3431326988"; + public static final String TS_SIGNATURE = "rusEFI master.2024.01.17.f407-discovery.1076535952"; public static final char TS_SIMULATE_CAN = '>'; public static final char TS_SINGLE_WRITE_COMMAND = 'W'; public static final char TS_TEST_COMMAND = 't'; @@ -2915,7 +2916,7 @@ public class Fields { public static final Field IGNBLENDS1_LOADBINS = Field.create("IGNBLENDS1_LOADBINS", 19840, FieldType.INT16).setScale(1.0).setBaseOffset(0); public static final Field IGNBLENDS1_RPMBINS = Field.create("IGNBLENDS1_RPMBINS", 19856, FieldType.INT16).setScale(1.0).setBaseOffset(0); public static final Field IGNBLENDS1_BLENDPARAMETER = Field.create("IGNBLENDS1_BLENDPARAMETER", 19872, FieldType.INT8, gppwm_channel_e).setScale(1.0).setBaseOffset(0); - public static final Field IGNBLENDS1_ALIGNMENTFILL_AT_161 = Field.create("IGNBLENDS1_ALIGNMENTFILL_AT_161", 19873, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field IGNBLENDS1_YAXISOVERRIDE = Field.create("IGNBLENDS1_YAXISOVERRIDE", 19873, FieldType.INT8, gppwm_channel_e).setScale(1.0).setBaseOffset(0); public static final Field IGNBLENDS1_BLENDBINS = Field.create("IGNBLENDS1_BLENDBINS", 19874, FieldType.INT16).setScale(0.1).setBaseOffset(0); public static final Field IGNBLENDS1_BLENDVALUES = Field.create("IGNBLENDS1_BLENDVALUES", 19890, FieldType.INT8).setScale(0.5).setBaseOffset(0); public static final Field IGNBLENDS1_ALIGNMENTFILL_AT_186 = Field.create("IGNBLENDS1_ALIGNMENTFILL_AT_186", 19898, FieldType.INT8).setScale(1.0).setBaseOffset(0); @@ -2923,7 +2924,7 @@ public class Fields { public static final Field IGNBLENDS2_LOADBINS = Field.create("IGNBLENDS2_LOADBINS", 20028, FieldType.INT16).setScale(1.0).setBaseOffset(0); public static final Field IGNBLENDS2_RPMBINS = Field.create("IGNBLENDS2_RPMBINS", 20044, FieldType.INT16).setScale(1.0).setBaseOffset(0); public static final Field IGNBLENDS2_BLENDPARAMETER = Field.create("IGNBLENDS2_BLENDPARAMETER", 20060, FieldType.INT8, gppwm_channel_e).setScale(1.0).setBaseOffset(0); - public static final Field IGNBLENDS2_ALIGNMENTFILL_AT_161 = Field.create("IGNBLENDS2_ALIGNMENTFILL_AT_161", 20061, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field IGNBLENDS2_YAXISOVERRIDE = Field.create("IGNBLENDS2_YAXISOVERRIDE", 20061, FieldType.INT8, gppwm_channel_e).setScale(1.0).setBaseOffset(0); public static final Field IGNBLENDS2_BLENDBINS = Field.create("IGNBLENDS2_BLENDBINS", 20062, FieldType.INT16).setScale(0.1).setBaseOffset(0); public static final Field IGNBLENDS2_BLENDVALUES = Field.create("IGNBLENDS2_BLENDVALUES", 20078, FieldType.INT8).setScale(0.5).setBaseOffset(0); public static final Field IGNBLENDS2_ALIGNMENTFILL_AT_186 = Field.create("IGNBLENDS2_ALIGNMENTFILL_AT_186", 20086, FieldType.INT8).setScale(1.0).setBaseOffset(0); @@ -2931,7 +2932,7 @@ public class Fields { public static final Field IGNBLENDS3_LOADBINS = Field.create("IGNBLENDS3_LOADBINS", 20216, FieldType.INT16).setScale(1.0).setBaseOffset(0); public static final Field IGNBLENDS3_RPMBINS = Field.create("IGNBLENDS3_RPMBINS", 20232, FieldType.INT16).setScale(1.0).setBaseOffset(0); public static final Field IGNBLENDS3_BLENDPARAMETER = Field.create("IGNBLENDS3_BLENDPARAMETER", 20248, FieldType.INT8, gppwm_channel_e).setScale(1.0).setBaseOffset(0); - public static final Field IGNBLENDS3_ALIGNMENTFILL_AT_161 = Field.create("IGNBLENDS3_ALIGNMENTFILL_AT_161", 20249, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field IGNBLENDS3_YAXISOVERRIDE = Field.create("IGNBLENDS3_YAXISOVERRIDE", 20249, FieldType.INT8, gppwm_channel_e).setScale(1.0).setBaseOffset(0); public static final Field IGNBLENDS3_BLENDBINS = Field.create("IGNBLENDS3_BLENDBINS", 20250, FieldType.INT16).setScale(0.1).setBaseOffset(0); public static final Field IGNBLENDS3_BLENDVALUES = Field.create("IGNBLENDS3_BLENDVALUES", 20266, FieldType.INT8).setScale(0.5).setBaseOffset(0); public static final Field IGNBLENDS3_ALIGNMENTFILL_AT_186 = Field.create("IGNBLENDS3_ALIGNMENTFILL_AT_186", 20274, FieldType.INT8).setScale(1.0).setBaseOffset(0); @@ -2939,7 +2940,7 @@ public class Fields { public static final Field IGNBLENDS4_LOADBINS = Field.create("IGNBLENDS4_LOADBINS", 20404, FieldType.INT16).setScale(1.0).setBaseOffset(0); public static final Field IGNBLENDS4_RPMBINS = Field.create("IGNBLENDS4_RPMBINS", 20420, FieldType.INT16).setScale(1.0).setBaseOffset(0); public static final Field IGNBLENDS4_BLENDPARAMETER = Field.create("IGNBLENDS4_BLENDPARAMETER", 20436, FieldType.INT8, gppwm_channel_e).setScale(1.0).setBaseOffset(0); - public static final Field IGNBLENDS4_ALIGNMENTFILL_AT_161 = Field.create("IGNBLENDS4_ALIGNMENTFILL_AT_161", 20437, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field IGNBLENDS4_YAXISOVERRIDE = Field.create("IGNBLENDS4_YAXISOVERRIDE", 20437, FieldType.INT8, gppwm_channel_e).setScale(1.0).setBaseOffset(0); public static final Field IGNBLENDS4_BLENDBINS = Field.create("IGNBLENDS4_BLENDBINS", 20438, FieldType.INT16).setScale(0.1).setBaseOffset(0); public static final Field IGNBLENDS4_BLENDVALUES = Field.create("IGNBLENDS4_BLENDVALUES", 20454, FieldType.INT8).setScale(0.5).setBaseOffset(0); public static final Field IGNBLENDS4_ALIGNMENTFILL_AT_186 = Field.create("IGNBLENDS4_ALIGNMENTFILL_AT_186", 20462, FieldType.INT8).setScale(1.0).setBaseOffset(0); @@ -2947,7 +2948,7 @@ public class Fields { public static final Field VEBLENDS1_LOADBINS = Field.create("VEBLENDS1_LOADBINS", 20592, FieldType.INT16).setScale(1.0).setBaseOffset(0); public static final Field VEBLENDS1_RPMBINS = Field.create("VEBLENDS1_RPMBINS", 20608, FieldType.INT16).setScale(1.0).setBaseOffset(0); public static final Field VEBLENDS1_BLENDPARAMETER = Field.create("VEBLENDS1_BLENDPARAMETER", 20624, FieldType.INT8, gppwm_channel_e).setScale(1.0).setBaseOffset(0); - public static final Field VEBLENDS1_ALIGNMENTFILL_AT_161 = Field.create("VEBLENDS1_ALIGNMENTFILL_AT_161", 20625, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field VEBLENDS1_YAXISOVERRIDE = Field.create("VEBLENDS1_YAXISOVERRIDE", 20625, FieldType.INT8, gppwm_channel_e).setScale(1.0).setBaseOffset(0); public static final Field VEBLENDS1_BLENDBINS = Field.create("VEBLENDS1_BLENDBINS", 20626, FieldType.INT16).setScale(0.1).setBaseOffset(0); public static final Field VEBLENDS1_BLENDVALUES = Field.create("VEBLENDS1_BLENDVALUES", 20642, FieldType.INT8).setScale(0.5).setBaseOffset(0); public static final Field VEBLENDS1_ALIGNMENTFILL_AT_186 = Field.create("VEBLENDS1_ALIGNMENTFILL_AT_186", 20650, FieldType.INT8).setScale(1.0).setBaseOffset(0); @@ -2955,7 +2956,7 @@ public class Fields { public static final Field VEBLENDS2_LOADBINS = Field.create("VEBLENDS2_LOADBINS", 20780, FieldType.INT16).setScale(1.0).setBaseOffset(0); public static final Field VEBLENDS2_RPMBINS = Field.create("VEBLENDS2_RPMBINS", 20796, FieldType.INT16).setScale(1.0).setBaseOffset(0); public static final Field VEBLENDS2_BLENDPARAMETER = Field.create("VEBLENDS2_BLENDPARAMETER", 20812, FieldType.INT8, gppwm_channel_e).setScale(1.0).setBaseOffset(0); - public static final Field VEBLENDS2_ALIGNMENTFILL_AT_161 = Field.create("VEBLENDS2_ALIGNMENTFILL_AT_161", 20813, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field VEBLENDS2_YAXISOVERRIDE = Field.create("VEBLENDS2_YAXISOVERRIDE", 20813, FieldType.INT8, gppwm_channel_e).setScale(1.0).setBaseOffset(0); public static final Field VEBLENDS2_BLENDBINS = Field.create("VEBLENDS2_BLENDBINS", 20814, FieldType.INT16).setScale(0.1).setBaseOffset(0); public static final Field VEBLENDS2_BLENDVALUES = Field.create("VEBLENDS2_BLENDVALUES", 20830, FieldType.INT8).setScale(0.5).setBaseOffset(0); public static final Field VEBLENDS2_ALIGNMENTFILL_AT_186 = Field.create("VEBLENDS2_ALIGNMENTFILL_AT_186", 20838, FieldType.INT8).setScale(1.0).setBaseOffset(0); @@ -2963,7 +2964,7 @@ public class Fields { public static final Field VEBLENDS3_LOADBINS = Field.create("VEBLENDS3_LOADBINS", 20968, FieldType.INT16).setScale(1.0).setBaseOffset(0); public static final Field VEBLENDS3_RPMBINS = Field.create("VEBLENDS3_RPMBINS", 20984, FieldType.INT16).setScale(1.0).setBaseOffset(0); public static final Field VEBLENDS3_BLENDPARAMETER = Field.create("VEBLENDS3_BLENDPARAMETER", 21000, FieldType.INT8, gppwm_channel_e).setScale(1.0).setBaseOffset(0); - public static final Field VEBLENDS3_ALIGNMENTFILL_AT_161 = Field.create("VEBLENDS3_ALIGNMENTFILL_AT_161", 21001, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field VEBLENDS3_YAXISOVERRIDE = Field.create("VEBLENDS3_YAXISOVERRIDE", 21001, FieldType.INT8, gppwm_channel_e).setScale(1.0).setBaseOffset(0); public static final Field VEBLENDS3_BLENDBINS = Field.create("VEBLENDS3_BLENDBINS", 21002, FieldType.INT16).setScale(0.1).setBaseOffset(0); public static final Field VEBLENDS3_BLENDVALUES = Field.create("VEBLENDS3_BLENDVALUES", 21018, FieldType.INT8).setScale(0.5).setBaseOffset(0); public static final Field VEBLENDS3_ALIGNMENTFILL_AT_186 = Field.create("VEBLENDS3_ALIGNMENTFILL_AT_186", 21026, FieldType.INT8).setScale(1.0).setBaseOffset(0); @@ -2971,7 +2972,7 @@ public class Fields { public static final Field VEBLENDS4_LOADBINS = Field.create("VEBLENDS4_LOADBINS", 21156, FieldType.INT16).setScale(1.0).setBaseOffset(0); public static final Field VEBLENDS4_RPMBINS = Field.create("VEBLENDS4_RPMBINS", 21172, FieldType.INT16).setScale(1.0).setBaseOffset(0); public static final Field VEBLENDS4_BLENDPARAMETER = Field.create("VEBLENDS4_BLENDPARAMETER", 21188, FieldType.INT8, gppwm_channel_e).setScale(1.0).setBaseOffset(0); - public static final Field VEBLENDS4_ALIGNMENTFILL_AT_161 = Field.create("VEBLENDS4_ALIGNMENTFILL_AT_161", 21189, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field VEBLENDS4_YAXISOVERRIDE = Field.create("VEBLENDS4_YAXISOVERRIDE", 21189, FieldType.INT8, gppwm_channel_e).setScale(1.0).setBaseOffset(0); public static final Field VEBLENDS4_BLENDBINS = Field.create("VEBLENDS4_BLENDBINS", 21190, FieldType.INT16).setScale(0.1).setBaseOffset(0); public static final Field VEBLENDS4_BLENDVALUES = Field.create("VEBLENDS4_BLENDVALUES", 21206, FieldType.INT8).setScale(0.5).setBaseOffset(0); public static final Field VEBLENDS4_ALIGNMENTFILL_AT_186 = Field.create("VEBLENDS4_ALIGNMENTFILL_AT_186", 21214, FieldType.INT8).setScale(1.0).setBaseOffset(0); @@ -2981,7 +2982,7 @@ public class Fields { public static final Field BOOSTOPENLOOPBLENDS1_LOADBINS = Field.create("BOOSTOPENLOOPBLENDS1_LOADBINS", 21392, FieldType.INT16).setScale(1.0).setBaseOffset(0); public static final Field BOOSTOPENLOOPBLENDS1_RPMBINS = Field.create("BOOSTOPENLOOPBLENDS1_RPMBINS", 21408, FieldType.INT16).setScale(1.0).setBaseOffset(0); public static final Field BOOSTOPENLOOPBLENDS1_BLENDPARAMETER = Field.create("BOOSTOPENLOOPBLENDS1_BLENDPARAMETER", 21424, FieldType.INT8, gppwm_channel_e).setScale(1.0).setBaseOffset(0); - public static final Field BOOSTOPENLOOPBLENDS1_ALIGNMENTFILL_AT_161 = Field.create("BOOSTOPENLOOPBLENDS1_ALIGNMENTFILL_AT_161", 21425, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field BOOSTOPENLOOPBLENDS1_YAXISOVERRIDE = Field.create("BOOSTOPENLOOPBLENDS1_YAXISOVERRIDE", 21425, FieldType.INT8, gppwm_channel_e).setScale(1.0).setBaseOffset(0); public static final Field BOOSTOPENLOOPBLENDS1_BLENDBINS = Field.create("BOOSTOPENLOOPBLENDS1_BLENDBINS", 21426, FieldType.INT16).setScale(0.1).setBaseOffset(0); public static final Field BOOSTOPENLOOPBLENDS1_BLENDVALUES = Field.create("BOOSTOPENLOOPBLENDS1_BLENDVALUES", 21442, FieldType.INT8).setScale(0.5).setBaseOffset(0); public static final Field BOOSTOPENLOOPBLENDS1_ALIGNMENTFILL_AT_186 = Field.create("BOOSTOPENLOOPBLENDS1_ALIGNMENTFILL_AT_186", 21450, FieldType.INT8).setScale(1.0).setBaseOffset(0); @@ -2989,7 +2990,7 @@ public class Fields { public static final Field BOOSTOPENLOOPBLENDS2_LOADBINS = Field.create("BOOSTOPENLOOPBLENDS2_LOADBINS", 21580, FieldType.INT16).setScale(1.0).setBaseOffset(0); public static final Field BOOSTOPENLOOPBLENDS2_RPMBINS = Field.create("BOOSTOPENLOOPBLENDS2_RPMBINS", 21596, FieldType.INT16).setScale(1.0).setBaseOffset(0); public static final Field BOOSTOPENLOOPBLENDS2_BLENDPARAMETER = Field.create("BOOSTOPENLOOPBLENDS2_BLENDPARAMETER", 21612, FieldType.INT8, gppwm_channel_e).setScale(1.0).setBaseOffset(0); - public static final Field BOOSTOPENLOOPBLENDS2_ALIGNMENTFILL_AT_161 = Field.create("BOOSTOPENLOOPBLENDS2_ALIGNMENTFILL_AT_161", 21613, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field BOOSTOPENLOOPBLENDS2_YAXISOVERRIDE = Field.create("BOOSTOPENLOOPBLENDS2_YAXISOVERRIDE", 21613, FieldType.INT8, gppwm_channel_e).setScale(1.0).setBaseOffset(0); public static final Field BOOSTOPENLOOPBLENDS2_BLENDBINS = Field.create("BOOSTOPENLOOPBLENDS2_BLENDBINS", 21614, FieldType.INT16).setScale(0.1).setBaseOffset(0); public static final Field BOOSTOPENLOOPBLENDS2_BLENDVALUES = Field.create("BOOSTOPENLOOPBLENDS2_BLENDVALUES", 21630, FieldType.INT8).setScale(0.5).setBaseOffset(0); public static final Field BOOSTOPENLOOPBLENDS2_ALIGNMENTFILL_AT_186 = Field.create("BOOSTOPENLOOPBLENDS2_ALIGNMENTFILL_AT_186", 21638, FieldType.INT8).setScale(1.0).setBaseOffset(0); @@ -2997,7 +2998,7 @@ public class Fields { public static final Field BOOSTCLOSEDLOOPBLENDS1_LOADBINS = Field.create("BOOSTCLOSEDLOOPBLENDS1_LOADBINS", 21768, FieldType.INT16).setScale(1.0).setBaseOffset(0); public static final Field BOOSTCLOSEDLOOPBLENDS1_RPMBINS = Field.create("BOOSTCLOSEDLOOPBLENDS1_RPMBINS", 21784, FieldType.INT16).setScale(1.0).setBaseOffset(0); public static final Field BOOSTCLOSEDLOOPBLENDS1_BLENDPARAMETER = Field.create("BOOSTCLOSEDLOOPBLENDS1_BLENDPARAMETER", 21800, FieldType.INT8, gppwm_channel_e).setScale(1.0).setBaseOffset(0); - public static final Field BOOSTCLOSEDLOOPBLENDS1_ALIGNMENTFILL_AT_161 = Field.create("BOOSTCLOSEDLOOPBLENDS1_ALIGNMENTFILL_AT_161", 21801, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field BOOSTCLOSEDLOOPBLENDS1_YAXISOVERRIDE = Field.create("BOOSTCLOSEDLOOPBLENDS1_YAXISOVERRIDE", 21801, FieldType.INT8, gppwm_channel_e).setScale(1.0).setBaseOffset(0); public static final Field BOOSTCLOSEDLOOPBLENDS1_BLENDBINS = Field.create("BOOSTCLOSEDLOOPBLENDS1_BLENDBINS", 21802, FieldType.INT16).setScale(0.1).setBaseOffset(0); public static final Field BOOSTCLOSEDLOOPBLENDS1_BLENDVALUES = Field.create("BOOSTCLOSEDLOOPBLENDS1_BLENDVALUES", 21818, FieldType.INT8).setScale(0.5).setBaseOffset(0); public static final Field BOOSTCLOSEDLOOPBLENDS1_ALIGNMENTFILL_AT_186 = Field.create("BOOSTCLOSEDLOOPBLENDS1_ALIGNMENTFILL_AT_186", 21826, FieldType.INT8).setScale(1.0).setBaseOffset(0); @@ -3005,7 +3006,7 @@ public class Fields { public static final Field BOOSTCLOSEDLOOPBLENDS2_LOADBINS = Field.create("BOOSTCLOSEDLOOPBLENDS2_LOADBINS", 21956, FieldType.INT16).setScale(1.0).setBaseOffset(0); public static final Field BOOSTCLOSEDLOOPBLENDS2_RPMBINS = Field.create("BOOSTCLOSEDLOOPBLENDS2_RPMBINS", 21972, FieldType.INT16).setScale(1.0).setBaseOffset(0); public static final Field BOOSTCLOSEDLOOPBLENDS2_BLENDPARAMETER = Field.create("BOOSTCLOSEDLOOPBLENDS2_BLENDPARAMETER", 21988, FieldType.INT8, gppwm_channel_e).setScale(1.0).setBaseOffset(0); - public static final Field BOOSTCLOSEDLOOPBLENDS2_ALIGNMENTFILL_AT_161 = Field.create("BOOSTCLOSEDLOOPBLENDS2_ALIGNMENTFILL_AT_161", 21989, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field BOOSTCLOSEDLOOPBLENDS2_YAXISOVERRIDE = Field.create("BOOSTCLOSEDLOOPBLENDS2_YAXISOVERRIDE", 21989, FieldType.INT8, gppwm_channel_e).setScale(1.0).setBaseOffset(0); public static final Field BOOSTCLOSEDLOOPBLENDS2_BLENDBINS = Field.create("BOOSTCLOSEDLOOPBLENDS2_BLENDBINS", 21990, FieldType.INT16).setScale(0.1).setBaseOffset(0); public static final Field BOOSTCLOSEDLOOPBLENDS2_BLENDVALUES = Field.create("BOOSTCLOSEDLOOPBLENDS2_BLENDVALUES", 22006, FieldType.INT8).setScale(0.5).setBaseOffset(0); public static final Field BOOSTCLOSEDLOOPBLENDS2_ALIGNMENTFILL_AT_186 = Field.create("BOOSTCLOSEDLOOPBLENDS2_ALIGNMENTFILL_AT_186", 22014, FieldType.INT8).setScale(1.0).setBaseOffset(0); @@ -4513,7 +4514,7 @@ public class Fields { IGNBLENDS1_LOADBINS, IGNBLENDS1_RPMBINS, IGNBLENDS1_BLENDPARAMETER, - IGNBLENDS1_ALIGNMENTFILL_AT_161, + IGNBLENDS1_YAXISOVERRIDE, IGNBLENDS1_BLENDBINS, IGNBLENDS1_BLENDVALUES, IGNBLENDS1_ALIGNMENTFILL_AT_186, @@ -4521,7 +4522,7 @@ public class Fields { IGNBLENDS2_LOADBINS, IGNBLENDS2_RPMBINS, IGNBLENDS2_BLENDPARAMETER, - IGNBLENDS2_ALIGNMENTFILL_AT_161, + IGNBLENDS2_YAXISOVERRIDE, IGNBLENDS2_BLENDBINS, IGNBLENDS2_BLENDVALUES, IGNBLENDS2_ALIGNMENTFILL_AT_186, @@ -4529,7 +4530,7 @@ public class Fields { IGNBLENDS3_LOADBINS, IGNBLENDS3_RPMBINS, IGNBLENDS3_BLENDPARAMETER, - IGNBLENDS3_ALIGNMENTFILL_AT_161, + IGNBLENDS3_YAXISOVERRIDE, IGNBLENDS3_BLENDBINS, IGNBLENDS3_BLENDVALUES, IGNBLENDS3_ALIGNMENTFILL_AT_186, @@ -4537,7 +4538,7 @@ public class Fields { IGNBLENDS4_LOADBINS, IGNBLENDS4_RPMBINS, IGNBLENDS4_BLENDPARAMETER, - IGNBLENDS4_ALIGNMENTFILL_AT_161, + IGNBLENDS4_YAXISOVERRIDE, IGNBLENDS4_BLENDBINS, IGNBLENDS4_BLENDVALUES, IGNBLENDS4_ALIGNMENTFILL_AT_186, @@ -4545,7 +4546,7 @@ public class Fields { VEBLENDS1_LOADBINS, VEBLENDS1_RPMBINS, VEBLENDS1_BLENDPARAMETER, - VEBLENDS1_ALIGNMENTFILL_AT_161, + VEBLENDS1_YAXISOVERRIDE, VEBLENDS1_BLENDBINS, VEBLENDS1_BLENDVALUES, VEBLENDS1_ALIGNMENTFILL_AT_186, @@ -4553,7 +4554,7 @@ public class Fields { VEBLENDS2_LOADBINS, VEBLENDS2_RPMBINS, VEBLENDS2_BLENDPARAMETER, - VEBLENDS2_ALIGNMENTFILL_AT_161, + VEBLENDS2_YAXISOVERRIDE, VEBLENDS2_BLENDBINS, VEBLENDS2_BLENDVALUES, VEBLENDS2_ALIGNMENTFILL_AT_186, @@ -4561,7 +4562,7 @@ public class Fields { VEBLENDS3_LOADBINS, VEBLENDS3_RPMBINS, VEBLENDS3_BLENDPARAMETER, - VEBLENDS3_ALIGNMENTFILL_AT_161, + VEBLENDS3_YAXISOVERRIDE, VEBLENDS3_BLENDBINS, VEBLENDS3_BLENDVALUES, VEBLENDS3_ALIGNMENTFILL_AT_186, @@ -4569,7 +4570,7 @@ public class Fields { VEBLENDS4_LOADBINS, VEBLENDS4_RPMBINS, VEBLENDS4_BLENDPARAMETER, - VEBLENDS4_ALIGNMENTFILL_AT_161, + VEBLENDS4_YAXISOVERRIDE, VEBLENDS4_BLENDBINS, VEBLENDS4_BLENDVALUES, VEBLENDS4_ALIGNMENTFILL_AT_186, @@ -4579,7 +4580,7 @@ public class Fields { BOOSTOPENLOOPBLENDS1_LOADBINS, BOOSTOPENLOOPBLENDS1_RPMBINS, BOOSTOPENLOOPBLENDS1_BLENDPARAMETER, - BOOSTOPENLOOPBLENDS1_ALIGNMENTFILL_AT_161, + BOOSTOPENLOOPBLENDS1_YAXISOVERRIDE, BOOSTOPENLOOPBLENDS1_BLENDBINS, BOOSTOPENLOOPBLENDS1_BLENDVALUES, BOOSTOPENLOOPBLENDS1_ALIGNMENTFILL_AT_186, @@ -4587,7 +4588,7 @@ public class Fields { BOOSTOPENLOOPBLENDS2_LOADBINS, BOOSTOPENLOOPBLENDS2_RPMBINS, BOOSTOPENLOOPBLENDS2_BLENDPARAMETER, - BOOSTOPENLOOPBLENDS2_ALIGNMENTFILL_AT_161, + BOOSTOPENLOOPBLENDS2_YAXISOVERRIDE, BOOSTOPENLOOPBLENDS2_BLENDBINS, BOOSTOPENLOOPBLENDS2_BLENDVALUES, BOOSTOPENLOOPBLENDS2_ALIGNMENTFILL_AT_186, @@ -4595,7 +4596,7 @@ public class Fields { BOOSTCLOSEDLOOPBLENDS1_LOADBINS, BOOSTCLOSEDLOOPBLENDS1_RPMBINS, BOOSTCLOSEDLOOPBLENDS1_BLENDPARAMETER, - BOOSTCLOSEDLOOPBLENDS1_ALIGNMENTFILL_AT_161, + BOOSTCLOSEDLOOPBLENDS1_YAXISOVERRIDE, BOOSTCLOSEDLOOPBLENDS1_BLENDBINS, BOOSTCLOSEDLOOPBLENDS1_BLENDVALUES, BOOSTCLOSEDLOOPBLENDS1_ALIGNMENTFILL_AT_186, @@ -4603,7 +4604,7 @@ public class Fields { BOOSTCLOSEDLOOPBLENDS2_LOADBINS, BOOSTCLOSEDLOOPBLENDS2_RPMBINS, BOOSTCLOSEDLOOPBLENDS2_BLENDPARAMETER, - BOOSTCLOSEDLOOPBLENDS2_ALIGNMENTFILL_AT_161, + BOOSTCLOSEDLOOPBLENDS2_YAXISOVERRIDE, BOOSTCLOSEDLOOPBLENDS2_BLENDBINS, BOOSTCLOSEDLOOPBLENDS2_BLENDVALUES, BOOSTCLOSEDLOOPBLENDS2_ALIGNMENTFILL_AT_186,