From 6783734505a147919e98a3dad286e2a5a0b34d5e Mon Sep 17 00:00:00 2001 From: GitHub gen-configs Action Date: Thu, 28 Nov 2024 23:29:00 +0000 Subject: [PATCH] Auto-generated configs and docs --- .../console/binary/generated/data_logs.ini | 3 + .../binary/generated/fancy_content.ini | 3 + .../binary/generated/output_channels.ini | 3 + ...ration_generated_structures_alphax-2chan.h | 26 +++++++- ...ration_generated_structures_alphax-4chan.h | 26 +++++++- ...ion_generated_structures_alphax-4chan_f7.h | 26 +++++++- ...ation_generated_structures_alphax-4k-gdi.h | 26 +++++++- ...n_generated_structures_alphax-8chan-revA.h | 26 +++++++- ...ration_generated_structures_alphax-8chan.h | 26 +++++++- ...ion_generated_structures_alphax-8chan_f7.h | 26 +++++++- ...ation_generated_structures_alphax-silver.h | 26 +++++++- ...ation_generated_structures_at_start_f435.h | 26 +++++++- ...configuration_generated_structures_atlas.h | 26 +++++++- ...tion_generated_structures_f407-discovery.h | 26 +++++++- ...tion_generated_structures_f429-discovery.h | 26 +++++++- ...tion_generated_structures_f469-discovery.h | 26 +++++++- ...ation_generated_structures_frankenso_na6.h | 26 +++++++- ...nfiguration_generated_structures_haba208.h | 26 +++++++- ...ation_generated_structures_hellen-112-17.h | 26 +++++++- ...ation_generated_structures_hellen-gm-e67.h | 26 +++++++- ...tion_generated_structures_hellen-honda-k.h | 26 +++++++- ...guration_generated_structures_hellen-nb1.h | 26 +++++++- ...ion_generated_structures_hellen121nissan.h | 26 +++++++- ...ration_generated_structures_hellen121vag.h | 26 +++++++- ...iguration_generated_structures_hellen128.h | 26 +++++++- ...on_generated_structures_hellen154hyundai.h | 26 +++++++- ...generated_structures_hellen154hyundai_f7.h | 26 +++++++- ...figuration_generated_structures_hellen72.h | 26 +++++++- ...figuration_generated_structures_hellen81.h | 26 +++++++- ...uration_generated_structures_hellen88bmw.h | 26 +++++++- ...iguration_generated_structures_hellenNA6.h | 26 +++++++- ...ration_generated_structures_hellenNA8_96.h | 26 +++++++- ...configuration_generated_structures_m74_9.h | 26 +++++++- ...ation_generated_structures_mre-legacy_f4.h | 26 +++++++- ...onfiguration_generated_structures_mre_f4.h | 26 +++++++- ...onfiguration_generated_structures_mre_f7.h | 26 +++++++- ...uration_generated_structures_nucleo_f413.h | 26 +++++++- ...guration_generated_structures_proteus_f4.h | 26 +++++++- ...guration_generated_structures_proteus_f7.h | 26 +++++++- ...guration_generated_structures_proteus_h7.h | 26 +++++++- ..._configuration_generated_structures_s105.h | 26 +++++++- ...ion_generated_structures_small-can-board.h | 26 +++++++- ...on_generated_structures_stm32f429_nucleo.h | 26 +++++++- ...on_generated_structures_stm32f767_nucleo.h | 26 +++++++- ...on_generated_structures_stm32h743_nucleo.h | 26 +++++++- ...tion_generated_structures_subaru_eg33_f7.h | 26 +++++++- ...configuration_generated_structures_t-b-g.h | 26 +++++++- ...figuration_generated_structures_tdg-pdm8.h | 26 +++++++- ...configuration_generated_structures_uaefi.h | 26 +++++++- ...figuration_generated_structures_uaefi121.h | 26 +++++++- .../generated/rusefi_generated_alphax-2chan.h | 6 +- .../generated/rusefi_generated_alphax-4chan.h | 6 +- .../rusefi_generated_alphax-4chan_f7.h | 6 +- .../rusefi_generated_alphax-4k-gdi.h | 6 +- .../rusefi_generated_alphax-8chan-revA.h | 6 +- .../generated/rusefi_generated_alphax-8chan.h | 6 +- .../rusefi_generated_alphax-8chan_f7.h | 6 +- .../rusefi_generated_alphax-silver.h | 6 +- .../rusefi_generated_at_start_f435.h | 6 +- .../generated/rusefi_generated_atlas.h | 6 +- .../rusefi_generated_f407-discovery.h | 6 +- .../rusefi_generated_f429-discovery.h | 6 +- .../rusefi_generated_f469-discovery.h | 6 +- .../rusefi_generated_frankenso_na6.h | 6 +- .../generated/rusefi_generated_haba208.h | 6 +- .../rusefi_generated_hellen-112-17.h | 6 +- .../rusefi_generated_hellen-gm-e67.h | 6 +- .../rusefi_generated_hellen-honda-k.h | 6 +- .../generated/rusefi_generated_hellen-nb1.h | 6 +- .../rusefi_generated_hellen121nissan.h | 6 +- .../generated/rusefi_generated_hellen121vag.h | 6 +- .../generated/rusefi_generated_hellen128.h | 6 +- .../rusefi_generated_hellen154hyundai.h | 6 +- .../rusefi_generated_hellen154hyundai_f7.h | 6 +- .../generated/rusefi_generated_hellen72.h | 6 +- .../generated/rusefi_generated_hellen81.h | 6 +- .../generated/rusefi_generated_hellen88bmw.h | 6 +- .../generated/rusefi_generated_hellenNA6.h | 6 +- .../generated/rusefi_generated_hellenNA8_96.h | 6 +- .../generated/rusefi_generated_m74_9.h | 6 +- .../rusefi_generated_mre-legacy_f4.h | 6 +- .../generated/rusefi_generated_mre_f4.h | 6 +- .../generated/rusefi_generated_mre_f7.h | 6 +- .../generated/rusefi_generated_nucleo_f413.h | 6 +- .../generated/rusefi_generated_proteus_f4.h | 6 +- .../generated/rusefi_generated_proteus_f7.h | 6 +- .../generated/rusefi_generated_proteus_h7.h | 6 +- .../generated/rusefi_generated_s105.h | 6 +- .../rusefi_generated_small-can-board.h | 6 +- .../rusefi_generated_stm32f429_nucleo.h | 6 +- .../rusefi_generated_stm32f767_nucleo.h | 6 +- .../rusefi_generated_stm32h743_nucleo.h | 6 +- .../rusefi_generated_subaru_eg33_f7.h | 6 +- .../generated/rusefi_generated_t-b-g.h | 6 +- .../generated/rusefi_generated_tdg-pdm8.h | 6 +- .../generated/rusefi_generated_uaefi.h | 6 +- .../generated/rusefi_generated_uaefi121.h | 6 +- .../generated/signature_alphax-2chan.h | 4 +- .../generated/signature_alphax-4chan.h | 4 +- .../generated/signature_alphax-4chan_f7.h | 4 +- .../generated/signature_alphax-4k-gdi.h | 4 +- .../generated/signature_alphax-8chan-revA.h | 4 +- .../generated/signature_alphax-8chan.h | 4 +- .../generated/signature_alphax-8chan_f7.h | 4 +- .../generated/signature_alphax-silver.h | 4 +- .../generated/signature_at_start_f435.h | 4 +- .../controllers/generated/signature_atlas.h | 4 +- .../generated/signature_f407-discovery.h | 4 +- .../generated/signature_f429-discovery.h | 4 +- .../generated/signature_f469-discovery.h | 4 +- .../generated/signature_frankenso_na6.h | 4 +- .../controllers/generated/signature_haba208.h | 4 +- .../generated/signature_hellen-112-17.h | 4 +- .../generated/signature_hellen-gm-e67.h | 4 +- .../generated/signature_hellen-honda-k.h | 4 +- .../generated/signature_hellen-nb1.h | 4 +- .../generated/signature_hellen121nissan.h | 4 +- .../generated/signature_hellen121vag.h | 4 +- .../generated/signature_hellen128.h | 4 +- .../generated/signature_hellen154hyundai.h | 4 +- .../generated/signature_hellen154hyundai_f7.h | 4 +- .../generated/signature_hellen72.h | 4 +- .../generated/signature_hellen81.h | 4 +- .../generated/signature_hellen88bmw.h | 4 +- .../generated/signature_hellenNA6.h | 4 +- .../generated/signature_hellenNA8_96.h | 4 +- .../controllers/generated/signature_m74_9.h | 4 +- .../generated/signature_mre-legacy_f4.h | 4 +- .../controllers/generated/signature_mre_f4.h | 4 +- .../controllers/generated/signature_mre_f7.h | 4 +- .../generated/signature_nucleo_f413.h | 4 +- .../generated/signature_proteus_f4.h | 4 +- .../generated/signature_proteus_f7.h | 4 +- .../generated/signature_proteus_h7.h | 4 +- .../controllers/generated/signature_s105.h | 4 +- .../generated/signature_small-can-board.h | 4 +- .../generated/signature_stm32f429_nucleo.h | 4 +- .../generated/signature_stm32f767_nucleo.h | 4 +- .../generated/signature_stm32h743_nucleo.h | 4 +- .../generated/signature_subaru_eg33_f7.h | 4 +- .../controllers/generated/signature_t-b-g.h | 4 +- .../generated/signature_tdg-pdm8.h | 4 +- .../controllers/generated/signature_uaefi.h | 4 +- .../generated/signature_uaefi121.h | 4 +- .../lua/generated/output_lookup_generated.cpp | 15 +++++ .../lua/generated/value_lookup_generated.cpp | 24 +++++++ .../lua/generated/value_lookup_generated.md | 9 +++ .../nitrous_control_state_generated.h | 62 +++++++++---------- firmware/tunerstudio/generated/rusefi.ini | 25 ++++++-- .../generated/rusefi_alphax-2chan.ini | 25 ++++++-- .../generated/rusefi_alphax-4chan.ini | 25 ++++++-- .../generated/rusefi_alphax-4chan_f7.ini | 25 ++++++-- .../generated/rusefi_alphax-4k-gdi.ini | 25 ++++++-- .../generated/rusefi_alphax-8chan-revA.ini | 25 ++++++-- .../generated/rusefi_alphax-8chan.ini | 25 ++++++-- .../generated/rusefi_alphax-8chan_f7.ini | 25 ++++++-- .../generated/rusefi_alphax-silver.ini | 25 ++++++-- .../generated/rusefi_at_start_f435.ini | 25 ++++++-- .../tunerstudio/generated/rusefi_atlas.ini | 25 ++++++-- .../generated/rusefi_f407-discovery.ini | 25 ++++++-- .../generated/rusefi_f429-discovery.ini | 25 ++++++-- .../generated/rusefi_f469-discovery.ini | 25 ++++++-- .../generated/rusefi_frankenso_na6.ini | 25 ++++++-- .../tunerstudio/generated/rusefi_haba208.ini | 25 ++++++-- .../generated/rusefi_hellen-112-17.ini | 25 ++++++-- .../generated/rusefi_hellen-gm-e67.ini | 25 ++++++-- .../generated/rusefi_hellen-honda-k.ini | 24 ++++++- .../generated/rusefi_hellen-nb1.ini | 25 ++++++-- .../generated/rusefi_hellen121nissan.ini | 25 ++++++-- .../generated/rusefi_hellen121vag.ini | 25 ++++++-- .../generated/rusefi_hellen128.ini | 25 ++++++-- .../generated/rusefi_hellen154hyundai.ini | 25 ++++++-- .../generated/rusefi_hellen154hyundai_f7.ini | 25 ++++++-- .../tunerstudio/generated/rusefi_hellen72.ini | 25 ++++++-- .../tunerstudio/generated/rusefi_hellen81.ini | 25 ++++++-- .../generated/rusefi_hellen88bmw.ini | 25 ++++++-- .../generated/rusefi_hellenNA6.ini | 25 ++++++-- .../generated/rusefi_hellenNA8_96.ini | 25 ++++++-- .../tunerstudio/generated/rusefi_m74_9.ini | 25 ++++++-- .../generated/rusefi_mre-legacy_f4.ini | 25 ++++++-- .../tunerstudio/generated/rusefi_mre_f4.ini | 25 ++++++-- .../tunerstudio/generated/rusefi_mre_f7.ini | 25 ++++++-- .../generated/rusefi_nucleo_f413.ini | 25 ++++++-- .../generated/rusefi_proteus_f4.ini | 25 ++++++-- .../generated/rusefi_proteus_f7.ini | 25 ++++++-- .../generated/rusefi_proteus_h7.ini | 25 ++++++-- .../tunerstudio/generated/rusefi_s105.ini | 25 ++++++-- .../generated/rusefi_small-can-board.ini | 25 ++++++-- .../generated/rusefi_stm32f429_nucleo.ini | 25 ++++++-- .../generated/rusefi_stm32f767_nucleo.ini | 25 ++++++-- .../generated/rusefi_stm32h743_nucleo.ini | 25 ++++++-- .../generated/rusefi_subaru_eg33_f7.ini | 25 ++++++-- .../tunerstudio/generated/rusefi_t-b-g.ini | 25 ++++++-- .../tunerstudio/generated/rusefi_tdg-pdm8.ini | 25 ++++++-- .../tunerstudio/generated/rusefi_uaefi.ini | 25 ++++++-- .../tunerstudio/generated/rusefi_uaefi121.ini | 25 ++++++-- .../com/rusefi/config/generated/Fields.java | 16 +++-- .../config/generated/NitrousController.java | 6 ++ 198 files changed, 2430 insertions(+), 602 deletions(-) diff --git a/firmware/console/binary/generated/data_logs.ini b/firmware/console/binary/generated/data_logs.ini index 494b9c7476..628e9976f6 100644 --- a/firmware/console/binary/generated/data_logs.ini +++ b/firmware/console/binary/generated/data_logs.ini @@ -527,6 +527,9 @@ entry = isRpmConditionSatisfied, "isRpmConditionSatisfied", int, "%d" entry = isAppConditionSatisfied, "isAppConditionSatisfied", int, "%d" entry = isFlatShiftConditionSatisfied, "isFlatShiftConditionSatisfied", int, "%d" entry = isArmed, "isArmed", int, "%d" +entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" +entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" +entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" entry = isAntilagCondition, "isAntilagCondition", int, "%d" entry = ALSMinRPMCondition, "ALSMinRPMCondition", int, "%d" entry = ALSMaxRPMCondition, "ALSMaxRPMCondition", int, "%d" diff --git a/firmware/console/binary/generated/fancy_content.ini b/firmware/console/binary/generated/fancy_content.ini index f8107851e3..fca814e9ac 100644 --- a/firmware/console/binary/generated/fancy_content.ini +++ b/firmware/console/binary/generated/fancy_content.ini @@ -175,6 +175,9 @@ dialog = shift_torque_reduction_stateDialog, "shift_torque_reduction_state" indicatorPanel = nitrous_control_stateIndicatorPanel, 2 indicator = {isArmed}, "isArmed No", "isArmed Yes" + indicator = {isTpsConditionSatisfied}, "isTpsConditionSatisfied No", "isTpsConditionSatisfied Yes" + indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" + indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel diff --git a/firmware/console/binary/generated/output_channels.ini b/firmware/console/binary/generated/output_channels.ini index 6e66631e6c..fd4156084b 100644 --- a/firmware/console/binary/generated/output_channels.ini +++ b/firmware/console/binary/generated/output_channels.ini @@ -591,6 +591,9 @@ isAppConditionSatisfied = bits, U32, 1124, [4:4] isFlatShiftConditionSatisfied = bits, U32, 1124, [5:5] ; total TS size = 1128 isArmed = bits, U32, 1128, [0:0] +isTpsConditionSatisfied = bits, U32, 1128, [1:1] +isCltConditionSatisfied = bits, U32, 1128, [2:2] +isMapConditionSatisfied = bits, U32, 1128, [3:3] ; total TS size = 1132 isAntilagCondition = bits, U32, 1132, [0:0] ALSMinRPMCondition = bits, U32, 1132, [1:1] 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 7e41ce0870..28e05d7a48 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_alphax-2chan.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_alphax-2chan.h @@ -4852,16 +4852,36 @@ struct engine_configuration_s { */ float nitrousLuaGaugeArmingValue; /** - * units: units * offset 3944 */ + int nitrousMinimumTps; + /** + * units: deg C + * offset 3948 + */ + uint8_t nitrousMinimumClt; + /** + * need 4 byte alignment + * units: units + * offset 3949 + */ + uint8_t alignmentFill_at_3949[1]; + /** + * units: kPa + * offset 3950 + */ + int16_t nitrousMaximumMap; + /** + * units: units + * offset 3952 + */ uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; /** * need 4 byte alignment * units: units - * offset 4038 + * offset 4039 */ - uint8_t alignmentFill_at_4038[2]; + uint8_t alignmentFill_at_4039[1]; }; static_assert(sizeof(engine_configuration_s) == 4040); 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 1eddfbb0dc..8aa6b9ad93 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_alphax-4chan.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_alphax-4chan.h @@ -4852,16 +4852,36 @@ struct engine_configuration_s { */ float nitrousLuaGaugeArmingValue; /** - * units: units * offset 3944 */ + int nitrousMinimumTps; + /** + * units: deg C + * offset 3948 + */ + uint8_t nitrousMinimumClt; + /** + * need 4 byte alignment + * units: units + * offset 3949 + */ + uint8_t alignmentFill_at_3949[1]; + /** + * units: kPa + * offset 3950 + */ + int16_t nitrousMaximumMap; + /** + * units: units + * offset 3952 + */ uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; /** * need 4 byte alignment * units: units - * offset 4038 + * offset 4039 */ - uint8_t alignmentFill_at_4038[2]; + uint8_t alignmentFill_at_4039[1]; }; static_assert(sizeof(engine_configuration_s) == 4040); 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 1eddfbb0dc..8aa6b9ad93 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 @@ -4852,16 +4852,36 @@ struct engine_configuration_s { */ float nitrousLuaGaugeArmingValue; /** - * units: units * offset 3944 */ + int nitrousMinimumTps; + /** + * units: deg C + * offset 3948 + */ + uint8_t nitrousMinimumClt; + /** + * need 4 byte alignment + * units: units + * offset 3949 + */ + uint8_t alignmentFill_at_3949[1]; + /** + * units: kPa + * offset 3950 + */ + int16_t nitrousMaximumMap; + /** + * units: units + * offset 3952 + */ uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; /** * need 4 byte alignment * units: units - * offset 4038 + * offset 4039 */ - uint8_t alignmentFill_at_4038[2]; + uint8_t alignmentFill_at_4039[1]; }; static_assert(sizeof(engine_configuration_s) == 4040); diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_alphax-4k-gdi.h b/firmware/controllers/generated/engine_configuration_generated_structures_alphax-4k-gdi.h index 6f3f328c92..480c9cd9ca 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_alphax-4k-gdi.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_alphax-4k-gdi.h @@ -4852,16 +4852,36 @@ struct engine_configuration_s { */ float nitrousLuaGaugeArmingValue; /** - * units: units * offset 3944 */ + int nitrousMinimumTps; + /** + * units: deg C + * offset 3948 + */ + uint8_t nitrousMinimumClt; + /** + * need 4 byte alignment + * units: units + * offset 3949 + */ + uint8_t alignmentFill_at_3949[1]; + /** + * units: kPa + * offset 3950 + */ + int16_t nitrousMaximumMap; + /** + * units: units + * offset 3952 + */ uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; /** * need 4 byte alignment * units: units - * offset 4038 + * offset 4039 */ - uint8_t alignmentFill_at_4038[2]; + uint8_t alignmentFill_at_4039[1]; }; static_assert(sizeof(engine_configuration_s) == 4040); 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 585e9f0198..dfd0d02551 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 @@ -4852,16 +4852,36 @@ struct engine_configuration_s { */ float nitrousLuaGaugeArmingValue; /** - * units: units * offset 3944 */ + int nitrousMinimumTps; + /** + * units: deg C + * offset 3948 + */ + uint8_t nitrousMinimumClt; + /** + * need 4 byte alignment + * units: units + * offset 3949 + */ + uint8_t alignmentFill_at_3949[1]; + /** + * units: kPa + * offset 3950 + */ + int16_t nitrousMaximumMap; + /** + * units: units + * offset 3952 + */ uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; /** * need 4 byte alignment * units: units - * offset 4038 + * offset 4039 */ - uint8_t alignmentFill_at_4038[2]; + uint8_t alignmentFill_at_4039[1]; }; static_assert(sizeof(engine_configuration_s) == 4040); 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 988c27dc9b..338fef2871 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_alphax-8chan.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_alphax-8chan.h @@ -4852,16 +4852,36 @@ struct engine_configuration_s { */ float nitrousLuaGaugeArmingValue; /** - * units: units * offset 3960 */ + int nitrousMinimumTps; + /** + * units: deg C + * offset 3964 + */ + uint8_t nitrousMinimumClt; + /** + * need 4 byte alignment + * units: units + * offset 3965 + */ + uint8_t alignmentFill_at_3965[1]; + /** + * units: kPa + * offset 3966 + */ + int16_t nitrousMaximumMap; + /** + * units: units + * offset 3968 + */ uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; /** * need 4 byte alignment * units: units - * offset 4054 + * offset 4055 */ - uint8_t alignmentFill_at_4054[2]; + uint8_t alignmentFill_at_4055[1]; }; static_assert(sizeof(engine_configuration_s) == 4056); 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 988c27dc9b..338fef2871 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 @@ -4852,16 +4852,36 @@ struct engine_configuration_s { */ float nitrousLuaGaugeArmingValue; /** - * units: units * offset 3960 */ + int nitrousMinimumTps; + /** + * units: deg C + * offset 3964 + */ + uint8_t nitrousMinimumClt; + /** + * need 4 byte alignment + * units: units + * offset 3965 + */ + uint8_t alignmentFill_at_3965[1]; + /** + * units: kPa + * offset 3966 + */ + int16_t nitrousMaximumMap; + /** + * units: units + * offset 3968 + */ uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; /** * need 4 byte alignment * units: units - * offset 4054 + * offset 4055 */ - uint8_t alignmentFill_at_4054[2]; + uint8_t alignmentFill_at_4055[1]; }; static_assert(sizeof(engine_configuration_s) == 4056); diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_alphax-silver.h b/firmware/controllers/generated/engine_configuration_generated_structures_alphax-silver.h index 7be3c97f2d..9ed9c11050 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_alphax-silver.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_alphax-silver.h @@ -4948,16 +4948,36 @@ struct engine_configuration_s { */ float nitrousLuaGaugeArmingValue; /** - * units: units * offset 3948 */ + int nitrousMinimumTps; + /** + * units: deg C + * offset 3952 + */ + uint8_t nitrousMinimumClt; + /** + * need 4 byte alignment + * units: units + * offset 3953 + */ + uint8_t alignmentFill_at_3953[1]; + /** + * units: kPa + * offset 3954 + */ + int16_t nitrousMaximumMap; + /** + * units: units + * offset 3956 + */ uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; /** * need 4 byte alignment * units: units - * offset 4042 + * offset 4043 */ - uint8_t alignmentFill_at_4042[2]; + uint8_t alignmentFill_at_4043[1]; }; static_assert(sizeof(engine_configuration_s) == 4044); 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 9365d55dcb..45f361de43 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 @@ -4852,16 +4852,36 @@ struct engine_configuration_s { */ float nitrousLuaGaugeArmingValue; /** - * units: units * offset 3944 */ + int nitrousMinimumTps; + /** + * units: deg C + * offset 3948 + */ + uint8_t nitrousMinimumClt; + /** + * need 4 byte alignment + * units: units + * offset 3949 + */ + uint8_t alignmentFill_at_3949[1]; + /** + * units: kPa + * offset 3950 + */ + int16_t nitrousMaximumMap; + /** + * units: units + * offset 3952 + */ uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; /** * need 4 byte alignment * units: units - * offset 4038 + * offset 4039 */ - uint8_t alignmentFill_at_4038[2]; + uint8_t alignmentFill_at_4039[1]; }; static_assert(sizeof(engine_configuration_s) == 4040); diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_atlas.h b/firmware/controllers/generated/engine_configuration_generated_structures_atlas.h index 229785f42c..0d27672e34 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_atlas.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_atlas.h @@ -4852,16 +4852,36 @@ struct engine_configuration_s { */ float nitrousLuaGaugeArmingValue; /** - * units: units * offset 3784 */ + int nitrousMinimumTps; + /** + * units: deg C + * offset 3788 + */ + uint8_t nitrousMinimumClt; + /** + * need 4 byte alignment + * units: units + * offset 3789 + */ + uint8_t alignmentFill_at_3789[1]; + /** + * units: kPa + * offset 3790 + */ + int16_t nitrousMaximumMap; + /** + * units: units + * offset 3792 + */ uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; /** * need 4 byte alignment * units: units - * offset 3878 + * offset 3879 */ - uint8_t alignmentFill_at_3878[2]; + uint8_t alignmentFill_at_3879[1]; }; static_assert(sizeof(engine_configuration_s) == 3880); 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 ffef1cd4c9..a6cde0f234 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_f407-discovery.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_f407-discovery.h @@ -4852,16 +4852,36 @@ struct engine_configuration_s { */ float nitrousLuaGaugeArmingValue; /** - * units: units * offset 3944 */ + int nitrousMinimumTps; + /** + * units: deg C + * offset 3948 + */ + uint8_t nitrousMinimumClt; + /** + * need 4 byte alignment + * units: units + * offset 3949 + */ + uint8_t alignmentFill_at_3949[1]; + /** + * units: kPa + * offset 3950 + */ + int16_t nitrousMaximumMap; + /** + * units: units + * offset 3952 + */ uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; /** * need 4 byte alignment * units: units - * offset 4038 + * offset 4039 */ - uint8_t alignmentFill_at_4038[2]; + uint8_t alignmentFill_at_4039[1]; }; static_assert(sizeof(engine_configuration_s) == 4040); 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 9365d55dcb..45f361de43 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_f429-discovery.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_f429-discovery.h @@ -4852,16 +4852,36 @@ struct engine_configuration_s { */ float nitrousLuaGaugeArmingValue; /** - * units: units * offset 3944 */ + int nitrousMinimumTps; + /** + * units: deg C + * offset 3948 + */ + uint8_t nitrousMinimumClt; + /** + * need 4 byte alignment + * units: units + * offset 3949 + */ + uint8_t alignmentFill_at_3949[1]; + /** + * units: kPa + * offset 3950 + */ + int16_t nitrousMaximumMap; + /** + * units: units + * offset 3952 + */ uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; /** * need 4 byte alignment * units: units - * offset 4038 + * offset 4039 */ - uint8_t alignmentFill_at_4038[2]; + uint8_t alignmentFill_at_4039[1]; }; static_assert(sizeof(engine_configuration_s) == 4040); 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 9365d55dcb..45f361de43 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_f469-discovery.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_f469-discovery.h @@ -4852,16 +4852,36 @@ struct engine_configuration_s { */ float nitrousLuaGaugeArmingValue; /** - * units: units * offset 3944 */ + int nitrousMinimumTps; + /** + * units: deg C + * offset 3948 + */ + uint8_t nitrousMinimumClt; + /** + * need 4 byte alignment + * units: units + * offset 3949 + */ + uint8_t alignmentFill_at_3949[1]; + /** + * units: kPa + * offset 3950 + */ + int16_t nitrousMaximumMap; + /** + * units: units + * offset 3952 + */ uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; /** * need 4 byte alignment * units: units - * offset 4038 + * offset 4039 */ - uint8_t alignmentFill_at_4038[2]; + uint8_t alignmentFill_at_4039[1]; }; static_assert(sizeof(engine_configuration_s) == 4040); 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 9365d55dcb..45f361de43 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_frankenso_na6.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_frankenso_na6.h @@ -4852,16 +4852,36 @@ struct engine_configuration_s { */ float nitrousLuaGaugeArmingValue; /** - * units: units * offset 3944 */ + int nitrousMinimumTps; + /** + * units: deg C + * offset 3948 + */ + uint8_t nitrousMinimumClt; + /** + * need 4 byte alignment + * units: units + * offset 3949 + */ + uint8_t alignmentFill_at_3949[1]; + /** + * units: kPa + * offset 3950 + */ + int16_t nitrousMaximumMap; + /** + * units: units + * offset 3952 + */ uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; /** * need 4 byte alignment * units: units - * offset 4038 + * offset 4039 */ - uint8_t alignmentFill_at_4038[2]; + uint8_t alignmentFill_at_4039[1]; }; static_assert(sizeof(engine_configuration_s) == 4040); diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_haba208.h b/firmware/controllers/generated/engine_configuration_generated_structures_haba208.h index 9365d55dcb..45f361de43 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_haba208.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_haba208.h @@ -4852,16 +4852,36 @@ struct engine_configuration_s { */ float nitrousLuaGaugeArmingValue; /** - * units: units * offset 3944 */ + int nitrousMinimumTps; + /** + * units: deg C + * offset 3948 + */ + uint8_t nitrousMinimumClt; + /** + * need 4 byte alignment + * units: units + * offset 3949 + */ + uint8_t alignmentFill_at_3949[1]; + /** + * units: kPa + * offset 3950 + */ + int16_t nitrousMaximumMap; + /** + * units: units + * offset 3952 + */ uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; /** * need 4 byte alignment * units: units - * offset 4038 + * offset 4039 */ - uint8_t alignmentFill_at_4038[2]; + uint8_t alignmentFill_at_4039[1]; }; static_assert(sizeof(engine_configuration_s) == 4040); 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 9365d55dcb..45f361de43 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 @@ -4852,16 +4852,36 @@ struct engine_configuration_s { */ float nitrousLuaGaugeArmingValue; /** - * units: units * offset 3944 */ + int nitrousMinimumTps; + /** + * units: deg C + * offset 3948 + */ + uint8_t nitrousMinimumClt; + /** + * need 4 byte alignment + * units: units + * offset 3949 + */ + uint8_t alignmentFill_at_3949[1]; + /** + * units: kPa + * offset 3950 + */ + int16_t nitrousMaximumMap; + /** + * units: units + * offset 3952 + */ uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; /** * need 4 byte alignment * units: units - * offset 4038 + * offset 4039 */ - uint8_t alignmentFill_at_4038[2]; + uint8_t alignmentFill_at_4039[1]; }; static_assert(sizeof(engine_configuration_s) == 4040); 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 9365d55dcb..45f361de43 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 @@ -4852,16 +4852,36 @@ struct engine_configuration_s { */ float nitrousLuaGaugeArmingValue; /** - * units: units * offset 3944 */ + int nitrousMinimumTps; + /** + * units: deg C + * offset 3948 + */ + uint8_t nitrousMinimumClt; + /** + * need 4 byte alignment + * units: units + * offset 3949 + */ + uint8_t alignmentFill_at_3949[1]; + /** + * units: kPa + * offset 3950 + */ + int16_t nitrousMaximumMap; + /** + * units: units + * offset 3952 + */ uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; /** * need 4 byte alignment * units: units - * offset 4038 + * offset 4039 */ - uint8_t alignmentFill_at_4038[2]; + uint8_t alignmentFill_at_4039[1]; }; static_assert(sizeof(engine_configuration_s) == 4040); 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 bfca1df7b3..d73e4c7a74 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 @@ -4852,16 +4852,36 @@ struct engine_configuration_s { */ float nitrousLuaGaugeArmingValue; /** - * units: units * offset 3944 */ + int nitrousMinimumTps; + /** + * units: deg C + * offset 3948 + */ + uint8_t nitrousMinimumClt; + /** + * need 4 byte alignment + * units: units + * offset 3949 + */ + uint8_t alignmentFill_at_3949[1]; + /** + * units: kPa + * offset 3950 + */ + int16_t nitrousMaximumMap; + /** + * units: units + * offset 3952 + */ uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; /** * need 4 byte alignment * units: units - * offset 4038 + * offset 4039 */ - uint8_t alignmentFill_at_4038[2]; + uint8_t alignmentFill_at_4039[1]; }; static_assert(sizeof(engine_configuration_s) == 4040); 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 9365d55dcb..45f361de43 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_hellen-nb1.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_hellen-nb1.h @@ -4852,16 +4852,36 @@ struct engine_configuration_s { */ float nitrousLuaGaugeArmingValue; /** - * units: units * offset 3944 */ + int nitrousMinimumTps; + /** + * units: deg C + * offset 3948 + */ + uint8_t nitrousMinimumClt; + /** + * need 4 byte alignment + * units: units + * offset 3949 + */ + uint8_t alignmentFill_at_3949[1]; + /** + * units: kPa + * offset 3950 + */ + int16_t nitrousMaximumMap; + /** + * units: units + * offset 3952 + */ uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; /** * need 4 byte alignment * units: units - * offset 4038 + * offset 4039 */ - uint8_t alignmentFill_at_4038[2]; + uint8_t alignmentFill_at_4039[1]; }; static_assert(sizeof(engine_configuration_s) == 4040); diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_hellen121nissan.h b/firmware/controllers/generated/engine_configuration_generated_structures_hellen121nissan.h index 9365d55dcb..45f361de43 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_hellen121nissan.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_hellen121nissan.h @@ -4852,16 +4852,36 @@ struct engine_configuration_s { */ float nitrousLuaGaugeArmingValue; /** - * units: units * offset 3944 */ + int nitrousMinimumTps; + /** + * units: deg C + * offset 3948 + */ + uint8_t nitrousMinimumClt; + /** + * need 4 byte alignment + * units: units + * offset 3949 + */ + uint8_t alignmentFill_at_3949[1]; + /** + * units: kPa + * offset 3950 + */ + int16_t nitrousMaximumMap; + /** + * units: units + * offset 3952 + */ uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; /** * need 4 byte alignment * units: units - * offset 4038 + * offset 4039 */ - uint8_t alignmentFill_at_4038[2]; + uint8_t alignmentFill_at_4039[1]; }; static_assert(sizeof(engine_configuration_s) == 4040); diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_hellen121vag.h b/firmware/controllers/generated/engine_configuration_generated_structures_hellen121vag.h index 9365d55dcb..45f361de43 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_hellen121vag.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_hellen121vag.h @@ -4852,16 +4852,36 @@ struct engine_configuration_s { */ float nitrousLuaGaugeArmingValue; /** - * units: units * offset 3944 */ + int nitrousMinimumTps; + /** + * units: deg C + * offset 3948 + */ + uint8_t nitrousMinimumClt; + /** + * need 4 byte alignment + * units: units + * offset 3949 + */ + uint8_t alignmentFill_at_3949[1]; + /** + * units: kPa + * offset 3950 + */ + int16_t nitrousMaximumMap; + /** + * units: units + * offset 3952 + */ uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; /** * need 4 byte alignment * units: units - * offset 4038 + * offset 4039 */ - uint8_t alignmentFill_at_4038[2]; + uint8_t alignmentFill_at_4039[1]; }; static_assert(sizeof(engine_configuration_s) == 4040); diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_hellen128.h b/firmware/controllers/generated/engine_configuration_generated_structures_hellen128.h index 9365d55dcb..45f361de43 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_hellen128.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_hellen128.h @@ -4852,16 +4852,36 @@ struct engine_configuration_s { */ float nitrousLuaGaugeArmingValue; /** - * units: units * offset 3944 */ + int nitrousMinimumTps; + /** + * units: deg C + * offset 3948 + */ + uint8_t nitrousMinimumClt; + /** + * need 4 byte alignment + * units: units + * offset 3949 + */ + uint8_t alignmentFill_at_3949[1]; + /** + * units: kPa + * offset 3950 + */ + int16_t nitrousMaximumMap; + /** + * units: units + * offset 3952 + */ uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; /** * need 4 byte alignment * units: units - * offset 4038 + * offset 4039 */ - uint8_t alignmentFill_at_4038[2]; + uint8_t alignmentFill_at_4039[1]; }; static_assert(sizeof(engine_configuration_s) == 4040); diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_hellen154hyundai.h b/firmware/controllers/generated/engine_configuration_generated_structures_hellen154hyundai.h index 9365d55dcb..45f361de43 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_hellen154hyundai.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_hellen154hyundai.h @@ -4852,16 +4852,36 @@ struct engine_configuration_s { */ float nitrousLuaGaugeArmingValue; /** - * units: units * offset 3944 */ + int nitrousMinimumTps; + /** + * units: deg C + * offset 3948 + */ + uint8_t nitrousMinimumClt; + /** + * need 4 byte alignment + * units: units + * offset 3949 + */ + uint8_t alignmentFill_at_3949[1]; + /** + * units: kPa + * offset 3950 + */ + int16_t nitrousMaximumMap; + /** + * units: units + * offset 3952 + */ uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; /** * need 4 byte alignment * units: units - * offset 4038 + * offset 4039 */ - uint8_t alignmentFill_at_4038[2]; + uint8_t alignmentFill_at_4039[1]; }; static_assert(sizeof(engine_configuration_s) == 4040); diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_hellen154hyundai_f7.h b/firmware/controllers/generated/engine_configuration_generated_structures_hellen154hyundai_f7.h index 9365d55dcb..45f361de43 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_hellen154hyundai_f7.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_hellen154hyundai_f7.h @@ -4852,16 +4852,36 @@ struct engine_configuration_s { */ float nitrousLuaGaugeArmingValue; /** - * units: units * offset 3944 */ + int nitrousMinimumTps; + /** + * units: deg C + * offset 3948 + */ + uint8_t nitrousMinimumClt; + /** + * need 4 byte alignment + * units: units + * offset 3949 + */ + uint8_t alignmentFill_at_3949[1]; + /** + * units: kPa + * offset 3950 + */ + int16_t nitrousMaximumMap; + /** + * units: units + * offset 3952 + */ uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; /** * need 4 byte alignment * units: units - * offset 4038 + * offset 4039 */ - uint8_t alignmentFill_at_4038[2]; + uint8_t alignmentFill_at_4039[1]; }; static_assert(sizeof(engine_configuration_s) == 4040); diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_hellen72.h b/firmware/controllers/generated/engine_configuration_generated_structures_hellen72.h index 9365d55dcb..45f361de43 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_hellen72.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_hellen72.h @@ -4852,16 +4852,36 @@ struct engine_configuration_s { */ float nitrousLuaGaugeArmingValue; /** - * units: units * offset 3944 */ + int nitrousMinimumTps; + /** + * units: deg C + * offset 3948 + */ + uint8_t nitrousMinimumClt; + /** + * need 4 byte alignment + * units: units + * offset 3949 + */ + uint8_t alignmentFill_at_3949[1]; + /** + * units: kPa + * offset 3950 + */ + int16_t nitrousMaximumMap; + /** + * units: units + * offset 3952 + */ uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; /** * need 4 byte alignment * units: units - * offset 4038 + * offset 4039 */ - uint8_t alignmentFill_at_4038[2]; + uint8_t alignmentFill_at_4039[1]; }; static_assert(sizeof(engine_configuration_s) == 4040); diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_hellen81.h b/firmware/controllers/generated/engine_configuration_generated_structures_hellen81.h index 9365d55dcb..45f361de43 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_hellen81.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_hellen81.h @@ -4852,16 +4852,36 @@ struct engine_configuration_s { */ float nitrousLuaGaugeArmingValue; /** - * units: units * offset 3944 */ + int nitrousMinimumTps; + /** + * units: deg C + * offset 3948 + */ + uint8_t nitrousMinimumClt; + /** + * need 4 byte alignment + * units: units + * offset 3949 + */ + uint8_t alignmentFill_at_3949[1]; + /** + * units: kPa + * offset 3950 + */ + int16_t nitrousMaximumMap; + /** + * units: units + * offset 3952 + */ uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; /** * need 4 byte alignment * units: units - * offset 4038 + * offset 4039 */ - uint8_t alignmentFill_at_4038[2]; + uint8_t alignmentFill_at_4039[1]; }; static_assert(sizeof(engine_configuration_s) == 4040); diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_hellen88bmw.h b/firmware/controllers/generated/engine_configuration_generated_structures_hellen88bmw.h index 9365d55dcb..45f361de43 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_hellen88bmw.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_hellen88bmw.h @@ -4852,16 +4852,36 @@ struct engine_configuration_s { */ float nitrousLuaGaugeArmingValue; /** - * units: units * offset 3944 */ + int nitrousMinimumTps; + /** + * units: deg C + * offset 3948 + */ + uint8_t nitrousMinimumClt; + /** + * need 4 byte alignment + * units: units + * offset 3949 + */ + uint8_t alignmentFill_at_3949[1]; + /** + * units: kPa + * offset 3950 + */ + int16_t nitrousMaximumMap; + /** + * units: units + * offset 3952 + */ uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; /** * need 4 byte alignment * units: units - * offset 4038 + * offset 4039 */ - uint8_t alignmentFill_at_4038[2]; + uint8_t alignmentFill_at_4039[1]; }; static_assert(sizeof(engine_configuration_s) == 4040); diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_hellenNA6.h b/firmware/controllers/generated/engine_configuration_generated_structures_hellenNA6.h index 9365d55dcb..45f361de43 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_hellenNA6.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_hellenNA6.h @@ -4852,16 +4852,36 @@ struct engine_configuration_s { */ float nitrousLuaGaugeArmingValue; /** - * units: units * offset 3944 */ + int nitrousMinimumTps; + /** + * units: deg C + * offset 3948 + */ + uint8_t nitrousMinimumClt; + /** + * need 4 byte alignment + * units: units + * offset 3949 + */ + uint8_t alignmentFill_at_3949[1]; + /** + * units: kPa + * offset 3950 + */ + int16_t nitrousMaximumMap; + /** + * units: units + * offset 3952 + */ uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; /** * need 4 byte alignment * units: units - * offset 4038 + * offset 4039 */ - uint8_t alignmentFill_at_4038[2]; + uint8_t alignmentFill_at_4039[1]; }; static_assert(sizeof(engine_configuration_s) == 4040); 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 9365d55dcb..45f361de43 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_hellenNA8_96.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_hellenNA8_96.h @@ -4852,16 +4852,36 @@ struct engine_configuration_s { */ float nitrousLuaGaugeArmingValue; /** - * units: units * offset 3944 */ + int nitrousMinimumTps; + /** + * units: deg C + * offset 3948 + */ + uint8_t nitrousMinimumClt; + /** + * need 4 byte alignment + * units: units + * offset 3949 + */ + uint8_t alignmentFill_at_3949[1]; + /** + * units: kPa + * offset 3950 + */ + int16_t nitrousMaximumMap; + /** + * units: units + * offset 3952 + */ uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; /** * need 4 byte alignment * units: units - * offset 4038 + * offset 4039 */ - uint8_t alignmentFill_at_4038[2]; + uint8_t alignmentFill_at_4039[1]; }; static_assert(sizeof(engine_configuration_s) == 4040); 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 9365d55dcb..45f361de43 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_m74_9.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_m74_9.h @@ -4852,16 +4852,36 @@ struct engine_configuration_s { */ float nitrousLuaGaugeArmingValue; /** - * units: units * offset 3944 */ + int nitrousMinimumTps; + /** + * units: deg C + * offset 3948 + */ + uint8_t nitrousMinimumClt; + /** + * need 4 byte alignment + * units: units + * offset 3949 + */ + uint8_t alignmentFill_at_3949[1]; + /** + * units: kPa + * offset 3950 + */ + int16_t nitrousMaximumMap; + /** + * units: units + * offset 3952 + */ uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; /** * need 4 byte alignment * units: units - * offset 4038 + * offset 4039 */ - uint8_t alignmentFill_at_4038[2]; + uint8_t alignmentFill_at_4039[1]; }; static_assert(sizeof(engine_configuration_s) == 4040); diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_mre-legacy_f4.h b/firmware/controllers/generated/engine_configuration_generated_structures_mre-legacy_f4.h index df83fde41c..c31dec5bb4 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_mre-legacy_f4.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_mre-legacy_f4.h @@ -4852,16 +4852,36 @@ struct engine_configuration_s { */ float nitrousLuaGaugeArmingValue; /** - * units: units * offset 3944 */ + int nitrousMinimumTps; + /** + * units: deg C + * offset 3948 + */ + uint8_t nitrousMinimumClt; + /** + * need 4 byte alignment + * units: units + * offset 3949 + */ + uint8_t alignmentFill_at_3949[1]; + /** + * units: kPa + * offset 3950 + */ + int16_t nitrousMaximumMap; + /** + * units: units + * offset 3952 + */ uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; /** * need 4 byte alignment * units: units - * offset 4038 + * offset 4039 */ - uint8_t alignmentFill_at_4038[2]; + uint8_t alignmentFill_at_4039[1]; }; static_assert(sizeof(engine_configuration_s) == 4040); 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 df83fde41c..c31dec5bb4 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_mre_f4.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_mre_f4.h @@ -4852,16 +4852,36 @@ struct engine_configuration_s { */ float nitrousLuaGaugeArmingValue; /** - * units: units * offset 3944 */ + int nitrousMinimumTps; + /** + * units: deg C + * offset 3948 + */ + uint8_t nitrousMinimumClt; + /** + * need 4 byte alignment + * units: units + * offset 3949 + */ + uint8_t alignmentFill_at_3949[1]; + /** + * units: kPa + * offset 3950 + */ + int16_t nitrousMaximumMap; + /** + * units: units + * offset 3952 + */ uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; /** * need 4 byte alignment * units: units - * offset 4038 + * offset 4039 */ - uint8_t alignmentFill_at_4038[2]; + uint8_t alignmentFill_at_4039[1]; }; static_assert(sizeof(engine_configuration_s) == 4040); 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 df83fde41c..c31dec5bb4 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_mre_f7.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_mre_f7.h @@ -4852,16 +4852,36 @@ struct engine_configuration_s { */ float nitrousLuaGaugeArmingValue; /** - * units: units * offset 3944 */ + int nitrousMinimumTps; + /** + * units: deg C + * offset 3948 + */ + uint8_t nitrousMinimumClt; + /** + * need 4 byte alignment + * units: units + * offset 3949 + */ + uint8_t alignmentFill_at_3949[1]; + /** + * units: kPa + * offset 3950 + */ + int16_t nitrousMaximumMap; + /** + * units: units + * offset 3952 + */ uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; /** * need 4 byte alignment * units: units - * offset 4038 + * offset 4039 */ - uint8_t alignmentFill_at_4038[2]; + uint8_t alignmentFill_at_4039[1]; }; static_assert(sizeof(engine_configuration_s) == 4040); diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_nucleo_f413.h b/firmware/controllers/generated/engine_configuration_generated_structures_nucleo_f413.h index 9365d55dcb..45f361de43 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_nucleo_f413.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_nucleo_f413.h @@ -4852,16 +4852,36 @@ struct engine_configuration_s { */ float nitrousLuaGaugeArmingValue; /** - * units: units * offset 3944 */ + int nitrousMinimumTps; + /** + * units: deg C + * offset 3948 + */ + uint8_t nitrousMinimumClt; + /** + * need 4 byte alignment + * units: units + * offset 3949 + */ + uint8_t alignmentFill_at_3949[1]; + /** + * units: kPa + * offset 3950 + */ + int16_t nitrousMaximumMap; + /** + * units: units + * offset 3952 + */ uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; /** * need 4 byte alignment * units: units - * offset 4038 + * offset 4039 */ - uint8_t alignmentFill_at_4038[2]; + uint8_t alignmentFill_at_4039[1]; }; static_assert(sizeof(engine_configuration_s) == 4040); 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 6b344c3eb9..852f1c7bc7 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_proteus_f4.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_proteus_f4.h @@ -4852,16 +4852,36 @@ struct engine_configuration_s { */ float nitrousLuaGaugeArmingValue; /** - * units: units * offset 3944 */ + int nitrousMinimumTps; + /** + * units: deg C + * offset 3948 + */ + uint8_t nitrousMinimumClt; + /** + * need 4 byte alignment + * units: units + * offset 3949 + */ + uint8_t alignmentFill_at_3949[1]; + /** + * units: kPa + * offset 3950 + */ + int16_t nitrousMaximumMap; + /** + * units: units + * offset 3952 + */ uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; /** * need 4 byte alignment * units: units - * offset 4038 + * offset 4039 */ - uint8_t alignmentFill_at_4038[2]; + uint8_t alignmentFill_at_4039[1]; }; static_assert(sizeof(engine_configuration_s) == 4040); 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 6b344c3eb9..852f1c7bc7 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_proteus_f7.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_proteus_f7.h @@ -4852,16 +4852,36 @@ struct engine_configuration_s { */ float nitrousLuaGaugeArmingValue; /** - * units: units * offset 3944 */ + int nitrousMinimumTps; + /** + * units: deg C + * offset 3948 + */ + uint8_t nitrousMinimumClt; + /** + * need 4 byte alignment + * units: units + * offset 3949 + */ + uint8_t alignmentFill_at_3949[1]; + /** + * units: kPa + * offset 3950 + */ + int16_t nitrousMaximumMap; + /** + * units: units + * offset 3952 + */ uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; /** * need 4 byte alignment * units: units - * offset 4038 + * offset 4039 */ - uint8_t alignmentFill_at_4038[2]; + uint8_t alignmentFill_at_4039[1]; }; static_assert(sizeof(engine_configuration_s) == 4040); 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 6b344c3eb9..852f1c7bc7 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_proteus_h7.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_proteus_h7.h @@ -4852,16 +4852,36 @@ struct engine_configuration_s { */ float nitrousLuaGaugeArmingValue; /** - * units: units * offset 3944 */ + int nitrousMinimumTps; + /** + * units: deg C + * offset 3948 + */ + uint8_t nitrousMinimumClt; + /** + * need 4 byte alignment + * units: units + * offset 3949 + */ + uint8_t alignmentFill_at_3949[1]; + /** + * units: kPa + * offset 3950 + */ + int16_t nitrousMaximumMap; + /** + * units: units + * offset 3952 + */ uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; /** * need 4 byte alignment * units: units - * offset 4038 + * offset 4039 */ - uint8_t alignmentFill_at_4038[2]; + uint8_t alignmentFill_at_4039[1]; }; static_assert(sizeof(engine_configuration_s) == 4040); diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_s105.h b/firmware/controllers/generated/engine_configuration_generated_structures_s105.h index 9365d55dcb..45f361de43 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_s105.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_s105.h @@ -4852,16 +4852,36 @@ struct engine_configuration_s { */ float nitrousLuaGaugeArmingValue; /** - * units: units * offset 3944 */ + int nitrousMinimumTps; + /** + * units: deg C + * offset 3948 + */ + uint8_t nitrousMinimumClt; + /** + * need 4 byte alignment + * units: units + * offset 3949 + */ + uint8_t alignmentFill_at_3949[1]; + /** + * units: kPa + * offset 3950 + */ + int16_t nitrousMaximumMap; + /** + * units: units + * offset 3952 + */ uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; /** * need 4 byte alignment * units: units - * offset 4038 + * offset 4039 */ - uint8_t alignmentFill_at_4038[2]; + uint8_t alignmentFill_at_4039[1]; }; static_assert(sizeof(engine_configuration_s) == 4040); 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 9365d55dcb..45f361de43 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 @@ -4852,16 +4852,36 @@ struct engine_configuration_s { */ float nitrousLuaGaugeArmingValue; /** - * units: units * offset 3944 */ + int nitrousMinimumTps; + /** + * units: deg C + * offset 3948 + */ + uint8_t nitrousMinimumClt; + /** + * need 4 byte alignment + * units: units + * offset 3949 + */ + uint8_t alignmentFill_at_3949[1]; + /** + * units: kPa + * offset 3950 + */ + int16_t nitrousMaximumMap; + /** + * units: units + * offset 3952 + */ uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; /** * need 4 byte alignment * units: units - * offset 4038 + * offset 4039 */ - uint8_t alignmentFill_at_4038[2]; + uint8_t alignmentFill_at_4039[1]; }; static_assert(sizeof(engine_configuration_s) == 4040); 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 9365d55dcb..45f361de43 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_stm32f429_nucleo.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_stm32f429_nucleo.h @@ -4852,16 +4852,36 @@ struct engine_configuration_s { */ float nitrousLuaGaugeArmingValue; /** - * units: units * offset 3944 */ + int nitrousMinimumTps; + /** + * units: deg C + * offset 3948 + */ + uint8_t nitrousMinimumClt; + /** + * need 4 byte alignment + * units: units + * offset 3949 + */ + uint8_t alignmentFill_at_3949[1]; + /** + * units: kPa + * offset 3950 + */ + int16_t nitrousMaximumMap; + /** + * units: units + * offset 3952 + */ uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; /** * need 4 byte alignment * units: units - * offset 4038 + * offset 4039 */ - uint8_t alignmentFill_at_4038[2]; + uint8_t alignmentFill_at_4039[1]; }; static_assert(sizeof(engine_configuration_s) == 4040); 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 9365d55dcb..45f361de43 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_stm32f767_nucleo.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_stm32f767_nucleo.h @@ -4852,16 +4852,36 @@ struct engine_configuration_s { */ float nitrousLuaGaugeArmingValue; /** - * units: units * offset 3944 */ + int nitrousMinimumTps; + /** + * units: deg C + * offset 3948 + */ + uint8_t nitrousMinimumClt; + /** + * need 4 byte alignment + * units: units + * offset 3949 + */ + uint8_t alignmentFill_at_3949[1]; + /** + * units: kPa + * offset 3950 + */ + int16_t nitrousMaximumMap; + /** + * units: units + * offset 3952 + */ uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; /** * need 4 byte alignment * units: units - * offset 4038 + * offset 4039 */ - uint8_t alignmentFill_at_4038[2]; + uint8_t alignmentFill_at_4039[1]; }; static_assert(sizeof(engine_configuration_s) == 4040); diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_stm32h743_nucleo.h b/firmware/controllers/generated/engine_configuration_generated_structures_stm32h743_nucleo.h index 9365d55dcb..45f361de43 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_stm32h743_nucleo.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_stm32h743_nucleo.h @@ -4852,16 +4852,36 @@ struct engine_configuration_s { */ float nitrousLuaGaugeArmingValue; /** - * units: units * offset 3944 */ + int nitrousMinimumTps; + /** + * units: deg C + * offset 3948 + */ + uint8_t nitrousMinimumClt; + /** + * need 4 byte alignment + * units: units + * offset 3949 + */ + uint8_t alignmentFill_at_3949[1]; + /** + * units: kPa + * offset 3950 + */ + int16_t nitrousMaximumMap; + /** + * units: units + * offset 3952 + */ uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; /** * need 4 byte alignment * units: units - * offset 4038 + * offset 4039 */ - uint8_t alignmentFill_at_4038[2]; + uint8_t alignmentFill_at_4039[1]; }; static_assert(sizeof(engine_configuration_s) == 4040); diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_subaru_eg33_f7.h b/firmware/controllers/generated/engine_configuration_generated_structures_subaru_eg33_f7.h index 9365d55dcb..45f361de43 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_subaru_eg33_f7.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_subaru_eg33_f7.h @@ -4852,16 +4852,36 @@ struct engine_configuration_s { */ float nitrousLuaGaugeArmingValue; /** - * units: units * offset 3944 */ + int nitrousMinimumTps; + /** + * units: deg C + * offset 3948 + */ + uint8_t nitrousMinimumClt; + /** + * need 4 byte alignment + * units: units + * offset 3949 + */ + uint8_t alignmentFill_at_3949[1]; + /** + * units: kPa + * offset 3950 + */ + int16_t nitrousMaximumMap; + /** + * units: units + * offset 3952 + */ uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; /** * need 4 byte alignment * units: units - * offset 4038 + * offset 4039 */ - uint8_t alignmentFill_at_4038[2]; + uint8_t alignmentFill_at_4039[1]; }; static_assert(sizeof(engine_configuration_s) == 4040); 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 9365d55dcb..45f361de43 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 @@ -4852,16 +4852,36 @@ struct engine_configuration_s { */ float nitrousLuaGaugeArmingValue; /** - * units: units * offset 3944 */ + int nitrousMinimumTps; + /** + * units: deg C + * offset 3948 + */ + uint8_t nitrousMinimumClt; + /** + * need 4 byte alignment + * units: units + * offset 3949 + */ + uint8_t alignmentFill_at_3949[1]; + /** + * units: kPa + * offset 3950 + */ + int16_t nitrousMaximumMap; + /** + * units: units + * offset 3952 + */ uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; /** * need 4 byte alignment * units: units - * offset 4038 + * offset 4039 */ - uint8_t alignmentFill_at_4038[2]; + uint8_t alignmentFill_at_4039[1]; }; static_assert(sizeof(engine_configuration_s) == 4040); 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 9365d55dcb..45f361de43 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_tdg-pdm8.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_tdg-pdm8.h @@ -4852,16 +4852,36 @@ struct engine_configuration_s { */ float nitrousLuaGaugeArmingValue; /** - * units: units * offset 3944 */ + int nitrousMinimumTps; + /** + * units: deg C + * offset 3948 + */ + uint8_t nitrousMinimumClt; + /** + * need 4 byte alignment + * units: units + * offset 3949 + */ + uint8_t alignmentFill_at_3949[1]; + /** + * units: kPa + * offset 3950 + */ + int16_t nitrousMaximumMap; + /** + * units: units + * offset 3952 + */ uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; /** * need 4 byte alignment * units: units - * offset 4038 + * offset 4039 */ - uint8_t alignmentFill_at_4038[2]; + uint8_t alignmentFill_at_4039[1]; }; static_assert(sizeof(engine_configuration_s) == 4040); diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_uaefi.h b/firmware/controllers/generated/engine_configuration_generated_structures_uaefi.h index c2d0620ab0..4cdff97251 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_uaefi.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_uaefi.h @@ -4852,16 +4852,36 @@ struct engine_configuration_s { */ float nitrousLuaGaugeArmingValue; /** - * units: units * offset 3944 */ + int nitrousMinimumTps; + /** + * units: deg C + * offset 3948 + */ + uint8_t nitrousMinimumClt; + /** + * need 4 byte alignment + * units: units + * offset 3949 + */ + uint8_t alignmentFill_at_3949[1]; + /** + * units: kPa + * offset 3950 + */ + int16_t nitrousMaximumMap; + /** + * units: units + * offset 3952 + */ uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; /** * need 4 byte alignment * units: units - * offset 4038 + * offset 4039 */ - uint8_t alignmentFill_at_4038[2]; + uint8_t alignmentFill_at_4039[1]; }; static_assert(sizeof(engine_configuration_s) == 4040); diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_uaefi121.h b/firmware/controllers/generated/engine_configuration_generated_structures_uaefi121.h index 9365d55dcb..45f361de43 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_uaefi121.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_uaefi121.h @@ -4852,16 +4852,36 @@ struct engine_configuration_s { */ float nitrousLuaGaugeArmingValue; /** - * units: units * offset 3944 */ + int nitrousMinimumTps; + /** + * units: deg C + * offset 3948 + */ + uint8_t nitrousMinimumClt; + /** + * need 4 byte alignment + * units: units + * offset 3949 + */ + uint8_t alignmentFill_at_3949[1]; + /** + * units: kPa + * offset 3950 + */ + int16_t nitrousMaximumMap; + /** + * units: units + * offset 3952 + */ uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; /** * need 4 byte alignment * units: units - * offset 4038 + * offset 4039 */ - uint8_t alignmentFill_at_4038[2]; + uint8_t alignmentFill_at_4039[1]; }; static_assert(sizeof(engine_configuration_s) == 4040); diff --git a/firmware/controllers/generated/rusefi_generated_alphax-2chan.h b/firmware/controllers/generated/rusefi_generated_alphax-2chan.h index aedf92e2e9..d04cabfe36 100644 --- a/firmware/controllers/generated/rusefi_generated_alphax-2chan.h +++ b/firmware/controllers/generated/rusefi_generated_alphax-2chan.h @@ -349,7 +349,7 @@ #define ego_sensor_e_ES_Innovate_MTX_L 1 #define ego_sensor_e_ES_PLX 4 #define EGT_CHANNEL_COUNT 8 -#define END_OF_CALIBRATION_PADDING 94 +#define END_OF_CALIBRATION_PADDING 87 #define engine_configuration_s_size 4040 #define engine_load_mode_e_auto_enum 0="LM_SPEED_DENSITY",2="LM_ALPHA_N",3="LM_LUA",100="LM_MOCK",1="LM_REAL_MAF" #define engine_load_mode_e_enum "Speed Density", "MAF Air Charge", "Alpha-N", "Lua" @@ -1328,7 +1328,7 @@ #define show_2chan_presets true #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 1155867515 +#define SIGNATURE_HASH 691172963 #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" @@ -1789,7 +1789,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.11.28.alphax-2chan.1155867515" +#define TS_SIGNATURE "rusEFI master.2024.11.28.alphax-2chan.691172963" #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 86aa17ebe9..50bdcea92c 100644 --- a/firmware/controllers/generated/rusefi_generated_alphax-4chan.h +++ b/firmware/controllers/generated/rusefi_generated_alphax-4chan.h @@ -349,7 +349,7 @@ #define ego_sensor_e_ES_Innovate_MTX_L 1 #define ego_sensor_e_ES_PLX 4 #define EGT_CHANNEL_COUNT 8 -#define END_OF_CALIBRATION_PADDING 94 +#define END_OF_CALIBRATION_PADDING 87 #define engine_configuration_s_size 4040 #define engine_load_mode_e_auto_enum 0="LM_SPEED_DENSITY",2="LM_ALPHA_N",3="LM_LUA",100="LM_MOCK",1="LM_REAL_MAF" #define engine_load_mode_e_enum "Speed Density", "MAF Air Charge", "Alpha-N", "Lua" @@ -1329,7 +1329,7 @@ #define show_4chan_presets true #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 2485438878 +#define SIGNATURE_HASH 4193492102 #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" @@ -1790,7 +1790,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.11.28.alphax-4chan.2485438878" +#define TS_SIGNATURE "rusEFI master.2024.11.28.alphax-4chan.4193492102" #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 f773ad3e0f..c0756ccdd3 100644 --- a/firmware/controllers/generated/rusefi_generated_alphax-4chan_f7.h +++ b/firmware/controllers/generated/rusefi_generated_alphax-4chan_f7.h @@ -349,7 +349,7 @@ #define ego_sensor_e_ES_Innovate_MTX_L 1 #define ego_sensor_e_ES_PLX 4 #define EGT_CHANNEL_COUNT 8 -#define END_OF_CALIBRATION_PADDING 94 +#define END_OF_CALIBRATION_PADDING 87 #define engine_configuration_s_size 4040 #define engine_load_mode_e_auto_enum 0="LM_SPEED_DENSITY",2="LM_ALPHA_N",3="LM_LUA",100="LM_MOCK",1="LM_REAL_MAF" #define engine_load_mode_e_enum "Speed Density", "MAF Air Charge", "Alpha-N", "Lua" @@ -1329,7 +1329,7 @@ #define show_4chan_presets true #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 2485438878 +#define SIGNATURE_HASH 4193492102 #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" @@ -1790,7 +1790,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.11.28.alphax-4chan_f7.2485438878" +#define TS_SIGNATURE "rusEFI master.2024.11.28.alphax-4chan_f7.4193492102" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_alphax-4k-gdi.h b/firmware/controllers/generated/rusefi_generated_alphax-4k-gdi.h index 92a7422354..2ad3a9d973 100644 --- a/firmware/controllers/generated/rusefi_generated_alphax-4k-gdi.h +++ b/firmware/controllers/generated/rusefi_generated_alphax-4k-gdi.h @@ -350,7 +350,7 @@ #define ego_sensor_e_ES_Innovate_MTX_L 1 #define ego_sensor_e_ES_PLX 4 #define EGT_CHANNEL_COUNT 8 -#define END_OF_CALIBRATION_PADDING 94 +#define END_OF_CALIBRATION_PADDING 87 #define engine_configuration_s_size 4040 #define engine_load_mode_e_auto_enum 0="LM_SPEED_DENSITY",2="LM_ALPHA_N",3="LM_LUA",100="LM_MOCK",1="LM_REAL_MAF" #define engine_load_mode_e_enum "Speed Density", "MAF Air Charge", "Alpha-N", "Lua" @@ -1328,7 +1328,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 2192732647 +#define SIGNATURE_HASH 4016383231 #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" @@ -1789,7 +1789,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.11.28.alphax-4k-gdi.2192732647" +#define TS_SIGNATURE "rusEFI master.2024.11.28.alphax-4k-gdi.4016383231" #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 4fe5c24992..a0eb1476d8 100644 --- a/firmware/controllers/generated/rusefi_generated_alphax-8chan-revA.h +++ b/firmware/controllers/generated/rusefi_generated_alphax-8chan-revA.h @@ -349,7 +349,7 @@ #define ego_sensor_e_ES_Innovate_MTX_L 1 #define ego_sensor_e_ES_PLX 4 #define EGT_CHANNEL_COUNT 8 -#define END_OF_CALIBRATION_PADDING 94 +#define END_OF_CALIBRATION_PADDING 87 #define engine_configuration_s_size 4040 #define engine_load_mode_e_auto_enum 0="LM_SPEED_DENSITY",2="LM_ALPHA_N",3="LM_LUA",100="LM_MOCK",1="LM_REAL_MAF" #define engine_load_mode_e_enum "Speed Density", "MAF Air Charge", "Alpha-N", "Lua" @@ -1328,7 +1328,7 @@ #define show_8chan_presets true #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 2850473625 +#define SIGNATURE_HASH 3291583361 #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" @@ -1789,7 +1789,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.11.28.alphax-8chan-revA.2850473625" +#define TS_SIGNATURE "rusEFI master.2024.11.28.alphax-8chan-revA.3291583361" #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 f33ea95851..e00aa72cb1 100644 --- a/firmware/controllers/generated/rusefi_generated_alphax-8chan.h +++ b/firmware/controllers/generated/rusefi_generated_alphax-8chan.h @@ -347,7 +347,7 @@ #define ego_sensor_e_ES_Innovate_MTX_L 1 #define ego_sensor_e_ES_PLX 4 #define EGT_CHANNEL_COUNT 8 -#define END_OF_CALIBRATION_PADDING 94 +#define END_OF_CALIBRATION_PADDING 87 #define engine_configuration_s_size 4056 #define engine_load_mode_e_auto_enum 0="LM_SPEED_DENSITY",2="LM_ALPHA_N",3="LM_LUA",100="LM_MOCK",1="LM_REAL_MAF" #define engine_load_mode_e_enum "Speed Density", "MAF Air Charge", "Alpha-N", "Lua" @@ -1326,7 +1326,7 @@ #define show_8chan_presets true #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 1444339341 +#define SIGNATURE_HASH 1002539925 #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" @@ -1787,7 +1787,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.11.28.alphax-8chan.1444339341" +#define TS_SIGNATURE "rusEFI master.2024.11.28.alphax-8chan.1002539925" #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 a09e74600c..5714dda434 100644 --- a/firmware/controllers/generated/rusefi_generated_alphax-8chan_f7.h +++ b/firmware/controllers/generated/rusefi_generated_alphax-8chan_f7.h @@ -347,7 +347,7 @@ #define ego_sensor_e_ES_Innovate_MTX_L 1 #define ego_sensor_e_ES_PLX 4 #define EGT_CHANNEL_COUNT 8 -#define END_OF_CALIBRATION_PADDING 94 +#define END_OF_CALIBRATION_PADDING 87 #define engine_configuration_s_size 4056 #define engine_load_mode_e_auto_enum 0="LM_SPEED_DENSITY",2="LM_ALPHA_N",3="LM_LUA",100="LM_MOCK",1="LM_REAL_MAF" #define engine_load_mode_e_enum "Speed Density", "MAF Air Charge", "Alpha-N", "Lua" @@ -1326,7 +1326,7 @@ #define show_8chan_presets true #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 1444339341 +#define SIGNATURE_HASH 1002539925 #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" @@ -1787,7 +1787,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.11.28.alphax-8chan_f7.1444339341" +#define TS_SIGNATURE "rusEFI master.2024.11.28.alphax-8chan_f7.1002539925" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_alphax-silver.h b/firmware/controllers/generated/rusefi_generated_alphax-silver.h index 2201be0f17..a13104b4d1 100644 --- a/firmware/controllers/generated/rusefi_generated_alphax-silver.h +++ b/firmware/controllers/generated/rusefi_generated_alphax-silver.h @@ -349,7 +349,7 @@ #define ego_sensor_e_ES_Innovate_MTX_L 1 #define ego_sensor_e_ES_PLX 4 #define EGT_CHANNEL_COUNT 8 -#define END_OF_CALIBRATION_PADDING 94 +#define END_OF_CALIBRATION_PADDING 87 #define engine_configuration_s_size 4044 #define engine_load_mode_e_auto_enum 0="LM_SPEED_DENSITY",2="LM_ALPHA_N",3="LM_LUA",100="LM_MOCK",1="LM_REAL_MAF" #define engine_load_mode_e_enum "Speed Density", "MAF Air Charge", "Alpha-N", "Lua" @@ -1327,7 +1327,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 814825130 +#define SIGNATURE_HASH 1564896178 #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" @@ -1788,7 +1788,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.11.28.alphax-silver.814825130" +#define TS_SIGNATURE "rusEFI master.2024.11.28.alphax-silver.1564896178" #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 a03283e2e8..16f8c5b522 100644 --- a/firmware/controllers/generated/rusefi_generated_at_start_f435.h +++ b/firmware/controllers/generated/rusefi_generated_at_start_f435.h @@ -352,7 +352,7 @@ #define ego_sensor_e_ES_Innovate_MTX_L 1 #define ego_sensor_e_ES_PLX 4 #define EGT_CHANNEL_COUNT 8 -#define END_OF_CALIBRATION_PADDING 94 +#define END_OF_CALIBRATION_PADDING 87 #define engine_configuration_s_size 4040 #define engine_load_mode_e_auto_enum 0="LM_SPEED_DENSITY",2="LM_ALPHA_N",3="LM_LUA",100="LM_MOCK",1="LM_REAL_MAF" #define engine_load_mode_e_enum "Speed Density", "MAF Air Charge", "Alpha-N", "Lua" @@ -1330,7 +1330,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 221197580 +#define SIGNATURE_HASH 1626890260 #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" @@ -1791,7 +1791,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.11.28.at_start_f435.221197580" +#define TS_SIGNATURE "rusEFI master.2024.11.28.at_start_f435.1626890260" #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 2a50867d19..3793321c15 100644 --- a/firmware/controllers/generated/rusefi_generated_atlas.h +++ b/firmware/controllers/generated/rusefi_generated_atlas.h @@ -352,7 +352,7 @@ #define ego_sensor_e_ES_Innovate_MTX_L 1 #define ego_sensor_e_ES_PLX 4 #define EGT_CHANNEL_COUNT 8 -#define END_OF_CALIBRATION_PADDING 94 +#define END_OF_CALIBRATION_PADDING 87 #define engine_configuration_s_size 3880 #define engine_load_mode_e_auto_enum 0="LM_SPEED_DENSITY",2="LM_ALPHA_N",3="LM_LUA",100="LM_MOCK",1="LM_REAL_MAF" #define engine_load_mode_e_enum "Speed Density", "MAF Air Charge", "Alpha-N", "Lua" @@ -1330,7 +1330,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 1227415874 +#define SIGNATURE_HASH 620737626 #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" @@ -1791,7 +1791,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.11.28.atlas.1227415874" +#define TS_SIGNATURE "rusEFI master.2024.11.28.atlas.620737626" #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 55d03c9365..b3e462c836 100644 --- a/firmware/controllers/generated/rusefi_generated_f407-discovery.h +++ b/firmware/controllers/generated/rusefi_generated_f407-discovery.h @@ -351,7 +351,7 @@ #define ego_sensor_e_ES_Innovate_MTX_L 1 #define ego_sensor_e_ES_PLX 4 #define EGT_CHANNEL_COUNT 8 -#define END_OF_CALIBRATION_PADDING 94 +#define END_OF_CALIBRATION_PADDING 87 #define engine_configuration_s_size 4040 #define engine_load_mode_e_auto_enum 0="LM_SPEED_DENSITY",2="LM_ALPHA_N",3="LM_LUA",100="LM_MOCK",1="LM_REAL_MAF" #define engine_load_mode_e_enum "Speed Density", "MAF Air Charge", "Alpha-N", "Lua" @@ -1331,7 +1331,7 @@ #define show_tcu_gauges false #define show_test_presets true #define show_vvt_output_pin true -#define SIGNATURE_HASH 3986160817 +#define SIGNATURE_HASH 2151721385 #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" @@ -1792,7 +1792,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.11.28.f407-discovery.3986160817" +#define TS_SIGNATURE "rusEFI master.2024.11.28.f407-discovery.2151721385" #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 8d4018f2d6..0babd21a04 100644 --- a/firmware/controllers/generated/rusefi_generated_f429-discovery.h +++ b/firmware/controllers/generated/rusefi_generated_f429-discovery.h @@ -352,7 +352,7 @@ #define ego_sensor_e_ES_Innovate_MTX_L 1 #define ego_sensor_e_ES_PLX 4 #define EGT_CHANNEL_COUNT 8 -#define END_OF_CALIBRATION_PADDING 94 +#define END_OF_CALIBRATION_PADDING 87 #define engine_configuration_s_size 4040 #define engine_load_mode_e_auto_enum 0="LM_SPEED_DENSITY",2="LM_ALPHA_N",3="LM_LUA",100="LM_MOCK",1="LM_REAL_MAF" #define engine_load_mode_e_enum "Speed Density", "MAF Air Charge", "Alpha-N", "Lua" @@ -1330,7 +1330,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 221197580 +#define SIGNATURE_HASH 1626890260 #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" @@ -1791,7 +1791,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.11.28.f429-discovery.221197580" +#define TS_SIGNATURE "rusEFI master.2024.11.28.f429-discovery.1626890260" #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 41dc279132..36e0c47e83 100644 --- a/firmware/controllers/generated/rusefi_generated_f469-discovery.h +++ b/firmware/controllers/generated/rusefi_generated_f469-discovery.h @@ -352,7 +352,7 @@ #define ego_sensor_e_ES_Innovate_MTX_L 1 #define ego_sensor_e_ES_PLX 4 #define EGT_CHANNEL_COUNT 8 -#define END_OF_CALIBRATION_PADDING 94 +#define END_OF_CALIBRATION_PADDING 87 #define engine_configuration_s_size 4040 #define engine_load_mode_e_auto_enum 0="LM_SPEED_DENSITY",2="LM_ALPHA_N",3="LM_LUA",100="LM_MOCK",1="LM_REAL_MAF" #define engine_load_mode_e_enum "Speed Density", "MAF Air Charge", "Alpha-N", "Lua" @@ -1330,7 +1330,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 1073230751 +#define SIGNATURE_HASH 1378838151 #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" @@ -1791,7 +1791,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.11.28.f469-discovery.1073230751" +#define TS_SIGNATURE "rusEFI master.2024.11.28.f469-discovery.1378838151" #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 b2bf55d74d..97c0ff374f 100644 --- a/firmware/controllers/generated/rusefi_generated_frankenso_na6.h +++ b/firmware/controllers/generated/rusefi_generated_frankenso_na6.h @@ -352,7 +352,7 @@ #define ego_sensor_e_ES_Innovate_MTX_L 1 #define ego_sensor_e_ES_PLX 4 #define EGT_CHANNEL_COUNT 8 -#define END_OF_CALIBRATION_PADDING 94 +#define END_OF_CALIBRATION_PADDING 87 #define engine_configuration_s_size 4040 #define engine_load_mode_e_auto_enum 0="LM_SPEED_DENSITY",2="LM_ALPHA_N",3="LM_LUA",100="LM_MOCK",1="LM_REAL_MAF" #define engine_load_mode_e_enum "Speed Density", "MAF Air Charge", "Alpha-N", "Lua" @@ -1332,7 +1332,7 @@ #define show_tcu_gauges false #define show_test_presets true #define show_vvt_output_pin true -#define SIGNATURE_HASH 1538015511 +#define SIGNATURE_HASH 914035727 #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" @@ -1793,7 +1793,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.11.28.frankenso_na6.1538015511" +#define TS_SIGNATURE "rusEFI master.2024.11.28.frankenso_na6.914035727" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_haba208.h b/firmware/controllers/generated/rusefi_generated_haba208.h index 354e4847b0..84c5c478e0 100644 --- a/firmware/controllers/generated/rusefi_generated_haba208.h +++ b/firmware/controllers/generated/rusefi_generated_haba208.h @@ -352,7 +352,7 @@ #define ego_sensor_e_ES_Innovate_MTX_L 1 #define ego_sensor_e_ES_PLX 4 #define EGT_CHANNEL_COUNT 8 -#define END_OF_CALIBRATION_PADDING 94 +#define END_OF_CALIBRATION_PADDING 87 #define engine_configuration_s_size 4040 #define engine_load_mode_e_auto_enum 0="LM_SPEED_DENSITY",2="LM_ALPHA_N",3="LM_LUA",100="LM_MOCK",1="LM_REAL_MAF" #define engine_load_mode_e_enum "Speed Density", "MAF Air Charge", "Alpha-N", "Lua" @@ -1330,7 +1330,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 221197580 +#define SIGNATURE_HASH 1626890260 #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" @@ -1791,7 +1791,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.11.28.haba208.221197580" +#define TS_SIGNATURE "rusEFI master.2024.11.28.haba208.1626890260" #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 add9ef3662..7e4e30f41b 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen-112-17.h +++ b/firmware/controllers/generated/rusefi_generated_hellen-112-17.h @@ -352,7 +352,7 @@ #define ego_sensor_e_ES_Innovate_MTX_L 1 #define ego_sensor_e_ES_PLX 4 #define EGT_CHANNEL_COUNT 8 -#define END_OF_CALIBRATION_PADDING 94 +#define END_OF_CALIBRATION_PADDING 87 #define engine_configuration_s_size 4040 #define engine_load_mode_e_auto_enum 0="LM_SPEED_DENSITY",2="LM_ALPHA_N",3="LM_LUA",100="LM_MOCK",1="LM_REAL_MAF" #define engine_load_mode_e_enum "Speed Density", "MAF Air Charge", "Alpha-N", "Lua" @@ -1331,7 +1331,7 @@ #define show_8chan_presets false #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 2217192840 +#define SIGNATURE_HASH 3924883600 #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" @@ -1792,7 +1792,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.11.28.hellen-112-17.2217192840" +#define TS_SIGNATURE "rusEFI master.2024.11.28.hellen-112-17.3924883600" #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 e626318c27..a53829f55d 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen-gm-e67.h +++ b/firmware/controllers/generated/rusefi_generated_hellen-gm-e67.h @@ -352,7 +352,7 @@ #define ego_sensor_e_ES_Innovate_MTX_L 1 #define ego_sensor_e_ES_PLX 4 #define EGT_CHANNEL_COUNT 8 -#define END_OF_CALIBRATION_PADDING 94 +#define END_OF_CALIBRATION_PADDING 87 #define engine_configuration_s_size 4040 #define engine_load_mode_e_auto_enum 0="LM_SPEED_DENSITY",2="LM_ALPHA_N",3="LM_LUA",100="LM_MOCK",1="LM_REAL_MAF" #define engine_load_mode_e_enum "Speed Density", "MAF Air Charge", "Alpha-N", "Lua" @@ -1330,7 +1330,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 3243659956 +#define SIGNATURE_HASH 2894137260 #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" @@ -1791,7 +1791,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.11.28.hellen-gm-e67.3243659956" +#define TS_SIGNATURE "rusEFI master.2024.11.28.hellen-gm-e67.2894137260" #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 1e6d591289..f3e376e217 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen-honda-k.h +++ b/firmware/controllers/generated/rusefi_generated_hellen-honda-k.h @@ -350,7 +350,7 @@ #define ego_sensor_e_ES_Innovate_MTX_L 1 #define ego_sensor_e_ES_PLX 4 #define EGT_CHANNEL_COUNT 8 -#define END_OF_CALIBRATION_PADDING 94 +#define END_OF_CALIBRATION_PADDING 87 #define engine_configuration_s_size 4040 #define engine_load_mode_e_auto_enum 0="LM_SPEED_DENSITY",2="LM_ALPHA_N",3="LM_LUA",100="LM_MOCK",1="LM_REAL_MAF" #define engine_load_mode_e_enum "Speed Density", "MAF Air Charge", "Alpha-N", "Lua" @@ -1328,7 +1328,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 1494632314 +#define SIGNATURE_HASH 885068386 #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" @@ -1791,7 +1791,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.11.28.hellen-honda-k.1494632314" +#define TS_SIGNATURE "rusEFI master.2024.11.28.hellen-honda-k.885068386" #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 a68d16c870..176f1aa5bf 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen-nb1.h +++ b/firmware/controllers/generated/rusefi_generated_hellen-nb1.h @@ -352,7 +352,7 @@ #define ego_sensor_e_ES_Innovate_MTX_L 1 #define ego_sensor_e_ES_PLX 4 #define EGT_CHANNEL_COUNT 8 -#define END_OF_CALIBRATION_PADDING 94 +#define END_OF_CALIBRATION_PADDING 87 #define engine_configuration_s_size 4040 #define engine_load_mode_e_auto_enum 0="LM_SPEED_DENSITY",2="LM_ALPHA_N",3="LM_LUA",100="LM_MOCK",1="LM_REAL_MAF" #define engine_load_mode_e_enum "Speed Density", "MAF Air Charge", "Alpha-N", "Lua" @@ -1331,7 +1331,7 @@ #define show_HellenNB1_presets true #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 2391400467 +#define SIGNATURE_HASH 3814634763 #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" @@ -1792,7 +1792,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.11.28.hellen-nb1.2391400467" +#define TS_SIGNATURE "rusEFI master.2024.11.28.hellen-nb1.3814634763" #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 f61ac6dce0..640bbd6c0a 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen121nissan.h +++ b/firmware/controllers/generated/rusefi_generated_hellen121nissan.h @@ -352,7 +352,7 @@ #define ego_sensor_e_ES_Innovate_MTX_L 1 #define ego_sensor_e_ES_PLX 4 #define EGT_CHANNEL_COUNT 8 -#define END_OF_CALIBRATION_PADDING 94 +#define END_OF_CALIBRATION_PADDING 87 #define engine_configuration_s_size 4040 #define engine_load_mode_e_auto_enum 0="LM_SPEED_DENSITY",2="LM_ALPHA_N",3="LM_LUA",100="LM_MOCK",1="LM_REAL_MAF" #define engine_load_mode_e_enum "Speed Density", "MAF Air Charge", "Alpha-N", "Lua" @@ -1331,7 +1331,7 @@ #define show_Hellen121nissan_presets true #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 3719604108 +#define SIGNATURE_HASH 2959340180 #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" @@ -1792,7 +1792,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.11.28.hellen121nissan.3719604108" +#define TS_SIGNATURE "rusEFI master.2024.11.28.hellen121nissan.2959340180" #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 1d7ec67cd9..688eb15cfb 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen121vag.h +++ b/firmware/controllers/generated/rusefi_generated_hellen121vag.h @@ -352,7 +352,7 @@ #define ego_sensor_e_ES_Innovate_MTX_L 1 #define ego_sensor_e_ES_PLX 4 #define EGT_CHANNEL_COUNT 8 -#define END_OF_CALIBRATION_PADDING 94 +#define END_OF_CALIBRATION_PADDING 87 #define engine_configuration_s_size 4040 #define engine_load_mode_e_auto_enum 0="LM_SPEED_DENSITY",2="LM_ALPHA_N",3="LM_LUA",100="LM_MOCK",1="LM_REAL_MAF" #define engine_load_mode_e_enum "Speed Density", "MAF Air Charge", "Alpha-N", "Lua" @@ -1331,7 +1331,7 @@ #define show_Hellen121vag_presets true #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 2245899723 +#define SIGNATURE_HASH 3893027027 #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" @@ -1792,7 +1792,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.11.28.hellen121vag.2245899723" +#define TS_SIGNATURE "rusEFI master.2024.11.28.hellen121vag.3893027027" #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 9e4cf4857e..762e7df153 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen128.h +++ b/firmware/controllers/generated/rusefi_generated_hellen128.h @@ -352,7 +352,7 @@ #define ego_sensor_e_ES_Innovate_MTX_L 1 #define ego_sensor_e_ES_PLX 4 #define EGT_CHANNEL_COUNT 8 -#define END_OF_CALIBRATION_PADDING 94 +#define END_OF_CALIBRATION_PADDING 87 #define engine_configuration_s_size 4040 #define engine_load_mode_e_auto_enum 0="LM_SPEED_DENSITY",2="LM_ALPHA_N",3="LM_LUA",100="LM_MOCK",1="LM_REAL_MAF" #define engine_load_mode_e_enum "Speed Density", "MAF Air Charge", "Alpha-N", "Lua" @@ -1331,7 +1331,7 @@ #define show_Hellen128merc_presets true #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 3770490875 +#define SIGNATURE_HASH 2372553443 #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" @@ -1792,7 +1792,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.11.28.hellen128.3770490875" +#define TS_SIGNATURE "rusEFI master.2024.11.28.hellen128.2372553443" #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 fdcc27165b..5fe5ae1f68 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen154hyundai.h +++ b/firmware/controllers/generated/rusefi_generated_hellen154hyundai.h @@ -350,7 +350,7 @@ #define ego_sensor_e_ES_Innovate_MTX_L 1 #define ego_sensor_e_ES_PLX 4 #define EGT_CHANNEL_COUNT 8 -#define END_OF_CALIBRATION_PADDING 94 +#define END_OF_CALIBRATION_PADDING 87 #define engine_configuration_s_size 4040 #define engine_load_mode_e_auto_enum 0="LM_SPEED_DENSITY",2="LM_ALPHA_N",3="LM_LUA",100="LM_MOCK",1="LM_REAL_MAF" #define engine_load_mode_e_enum "Speed Density", "MAF Air Charge", "Alpha-N", "Lua" @@ -1328,7 +1328,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 729418902 +#define SIGNATURE_HASH 1185765774 #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" @@ -1789,7 +1789,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.11.28.hellen154hyundai.729418902" +#define TS_SIGNATURE "rusEFI master.2024.11.28.hellen154hyundai.1185765774" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_hellen154hyundai_f7.h b/firmware/controllers/generated/rusefi_generated_hellen154hyundai_f7.h index a3d342de45..a8f6e189c9 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen154hyundai_f7.h +++ b/firmware/controllers/generated/rusefi_generated_hellen154hyundai_f7.h @@ -350,7 +350,7 @@ #define ego_sensor_e_ES_Innovate_MTX_L 1 #define ego_sensor_e_ES_PLX 4 #define EGT_CHANNEL_COUNT 8 -#define END_OF_CALIBRATION_PADDING 94 +#define END_OF_CALIBRATION_PADDING 87 #define engine_configuration_s_size 4040 #define engine_load_mode_e_auto_enum 0="LM_SPEED_DENSITY",2="LM_ALPHA_N",3="LM_LUA",100="LM_MOCK",1="LM_REAL_MAF" #define engine_load_mode_e_enum "Speed Density", "MAF Air Charge", "Alpha-N", "Lua" @@ -1328,7 +1328,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 1695310101 +#define SIGNATURE_HASH 148583437 #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" @@ -1789,7 +1789,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.11.28.hellen154hyundai_f7.1695310101" +#define TS_SIGNATURE "rusEFI master.2024.11.28.hellen154hyundai_f7.148583437" #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 b40914bc42..660d8fb45d 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen72.h +++ b/firmware/controllers/generated/rusefi_generated_hellen72.h @@ -352,7 +352,7 @@ #define ego_sensor_e_ES_Innovate_MTX_L 1 #define ego_sensor_e_ES_PLX 4 #define EGT_CHANNEL_COUNT 8 -#define END_OF_CALIBRATION_PADDING 94 +#define END_OF_CALIBRATION_PADDING 87 #define engine_configuration_s_size 4040 #define engine_load_mode_e_auto_enum 0="LM_SPEED_DENSITY",2="LM_ALPHA_N",3="LM_LUA",100="LM_MOCK",1="LM_REAL_MAF" #define engine_load_mode_e_enum "Speed Density", "MAF Air Charge", "Alpha-N", "Lua" @@ -1331,7 +1331,7 @@ #define show_HellenNB2_presets true #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 4027046106 +#define SIGNATURE_HASH 2647690690 #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" @@ -1792,7 +1792,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.11.28.hellen72.4027046106" +#define TS_SIGNATURE "rusEFI master.2024.11.28.hellen72.2647690690" #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 9d66f94468..f185d48f83 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen81.h +++ b/firmware/controllers/generated/rusefi_generated_hellen81.h @@ -352,7 +352,7 @@ #define ego_sensor_e_ES_Innovate_MTX_L 1 #define ego_sensor_e_ES_PLX 4 #define EGT_CHANNEL_COUNT 8 -#define END_OF_CALIBRATION_PADDING 94 +#define END_OF_CALIBRATION_PADDING 87 #define engine_configuration_s_size 4040 #define engine_load_mode_e_auto_enum 0="LM_SPEED_DENSITY",2="LM_ALPHA_N",3="LM_LUA",100="LM_MOCK",1="LM_REAL_MAF" #define engine_load_mode_e_enum "Speed Density", "MAF Air Charge", "Alpha-N", "Lua" @@ -1330,7 +1330,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 1757390314 +#define SIGNATURE_HASH 90763506 #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" @@ -1791,7 +1791,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.11.28.hellen81.1757390314" +#define TS_SIGNATURE "rusEFI master.2024.11.28.hellen81.90763506" #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 faffa31ab3..baef692595 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen88bmw.h +++ b/firmware/controllers/generated/rusefi_generated_hellen88bmw.h @@ -352,7 +352,7 @@ #define ego_sensor_e_ES_Innovate_MTX_L 1 #define ego_sensor_e_ES_PLX 4 #define EGT_CHANNEL_COUNT 8 -#define END_OF_CALIBRATION_PADDING 94 +#define END_OF_CALIBRATION_PADDING 87 #define engine_configuration_s_size 4040 #define engine_load_mode_e_auto_enum 0="LM_SPEED_DENSITY",2="LM_ALPHA_N",3="LM_LUA",100="LM_MOCK",1="LM_REAL_MAF" #define engine_load_mode_e_enum "Speed Density", "MAF Air Charge", "Alpha-N", "Lua" @@ -1331,7 +1331,7 @@ #define show_Hellen88bmw_presets true #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 2140975273 +#define SIGNATURE_HASH 306963889 #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" @@ -1792,7 +1792,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.11.28.hellen88bmw.2140975273" +#define TS_SIGNATURE "rusEFI master.2024.11.28.hellen88bmw.306963889" #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 8fdcdbb405..f9e297288c 100644 --- a/firmware/controllers/generated/rusefi_generated_hellenNA6.h +++ b/firmware/controllers/generated/rusefi_generated_hellenNA6.h @@ -352,7 +352,7 @@ #define ego_sensor_e_ES_Innovate_MTX_L 1 #define ego_sensor_e_ES_PLX 4 #define EGT_CHANNEL_COUNT 8 -#define END_OF_CALIBRATION_PADDING 94 +#define END_OF_CALIBRATION_PADDING 87 #define engine_configuration_s_size 4040 #define engine_load_mode_e_auto_enum 0="LM_SPEED_DENSITY",2="LM_ALPHA_N",3="LM_LUA",100="LM_MOCK",1="LM_REAL_MAF" #define engine_load_mode_e_enum "Speed Density", "MAF Air Charge", "Alpha-N", "Lua" @@ -1331,7 +1331,7 @@ #define show_HellenNA6_presets true #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 2576013036 +#define SIGNATURE_HASH 4099769332 #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" @@ -1792,7 +1792,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.11.28.hellenNA6.2576013036" +#define TS_SIGNATURE "rusEFI master.2024.11.28.hellenNA6.4099769332" #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 f32ef7781b..5492ba09df 100644 --- a/firmware/controllers/generated/rusefi_generated_hellenNA8_96.h +++ b/firmware/controllers/generated/rusefi_generated_hellenNA8_96.h @@ -352,7 +352,7 @@ #define ego_sensor_e_ES_Innovate_MTX_L 1 #define ego_sensor_e_ES_PLX 4 #define EGT_CHANNEL_COUNT 8 -#define END_OF_CALIBRATION_PADDING 94 +#define END_OF_CALIBRATION_PADDING 87 #define engine_configuration_s_size 4040 #define engine_load_mode_e_auto_enum 0="LM_SPEED_DENSITY",2="LM_ALPHA_N",3="LM_LUA",100="LM_MOCK",1="LM_REAL_MAF" #define engine_load_mode_e_enum "Speed Density", "MAF Air Charge", "Alpha-N", "Lua" @@ -1332,7 +1332,7 @@ #define show_HellenNB1_presets false #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 1716556834 +#define SIGNATURE_HASH 193446202 #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" @@ -1793,7 +1793,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.11.28.hellenNA8_96.1716556834" +#define TS_SIGNATURE "rusEFI master.2024.11.28.hellenNA8_96.193446202" #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 948fd9a921..41cc2509b1 100644 --- a/firmware/controllers/generated/rusefi_generated_m74_9.h +++ b/firmware/controllers/generated/rusefi_generated_m74_9.h @@ -352,7 +352,7 @@ #define ego_sensor_e_ES_Innovate_MTX_L 1 #define ego_sensor_e_ES_PLX 4 #define EGT_CHANNEL_COUNT 8 -#define END_OF_CALIBRATION_PADDING 94 +#define END_OF_CALIBRATION_PADDING 87 #define engine_configuration_s_size 4040 #define engine_load_mode_e_auto_enum 0="LM_SPEED_DENSITY",2="LM_ALPHA_N",3="LM_LUA",100="LM_MOCK",1="LM_REAL_MAF" #define engine_load_mode_e_enum "Speed Density", "MAF Air Charge", "Alpha-N", "Lua" @@ -1330,7 +1330,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 3113553363 +#define SIGNATURE_HASH 3561117899 #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" @@ -1792,7 +1792,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.11.28.m74_9.3113553363" +#define TS_SIGNATURE "rusEFI master.2024.11.28.m74_9.3561117899" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_mre-legacy_f4.h b/firmware/controllers/generated/rusefi_generated_mre-legacy_f4.h index db245db1ec..230ccae61c 100644 --- a/firmware/controllers/generated/rusefi_generated_mre-legacy_f4.h +++ b/firmware/controllers/generated/rusefi_generated_mre-legacy_f4.h @@ -350,7 +350,7 @@ #define ego_sensor_e_ES_Innovate_MTX_L 1 #define ego_sensor_e_ES_PLX 4 #define EGT_CHANNEL_COUNT 8 -#define END_OF_CALIBRATION_PADDING 94 +#define END_OF_CALIBRATION_PADDING 87 #define engine_configuration_s_size 4040 #define engine_load_mode_e_auto_enum 0="LM_SPEED_DENSITY",2="LM_ALPHA_N",3="LM_LUA",100="LM_MOCK",1="LM_REAL_MAF" #define engine_load_mode_e_enum "Speed Density", "MAF Air Charge", "Alpha-N", "Lua" @@ -1329,7 +1329,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 1179776207 +#define SIGNATURE_HASH 730243543 #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" @@ -1790,7 +1790,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.11.28.mre-legacy_f4.1179776207" +#define TS_SIGNATURE "rusEFI master.2024.11.28.mre-legacy_f4.730243543" #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 df90211785..2f416b0584 100644 --- a/firmware/controllers/generated/rusefi_generated_mre_f4.h +++ b/firmware/controllers/generated/rusefi_generated_mre_f4.h @@ -350,7 +350,7 @@ #define ego_sensor_e_ES_Innovate_MTX_L 1 #define ego_sensor_e_ES_PLX 4 #define EGT_CHANNEL_COUNT 8 -#define END_OF_CALIBRATION_PADDING 94 +#define END_OF_CALIBRATION_PADDING 87 #define engine_configuration_s_size 4040 #define engine_load_mode_e_auto_enum 0="LM_SPEED_DENSITY",2="LM_ALPHA_N",3="LM_LUA",100="LM_MOCK",1="LM_REAL_MAF" #define engine_load_mode_e_enum "Speed Density", "MAF Air Charge", "Alpha-N", "Lua" @@ -1329,7 +1329,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 1179776207 +#define SIGNATURE_HASH 730243543 #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" @@ -1790,7 +1790,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.11.28.mre_f4.1179776207" +#define TS_SIGNATURE "rusEFI master.2024.11.28.mre_f4.730243543" #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 a42dc01cde..3152217009 100644 --- a/firmware/controllers/generated/rusefi_generated_mre_f7.h +++ b/firmware/controllers/generated/rusefi_generated_mre_f7.h @@ -350,7 +350,7 @@ #define ego_sensor_e_ES_Innovate_MTX_L 1 #define ego_sensor_e_ES_PLX 4 #define EGT_CHANNEL_COUNT 8 -#define END_OF_CALIBRATION_PADDING 94 +#define END_OF_CALIBRATION_PADDING 87 #define engine_configuration_s_size 4040 #define engine_load_mode_e_auto_enum 0="LM_SPEED_DENSITY",2="LM_ALPHA_N",3="LM_LUA",100="LM_MOCK",1="LM_REAL_MAF" #define engine_load_mode_e_enum "Speed Density", "MAF Air Charge", "Alpha-N", "Lua" @@ -1329,7 +1329,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 1179776207 +#define SIGNATURE_HASH 730243543 #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" @@ -1790,7 +1790,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.11.28.mre_f7.1179776207" +#define TS_SIGNATURE "rusEFI master.2024.11.28.mre_f7.730243543" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_nucleo_f413.h b/firmware/controllers/generated/rusefi_generated_nucleo_f413.h index bce0df6746..18428847f8 100644 --- a/firmware/controllers/generated/rusefi_generated_nucleo_f413.h +++ b/firmware/controllers/generated/rusefi_generated_nucleo_f413.h @@ -352,7 +352,7 @@ #define ego_sensor_e_ES_Innovate_MTX_L 1 #define ego_sensor_e_ES_PLX 4 #define EGT_CHANNEL_COUNT 8 -#define END_OF_CALIBRATION_PADDING 94 +#define END_OF_CALIBRATION_PADDING 87 #define engine_configuration_s_size 4040 #define engine_load_mode_e_auto_enum 0="LM_SPEED_DENSITY",2="LM_ALPHA_N",3="LM_LUA",100="LM_MOCK",1="LM_REAL_MAF" #define engine_load_mode_e_enum "Speed Density", "MAF Air Charge", "Alpha-N", "Lua" @@ -1330,7 +1330,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 221197580 +#define SIGNATURE_HASH 1626890260 #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" @@ -1791,7 +1791,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.11.28.nucleo_f413.221197580" +#define TS_SIGNATURE "rusEFI master.2024.11.28.nucleo_f413.1626890260" #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 ad61d69cfc..867b196345 100644 --- a/firmware/controllers/generated/rusefi_generated_proteus_f4.h +++ b/firmware/controllers/generated/rusefi_generated_proteus_f4.h @@ -350,7 +350,7 @@ #define ego_sensor_e_ES_Innovate_MTX_L 1 #define ego_sensor_e_ES_PLX 4 #define EGT_CHANNEL_COUNT 8 -#define END_OF_CALIBRATION_PADDING 94 +#define END_OF_CALIBRATION_PADDING 87 #define engine_configuration_s_size 4040 #define engine_load_mode_e_auto_enum 0="LM_SPEED_DENSITY",2="LM_ALPHA_N",3="LM_LUA",100="LM_MOCK",1="LM_REAL_MAF" #define engine_load_mode_e_enum "Speed Density", "MAF Air Charge", "Alpha-N", "Lua" @@ -1328,7 +1328,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 2919678414 +#define SIGNATURE_HASH 3285292246 #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" @@ -1789,7 +1789,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.11.28.proteus_f4.2919678414" +#define TS_SIGNATURE "rusEFI master.2024.11.28.proteus_f4.3285292246" #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 c1f74bbf7b..4ca222d91e 100644 --- a/firmware/controllers/generated/rusefi_generated_proteus_f7.h +++ b/firmware/controllers/generated/rusefi_generated_proteus_f7.h @@ -350,7 +350,7 @@ #define ego_sensor_e_ES_Innovate_MTX_L 1 #define ego_sensor_e_ES_PLX 4 #define EGT_CHANNEL_COUNT 8 -#define END_OF_CALIBRATION_PADDING 94 +#define END_OF_CALIBRATION_PADDING 87 #define engine_configuration_s_size 4040 #define engine_load_mode_e_auto_enum 0="LM_SPEED_DENSITY",2="LM_ALPHA_N",3="LM_LUA",100="LM_MOCK",1="LM_REAL_MAF" #define engine_load_mode_e_enum "Speed Density", "MAF Air Charge", "Alpha-N", "Lua" @@ -1328,7 +1328,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 2919678414 +#define SIGNATURE_HASH 3285292246 #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" @@ -1789,7 +1789,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.11.28.proteus_f7.2919678414" +#define TS_SIGNATURE "rusEFI master.2024.11.28.proteus_f7.3285292246" #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 22de670f40..77a7763f31 100644 --- a/firmware/controllers/generated/rusefi_generated_proteus_h7.h +++ b/firmware/controllers/generated/rusefi_generated_proteus_h7.h @@ -350,7 +350,7 @@ #define ego_sensor_e_ES_Innovate_MTX_L 1 #define ego_sensor_e_ES_PLX 4 #define EGT_CHANNEL_COUNT 8 -#define END_OF_CALIBRATION_PADDING 94 +#define END_OF_CALIBRATION_PADDING 87 #define engine_configuration_s_size 4040 #define engine_load_mode_e_auto_enum 0="LM_SPEED_DENSITY",2="LM_ALPHA_N",3="LM_LUA",100="LM_MOCK",1="LM_REAL_MAF" #define engine_load_mode_e_enum "Speed Density", "MAF Air Charge", "Alpha-N", "Lua" @@ -1328,7 +1328,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 2919678414 +#define SIGNATURE_HASH 3285292246 #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" @@ -1789,7 +1789,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.11.28.proteus_h7.2919678414" +#define TS_SIGNATURE "rusEFI master.2024.11.28.proteus_h7.3285292246" #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 abca82c3fa..0fbe4fb7ae 100644 --- a/firmware/controllers/generated/rusefi_generated_s105.h +++ b/firmware/controllers/generated/rusefi_generated_s105.h @@ -352,7 +352,7 @@ #define ego_sensor_e_ES_Innovate_MTX_L 1 #define ego_sensor_e_ES_PLX 4 #define EGT_CHANNEL_COUNT 8 -#define END_OF_CALIBRATION_PADDING 94 +#define END_OF_CALIBRATION_PADDING 87 #define engine_configuration_s_size 4040 #define engine_load_mode_e_auto_enum 0="LM_SPEED_DENSITY",2="LM_ALPHA_N",3="LM_LUA",100="LM_MOCK",1="LM_REAL_MAF" #define engine_load_mode_e_enum "Speed Density", "MAF Air Charge", "Alpha-N", "Lua" @@ -1330,7 +1330,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 2997138894 +#define SIGNATURE_HASH 3748913366 #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" @@ -1792,7 +1792,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.11.28.s105.2997138894" +#define TS_SIGNATURE "rusEFI master.2024.11.28.s105.3748913366" #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 cb8d28cd1a..7d7c473c47 100644 --- a/firmware/controllers/generated/rusefi_generated_small-can-board.h +++ b/firmware/controllers/generated/rusefi_generated_small-can-board.h @@ -350,7 +350,7 @@ #define ego_sensor_e_ES_Innovate_MTX_L 1 #define ego_sensor_e_ES_PLX 4 #define EGT_CHANNEL_COUNT 8 -#define END_OF_CALIBRATION_PADDING 94 +#define END_OF_CALIBRATION_PADDING 87 #define engine_configuration_s_size 4040 #define engine_load_mode_e_auto_enum 0="LM_SPEED_DENSITY",2="LM_ALPHA_N",3="LM_LUA",100="LM_MOCK",1="LM_REAL_MAF" #define engine_load_mode_e_enum "Speed Density", "MAF Air Charge", "Alpha-N", "Lua" @@ -1328,7 +1328,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 1372854305 +#define SIGNATURE_HASH 1006849337 #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" @@ -1790,7 +1790,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.11.28.small-can-board.1372854305" +#define TS_SIGNATURE "rusEFI master.2024.11.28.small-can-board.1006849337" #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 ac50c2ffab..3d43b17049 100644 --- a/firmware/controllers/generated/rusefi_generated_stm32f429_nucleo.h +++ b/firmware/controllers/generated/rusefi_generated_stm32f429_nucleo.h @@ -352,7 +352,7 @@ #define ego_sensor_e_ES_Innovate_MTX_L 1 #define ego_sensor_e_ES_PLX 4 #define EGT_CHANNEL_COUNT 8 -#define END_OF_CALIBRATION_PADDING 94 +#define END_OF_CALIBRATION_PADDING 87 #define engine_configuration_s_size 4040 #define engine_load_mode_e_auto_enum 0="LM_SPEED_DENSITY",2="LM_ALPHA_N",3="LM_LUA",100="LM_MOCK",1="LM_REAL_MAF" #define engine_load_mode_e_enum "Speed Density", "MAF Air Charge", "Alpha-N", "Lua" @@ -1330,7 +1330,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 221197580 +#define SIGNATURE_HASH 1626890260 #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" @@ -1791,7 +1791,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.11.28.stm32f429_nucleo.221197580" +#define TS_SIGNATURE "rusEFI master.2024.11.28.stm32f429_nucleo.1626890260" #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 4e91377e69..4319eaed9b 100644 --- a/firmware/controllers/generated/rusefi_generated_stm32f767_nucleo.h +++ b/firmware/controllers/generated/rusefi_generated_stm32f767_nucleo.h @@ -352,7 +352,7 @@ #define ego_sensor_e_ES_Innovate_MTX_L 1 #define ego_sensor_e_ES_PLX 4 #define EGT_CHANNEL_COUNT 8 -#define END_OF_CALIBRATION_PADDING 94 +#define END_OF_CALIBRATION_PADDING 87 #define engine_configuration_s_size 4040 #define engine_load_mode_e_auto_enum 0="LM_SPEED_DENSITY",2="LM_ALPHA_N",3="LM_LUA",100="LM_MOCK",1="LM_REAL_MAF" #define engine_load_mode_e_enum "Speed Density", "MAF Air Charge", "Alpha-N", "Lua" @@ -1330,7 +1330,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 221197580 +#define SIGNATURE_HASH 1626890260 #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" @@ -1791,7 +1791,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.11.28.stm32f767_nucleo.221197580" +#define TS_SIGNATURE "rusEFI master.2024.11.28.stm32f767_nucleo.1626890260" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_stm32h743_nucleo.h b/firmware/controllers/generated/rusefi_generated_stm32h743_nucleo.h index d366d92706..de46accb3c 100644 --- a/firmware/controllers/generated/rusefi_generated_stm32h743_nucleo.h +++ b/firmware/controllers/generated/rusefi_generated_stm32h743_nucleo.h @@ -352,7 +352,7 @@ #define ego_sensor_e_ES_Innovate_MTX_L 1 #define ego_sensor_e_ES_PLX 4 #define EGT_CHANNEL_COUNT 8 -#define END_OF_CALIBRATION_PADDING 94 +#define END_OF_CALIBRATION_PADDING 87 #define engine_configuration_s_size 4040 #define engine_load_mode_e_auto_enum 0="LM_SPEED_DENSITY",2="LM_ALPHA_N",3="LM_LUA",100="LM_MOCK",1="LM_REAL_MAF" #define engine_load_mode_e_enum "Speed Density", "MAF Air Charge", "Alpha-N", "Lua" @@ -1330,7 +1330,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 221197580 +#define SIGNATURE_HASH 1626890260 #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" @@ -1791,7 +1791,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.11.28.stm32h743_nucleo.221197580" +#define TS_SIGNATURE "rusEFI master.2024.11.28.stm32h743_nucleo.1626890260" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_subaru_eg33_f7.h b/firmware/controllers/generated/rusefi_generated_subaru_eg33_f7.h index 2e5d7dd4eb..47822a3d90 100644 --- a/firmware/controllers/generated/rusefi_generated_subaru_eg33_f7.h +++ b/firmware/controllers/generated/rusefi_generated_subaru_eg33_f7.h @@ -352,7 +352,7 @@ #define ego_sensor_e_ES_Innovate_MTX_L 1 #define ego_sensor_e_ES_PLX 4 #define EGT_CHANNEL_COUNT 8 -#define END_OF_CALIBRATION_PADDING 94 +#define END_OF_CALIBRATION_PADDING 87 #define engine_configuration_s_size 4040 #define engine_load_mode_e_auto_enum 0="LM_SPEED_DENSITY",2="LM_ALPHA_N",3="LM_LUA",100="LM_MOCK",1="LM_REAL_MAF" #define engine_load_mode_e_enum "Speed Density", "MAF Air Charge", "Alpha-N", "Lua" @@ -1330,7 +1330,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 1376652626 +#define SIGNATURE_HASH 1071208522 #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" @@ -1792,7 +1792,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.11.28.subaru_eg33_f7.1376652626" +#define TS_SIGNATURE "rusEFI master.2024.11.28.subaru_eg33_f7.1071208522" #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 9249fd6ba2..058fa3b086 100644 --- a/firmware/controllers/generated/rusefi_generated_t-b-g.h +++ b/firmware/controllers/generated/rusefi_generated_t-b-g.h @@ -352,7 +352,7 @@ #define ego_sensor_e_ES_Innovate_MTX_L 1 #define ego_sensor_e_ES_PLX 4 #define EGT_CHANNEL_COUNT 8 -#define END_OF_CALIBRATION_PADDING 94 +#define END_OF_CALIBRATION_PADDING 87 #define engine_configuration_s_size 4040 #define engine_load_mode_e_auto_enum 0="LM_SPEED_DENSITY",2="LM_ALPHA_N",3="LM_LUA",100="LM_MOCK",1="LM_REAL_MAF" #define engine_load_mode_e_enum "Speed Density", "MAF Air Charge", "Alpha-N", "Lua" @@ -1330,7 +1330,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 221197580 +#define SIGNATURE_HASH 1626890260 #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" @@ -1791,7 +1791,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.11.28.t-b-g.221197580" +#define TS_SIGNATURE "rusEFI master.2024.11.28.t-b-g.1626890260" #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 126a6b829d..322b46e4f4 100644 --- a/firmware/controllers/generated/rusefi_generated_tdg-pdm8.h +++ b/firmware/controllers/generated/rusefi_generated_tdg-pdm8.h @@ -352,7 +352,7 @@ #define ego_sensor_e_ES_Innovate_MTX_L 1 #define ego_sensor_e_ES_PLX 4 #define EGT_CHANNEL_COUNT 8 -#define END_OF_CALIBRATION_PADDING 94 +#define END_OF_CALIBRATION_PADDING 87 #define engine_configuration_s_size 4040 #define engine_load_mode_e_auto_enum 0="LM_SPEED_DENSITY",2="LM_ALPHA_N",3="LM_LUA",100="LM_MOCK",1="LM_REAL_MAF" #define engine_load_mode_e_enum "Speed Density", "MAF Air Charge", "Alpha-N", "Lua" @@ -1330,7 +1330,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 922913156 +#define SIGNATURE_HASH 1523965084 #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" @@ -1791,7 +1791,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.11.28.tdg-pdm8.922913156" +#define TS_SIGNATURE "rusEFI master.2024.11.28.tdg-pdm8.1523965084" #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 fe1bdb20d7..287573a3c3 100644 --- a/firmware/controllers/generated/rusefi_generated_uaefi.h +++ b/firmware/controllers/generated/rusefi_generated_uaefi.h @@ -346,7 +346,7 @@ #define ego_sensor_e_ES_Innovate_MTX_L 1 #define ego_sensor_e_ES_PLX 4 #define EGT_CHANNEL_COUNT 8 -#define END_OF_CALIBRATION_PADDING 94 +#define END_OF_CALIBRATION_PADDING 87 #define engine_configuration_s_size 4040 #define engine_load_mode_e_auto_enum 0="LM_SPEED_DENSITY",2="LM_ALPHA_N",3="LM_LUA",100="LM_MOCK",1="LM_REAL_MAF" #define engine_load_mode_e_enum "Speed Density", "MAF Air Charge", "Alpha-N", "Lua" @@ -1324,7 +1324,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 1428073999 +#define SIGNATURE_HASH 952761111 #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" @@ -1786,7 +1786,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.11.28.uaefi.1428073999" +#define TS_SIGNATURE "rusEFI master.2024.11.28.uaefi.952761111" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_uaefi121.h b/firmware/controllers/generated/rusefi_generated_uaefi121.h index a95e19f326..e5ccf9b473 100644 --- a/firmware/controllers/generated/rusefi_generated_uaefi121.h +++ b/firmware/controllers/generated/rusefi_generated_uaefi121.h @@ -350,7 +350,7 @@ #define ego_sensor_e_ES_Innovate_MTX_L 1 #define ego_sensor_e_ES_PLX 4 #define EGT_CHANNEL_COUNT 8 -#define END_OF_CALIBRATION_PADDING 94 +#define END_OF_CALIBRATION_PADDING 87 #define engine_configuration_s_size 4040 #define engine_load_mode_e_auto_enum 0="LM_SPEED_DENSITY",2="LM_ALPHA_N",3="LM_LUA",100="LM_MOCK",1="LM_REAL_MAF" #define engine_load_mode_e_enum "Speed Density", "MAF Air Charge", "Alpha-N", "Lua" @@ -1328,7 +1328,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 3959186340 +#define SIGNATURE_HASH 2250979004 #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" @@ -1789,7 +1789,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.11.28.uaefi121.3959186340" +#define TS_SIGNATURE "rusEFI master.2024.11.28.uaefi121.2250979004" #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 86715e0e98..fd35a079aa 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-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1155867515 -#define TS_SIGNATURE "rusEFI master.2024.11.28.alphax-2chan.1155867515" +#define SIGNATURE_HASH 691172963 +#define TS_SIGNATURE "rusEFI master.2024.11.28.alphax-2chan.691172963" diff --git a/firmware/controllers/generated/signature_alphax-4chan.h b/firmware/controllers/generated/signature_alphax-4chan.h index a684bb2f47..408f83a5e9 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-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2485438878 -#define TS_SIGNATURE "rusEFI master.2024.11.28.alphax-4chan.2485438878" +#define SIGNATURE_HASH 4193492102 +#define TS_SIGNATURE "rusEFI master.2024.11.28.alphax-4chan.4193492102" diff --git a/firmware/controllers/generated/signature_alphax-4chan_f7.h b/firmware/controllers/generated/signature_alphax-4chan_f7.h index 31b839f845..cd5fa56bf6 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-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2485438878 -#define TS_SIGNATURE "rusEFI master.2024.11.28.alphax-4chan_f7.2485438878" +#define SIGNATURE_HASH 4193492102 +#define TS_SIGNATURE "rusEFI master.2024.11.28.alphax-4chan_f7.4193492102" diff --git a/firmware/controllers/generated/signature_alphax-4k-gdi.h b/firmware/controllers/generated/signature_alphax-4k-gdi.h index 7a91355ee7..249b45b5a3 100644 --- a/firmware/controllers/generated/signature_alphax-4k-gdi.h +++ b/firmware/controllers/generated/signature_alphax-4k-gdi.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2192732647 -#define TS_SIGNATURE "rusEFI master.2024.11.28.alphax-4k-gdi.2192732647" +#define SIGNATURE_HASH 4016383231 +#define TS_SIGNATURE "rusEFI master.2024.11.28.alphax-4k-gdi.4016383231" diff --git a/firmware/controllers/generated/signature_alphax-8chan-revA.h b/firmware/controllers/generated/signature_alphax-8chan-revA.h index efbd70daf7..419a29cb5b 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-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2850473625 -#define TS_SIGNATURE "rusEFI master.2024.11.28.alphax-8chan-revA.2850473625" +#define SIGNATURE_HASH 3291583361 +#define TS_SIGNATURE "rusEFI master.2024.11.28.alphax-8chan-revA.3291583361" diff --git a/firmware/controllers/generated/signature_alphax-8chan.h b/firmware/controllers/generated/signature_alphax-8chan.h index d985fef8d7..e9db229095 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-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1444339341 -#define TS_SIGNATURE "rusEFI master.2024.11.28.alphax-8chan.1444339341" +#define SIGNATURE_HASH 1002539925 +#define TS_SIGNATURE "rusEFI master.2024.11.28.alphax-8chan.1002539925" diff --git a/firmware/controllers/generated/signature_alphax-8chan_f7.h b/firmware/controllers/generated/signature_alphax-8chan_f7.h index 5bd30ceef0..05c9a3599c 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-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1444339341 -#define TS_SIGNATURE "rusEFI master.2024.11.28.alphax-8chan_f7.1444339341" +#define SIGNATURE_HASH 1002539925 +#define TS_SIGNATURE "rusEFI master.2024.11.28.alphax-8chan_f7.1002539925" diff --git a/firmware/controllers/generated/signature_alphax-silver.h b/firmware/controllers/generated/signature_alphax-silver.h index dbdbdd0c1e..35e742f84c 100644 --- a/firmware/controllers/generated/signature_alphax-silver.h +++ b/firmware/controllers/generated/signature_alphax-silver.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 814825130 -#define TS_SIGNATURE "rusEFI master.2024.11.28.alphax-silver.814825130" +#define SIGNATURE_HASH 1564896178 +#define TS_SIGNATURE "rusEFI master.2024.11.28.alphax-silver.1564896178" diff --git a/firmware/controllers/generated/signature_at_start_f435.h b/firmware/controllers/generated/signature_at_start_f435.h index 2d1b0076f6..16cba4d9ab 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-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 221197580 -#define TS_SIGNATURE "rusEFI master.2024.11.28.at_start_f435.221197580" +#define SIGNATURE_HASH 1626890260 +#define TS_SIGNATURE "rusEFI master.2024.11.28.at_start_f435.1626890260" diff --git a/firmware/controllers/generated/signature_atlas.h b/firmware/controllers/generated/signature_atlas.h index a54f0d4f8f..fe8d0598b2 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-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1227415874 -#define TS_SIGNATURE "rusEFI master.2024.11.28.atlas.1227415874" +#define SIGNATURE_HASH 620737626 +#define TS_SIGNATURE "rusEFI master.2024.11.28.atlas.620737626" diff --git a/firmware/controllers/generated/signature_f407-discovery.h b/firmware/controllers/generated/signature_f407-discovery.h index 6a954d71f7..cfb9197e6d 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-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3986160817 -#define TS_SIGNATURE "rusEFI master.2024.11.28.f407-discovery.3986160817" +#define SIGNATURE_HASH 2151721385 +#define TS_SIGNATURE "rusEFI master.2024.11.28.f407-discovery.2151721385" diff --git a/firmware/controllers/generated/signature_f429-discovery.h b/firmware/controllers/generated/signature_f429-discovery.h index c2c269c596..4bf8275f30 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-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 221197580 -#define TS_SIGNATURE "rusEFI master.2024.11.28.f429-discovery.221197580" +#define SIGNATURE_HASH 1626890260 +#define TS_SIGNATURE "rusEFI master.2024.11.28.f429-discovery.1626890260" diff --git a/firmware/controllers/generated/signature_f469-discovery.h b/firmware/controllers/generated/signature_f469-discovery.h index f1dfa3e3ac..d6ee4caa8d 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-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1073230751 -#define TS_SIGNATURE "rusEFI master.2024.11.28.f469-discovery.1073230751" +#define SIGNATURE_HASH 1378838151 +#define TS_SIGNATURE "rusEFI master.2024.11.28.f469-discovery.1378838151" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index c05931c913..26d4d5f207 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-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1538015511 -#define TS_SIGNATURE "rusEFI master.2024.11.28.frankenso_na6.1538015511" +#define SIGNATURE_HASH 914035727 +#define TS_SIGNATURE "rusEFI master.2024.11.28.frankenso_na6.914035727" diff --git a/firmware/controllers/generated/signature_haba208.h b/firmware/controllers/generated/signature_haba208.h index 96b885f2d4..7626934b17 100644 --- a/firmware/controllers/generated/signature_haba208.h +++ b/firmware/controllers/generated/signature_haba208.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 221197580 -#define TS_SIGNATURE "rusEFI master.2024.11.28.haba208.221197580" +#define SIGNATURE_HASH 1626890260 +#define TS_SIGNATURE "rusEFI master.2024.11.28.haba208.1626890260" diff --git a/firmware/controllers/generated/signature_hellen-112-17.h b/firmware/controllers/generated/signature_hellen-112-17.h index 3a8bd29e9b..e3cb757a32 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-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2217192840 -#define TS_SIGNATURE "rusEFI master.2024.11.28.hellen-112-17.2217192840" +#define SIGNATURE_HASH 3924883600 +#define TS_SIGNATURE "rusEFI master.2024.11.28.hellen-112-17.3924883600" diff --git a/firmware/controllers/generated/signature_hellen-gm-e67.h b/firmware/controllers/generated/signature_hellen-gm-e67.h index da96272278..d3ecc8787b 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-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3243659956 -#define TS_SIGNATURE "rusEFI master.2024.11.28.hellen-gm-e67.3243659956" +#define SIGNATURE_HASH 2894137260 +#define TS_SIGNATURE "rusEFI master.2024.11.28.hellen-gm-e67.2894137260" diff --git a/firmware/controllers/generated/signature_hellen-honda-k.h b/firmware/controllers/generated/signature_hellen-honda-k.h index 3e45cf72a2..a6761a1b8e 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-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1494632314 -#define TS_SIGNATURE "rusEFI master.2024.11.28.hellen-honda-k.1494632314" +#define SIGNATURE_HASH 885068386 +#define TS_SIGNATURE "rusEFI master.2024.11.28.hellen-honda-k.885068386" diff --git a/firmware/controllers/generated/signature_hellen-nb1.h b/firmware/controllers/generated/signature_hellen-nb1.h index e4fd9001f9..790b8d1b38 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-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2391400467 -#define TS_SIGNATURE "rusEFI master.2024.11.28.hellen-nb1.2391400467" +#define SIGNATURE_HASH 3814634763 +#define TS_SIGNATURE "rusEFI master.2024.11.28.hellen-nb1.3814634763" diff --git a/firmware/controllers/generated/signature_hellen121nissan.h b/firmware/controllers/generated/signature_hellen121nissan.h index c4ccca938c..be8eb31fc8 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-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3719604108 -#define TS_SIGNATURE "rusEFI master.2024.11.28.hellen121nissan.3719604108" +#define SIGNATURE_HASH 2959340180 +#define TS_SIGNATURE "rusEFI master.2024.11.28.hellen121nissan.2959340180" diff --git a/firmware/controllers/generated/signature_hellen121vag.h b/firmware/controllers/generated/signature_hellen121vag.h index 4278b43026..685f7d5f79 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-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2245899723 -#define TS_SIGNATURE "rusEFI master.2024.11.28.hellen121vag.2245899723" +#define SIGNATURE_HASH 3893027027 +#define TS_SIGNATURE "rusEFI master.2024.11.28.hellen121vag.3893027027" diff --git a/firmware/controllers/generated/signature_hellen128.h b/firmware/controllers/generated/signature_hellen128.h index 8518409401..7c11e72182 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-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3770490875 -#define TS_SIGNATURE "rusEFI master.2024.11.28.hellen128.3770490875" +#define SIGNATURE_HASH 2372553443 +#define TS_SIGNATURE "rusEFI master.2024.11.28.hellen128.2372553443" diff --git a/firmware/controllers/generated/signature_hellen154hyundai.h b/firmware/controllers/generated/signature_hellen154hyundai.h index 75da5f4df3..c8da756939 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-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 729418902 -#define TS_SIGNATURE "rusEFI master.2024.11.28.hellen154hyundai.729418902" +#define SIGNATURE_HASH 1185765774 +#define TS_SIGNATURE "rusEFI master.2024.11.28.hellen154hyundai.1185765774" diff --git a/firmware/controllers/generated/signature_hellen154hyundai_f7.h b/firmware/controllers/generated/signature_hellen154hyundai_f7.h index 2e01f717b9..cf167d4e74 100644 --- a/firmware/controllers/generated/signature_hellen154hyundai_f7.h +++ b/firmware/controllers/generated/signature_hellen154hyundai_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1695310101 -#define TS_SIGNATURE "rusEFI master.2024.11.28.hellen154hyundai_f7.1695310101" +#define SIGNATURE_HASH 148583437 +#define TS_SIGNATURE "rusEFI master.2024.11.28.hellen154hyundai_f7.148583437" diff --git a/firmware/controllers/generated/signature_hellen72.h b/firmware/controllers/generated/signature_hellen72.h index 55c94f659a..36f8034e12 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-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 4027046106 -#define TS_SIGNATURE "rusEFI master.2024.11.28.hellen72.4027046106" +#define SIGNATURE_HASH 2647690690 +#define TS_SIGNATURE "rusEFI master.2024.11.28.hellen72.2647690690" diff --git a/firmware/controllers/generated/signature_hellen81.h b/firmware/controllers/generated/signature_hellen81.h index fc6851d553..f8f1ce8107 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-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1757390314 -#define TS_SIGNATURE "rusEFI master.2024.11.28.hellen81.1757390314" +#define SIGNATURE_HASH 90763506 +#define TS_SIGNATURE "rusEFI master.2024.11.28.hellen81.90763506" diff --git a/firmware/controllers/generated/signature_hellen88bmw.h b/firmware/controllers/generated/signature_hellen88bmw.h index 2e4e12f5bd..1f40db0d2e 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-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2140975273 -#define TS_SIGNATURE "rusEFI master.2024.11.28.hellen88bmw.2140975273" +#define SIGNATURE_HASH 306963889 +#define TS_SIGNATURE "rusEFI master.2024.11.28.hellen88bmw.306963889" diff --git a/firmware/controllers/generated/signature_hellenNA6.h b/firmware/controllers/generated/signature_hellenNA6.h index 8179adcb11..46345bdf64 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-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2576013036 -#define TS_SIGNATURE "rusEFI master.2024.11.28.hellenNA6.2576013036" +#define SIGNATURE_HASH 4099769332 +#define TS_SIGNATURE "rusEFI master.2024.11.28.hellenNA6.4099769332" diff --git a/firmware/controllers/generated/signature_hellenNA8_96.h b/firmware/controllers/generated/signature_hellenNA8_96.h index 6581d15dc8..c5dc47013b 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-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1716556834 -#define TS_SIGNATURE "rusEFI master.2024.11.28.hellenNA8_96.1716556834" +#define SIGNATURE_HASH 193446202 +#define TS_SIGNATURE "rusEFI master.2024.11.28.hellenNA8_96.193446202" diff --git a/firmware/controllers/generated/signature_m74_9.h b/firmware/controllers/generated/signature_m74_9.h index 893b793ade..34cbec375d 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-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3113553363 -#define TS_SIGNATURE "rusEFI master.2024.11.28.m74_9.3113553363" +#define SIGNATURE_HASH 3561117899 +#define TS_SIGNATURE "rusEFI master.2024.11.28.m74_9.3561117899" diff --git a/firmware/controllers/generated/signature_mre-legacy_f4.h b/firmware/controllers/generated/signature_mre-legacy_f4.h index 799eae41e9..f6a9dcb992 100644 --- a/firmware/controllers/generated/signature_mre-legacy_f4.h +++ b/firmware/controllers/generated/signature_mre-legacy_f4.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1179776207 -#define TS_SIGNATURE "rusEFI master.2024.11.28.mre-legacy_f4.1179776207" +#define SIGNATURE_HASH 730243543 +#define TS_SIGNATURE "rusEFI master.2024.11.28.mre-legacy_f4.730243543" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index 6f66a3dd44..156f02e69a 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-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1179776207 -#define TS_SIGNATURE "rusEFI master.2024.11.28.mre_f4.1179776207" +#define SIGNATURE_HASH 730243543 +#define TS_SIGNATURE "rusEFI master.2024.11.28.mre_f4.730243543" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index f9327c7d1e..fce927cbf7 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-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1179776207 -#define TS_SIGNATURE "rusEFI master.2024.11.28.mre_f7.1179776207" +#define SIGNATURE_HASH 730243543 +#define TS_SIGNATURE "rusEFI master.2024.11.28.mre_f7.730243543" diff --git a/firmware/controllers/generated/signature_nucleo_f413.h b/firmware/controllers/generated/signature_nucleo_f413.h index f991f30f55..082820b1f3 100644 --- a/firmware/controllers/generated/signature_nucleo_f413.h +++ b/firmware/controllers/generated/signature_nucleo_f413.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 221197580 -#define TS_SIGNATURE "rusEFI master.2024.11.28.nucleo_f413.221197580" +#define SIGNATURE_HASH 1626890260 +#define TS_SIGNATURE "rusEFI master.2024.11.28.nucleo_f413.1626890260" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index cb346d96ed..1514d92f42 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-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2919678414 -#define TS_SIGNATURE "rusEFI master.2024.11.28.proteus_f4.2919678414" +#define SIGNATURE_HASH 3285292246 +#define TS_SIGNATURE "rusEFI master.2024.11.28.proteus_f4.3285292246" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index 93d9e9add6..56a0fe09d8 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-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2919678414 -#define TS_SIGNATURE "rusEFI master.2024.11.28.proteus_f7.2919678414" +#define SIGNATURE_HASH 3285292246 +#define TS_SIGNATURE "rusEFI master.2024.11.28.proteus_f7.3285292246" diff --git a/firmware/controllers/generated/signature_proteus_h7.h b/firmware/controllers/generated/signature_proteus_h7.h index 5d3bc6fa38..18a1482df3 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-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2919678414 -#define TS_SIGNATURE "rusEFI master.2024.11.28.proteus_h7.2919678414" +#define SIGNATURE_HASH 3285292246 +#define TS_SIGNATURE "rusEFI master.2024.11.28.proteus_h7.3285292246" diff --git a/firmware/controllers/generated/signature_s105.h b/firmware/controllers/generated/signature_s105.h index 7d73a08d2a..e2dfd4f750 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-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2997138894 -#define TS_SIGNATURE "rusEFI master.2024.11.28.s105.2997138894" +#define SIGNATURE_HASH 3748913366 +#define TS_SIGNATURE "rusEFI master.2024.11.28.s105.3748913366" diff --git a/firmware/controllers/generated/signature_small-can-board.h b/firmware/controllers/generated/signature_small-can-board.h index 34c3f5851b..27e07bdf72 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-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1372854305 -#define TS_SIGNATURE "rusEFI master.2024.11.28.small-can-board.1372854305" +#define SIGNATURE_HASH 1006849337 +#define TS_SIGNATURE "rusEFI master.2024.11.28.small-can-board.1006849337" diff --git a/firmware/controllers/generated/signature_stm32f429_nucleo.h b/firmware/controllers/generated/signature_stm32f429_nucleo.h index 22674752c9..bdd6c0d59b 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-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 221197580 -#define TS_SIGNATURE "rusEFI master.2024.11.28.stm32f429_nucleo.221197580" +#define SIGNATURE_HASH 1626890260 +#define TS_SIGNATURE "rusEFI master.2024.11.28.stm32f429_nucleo.1626890260" diff --git a/firmware/controllers/generated/signature_stm32f767_nucleo.h b/firmware/controllers/generated/signature_stm32f767_nucleo.h index 9d1287b7e1..75863e02ce 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-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 221197580 -#define TS_SIGNATURE "rusEFI master.2024.11.28.stm32f767_nucleo.221197580" +#define SIGNATURE_HASH 1626890260 +#define TS_SIGNATURE "rusEFI master.2024.11.28.stm32f767_nucleo.1626890260" diff --git a/firmware/controllers/generated/signature_stm32h743_nucleo.h b/firmware/controllers/generated/signature_stm32h743_nucleo.h index a91c46f755..f5b73a5b35 100644 --- a/firmware/controllers/generated/signature_stm32h743_nucleo.h +++ b/firmware/controllers/generated/signature_stm32h743_nucleo.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 221197580 -#define TS_SIGNATURE "rusEFI master.2024.11.28.stm32h743_nucleo.221197580" +#define SIGNATURE_HASH 1626890260 +#define TS_SIGNATURE "rusEFI master.2024.11.28.stm32h743_nucleo.1626890260" diff --git a/firmware/controllers/generated/signature_subaru_eg33_f7.h b/firmware/controllers/generated/signature_subaru_eg33_f7.h index 33e47c167c..9e1cfc42ae 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-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1376652626 -#define TS_SIGNATURE "rusEFI master.2024.11.28.subaru_eg33_f7.1376652626" +#define SIGNATURE_HASH 1071208522 +#define TS_SIGNATURE "rusEFI master.2024.11.28.subaru_eg33_f7.1071208522" diff --git a/firmware/controllers/generated/signature_t-b-g.h b/firmware/controllers/generated/signature_t-b-g.h index 8e94fca490..ab7ee0e925 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-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 221197580 -#define TS_SIGNATURE "rusEFI master.2024.11.28.t-b-g.221197580" +#define SIGNATURE_HASH 1626890260 +#define TS_SIGNATURE "rusEFI master.2024.11.28.t-b-g.1626890260" diff --git a/firmware/controllers/generated/signature_tdg-pdm8.h b/firmware/controllers/generated/signature_tdg-pdm8.h index 975cad702b..87e66ad1a8 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-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 922913156 -#define TS_SIGNATURE "rusEFI master.2024.11.28.tdg-pdm8.922913156" +#define SIGNATURE_HASH 1523965084 +#define TS_SIGNATURE "rusEFI master.2024.11.28.tdg-pdm8.1523965084" diff --git a/firmware/controllers/generated/signature_uaefi.h b/firmware/controllers/generated/signature_uaefi.h index 541a579297..d1a237e2c3 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-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1428073999 -#define TS_SIGNATURE "rusEFI master.2024.11.28.uaefi.1428073999" +#define SIGNATURE_HASH 952761111 +#define TS_SIGNATURE "rusEFI master.2024.11.28.uaefi.952761111" diff --git a/firmware/controllers/generated/signature_uaefi121.h b/firmware/controllers/generated/signature_uaefi121.h index 1aedbe0cfd..d548d878d8 100644 --- a/firmware/controllers/generated/signature_uaefi121.h +++ b/firmware/controllers/generated/signature_uaefi121.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3959186340 -#define TS_SIGNATURE "rusEFI master.2024.11.28.uaefi121.3959186340" +#define SIGNATURE_HASH 2250979004 +#define TS_SIGNATURE "rusEFI master.2024.11.28.uaefi121.2250979004" diff --git a/firmware/controllers/lua/generated/output_lookup_generated.cpp b/firmware/controllers/lua/generated/output_lookup_generated.cpp index 50d7361ee5..e4a2aaefa2 100644 --- a/firmware/controllers/lua/generated/output_lookup_generated.cpp +++ b/firmware/controllers/lua/generated/output_lookup_generated.cpp @@ -1094,6 +1094,21 @@ float getOutputValueByName(const char *name) { case -1447071222: return engine->nitrousController.isArmed; #endif +// isTpsConditionSatisfied +#if EFI_LAUNCH_CONTROL + case -1256912197: + return engine->nitrousController.isTpsConditionSatisfied; +#endif +// isCltConditionSatisfied +#if EFI_LAUNCH_CONTROL + case -747236121: + return engine->nitrousController.isCltConditionSatisfied; +#endif +// isMapConditionSatisfied +#if EFI_LAUNCH_CONTROL + case 1960789698: + return engine->nitrousController.isMapConditionSatisfied; +#endif // isTpsInvalid #if EFI_BOOST_CONTROL case -575666209: diff --git a/firmware/controllers/lua/generated/value_lookup_generated.cpp b/firmware/controllers/lua/generated/value_lookup_generated.cpp index 5cc716522f..4673285586 100644 --- a/firmware/controllers/lua/generated/value_lookup_generated.cpp +++ b/firmware/controllers/lua/generated/value_lookup_generated.cpp @@ -1913,6 +1913,15 @@ float getConfigValueByName(const char *name) { // nitrousLuaGaugeArmingValue case -1760115393: return engineConfiguration->nitrousLuaGaugeArmingValue; +// nitrousMinimumTps + case 1089367148: + return engineConfiguration->nitrousMinimumTps; +// nitrousMinimumClt + case 1089348504: + return engineConfiguration->nitrousMinimumClt; +// nitrousMaximumMap + case -677571211: + return engineConfiguration->nitrousMaximumMap; // tcu_shiftTime case -1658957891: return config->tcu_shiftTime; @@ -5101,6 +5110,21 @@ bool setConfigValueByName(const char *name, float value) { { engineConfiguration->nitrousLuaGaugeArmingValue = value; return 1; + } + case 1089367148: + { + engineConfiguration->nitrousMinimumTps = (int)value; + return 1; + } + case 1089348504: + { + engineConfiguration->nitrousMinimumClt = (int)value; + return 1; + } + case -677571211: + { + engineConfiguration->nitrousMaximumMap = (int)value; + return 1; } case -1658957891: { diff --git a/firmware/controllers/lua/generated/value_lookup_generated.md b/firmware/controllers/lua/generated/value_lookup_generated.md index ebd2283da6..d559e538f6 100644 --- a/firmware/controllers/lua/generated/value_lookup_generated.md +++ b/firmware/controllers/lua/generated/value_lookup_generated.md @@ -1906,6 +1906,15 @@ This is the pressure at which your injector flow is known.\nFor example if your ### nitrousLuaGaugeArmingValue +### nitrousMinimumTps + + +### nitrousMinimumClt + + +### nitrousMaximumMap + + ### tcu_shiftTime diff --git a/firmware/live_data_generated/nitrous_control_state_generated.h b/firmware/live_data_generated/nitrous_control_state_generated.h index f408710208..5152aab014 100644 --- a/firmware/live_data_generated/nitrous_control_state_generated.h +++ b/firmware/live_data_generated/nitrous_control_state_generated.h @@ -10,97 +10,97 @@ struct nitrous_control_state_s { bool isArmed : 1 {}; /** offset 0 bit 1 */ - bool unusedBit_1_1 : 1 {}; + bool isTpsConditionSatisfied : 1 {}; /** offset 0 bit 2 */ - bool unusedBit_1_2 : 1 {}; + bool isCltConditionSatisfied : 1 {}; /** offset 0 bit 3 */ - bool unusedBit_1_3 : 1 {}; + bool isMapConditionSatisfied : 1 {}; /** offset 0 bit 4 */ - bool unusedBit_1_4 : 1 {}; + bool unusedBit_4_4 : 1 {}; /** offset 0 bit 5 */ - bool unusedBit_1_5 : 1 {}; + bool unusedBit_4_5 : 1 {}; /** offset 0 bit 6 */ - bool unusedBit_1_6 : 1 {}; + bool unusedBit_4_6 : 1 {}; /** offset 0 bit 7 */ - bool unusedBit_1_7 : 1 {}; + bool unusedBit_4_7 : 1 {}; /** offset 0 bit 8 */ - bool unusedBit_1_8 : 1 {}; + bool unusedBit_4_8 : 1 {}; /** offset 0 bit 9 */ - bool unusedBit_1_9 : 1 {}; + bool unusedBit_4_9 : 1 {}; /** offset 0 bit 10 */ - bool unusedBit_1_10 : 1 {}; + bool unusedBit_4_10 : 1 {}; /** offset 0 bit 11 */ - bool unusedBit_1_11 : 1 {}; + bool unusedBit_4_11 : 1 {}; /** offset 0 bit 12 */ - bool unusedBit_1_12 : 1 {}; + bool unusedBit_4_12 : 1 {}; /** offset 0 bit 13 */ - bool unusedBit_1_13 : 1 {}; + bool unusedBit_4_13 : 1 {}; /** offset 0 bit 14 */ - bool unusedBit_1_14 : 1 {}; + bool unusedBit_4_14 : 1 {}; /** offset 0 bit 15 */ - bool unusedBit_1_15 : 1 {}; + bool unusedBit_4_15 : 1 {}; /** offset 0 bit 16 */ - bool unusedBit_1_16 : 1 {}; + bool unusedBit_4_16 : 1 {}; /** offset 0 bit 17 */ - bool unusedBit_1_17 : 1 {}; + bool unusedBit_4_17 : 1 {}; /** offset 0 bit 18 */ - bool unusedBit_1_18 : 1 {}; + bool unusedBit_4_18 : 1 {}; /** offset 0 bit 19 */ - bool unusedBit_1_19 : 1 {}; + bool unusedBit_4_19 : 1 {}; /** offset 0 bit 20 */ - bool unusedBit_1_20 : 1 {}; + bool unusedBit_4_20 : 1 {}; /** offset 0 bit 21 */ - bool unusedBit_1_21 : 1 {}; + bool unusedBit_4_21 : 1 {}; /** offset 0 bit 22 */ - bool unusedBit_1_22 : 1 {}; + bool unusedBit_4_22 : 1 {}; /** offset 0 bit 23 */ - bool unusedBit_1_23 : 1 {}; + bool unusedBit_4_23 : 1 {}; /** offset 0 bit 24 */ - bool unusedBit_1_24 : 1 {}; + bool unusedBit_4_24 : 1 {}; /** offset 0 bit 25 */ - bool unusedBit_1_25 : 1 {}; + bool unusedBit_4_25 : 1 {}; /** offset 0 bit 26 */ - bool unusedBit_1_26 : 1 {}; + bool unusedBit_4_26 : 1 {}; /** offset 0 bit 27 */ - bool unusedBit_1_27 : 1 {}; + bool unusedBit_4_27 : 1 {}; /** offset 0 bit 28 */ - bool unusedBit_1_28 : 1 {}; + bool unusedBit_4_28 : 1 {}; /** offset 0 bit 29 */ - bool unusedBit_1_29 : 1 {}; + bool unusedBit_4_29 : 1 {}; /** offset 0 bit 30 */ - bool unusedBit_1_30 : 1 {}; + bool unusedBit_4_30 : 1 {}; /** offset 0 bit 31 */ - bool unusedBit_1_31 : 1 {}; + bool unusedBit_4_31 : 1 {}; }; static_assert(sizeof(nitrous_control_state_s) == 4); diff --git a/firmware/tunerstudio/generated/rusefi.ini b/firmware/tunerstudio/generated/rusefi.ini index 8b68a98379..04da95ca66 100644 --- a/firmware/tunerstudio/generated/rusefi.ini +++ b/firmware/tunerstudio/generated/rusefi.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.11.28.f407-discovery.3986160817" + signature = "rusEFI master.2024.11.28.f407-discovery.2151721385" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.11.28.f407-discovery.3986160817" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.11.28.f407-discovery.2151721385" ; 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 @@ -1432,7 +1432,10 @@ nitrousControlTriggerPinMode = bits, U08, 3936, [0:1], "DEFAULT", "PULLUP", "PUL nitrousLuaGauge = bits, S08, 3937, [0:2], "Lua Gauge 1", "Lua Gauge 2", "Lua Gauge 3", "Lua Gauge 4", "Lua Gauge 5", "Lua Gauge 6", "Lua Gauge 7", "Lua Gauge 8" nitrousLuaGaugeMeaning = bits, S08, 3938, [3:3], "Lower Bound", "Upper Bound" nitrousLuaGaugeArmingValue = scalar, F32, 3940, "", 1, 0, -30000, 30000, 3 -unusedOftenChangesDuringFirmwareUpdate = array, U08, 3944, [94], "units", 1, 0, 0, 1, 0 +nitrousMinimumTps = scalar, S32, 3944, "", 1, 0, 0, 20000, 0 +nitrousMinimumClt = scalar, U08, 3948, "deg C", 1, 0, 0, 250, 0 +nitrousMaximumMap = scalar, S16, 3950, "kPa", 1, 0, 0, 1000, 0 +unusedOftenChangesDuringFirmwareUpdate = array, U08, 3952, [87], "units", 1, 0, 0, 1, 0 postCrankingFactor = array, F32, 4040, [6x6], "mult", 1, 0, 1, 3, 2 postCrankingDurationBins = array, F32, 4184, [6], "count", 1, 0, 0, 1000, 0 postCrankingCLTBins = array, S16, 4208, [6], "C", 1, 0, -100, 250, 0 @@ -3224,6 +3227,9 @@ isAppConditionSatisfied = bits, U32, 1124, [4:4] isFlatShiftConditionSatisfied = bits, U32, 1124, [5:5] ; total TS size = 1128 isArmed = bits, U32, 1128, [0:0] +isTpsConditionSatisfied = bits, U32, 1128, [1:1] +isCltConditionSatisfied = bits, U32, 1128, [2:2] +isMapConditionSatisfied = bits, U32, 1128, [3:3] ; total TS size = 1132 isAntilagCondition = bits, U32, 1132, [0:0] ALSMinRPMCondition = bits, U32, 1132, [1:1] @@ -5803,6 +5809,9 @@ entry = isRpmConditionSatisfied, "isRpmConditionSatisfied", int, "%d" entry = isAppConditionSatisfied, "isAppConditionSatisfied", int, "%d" entry = isFlatShiftConditionSatisfied, "isFlatShiftConditionSatisfied", int, "%d" entry = isArmed, "isArmed", int, "%d" +entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" +entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" +entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" entry = isAntilagCondition, "isAntilagCondition", int, "%d" entry = ALSMinRPMCondition, "ALSMinRPMCondition", int, "%d" entry = ALSMaxRPMCondition, "ALSMaxRPMCondition", int, "%d" @@ -6784,6 +6793,9 @@ dialog = shift_torque_reduction_stateDialog, "shift_torque_reduction_state" indicatorPanel = nitrous_control_stateIndicatorPanel, 2 indicator = {isArmed}, "isArmed No", "isArmed Yes" + indicator = {isTpsConditionSatisfied}, "isTpsConditionSatisfied No", "isTpsConditionSatisfied Yes" + indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" + indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9819,10 +9831,15 @@ dialog = tcuControls, "Transmission Settings" panel = NitrousControlButtonDialog, {nitrousControlArmingMethod == 0} panel = NitrousControlLuaGaugeDialog, {nitrousControlArmingMethod == 1} + dialog = NitrousControlSettings, "Settings" + field = "Minimum TPS", nitrousMinimumTps + field = "Minimum CLT", nitrousMinimumClt + field = "Maximum MAP", nitrousMaximumMap + dialog = NitrousControlSettingsDialog, "", yAxis field = "Enable Nitrous Control", nitrousControlEnabled panel = NitrousControlArmingMethodDialog, {nitrousControlEnabled == 1} -; panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))} + panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))} dialog = NitrousControlDialog panel = NitrousControlSettingsDialog, West diff --git a/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini index e63365ccfc..b54ed66288 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.11.28.alphax-2chan.1155867515" + signature = "rusEFI master.2024.11.28.alphax-2chan.691172963" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.11.28.alphax-2chan.1155867515" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.11.28.alphax-2chan.691172963" ; 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 @@ -1432,7 +1432,10 @@ nitrousControlTriggerPinMode = bits, U08, 3936, [0:1], "DEFAULT", "PULLUP", "PUL nitrousLuaGauge = bits, S08, 3937, [0:2], "Lua Gauge 1", "Lua Gauge 2", "Lua Gauge 3", "Lua Gauge 4", "Lua Gauge 5", "Lua Gauge 6", "Lua Gauge 7", "Lua Gauge 8" nitrousLuaGaugeMeaning = bits, S08, 3938, [3:3], "Lower Bound", "Upper Bound" nitrousLuaGaugeArmingValue = scalar, F32, 3940, "", 1, 0, -30000, 30000, 3 -unusedOftenChangesDuringFirmwareUpdate = array, U08, 3944, [94], "units", 1, 0, 0, 1, 0 +nitrousMinimumTps = scalar, S32, 3944, "", 1, 0, 0, 20000, 0 +nitrousMinimumClt = scalar, U08, 3948, "deg C", 1, 0, 0, 250, 0 +nitrousMaximumMap = scalar, S16, 3950, "kPa", 1, 0, 0, 1000, 0 +unusedOftenChangesDuringFirmwareUpdate = array, U08, 3952, [87], "units", 1, 0, 0, 1, 0 postCrankingFactor = array, F32, 4040, [6x6], "mult", 1, 0, 1, 3, 2 postCrankingDurationBins = array, F32, 4184, [6], "count", 1, 0, 0, 1000, 0 postCrankingCLTBins = array, S16, 4208, [6], "C", 1, 0, -100, 250, 0 @@ -3228,6 +3231,9 @@ isAppConditionSatisfied = bits, U32, 1124, [4:4] isFlatShiftConditionSatisfied = bits, U32, 1124, [5:5] ; total TS size = 1128 isArmed = bits, U32, 1128, [0:0] +isTpsConditionSatisfied = bits, U32, 1128, [1:1] +isCltConditionSatisfied = bits, U32, 1128, [2:2] +isMapConditionSatisfied = bits, U32, 1128, [3:3] ; total TS size = 1132 isAntilagCondition = bits, U32, 1132, [0:0] ALSMinRPMCondition = bits, U32, 1132, [1:1] @@ -5800,6 +5806,9 @@ entry = isRpmConditionSatisfied, "isRpmConditionSatisfied", int, "%d" entry = isAppConditionSatisfied, "isAppConditionSatisfied", int, "%d" entry = isFlatShiftConditionSatisfied, "isFlatShiftConditionSatisfied", int, "%d" entry = isArmed, "isArmed", int, "%d" +entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" +entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" +entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" entry = isAntilagCondition, "isAntilagCondition", int, "%d" entry = ALSMinRPMCondition, "ALSMinRPMCondition", int, "%d" entry = ALSMaxRPMCondition, "ALSMaxRPMCondition", int, "%d" @@ -6765,6 +6774,9 @@ dialog = shift_torque_reduction_stateDialog, "shift_torque_reduction_state" indicatorPanel = nitrous_control_stateIndicatorPanel, 2 indicator = {isArmed}, "isArmed No", "isArmed Yes" + indicator = {isTpsConditionSatisfied}, "isTpsConditionSatisfied No", "isTpsConditionSatisfied Yes" + indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" + indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9702,10 +9714,15 @@ dialog = tcuControls, "Transmission Settings" panel = NitrousControlButtonDialog, {nitrousControlArmingMethod == 0} panel = NitrousControlLuaGaugeDialog, {nitrousControlArmingMethod == 1} + dialog = NitrousControlSettings, "Settings" + field = "Minimum TPS", nitrousMinimumTps + field = "Minimum CLT", nitrousMinimumClt + field = "Maximum MAP", nitrousMaximumMap + dialog = NitrousControlSettingsDialog, "", yAxis field = "Enable Nitrous Control", nitrousControlEnabled panel = NitrousControlArmingMethodDialog, {nitrousControlEnabled == 1} -; panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))} + panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))} dialog = NitrousControlDialog panel = NitrousControlSettingsDialog, West diff --git a/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini index 1e54931f78..f5f743c73c 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.11.28.alphax-4chan.2485438878" + signature = "rusEFI master.2024.11.28.alphax-4chan.4193492102" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.11.28.alphax-4chan.2485438878" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.11.28.alphax-4chan.4193492102" ; 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 @@ -1432,7 +1432,10 @@ nitrousControlTriggerPinMode = bits, U08, 3936, [0:1], "DEFAULT", "PULLUP", "PUL nitrousLuaGauge = bits, S08, 3937, [0:2], "Lua Gauge 1", "Lua Gauge 2", "Lua Gauge 3", "Lua Gauge 4", "Lua Gauge 5", "Lua Gauge 6", "Lua Gauge 7", "Lua Gauge 8" nitrousLuaGaugeMeaning = bits, S08, 3938, [3:3], "Lower Bound", "Upper Bound" nitrousLuaGaugeArmingValue = scalar, F32, 3940, "", 1, 0, -30000, 30000, 3 -unusedOftenChangesDuringFirmwareUpdate = array, U08, 3944, [94], "units", 1, 0, 0, 1, 0 +nitrousMinimumTps = scalar, S32, 3944, "", 1, 0, 0, 20000, 0 +nitrousMinimumClt = scalar, U08, 3948, "deg C", 1, 0, 0, 250, 0 +nitrousMaximumMap = scalar, S16, 3950, "kPa", 1, 0, 0, 1000, 0 +unusedOftenChangesDuringFirmwareUpdate = array, U08, 3952, [87], "units", 1, 0, 0, 1, 0 postCrankingFactor = array, F32, 4040, [6x6], "mult", 1, 0, 1, 3, 2 postCrankingDurationBins = array, F32, 4184, [6], "count", 1, 0, 0, 1000, 0 postCrankingCLTBins = array, S16, 4208, [6], "C", 1, 0, -100, 250, 0 @@ -3233,6 +3236,9 @@ isAppConditionSatisfied = bits, U32, 1124, [4:4] isFlatShiftConditionSatisfied = bits, U32, 1124, [5:5] ; total TS size = 1128 isArmed = bits, U32, 1128, [0:0] +isTpsConditionSatisfied = bits, U32, 1128, [1:1] +isCltConditionSatisfied = bits, U32, 1128, [2:2] +isMapConditionSatisfied = bits, U32, 1128, [3:3] ; total TS size = 1132 isAntilagCondition = bits, U32, 1132, [0:0] ALSMinRPMCondition = bits, U32, 1132, [1:1] @@ -5812,6 +5818,9 @@ entry = isRpmConditionSatisfied, "isRpmConditionSatisfied", int, "%d" entry = isAppConditionSatisfied, "isAppConditionSatisfied", int, "%d" entry = isFlatShiftConditionSatisfied, "isFlatShiftConditionSatisfied", int, "%d" entry = isArmed, "isArmed", int, "%d" +entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" +entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" +entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" entry = isAntilagCondition, "isAntilagCondition", int, "%d" entry = ALSMinRPMCondition, "ALSMinRPMCondition", int, "%d" entry = ALSMaxRPMCondition, "ALSMaxRPMCondition", int, "%d" @@ -6806,6 +6815,9 @@ dialog = shift_torque_reduction_stateDialog, "shift_torque_reduction_state" indicatorPanel = nitrous_control_stateIndicatorPanel, 2 indicator = {isArmed}, "isArmed No", "isArmed Yes" + indicator = {isTpsConditionSatisfied}, "isTpsConditionSatisfied No", "isTpsConditionSatisfied Yes" + indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" + indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9781,10 +9793,15 @@ dialog = tcuControls, "Transmission Settings" panel = NitrousControlButtonDialog, {nitrousControlArmingMethod == 0} panel = NitrousControlLuaGaugeDialog, {nitrousControlArmingMethod == 1} + dialog = NitrousControlSettings, "Settings" + field = "Minimum TPS", nitrousMinimumTps + field = "Minimum CLT", nitrousMinimumClt + field = "Maximum MAP", nitrousMaximumMap + dialog = NitrousControlSettingsDialog, "", yAxis field = "Enable Nitrous Control", nitrousControlEnabled panel = NitrousControlArmingMethodDialog, {nitrousControlEnabled == 1} -; panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))} + panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))} dialog = NitrousControlDialog panel = NitrousControlSettingsDialog, West diff --git a/firmware/tunerstudio/generated/rusefi_alphax-4chan_f7.ini b/firmware/tunerstudio/generated/rusefi_alphax-4chan_f7.ini index 1a3ce0bf14..6de46fe13c 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-4chan_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-4chan_f7.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.11.28.alphax-4chan_f7.2485438878" + signature = "rusEFI master.2024.11.28.alphax-4chan_f7.4193492102" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.11.28.alphax-4chan_f7.2485438878" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.11.28.alphax-4chan_f7.4193492102" ; 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 @@ -1432,7 +1432,10 @@ nitrousControlTriggerPinMode = bits, U08, 3936, [0:1], "DEFAULT", "PULLUP", "PUL nitrousLuaGauge = bits, S08, 3937, [0:2], "Lua Gauge 1", "Lua Gauge 2", "Lua Gauge 3", "Lua Gauge 4", "Lua Gauge 5", "Lua Gauge 6", "Lua Gauge 7", "Lua Gauge 8" nitrousLuaGaugeMeaning = bits, S08, 3938, [3:3], "Lower Bound", "Upper Bound" nitrousLuaGaugeArmingValue = scalar, F32, 3940, "", 1, 0, -30000, 30000, 3 -unusedOftenChangesDuringFirmwareUpdate = array, U08, 3944, [94], "units", 1, 0, 0, 1, 0 +nitrousMinimumTps = scalar, S32, 3944, "", 1, 0, 0, 20000, 0 +nitrousMinimumClt = scalar, U08, 3948, "deg C", 1, 0, 0, 250, 0 +nitrousMaximumMap = scalar, S16, 3950, "kPa", 1, 0, 0, 1000, 0 +unusedOftenChangesDuringFirmwareUpdate = array, U08, 3952, [87], "units", 1, 0, 0, 1, 0 postCrankingFactor = array, F32, 4040, [6x6], "mult", 1, 0, 1, 3, 2 postCrankingDurationBins = array, F32, 4184, [6], "count", 1, 0, 0, 1000, 0 postCrankingCLTBins = array, S16, 4208, [6], "C", 1, 0, -100, 250, 0 @@ -3233,6 +3236,9 @@ isAppConditionSatisfied = bits, U32, 1124, [4:4] isFlatShiftConditionSatisfied = bits, U32, 1124, [5:5] ; total TS size = 1128 isArmed = bits, U32, 1128, [0:0] +isTpsConditionSatisfied = bits, U32, 1128, [1:1] +isCltConditionSatisfied = bits, U32, 1128, [2:2] +isMapConditionSatisfied = bits, U32, 1128, [3:3] ; total TS size = 1132 isAntilagCondition = bits, U32, 1132, [0:0] ALSMinRPMCondition = bits, U32, 1132, [1:1] @@ -5812,6 +5818,9 @@ entry = isRpmConditionSatisfied, "isRpmConditionSatisfied", int, "%d" entry = isAppConditionSatisfied, "isAppConditionSatisfied", int, "%d" entry = isFlatShiftConditionSatisfied, "isFlatShiftConditionSatisfied", int, "%d" entry = isArmed, "isArmed", int, "%d" +entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" +entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" +entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" entry = isAntilagCondition, "isAntilagCondition", int, "%d" entry = ALSMinRPMCondition, "ALSMinRPMCondition", int, "%d" entry = ALSMaxRPMCondition, "ALSMaxRPMCondition", int, "%d" @@ -6806,6 +6815,9 @@ dialog = shift_torque_reduction_stateDialog, "shift_torque_reduction_state" indicatorPanel = nitrous_control_stateIndicatorPanel, 2 indicator = {isArmed}, "isArmed No", "isArmed Yes" + indicator = {isTpsConditionSatisfied}, "isTpsConditionSatisfied No", "isTpsConditionSatisfied Yes" + indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" + indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9781,10 +9793,15 @@ dialog = tcuControls, "Transmission Settings" panel = NitrousControlButtonDialog, {nitrousControlArmingMethod == 0} panel = NitrousControlLuaGaugeDialog, {nitrousControlArmingMethod == 1} + dialog = NitrousControlSettings, "Settings" + field = "Minimum TPS", nitrousMinimumTps + field = "Minimum CLT", nitrousMinimumClt + field = "Maximum MAP", nitrousMaximumMap + dialog = NitrousControlSettingsDialog, "", yAxis field = "Enable Nitrous Control", nitrousControlEnabled panel = NitrousControlArmingMethodDialog, {nitrousControlEnabled == 1} -; panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))} + panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))} dialog = NitrousControlDialog panel = NitrousControlSettingsDialog, West diff --git a/firmware/tunerstudio/generated/rusefi_alphax-4k-gdi.ini b/firmware/tunerstudio/generated/rusefi_alphax-4k-gdi.ini index b2242322f5..eb3573ab17 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-4k-gdi.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-4k-gdi.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.11.28.alphax-4k-gdi.2192732647" + signature = "rusEFI master.2024.11.28.alphax-4k-gdi.4016383231" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.11.28.alphax-4k-gdi.2192732647" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.11.28.alphax-4k-gdi.4016383231" ; 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 @@ -1432,7 +1432,10 @@ nitrousControlTriggerPinMode = bits, U08, 3936, [0:1], "DEFAULT", "PULLUP", "PUL nitrousLuaGauge = bits, S08, 3937, [0:2], "Lua Gauge 1", "Lua Gauge 2", "Lua Gauge 3", "Lua Gauge 4", "Lua Gauge 5", "Lua Gauge 6", "Lua Gauge 7", "Lua Gauge 8" nitrousLuaGaugeMeaning = bits, S08, 3938, [3:3], "Lower Bound", "Upper Bound" nitrousLuaGaugeArmingValue = scalar, F32, 3940, "", 1, 0, -30000, 30000, 3 -unusedOftenChangesDuringFirmwareUpdate = array, U08, 3944, [94], "units", 1, 0, 0, 1, 0 +nitrousMinimumTps = scalar, S32, 3944, "", 1, 0, 0, 20000, 0 +nitrousMinimumClt = scalar, U08, 3948, "deg C", 1, 0, 0, 250, 0 +nitrousMaximumMap = scalar, S16, 3950, "kPa", 1, 0, 0, 1000, 0 +unusedOftenChangesDuringFirmwareUpdate = array, U08, 3952, [87], "units", 1, 0, 0, 1, 0 postCrankingFactor = array, F32, 4040, [6x6], "mult", 1, 0, 1, 3, 2 postCrankingDurationBins = array, F32, 4184, [6], "count", 1, 0, 0, 1000, 0 postCrankingCLTBins = array, S16, 4208, [6], "C", 1, 0, -100, 250, 0 @@ -3223,6 +3226,9 @@ isAppConditionSatisfied = bits, U32, 1124, [4:4] isFlatShiftConditionSatisfied = bits, U32, 1124, [5:5] ; total TS size = 1128 isArmed = bits, U32, 1128, [0:0] +isTpsConditionSatisfied = bits, U32, 1128, [1:1] +isCltConditionSatisfied = bits, U32, 1128, [2:2] +isMapConditionSatisfied = bits, U32, 1128, [3:3] ; total TS size = 1132 isAntilagCondition = bits, U32, 1132, [0:0] ALSMinRPMCondition = bits, U32, 1132, [1:1] @@ -5798,6 +5804,9 @@ entry = isRpmConditionSatisfied, "isRpmConditionSatisfied", int, "%d" entry = isAppConditionSatisfied, "isAppConditionSatisfied", int, "%d" entry = isFlatShiftConditionSatisfied, "isFlatShiftConditionSatisfied", int, "%d" entry = isArmed, "isArmed", int, "%d" +entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" +entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" +entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" entry = isAntilagCondition, "isAntilagCondition", int, "%d" entry = ALSMinRPMCondition, "ALSMinRPMCondition", int, "%d" entry = ALSMaxRPMCondition, "ALSMaxRPMCondition", int, "%d" @@ -6782,6 +6791,9 @@ dialog = shift_torque_reduction_stateDialog, "shift_torque_reduction_state" indicatorPanel = nitrous_control_stateIndicatorPanel, 2 indicator = {isArmed}, "isArmed No", "isArmed Yes" + indicator = {isTpsConditionSatisfied}, "isTpsConditionSatisfied No", "isTpsConditionSatisfied Yes" + indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" + indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9753,10 +9765,15 @@ commandButton = "GM LCV", cmd_set_engine_type_GM_LCV panel = NitrousControlButtonDialog, {nitrousControlArmingMethod == 0} panel = NitrousControlLuaGaugeDialog, {nitrousControlArmingMethod == 1} + dialog = NitrousControlSettings, "Settings" + field = "Minimum TPS", nitrousMinimumTps + field = "Minimum CLT", nitrousMinimumClt + field = "Maximum MAP", nitrousMaximumMap + dialog = NitrousControlSettingsDialog, "", yAxis field = "Enable Nitrous Control", nitrousControlEnabled panel = NitrousControlArmingMethodDialog, {nitrousControlEnabled == 1} -; panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))} + panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))} dialog = NitrousControlDialog panel = NitrousControlSettingsDialog, West diff --git a/firmware/tunerstudio/generated/rusefi_alphax-8chan-revA.ini b/firmware/tunerstudio/generated/rusefi_alphax-8chan-revA.ini index 818952a9ff..2637b115d1 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-8chan-revA.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-8chan-revA.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.11.28.alphax-8chan-revA.2850473625" + signature = "rusEFI master.2024.11.28.alphax-8chan-revA.3291583361" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.11.28.alphax-8chan-revA.2850473625" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.11.28.alphax-8chan-revA.3291583361" ; 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 @@ -1432,7 +1432,10 @@ nitrousControlTriggerPinMode = bits, U08, 3936, [0:1], "DEFAULT", "PULLUP", "PUL nitrousLuaGauge = bits, S08, 3937, [0:2], "Lua Gauge 1", "Lua Gauge 2", "Lua Gauge 3", "Lua Gauge 4", "Lua Gauge 5", "Lua Gauge 6", "Lua Gauge 7", "Lua Gauge 8" nitrousLuaGaugeMeaning = bits, S08, 3938, [3:3], "Lower Bound", "Upper Bound" nitrousLuaGaugeArmingValue = scalar, F32, 3940, "", 1, 0, -30000, 30000, 3 -unusedOftenChangesDuringFirmwareUpdate = array, U08, 3944, [94], "units", 1, 0, 0, 1, 0 +nitrousMinimumTps = scalar, S32, 3944, "", 1, 0, 0, 20000, 0 +nitrousMinimumClt = scalar, U08, 3948, "deg C", 1, 0, 0, 250, 0 +nitrousMaximumMap = scalar, S16, 3950, "kPa", 1, 0, 0, 1000, 0 +unusedOftenChangesDuringFirmwareUpdate = array, U08, 3952, [87], "units", 1, 0, 0, 1, 0 postCrankingFactor = array, F32, 4040, [6x6], "mult", 1, 0, 1, 3, 2 postCrankingDurationBins = array, F32, 4184, [6], "count", 1, 0, 0, 1000, 0 postCrankingCLTBins = array, S16, 4208, [6], "C", 1, 0, -100, 250, 0 @@ -3228,6 +3231,9 @@ isAppConditionSatisfied = bits, U32, 1124, [4:4] isFlatShiftConditionSatisfied = bits, U32, 1124, [5:5] ; total TS size = 1128 isArmed = bits, U32, 1128, [0:0] +isTpsConditionSatisfied = bits, U32, 1128, [1:1] +isCltConditionSatisfied = bits, U32, 1128, [2:2] +isMapConditionSatisfied = bits, U32, 1128, [3:3] ; total TS size = 1132 isAntilagCondition = bits, U32, 1132, [0:0] ALSMinRPMCondition = bits, U32, 1132, [1:1] @@ -5806,6 +5812,9 @@ entry = isRpmConditionSatisfied, "isRpmConditionSatisfied", int, "%d" entry = isAppConditionSatisfied, "isAppConditionSatisfied", int, "%d" entry = isFlatShiftConditionSatisfied, "isFlatShiftConditionSatisfied", int, "%d" entry = isArmed, "isArmed", int, "%d" +entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" +entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" +entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" entry = isAntilagCondition, "isAntilagCondition", int, "%d" entry = ALSMinRPMCondition, "ALSMinRPMCondition", int, "%d" entry = ALSMaxRPMCondition, "ALSMaxRPMCondition", int, "%d" @@ -6782,6 +6791,9 @@ dialog = shift_torque_reduction_stateDialog, "shift_torque_reduction_state" indicatorPanel = nitrous_control_stateIndicatorPanel, 2 indicator = {isArmed}, "isArmed No", "isArmed Yes" + indicator = {isTpsConditionSatisfied}, "isTpsConditionSatisfied No", "isTpsConditionSatisfied Yes" + indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" + indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9757,10 +9769,15 @@ dialog = tcuControls, "Transmission Settings" panel = NitrousControlButtonDialog, {nitrousControlArmingMethod == 0} panel = NitrousControlLuaGaugeDialog, {nitrousControlArmingMethod == 1} + dialog = NitrousControlSettings, "Settings" + field = "Minimum TPS", nitrousMinimumTps + field = "Minimum CLT", nitrousMinimumClt + field = "Maximum MAP", nitrousMaximumMap + dialog = NitrousControlSettingsDialog, "", yAxis field = "Enable Nitrous Control", nitrousControlEnabled panel = NitrousControlArmingMethodDialog, {nitrousControlEnabled == 1} -; panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))} + panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))} dialog = NitrousControlDialog panel = NitrousControlSettingsDialog, West diff --git a/firmware/tunerstudio/generated/rusefi_alphax-8chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-8chan.ini index 8b65e67843..4514645f46 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-8chan.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-8chan.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.11.28.alphax-8chan.1444339341" + signature = "rusEFI master.2024.11.28.alphax-8chan.1002539925" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.11.28.alphax-8chan.1444339341" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.11.28.alphax-8chan.1002539925" ; 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 @@ -1435,7 +1435,10 @@ nitrousControlTriggerPinMode = bits, U08, 3952, [0:1], "DEFAULT", "PULLUP", "PUL nitrousLuaGauge = bits, S08, 3953, [0:2], "Lua Gauge 1", "Lua Gauge 2", "Lua Gauge 3", "Lua Gauge 4", "Lua Gauge 5", "Lua Gauge 6", "Lua Gauge 7", "Lua Gauge 8" nitrousLuaGaugeMeaning = bits, S08, 3954, [3:3], "Lower Bound", "Upper Bound" nitrousLuaGaugeArmingValue = scalar, F32, 3956, "", 1, 0, -30000, 30000, 3 -unusedOftenChangesDuringFirmwareUpdate = array, U08, 3960, [94], "units", 1, 0, 0, 1, 0 +nitrousMinimumTps = scalar, S32, 3960, "", 1, 0, 0, 20000, 0 +nitrousMinimumClt = scalar, U08, 3964, "deg C", 1, 0, 0, 250, 0 +nitrousMaximumMap = scalar, S16, 3966, "kPa", 1, 0, 0, 1000, 0 +unusedOftenChangesDuringFirmwareUpdate = array, U08, 3968, [87], "units", 1, 0, 0, 1, 0 postCrankingFactor = array, F32, 4056, [6x6], "mult", 1, 0, 1, 3, 2 postCrankingDurationBins = array, F32, 4200, [6], "count", 1, 0, 0, 1000, 0 postCrankingCLTBins = array, S16, 4224, [6], "C", 1, 0, -100, 250, 0 @@ -3237,6 +3240,9 @@ isAppConditionSatisfied = bits, U32, 1124, [4:4] isFlatShiftConditionSatisfied = bits, U32, 1124, [5:5] ; total TS size = 1128 isArmed = bits, U32, 1128, [0:0] +isTpsConditionSatisfied = bits, U32, 1128, [1:1] +isCltConditionSatisfied = bits, U32, 1128, [2:2] +isMapConditionSatisfied = bits, U32, 1128, [3:3] ; total TS size = 1132 isAntilagCondition = bits, U32, 1132, [0:0] ALSMinRPMCondition = bits, U32, 1132, [1:1] @@ -5816,6 +5822,9 @@ entry = isRpmConditionSatisfied, "isRpmConditionSatisfied", int, "%d" entry = isAppConditionSatisfied, "isAppConditionSatisfied", int, "%d" entry = isFlatShiftConditionSatisfied, "isFlatShiftConditionSatisfied", int, "%d" entry = isArmed, "isArmed", int, "%d" +entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" +entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" +entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" entry = isAntilagCondition, "isAntilagCondition", int, "%d" entry = ALSMinRPMCondition, "ALSMinRPMCondition", int, "%d" entry = ALSMaxRPMCondition, "ALSMaxRPMCondition", int, "%d" @@ -6805,6 +6814,9 @@ dialog = shift_torque_reduction_stateDialog, "shift_torque_reduction_state" indicatorPanel = nitrous_control_stateIndicatorPanel, 2 indicator = {isArmed}, "isArmed No", "isArmed Yes" + indicator = {isTpsConditionSatisfied}, "isTpsConditionSatisfied No", "isTpsConditionSatisfied Yes" + indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" + indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9782,10 +9794,15 @@ commandButton = "GM LCV", cmd_set_engine_type_GM_LCV panel = NitrousControlButtonDialog, {nitrousControlArmingMethod == 0} panel = NitrousControlLuaGaugeDialog, {nitrousControlArmingMethod == 1} + dialog = NitrousControlSettings, "Settings" + field = "Minimum TPS", nitrousMinimumTps + field = "Minimum CLT", nitrousMinimumClt + field = "Maximum MAP", nitrousMaximumMap + dialog = NitrousControlSettingsDialog, "", yAxis field = "Enable Nitrous Control", nitrousControlEnabled panel = NitrousControlArmingMethodDialog, {nitrousControlEnabled == 1} -; panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))} + panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))} dialog = NitrousControlDialog panel = NitrousControlSettingsDialog, West diff --git a/firmware/tunerstudio/generated/rusefi_alphax-8chan_f7.ini b/firmware/tunerstudio/generated/rusefi_alphax-8chan_f7.ini index 68580fb7ab..072100f336 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-8chan_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-8chan_f7.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.11.28.alphax-8chan_f7.1444339341" + signature = "rusEFI master.2024.11.28.alphax-8chan_f7.1002539925" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.11.28.alphax-8chan_f7.1444339341" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.11.28.alphax-8chan_f7.1002539925" ; 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 @@ -1435,7 +1435,10 @@ nitrousControlTriggerPinMode = bits, U08, 3952, [0:1], "DEFAULT", "PULLUP", "PUL nitrousLuaGauge = bits, S08, 3953, [0:2], "Lua Gauge 1", "Lua Gauge 2", "Lua Gauge 3", "Lua Gauge 4", "Lua Gauge 5", "Lua Gauge 6", "Lua Gauge 7", "Lua Gauge 8" nitrousLuaGaugeMeaning = bits, S08, 3954, [3:3], "Lower Bound", "Upper Bound" nitrousLuaGaugeArmingValue = scalar, F32, 3956, "", 1, 0, -30000, 30000, 3 -unusedOftenChangesDuringFirmwareUpdate = array, U08, 3960, [94], "units", 1, 0, 0, 1, 0 +nitrousMinimumTps = scalar, S32, 3960, "", 1, 0, 0, 20000, 0 +nitrousMinimumClt = scalar, U08, 3964, "deg C", 1, 0, 0, 250, 0 +nitrousMaximumMap = scalar, S16, 3966, "kPa", 1, 0, 0, 1000, 0 +unusedOftenChangesDuringFirmwareUpdate = array, U08, 3968, [87], "units", 1, 0, 0, 1, 0 postCrankingFactor = array, F32, 4056, [6x6], "mult", 1, 0, 1, 3, 2 postCrankingDurationBins = array, F32, 4200, [6], "count", 1, 0, 0, 1000, 0 postCrankingCLTBins = array, S16, 4224, [6], "C", 1, 0, -100, 250, 0 @@ -3237,6 +3240,9 @@ isAppConditionSatisfied = bits, U32, 1124, [4:4] isFlatShiftConditionSatisfied = bits, U32, 1124, [5:5] ; total TS size = 1128 isArmed = bits, U32, 1128, [0:0] +isTpsConditionSatisfied = bits, U32, 1128, [1:1] +isCltConditionSatisfied = bits, U32, 1128, [2:2] +isMapConditionSatisfied = bits, U32, 1128, [3:3] ; total TS size = 1132 isAntilagCondition = bits, U32, 1132, [0:0] ALSMinRPMCondition = bits, U32, 1132, [1:1] @@ -5816,6 +5822,9 @@ entry = isRpmConditionSatisfied, "isRpmConditionSatisfied", int, "%d" entry = isAppConditionSatisfied, "isAppConditionSatisfied", int, "%d" entry = isFlatShiftConditionSatisfied, "isFlatShiftConditionSatisfied", int, "%d" entry = isArmed, "isArmed", int, "%d" +entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" +entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" +entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" entry = isAntilagCondition, "isAntilagCondition", int, "%d" entry = ALSMinRPMCondition, "ALSMinRPMCondition", int, "%d" entry = ALSMaxRPMCondition, "ALSMaxRPMCondition", int, "%d" @@ -6805,6 +6814,9 @@ dialog = shift_torque_reduction_stateDialog, "shift_torque_reduction_state" indicatorPanel = nitrous_control_stateIndicatorPanel, 2 indicator = {isArmed}, "isArmed No", "isArmed Yes" + indicator = {isTpsConditionSatisfied}, "isTpsConditionSatisfied No", "isTpsConditionSatisfied Yes" + indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" + indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9782,10 +9794,15 @@ commandButton = "GM LCV", cmd_set_engine_type_GM_LCV panel = NitrousControlButtonDialog, {nitrousControlArmingMethod == 0} panel = NitrousControlLuaGaugeDialog, {nitrousControlArmingMethod == 1} + dialog = NitrousControlSettings, "Settings" + field = "Minimum TPS", nitrousMinimumTps + field = "Minimum CLT", nitrousMinimumClt + field = "Maximum MAP", nitrousMaximumMap + dialog = NitrousControlSettingsDialog, "", yAxis field = "Enable Nitrous Control", nitrousControlEnabled panel = NitrousControlArmingMethodDialog, {nitrousControlEnabled == 1} -; panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))} + panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))} dialog = NitrousControlDialog panel = NitrousControlSettingsDialog, West diff --git a/firmware/tunerstudio/generated/rusefi_alphax-silver.ini b/firmware/tunerstudio/generated/rusefi_alphax-silver.ini index 3dfb4a0467..3ba06e3cd2 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-silver.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-silver.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.11.28.alphax-silver.814825130" + signature = "rusEFI master.2024.11.28.alphax-silver.1564896178" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.11.28.alphax-silver.814825130" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.11.28.alphax-silver.1564896178" ; 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 @@ -1433,7 +1433,10 @@ nitrousControlTriggerPinMode = bits, U08, 3940, [0:1], "DEFAULT", "PULLUP", "PUL nitrousLuaGauge = bits, S08, 3941, [0:2], "Lua Gauge 1", "Lua Gauge 2", "Lua Gauge 3", "Lua Gauge 4", "Lua Gauge 5", "Lua Gauge 6", "Lua Gauge 7", "Lua Gauge 8" nitrousLuaGaugeMeaning = bits, S08, 3942, [3:3], "Lower Bound", "Upper Bound" nitrousLuaGaugeArmingValue = scalar, F32, 3944, "", 1, 0, -30000, 30000, 3 -unusedOftenChangesDuringFirmwareUpdate = array, U08, 3948, [94], "units", 1, 0, 0, 1, 0 +nitrousMinimumTps = scalar, S32, 3948, "", 1, 0, 0, 20000, 0 +nitrousMinimumClt = scalar, U08, 3952, "deg C", 1, 0, 0, 250, 0 +nitrousMaximumMap = scalar, S16, 3954, "kPa", 1, 0, 0, 1000, 0 +unusedOftenChangesDuringFirmwareUpdate = array, U08, 3956, [87], "units", 1, 0, 0, 1, 0 postCrankingFactor = array, F32, 4044, [6x6], "mult", 1, 0, 1, 3, 2 postCrankingDurationBins = array, F32, 4188, [6], "count", 1, 0, 0, 1000, 0 postCrankingCLTBins = array, S16, 4212, [6], "C", 1, 0, -100, 250, 0 @@ -3224,6 +3227,9 @@ isAppConditionSatisfied = bits, U32, 1124, [4:4] isFlatShiftConditionSatisfied = bits, U32, 1124, [5:5] ; total TS size = 1128 isArmed = bits, U32, 1128, [0:0] +isTpsConditionSatisfied = bits, U32, 1128, [1:1] +isCltConditionSatisfied = bits, U32, 1128, [2:2] +isMapConditionSatisfied = bits, U32, 1128, [3:3] ; total TS size = 1132 isAntilagCondition = bits, U32, 1132, [0:0] ALSMinRPMCondition = bits, U32, 1132, [1:1] @@ -5796,6 +5802,9 @@ entry = isRpmConditionSatisfied, "isRpmConditionSatisfied", int, "%d" entry = isAppConditionSatisfied, "isAppConditionSatisfied", int, "%d" entry = isFlatShiftConditionSatisfied, "isFlatShiftConditionSatisfied", int, "%d" entry = isArmed, "isArmed", int, "%d" +entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" +entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" +entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" entry = isAntilagCondition, "isAntilagCondition", int, "%d" entry = ALSMinRPMCondition, "ALSMinRPMCondition", int, "%d" entry = ALSMaxRPMCondition, "ALSMaxRPMCondition", int, "%d" @@ -6762,6 +6771,9 @@ dialog = shift_torque_reduction_stateDialog, "shift_torque_reduction_state" indicatorPanel = nitrous_control_stateIndicatorPanel, 2 indicator = {isArmed}, "isArmed No", "isArmed Yes" + indicator = {isTpsConditionSatisfied}, "isTpsConditionSatisfied No", "isTpsConditionSatisfied Yes" + indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" + indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9695,10 +9707,15 @@ dialog = tcuControls, "Transmission Settings" panel = NitrousControlButtonDialog, {nitrousControlArmingMethod == 0} panel = NitrousControlLuaGaugeDialog, {nitrousControlArmingMethod == 1} + dialog = NitrousControlSettings, "Settings" + field = "Minimum TPS", nitrousMinimumTps + field = "Minimum CLT", nitrousMinimumClt + field = "Maximum MAP", nitrousMaximumMap + dialog = NitrousControlSettingsDialog, "", yAxis field = "Enable Nitrous Control", nitrousControlEnabled panel = NitrousControlArmingMethodDialog, {nitrousControlEnabled == 1} -; panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))} + panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))} dialog = NitrousControlDialog panel = NitrousControlSettingsDialog, West diff --git a/firmware/tunerstudio/generated/rusefi_at_start_f435.ini b/firmware/tunerstudio/generated/rusefi_at_start_f435.ini index bf697a8c90..b2b5cf1d05 100644 --- a/firmware/tunerstudio/generated/rusefi_at_start_f435.ini +++ b/firmware/tunerstudio/generated/rusefi_at_start_f435.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.11.28.at_start_f435.221197580" + signature = "rusEFI master.2024.11.28.at_start_f435.1626890260" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.11.28.at_start_f435.221197580" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.11.28.at_start_f435.1626890260" ; 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 @@ -1432,7 +1432,10 @@ nitrousControlTriggerPinMode = bits, U08, 3936, [0:1], "DEFAULT", "PULLUP", "PUL nitrousLuaGauge = bits, S08, 3937, [0:2], "Lua Gauge 1", "Lua Gauge 2", "Lua Gauge 3", "Lua Gauge 4", "Lua Gauge 5", "Lua Gauge 6", "Lua Gauge 7", "Lua Gauge 8" nitrousLuaGaugeMeaning = bits, S08, 3938, [3:3], "Lower Bound", "Upper Bound" nitrousLuaGaugeArmingValue = scalar, F32, 3940, "", 1, 0, -30000, 30000, 3 -unusedOftenChangesDuringFirmwareUpdate = array, U08, 3944, [94], "units", 1, 0, 0, 1, 0 +nitrousMinimumTps = scalar, S32, 3944, "", 1, 0, 0, 20000, 0 +nitrousMinimumClt = scalar, U08, 3948, "deg C", 1, 0, 0, 250, 0 +nitrousMaximumMap = scalar, S16, 3950, "kPa", 1, 0, 0, 1000, 0 +unusedOftenChangesDuringFirmwareUpdate = array, U08, 3952, [87], "units", 1, 0, 0, 1, 0 postCrankingFactor = array, F32, 4040, [6x6], "mult", 1, 0, 1, 3, 2 postCrankingDurationBins = array, F32, 4184, [6], "count", 1, 0, 0, 1000, 0 postCrankingCLTBins = array, S16, 4208, [6], "C", 1, 0, -100, 250, 0 @@ -3223,6 +3226,9 @@ isAppConditionSatisfied = bits, U32, 1124, [4:4] isFlatShiftConditionSatisfied = bits, U32, 1124, [5:5] ; total TS size = 1128 isArmed = bits, U32, 1128, [0:0] +isTpsConditionSatisfied = bits, U32, 1128, [1:1] +isCltConditionSatisfied = bits, U32, 1128, [2:2] +isMapConditionSatisfied = bits, U32, 1128, [3:3] ; total TS size = 1132 isAntilagCondition = bits, U32, 1132, [0:0] ALSMinRPMCondition = bits, U32, 1132, [1:1] @@ -5801,6 +5807,9 @@ entry = isRpmConditionSatisfied, "isRpmConditionSatisfied", int, "%d" entry = isAppConditionSatisfied, "isAppConditionSatisfied", int, "%d" entry = isFlatShiftConditionSatisfied, "isFlatShiftConditionSatisfied", int, "%d" entry = isArmed, "isArmed", int, "%d" +entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" +entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" +entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" entry = isAntilagCondition, "isAntilagCondition", int, "%d" entry = ALSMinRPMCondition, "ALSMinRPMCondition", int, "%d" entry = ALSMaxRPMCondition, "ALSMaxRPMCondition", int, "%d" @@ -6777,6 +6786,9 @@ dialog = shift_torque_reduction_stateDialog, "shift_torque_reduction_state" indicatorPanel = nitrous_control_stateIndicatorPanel, 2 indicator = {isArmed}, "isArmed No", "isArmed Yes" + indicator = {isTpsConditionSatisfied}, "isTpsConditionSatisfied No", "isTpsConditionSatisfied Yes" + indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" + indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9806,10 +9818,15 @@ dialog = tcuControls, "Transmission Settings" panel = NitrousControlButtonDialog, {nitrousControlArmingMethod == 0} panel = NitrousControlLuaGaugeDialog, {nitrousControlArmingMethod == 1} + dialog = NitrousControlSettings, "Settings" + field = "Minimum TPS", nitrousMinimumTps + field = "Minimum CLT", nitrousMinimumClt + field = "Maximum MAP", nitrousMaximumMap + dialog = NitrousControlSettingsDialog, "", yAxis field = "Enable Nitrous Control", nitrousControlEnabled panel = NitrousControlArmingMethodDialog, {nitrousControlEnabled == 1} -; panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))} + panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))} dialog = NitrousControlDialog panel = NitrousControlSettingsDialog, West diff --git a/firmware/tunerstudio/generated/rusefi_atlas.ini b/firmware/tunerstudio/generated/rusefi_atlas.ini index 0696c48e61..83eca52355 100644 --- a/firmware/tunerstudio/generated/rusefi_atlas.ini +++ b/firmware/tunerstudio/generated/rusefi_atlas.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.11.28.atlas.1227415874" + signature = "rusEFI master.2024.11.28.atlas.620737626" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.11.28.atlas.1227415874" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.11.28.atlas.620737626" ; 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 @@ -1432,7 +1432,10 @@ nitrousControlTriggerPinMode = bits, U08, 3776, [0:1], "DEFAULT", "PULLUP", "PUL nitrousLuaGauge = bits, S08, 3777, [0:2], "Lua Gauge 1", "Lua Gauge 2", "Lua Gauge 3", "Lua Gauge 4", "Lua Gauge 5", "Lua Gauge 6", "Lua Gauge 7", "Lua Gauge 8" nitrousLuaGaugeMeaning = bits, S08, 3778, [3:3], "Lower Bound", "Upper Bound" nitrousLuaGaugeArmingValue = scalar, F32, 3780, "", 1, 0, -30000, 30000, 3 -unusedOftenChangesDuringFirmwareUpdate = array, U08, 3784, [94], "units", 1, 0, 0, 1, 0 +nitrousMinimumTps = scalar, S32, 3784, "", 1, 0, 0, 20000, 0 +nitrousMinimumClt = scalar, U08, 3788, "deg C", 1, 0, 0, 250, 0 +nitrousMaximumMap = scalar, S16, 3790, "kPa", 1, 0, 0, 1000, 0 +unusedOftenChangesDuringFirmwareUpdate = array, U08, 3792, [87], "units", 1, 0, 0, 1, 0 postCrankingFactor = array, F32, 3880, [6x6], "mult", 1, 0, 1, 3, 2 postCrankingDurationBins = array, F32, 4024, [6], "count", 1, 0, 0, 1000, 0 postCrankingCLTBins = array, S16, 4048, [6], "C", 1, 0, -100, 250, 0 @@ -3223,6 +3226,9 @@ isAppConditionSatisfied = bits, U32, 1124, [4:4] isFlatShiftConditionSatisfied = bits, U32, 1124, [5:5] ; total TS size = 1128 isArmed = bits, U32, 1128, [0:0] +isTpsConditionSatisfied = bits, U32, 1128, [1:1] +isCltConditionSatisfied = bits, U32, 1128, [2:2] +isMapConditionSatisfied = bits, U32, 1128, [3:3] ; total TS size = 1132 isAntilagCondition = bits, U32, 1132, [0:0] ALSMinRPMCondition = bits, U32, 1132, [1:1] @@ -5801,6 +5807,9 @@ entry = isRpmConditionSatisfied, "isRpmConditionSatisfied", int, "%d" entry = isAppConditionSatisfied, "isAppConditionSatisfied", int, "%d" entry = isFlatShiftConditionSatisfied, "isFlatShiftConditionSatisfied", int, "%d" entry = isArmed, "isArmed", int, "%d" +entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" +entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" +entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" entry = isAntilagCondition, "isAntilagCondition", int, "%d" entry = ALSMinRPMCondition, "ALSMinRPMCondition", int, "%d" entry = ALSMaxRPMCondition, "ALSMaxRPMCondition", int, "%d" @@ -6777,6 +6786,9 @@ dialog = shift_torque_reduction_stateDialog, "shift_torque_reduction_state" indicatorPanel = nitrous_control_stateIndicatorPanel, 2 indicator = {isArmed}, "isArmed No", "isArmed Yes" + indicator = {isTpsConditionSatisfied}, "isTpsConditionSatisfied No", "isTpsConditionSatisfied Yes" + indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" + indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9797,10 +9809,15 @@ dialog = tcuControls, "Transmission Settings" panel = NitrousControlButtonDialog, {nitrousControlArmingMethod == 0} panel = NitrousControlLuaGaugeDialog, {nitrousControlArmingMethod == 1} + dialog = NitrousControlSettings, "Settings" + field = "Minimum TPS", nitrousMinimumTps + field = "Minimum CLT", nitrousMinimumClt + field = "Maximum MAP", nitrousMaximumMap + dialog = NitrousControlSettingsDialog, "", yAxis field = "Enable Nitrous Control", nitrousControlEnabled panel = NitrousControlArmingMethodDialog, {nitrousControlEnabled == 1} -; panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))} + panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))} dialog = NitrousControlDialog panel = NitrousControlSettingsDialog, West diff --git a/firmware/tunerstudio/generated/rusefi_f407-discovery.ini b/firmware/tunerstudio/generated/rusefi_f407-discovery.ini index 8b68a98379..04da95ca66 100644 --- a/firmware/tunerstudio/generated/rusefi_f407-discovery.ini +++ b/firmware/tunerstudio/generated/rusefi_f407-discovery.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.11.28.f407-discovery.3986160817" + signature = "rusEFI master.2024.11.28.f407-discovery.2151721385" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.11.28.f407-discovery.3986160817" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.11.28.f407-discovery.2151721385" ; 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 @@ -1432,7 +1432,10 @@ nitrousControlTriggerPinMode = bits, U08, 3936, [0:1], "DEFAULT", "PULLUP", "PUL nitrousLuaGauge = bits, S08, 3937, [0:2], "Lua Gauge 1", "Lua Gauge 2", "Lua Gauge 3", "Lua Gauge 4", "Lua Gauge 5", "Lua Gauge 6", "Lua Gauge 7", "Lua Gauge 8" nitrousLuaGaugeMeaning = bits, S08, 3938, [3:3], "Lower Bound", "Upper Bound" nitrousLuaGaugeArmingValue = scalar, F32, 3940, "", 1, 0, -30000, 30000, 3 -unusedOftenChangesDuringFirmwareUpdate = array, U08, 3944, [94], "units", 1, 0, 0, 1, 0 +nitrousMinimumTps = scalar, S32, 3944, "", 1, 0, 0, 20000, 0 +nitrousMinimumClt = scalar, U08, 3948, "deg C", 1, 0, 0, 250, 0 +nitrousMaximumMap = scalar, S16, 3950, "kPa", 1, 0, 0, 1000, 0 +unusedOftenChangesDuringFirmwareUpdate = array, U08, 3952, [87], "units", 1, 0, 0, 1, 0 postCrankingFactor = array, F32, 4040, [6x6], "mult", 1, 0, 1, 3, 2 postCrankingDurationBins = array, F32, 4184, [6], "count", 1, 0, 0, 1000, 0 postCrankingCLTBins = array, S16, 4208, [6], "C", 1, 0, -100, 250, 0 @@ -3224,6 +3227,9 @@ isAppConditionSatisfied = bits, U32, 1124, [4:4] isFlatShiftConditionSatisfied = bits, U32, 1124, [5:5] ; total TS size = 1128 isArmed = bits, U32, 1128, [0:0] +isTpsConditionSatisfied = bits, U32, 1128, [1:1] +isCltConditionSatisfied = bits, U32, 1128, [2:2] +isMapConditionSatisfied = bits, U32, 1128, [3:3] ; total TS size = 1132 isAntilagCondition = bits, U32, 1132, [0:0] ALSMinRPMCondition = bits, U32, 1132, [1:1] @@ -5803,6 +5809,9 @@ entry = isRpmConditionSatisfied, "isRpmConditionSatisfied", int, "%d" entry = isAppConditionSatisfied, "isAppConditionSatisfied", int, "%d" entry = isFlatShiftConditionSatisfied, "isFlatShiftConditionSatisfied", int, "%d" entry = isArmed, "isArmed", int, "%d" +entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" +entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" +entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" entry = isAntilagCondition, "isAntilagCondition", int, "%d" entry = ALSMinRPMCondition, "ALSMinRPMCondition", int, "%d" entry = ALSMaxRPMCondition, "ALSMaxRPMCondition", int, "%d" @@ -6784,6 +6793,9 @@ dialog = shift_torque_reduction_stateDialog, "shift_torque_reduction_state" indicatorPanel = nitrous_control_stateIndicatorPanel, 2 indicator = {isArmed}, "isArmed No", "isArmed Yes" + indicator = {isTpsConditionSatisfied}, "isTpsConditionSatisfied No", "isTpsConditionSatisfied Yes" + indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" + indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9819,10 +9831,15 @@ dialog = tcuControls, "Transmission Settings" panel = NitrousControlButtonDialog, {nitrousControlArmingMethod == 0} panel = NitrousControlLuaGaugeDialog, {nitrousControlArmingMethod == 1} + dialog = NitrousControlSettings, "Settings" + field = "Minimum TPS", nitrousMinimumTps + field = "Minimum CLT", nitrousMinimumClt + field = "Maximum MAP", nitrousMaximumMap + dialog = NitrousControlSettingsDialog, "", yAxis field = "Enable Nitrous Control", nitrousControlEnabled panel = NitrousControlArmingMethodDialog, {nitrousControlEnabled == 1} -; panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))} + panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))} dialog = NitrousControlDialog panel = NitrousControlSettingsDialog, West diff --git a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini index 8e51eca0e1..e562dfabfb 100644 --- a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini +++ b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.11.28.f429-discovery.221197580" + signature = "rusEFI master.2024.11.28.f429-discovery.1626890260" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.11.28.f429-discovery.221197580" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.11.28.f429-discovery.1626890260" ; 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 @@ -1432,7 +1432,10 @@ nitrousControlTriggerPinMode = bits, U08, 3936, [0:1], "DEFAULT", "PULLUP", "PUL nitrousLuaGauge = bits, S08, 3937, [0:2], "Lua Gauge 1", "Lua Gauge 2", "Lua Gauge 3", "Lua Gauge 4", "Lua Gauge 5", "Lua Gauge 6", "Lua Gauge 7", "Lua Gauge 8" nitrousLuaGaugeMeaning = bits, S08, 3938, [3:3], "Lower Bound", "Upper Bound" nitrousLuaGaugeArmingValue = scalar, F32, 3940, "", 1, 0, -30000, 30000, 3 -unusedOftenChangesDuringFirmwareUpdate = array, U08, 3944, [94], "units", 1, 0, 0, 1, 0 +nitrousMinimumTps = scalar, S32, 3944, "", 1, 0, 0, 20000, 0 +nitrousMinimumClt = scalar, U08, 3948, "deg C", 1, 0, 0, 250, 0 +nitrousMaximumMap = scalar, S16, 3950, "kPa", 1, 0, 0, 1000, 0 +unusedOftenChangesDuringFirmwareUpdate = array, U08, 3952, [87], "units", 1, 0, 0, 1, 0 postCrankingFactor = array, F32, 4040, [6x6], "mult", 1, 0, 1, 3, 2 postCrankingDurationBins = array, F32, 4184, [6], "count", 1, 0, 0, 1000, 0 postCrankingCLTBins = array, S16, 4208, [6], "C", 1, 0, -100, 250, 0 @@ -3223,6 +3226,9 @@ isAppConditionSatisfied = bits, U32, 1124, [4:4] isFlatShiftConditionSatisfied = bits, U32, 1124, [5:5] ; total TS size = 1128 isArmed = bits, U32, 1128, [0:0] +isTpsConditionSatisfied = bits, U32, 1128, [1:1] +isCltConditionSatisfied = bits, U32, 1128, [2:2] +isMapConditionSatisfied = bits, U32, 1128, [3:3] ; total TS size = 1132 isAntilagCondition = bits, U32, 1132, [0:0] ALSMinRPMCondition = bits, U32, 1132, [1:1] @@ -5801,6 +5807,9 @@ entry = isRpmConditionSatisfied, "isRpmConditionSatisfied", int, "%d" entry = isAppConditionSatisfied, "isAppConditionSatisfied", int, "%d" entry = isFlatShiftConditionSatisfied, "isFlatShiftConditionSatisfied", int, "%d" entry = isArmed, "isArmed", int, "%d" +entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" +entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" +entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" entry = isAntilagCondition, "isAntilagCondition", int, "%d" entry = ALSMinRPMCondition, "ALSMinRPMCondition", int, "%d" entry = ALSMaxRPMCondition, "ALSMaxRPMCondition", int, "%d" @@ -6777,6 +6786,9 @@ dialog = shift_torque_reduction_stateDialog, "shift_torque_reduction_state" indicatorPanel = nitrous_control_stateIndicatorPanel, 2 indicator = {isArmed}, "isArmed No", "isArmed Yes" + indicator = {isTpsConditionSatisfied}, "isTpsConditionSatisfied No", "isTpsConditionSatisfied Yes" + indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" + indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9806,10 +9818,15 @@ dialog = tcuControls, "Transmission Settings" panel = NitrousControlButtonDialog, {nitrousControlArmingMethod == 0} panel = NitrousControlLuaGaugeDialog, {nitrousControlArmingMethod == 1} + dialog = NitrousControlSettings, "Settings" + field = "Minimum TPS", nitrousMinimumTps + field = "Minimum CLT", nitrousMinimumClt + field = "Maximum MAP", nitrousMaximumMap + dialog = NitrousControlSettingsDialog, "", yAxis field = "Enable Nitrous Control", nitrousControlEnabled panel = NitrousControlArmingMethodDialog, {nitrousControlEnabled == 1} -; panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))} + panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))} dialog = NitrousControlDialog panel = NitrousControlSettingsDialog, West diff --git a/firmware/tunerstudio/generated/rusefi_f469-discovery.ini b/firmware/tunerstudio/generated/rusefi_f469-discovery.ini index 2fc453eea7..e0d37722f7 100644 --- a/firmware/tunerstudio/generated/rusefi_f469-discovery.ini +++ b/firmware/tunerstudio/generated/rusefi_f469-discovery.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.11.28.f469-discovery.1073230751" + signature = "rusEFI master.2024.11.28.f469-discovery.1378838151" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.11.28.f469-discovery.1073230751" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.11.28.f469-discovery.1378838151" ; 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 @@ -1432,7 +1432,10 @@ nitrousControlTriggerPinMode = bits, U08, 3936, [0:1], "DEFAULT", "PULLUP", "PUL nitrousLuaGauge = bits, S08, 3937, [0:2], "Lua Gauge 1", "Lua Gauge 2", "Lua Gauge 3", "Lua Gauge 4", "Lua Gauge 5", "Lua Gauge 6", "Lua Gauge 7", "Lua Gauge 8" nitrousLuaGaugeMeaning = bits, S08, 3938, [3:3], "Lower Bound", "Upper Bound" nitrousLuaGaugeArmingValue = scalar, F32, 3940, "", 1, 0, -30000, 30000, 3 -unusedOftenChangesDuringFirmwareUpdate = array, U08, 3944, [94], "units", 1, 0, 0, 1, 0 +nitrousMinimumTps = scalar, S32, 3944, "", 1, 0, 0, 20000, 0 +nitrousMinimumClt = scalar, U08, 3948, "deg C", 1, 0, 0, 250, 0 +nitrousMaximumMap = scalar, S16, 3950, "kPa", 1, 0, 0, 1000, 0 +unusedOftenChangesDuringFirmwareUpdate = array, U08, 3952, [87], "units", 1, 0, 0, 1, 0 postCrankingFactor = array, F32, 4040, [6x6], "mult", 1, 0, 1, 3, 2 postCrankingDurationBins = array, F32, 4184, [6], "count", 1, 0, 0, 1000, 0 postCrankingCLTBins = array, S16, 4208, [6], "C", 1, 0, -100, 250, 0 @@ -3223,6 +3226,9 @@ isAppConditionSatisfied = bits, U32, 1124, [4:4] isFlatShiftConditionSatisfied = bits, U32, 1124, [5:5] ; total TS size = 1128 isArmed = bits, U32, 1128, [0:0] +isTpsConditionSatisfied = bits, U32, 1128, [1:1] +isCltConditionSatisfied = bits, U32, 1128, [2:2] +isMapConditionSatisfied = bits, U32, 1128, [3:3] ; total TS size = 1132 isAntilagCondition = bits, U32, 1132, [0:0] ALSMinRPMCondition = bits, U32, 1132, [1:1] @@ -5801,6 +5807,9 @@ entry = isRpmConditionSatisfied, "isRpmConditionSatisfied", int, "%d" entry = isAppConditionSatisfied, "isAppConditionSatisfied", int, "%d" entry = isFlatShiftConditionSatisfied, "isFlatShiftConditionSatisfied", int, "%d" entry = isArmed, "isArmed", int, "%d" +entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" +entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" +entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" entry = isAntilagCondition, "isAntilagCondition", int, "%d" entry = ALSMinRPMCondition, "ALSMinRPMCondition", int, "%d" entry = ALSMaxRPMCondition, "ALSMaxRPMCondition", int, "%d" @@ -6777,6 +6786,9 @@ dialog = shift_torque_reduction_stateDialog, "shift_torque_reduction_state" indicatorPanel = nitrous_control_stateIndicatorPanel, 2 indicator = {isArmed}, "isArmed No", "isArmed Yes" + indicator = {isTpsConditionSatisfied}, "isTpsConditionSatisfied No", "isTpsConditionSatisfied Yes" + indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" + indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9806,10 +9818,15 @@ dialog = tcuControls, "Transmission Settings" panel = NitrousControlButtonDialog, {nitrousControlArmingMethod == 0} panel = NitrousControlLuaGaugeDialog, {nitrousControlArmingMethod == 1} + dialog = NitrousControlSettings, "Settings" + field = "Minimum TPS", nitrousMinimumTps + field = "Minimum CLT", nitrousMinimumClt + field = "Maximum MAP", nitrousMaximumMap + dialog = NitrousControlSettingsDialog, "", yAxis field = "Enable Nitrous Control", nitrousControlEnabled panel = NitrousControlArmingMethodDialog, {nitrousControlEnabled == 1} -; panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))} + panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))} dialog = NitrousControlDialog panel = NitrousControlSettingsDialog, West diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index 2e96fbc9ca..721908d1f4 100644 --- a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini +++ b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.11.28.frankenso_na6.1538015511" + signature = "rusEFI master.2024.11.28.frankenso_na6.914035727" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.11.28.frankenso_na6.1538015511" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.11.28.frankenso_na6.914035727" ; 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 @@ -1432,7 +1432,10 @@ nitrousControlTriggerPinMode = bits, U08, 3936, [0:1], "DEFAULT", "PULLUP", "PUL nitrousLuaGauge = bits, S08, 3937, [0:2], "Lua Gauge 1", "Lua Gauge 2", "Lua Gauge 3", "Lua Gauge 4", "Lua Gauge 5", "Lua Gauge 6", "Lua Gauge 7", "Lua Gauge 8" nitrousLuaGaugeMeaning = bits, S08, 3938, [3:3], "Lower Bound", "Upper Bound" nitrousLuaGaugeArmingValue = scalar, F32, 3940, "", 1, 0, -30000, 30000, 3 -unusedOftenChangesDuringFirmwareUpdate = array, U08, 3944, [94], "units", 1, 0, 0, 1, 0 +nitrousMinimumTps = scalar, S32, 3944, "", 1, 0, 0, 20000, 0 +nitrousMinimumClt = scalar, U08, 3948, "deg C", 1, 0, 0, 250, 0 +nitrousMaximumMap = scalar, S16, 3950, "kPa", 1, 0, 0, 1000, 0 +unusedOftenChangesDuringFirmwareUpdate = array, U08, 3952, [87], "units", 1, 0, 0, 1, 0 postCrankingFactor = array, F32, 4040, [6x6], "mult", 1, 0, 1, 3, 2 postCrankingDurationBins = array, F32, 4184, [6], "count", 1, 0, 0, 1000, 0 postCrankingCLTBins = array, S16, 4208, [6], "C", 1, 0, -100, 250, 0 @@ -3223,6 +3226,9 @@ isAppConditionSatisfied = bits, U32, 1124, [4:4] isFlatShiftConditionSatisfied = bits, U32, 1124, [5:5] ; total TS size = 1128 isArmed = bits, U32, 1128, [0:0] +isTpsConditionSatisfied = bits, U32, 1128, [1:1] +isCltConditionSatisfied = bits, U32, 1128, [2:2] +isMapConditionSatisfied = bits, U32, 1128, [3:3] ; total TS size = 1132 isAntilagCondition = bits, U32, 1132, [0:0] ALSMinRPMCondition = bits, U32, 1132, [1:1] @@ -5801,6 +5807,9 @@ entry = isRpmConditionSatisfied, "isRpmConditionSatisfied", int, "%d" entry = isAppConditionSatisfied, "isAppConditionSatisfied", int, "%d" entry = isFlatShiftConditionSatisfied, "isFlatShiftConditionSatisfied", int, "%d" entry = isArmed, "isArmed", int, "%d" +entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" +entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" +entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" entry = isAntilagCondition, "isAntilagCondition", int, "%d" entry = ALSMinRPMCondition, "ALSMinRPMCondition", int, "%d" entry = ALSMaxRPMCondition, "ALSMaxRPMCondition", int, "%d" @@ -6777,6 +6786,9 @@ dialog = shift_torque_reduction_stateDialog, "shift_torque_reduction_state" indicatorPanel = nitrous_control_stateIndicatorPanel, 2 indicator = {isArmed}, "isArmed No", "isArmed Yes" + indicator = {isTpsConditionSatisfied}, "isTpsConditionSatisfied No", "isTpsConditionSatisfied Yes" + indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" + indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9807,10 +9819,15 @@ dialog = tcuControls, "Transmission Settings" panel = NitrousControlButtonDialog, {nitrousControlArmingMethod == 0} panel = NitrousControlLuaGaugeDialog, {nitrousControlArmingMethod == 1} + dialog = NitrousControlSettings, "Settings" + field = "Minimum TPS", nitrousMinimumTps + field = "Minimum CLT", nitrousMinimumClt + field = "Maximum MAP", nitrousMaximumMap + dialog = NitrousControlSettingsDialog, "", yAxis field = "Enable Nitrous Control", nitrousControlEnabled panel = NitrousControlArmingMethodDialog, {nitrousControlEnabled == 1} -; panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))} + panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))} dialog = NitrousControlDialog panel = NitrousControlSettingsDialog, West diff --git a/firmware/tunerstudio/generated/rusefi_haba208.ini b/firmware/tunerstudio/generated/rusefi_haba208.ini index 9b15883b67..3e6c689c94 100644 --- a/firmware/tunerstudio/generated/rusefi_haba208.ini +++ b/firmware/tunerstudio/generated/rusefi_haba208.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.11.28.haba208.221197580" + signature = "rusEFI master.2024.11.28.haba208.1626890260" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.11.28.haba208.221197580" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.11.28.haba208.1626890260" ; 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 @@ -1432,7 +1432,10 @@ nitrousControlTriggerPinMode = bits, U08, 3936, [0:1], "DEFAULT", "PULLUP", "PUL nitrousLuaGauge = bits, S08, 3937, [0:2], "Lua Gauge 1", "Lua Gauge 2", "Lua Gauge 3", "Lua Gauge 4", "Lua Gauge 5", "Lua Gauge 6", "Lua Gauge 7", "Lua Gauge 8" nitrousLuaGaugeMeaning = bits, S08, 3938, [3:3], "Lower Bound", "Upper Bound" nitrousLuaGaugeArmingValue = scalar, F32, 3940, "", 1, 0, -30000, 30000, 3 -unusedOftenChangesDuringFirmwareUpdate = array, U08, 3944, [94], "units", 1, 0, 0, 1, 0 +nitrousMinimumTps = scalar, S32, 3944, "", 1, 0, 0, 20000, 0 +nitrousMinimumClt = scalar, U08, 3948, "deg C", 1, 0, 0, 250, 0 +nitrousMaximumMap = scalar, S16, 3950, "kPa", 1, 0, 0, 1000, 0 +unusedOftenChangesDuringFirmwareUpdate = array, U08, 3952, [87], "units", 1, 0, 0, 1, 0 postCrankingFactor = array, F32, 4040, [6x6], "mult", 1, 0, 1, 3, 2 postCrankingDurationBins = array, F32, 4184, [6], "count", 1, 0, 0, 1000, 0 postCrankingCLTBins = array, S16, 4208, [6], "C", 1, 0, -100, 250, 0 @@ -3223,6 +3226,9 @@ isAppConditionSatisfied = bits, U32, 1124, [4:4] isFlatShiftConditionSatisfied = bits, U32, 1124, [5:5] ; total TS size = 1128 isArmed = bits, U32, 1128, [0:0] +isTpsConditionSatisfied = bits, U32, 1128, [1:1] +isCltConditionSatisfied = bits, U32, 1128, [2:2] +isMapConditionSatisfied = bits, U32, 1128, [3:3] ; total TS size = 1132 isAntilagCondition = bits, U32, 1132, [0:0] ALSMinRPMCondition = bits, U32, 1132, [1:1] @@ -5801,6 +5807,9 @@ entry = isRpmConditionSatisfied, "isRpmConditionSatisfied", int, "%d" entry = isAppConditionSatisfied, "isAppConditionSatisfied", int, "%d" entry = isFlatShiftConditionSatisfied, "isFlatShiftConditionSatisfied", int, "%d" entry = isArmed, "isArmed", int, "%d" +entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" +entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" +entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" entry = isAntilagCondition, "isAntilagCondition", int, "%d" entry = ALSMinRPMCondition, "ALSMinRPMCondition", int, "%d" entry = ALSMaxRPMCondition, "ALSMaxRPMCondition", int, "%d" @@ -6777,6 +6786,9 @@ dialog = shift_torque_reduction_stateDialog, "shift_torque_reduction_state" indicatorPanel = nitrous_control_stateIndicatorPanel, 2 indicator = {isArmed}, "isArmed No", "isArmed Yes" + indicator = {isTpsConditionSatisfied}, "isTpsConditionSatisfied No", "isTpsConditionSatisfied Yes" + indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" + indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9806,10 +9818,15 @@ dialog = tcuControls, "Transmission Settings" panel = NitrousControlButtonDialog, {nitrousControlArmingMethod == 0} panel = NitrousControlLuaGaugeDialog, {nitrousControlArmingMethod == 1} + dialog = NitrousControlSettings, "Settings" + field = "Minimum TPS", nitrousMinimumTps + field = "Minimum CLT", nitrousMinimumClt + field = "Maximum MAP", nitrousMaximumMap + dialog = NitrousControlSettingsDialog, "", yAxis field = "Enable Nitrous Control", nitrousControlEnabled panel = NitrousControlArmingMethodDialog, {nitrousControlEnabled == 1} -; panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))} + panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))} dialog = NitrousControlDialog panel = NitrousControlSettingsDialog, West diff --git a/firmware/tunerstudio/generated/rusefi_hellen-112-17.ini b/firmware/tunerstudio/generated/rusefi_hellen-112-17.ini index c5d775ef36..ec10b9392d 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-112-17.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-112-17.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.11.28.hellen-112-17.2217192840" + signature = "rusEFI master.2024.11.28.hellen-112-17.3924883600" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.11.28.hellen-112-17.2217192840" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.11.28.hellen-112-17.3924883600" ; 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 @@ -1432,7 +1432,10 @@ nitrousControlTriggerPinMode = bits, U08, 3936, [0:1], "DEFAULT", "PULLUP", "PUL nitrousLuaGauge = bits, S08, 3937, [0:2], "Lua Gauge 1", "Lua Gauge 2", "Lua Gauge 3", "Lua Gauge 4", "Lua Gauge 5", "Lua Gauge 6", "Lua Gauge 7", "Lua Gauge 8" nitrousLuaGaugeMeaning = bits, S08, 3938, [3:3], "Lower Bound", "Upper Bound" nitrousLuaGaugeArmingValue = scalar, F32, 3940, "", 1, 0, -30000, 30000, 3 -unusedOftenChangesDuringFirmwareUpdate = array, U08, 3944, [94], "units", 1, 0, 0, 1, 0 +nitrousMinimumTps = scalar, S32, 3944, "", 1, 0, 0, 20000, 0 +nitrousMinimumClt = scalar, U08, 3948, "deg C", 1, 0, 0, 250, 0 +nitrousMaximumMap = scalar, S16, 3950, "kPa", 1, 0, 0, 1000, 0 +unusedOftenChangesDuringFirmwareUpdate = array, U08, 3952, [87], "units", 1, 0, 0, 1, 0 postCrankingFactor = array, F32, 4040, [6x6], "mult", 1, 0, 1, 3, 2 postCrankingDurationBins = array, F32, 4184, [6], "count", 1, 0, 0, 1000, 0 postCrankingCLTBins = array, S16, 4208, [6], "C", 1, 0, -100, 250, 0 @@ -3223,6 +3226,9 @@ isAppConditionSatisfied = bits, U32, 1124, [4:4] isFlatShiftConditionSatisfied = bits, U32, 1124, [5:5] ; total TS size = 1128 isArmed = bits, U32, 1128, [0:0] +isTpsConditionSatisfied = bits, U32, 1128, [1:1] +isCltConditionSatisfied = bits, U32, 1128, [2:2] +isMapConditionSatisfied = bits, U32, 1128, [3:3] ; total TS size = 1132 isAntilagCondition = bits, U32, 1132, [0:0] ALSMinRPMCondition = bits, U32, 1132, [1:1] @@ -5801,6 +5807,9 @@ entry = isRpmConditionSatisfied, "isRpmConditionSatisfied", int, "%d" entry = isAppConditionSatisfied, "isAppConditionSatisfied", int, "%d" entry = isFlatShiftConditionSatisfied, "isFlatShiftConditionSatisfied", int, "%d" entry = isArmed, "isArmed", int, "%d" +entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" +entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" +entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" entry = isAntilagCondition, "isAntilagCondition", int, "%d" entry = ALSMinRPMCondition, "ALSMinRPMCondition", int, "%d" entry = ALSMaxRPMCondition, "ALSMaxRPMCondition", int, "%d" @@ -6776,6 +6785,9 @@ dialog = shift_torque_reduction_stateDialog, "shift_torque_reduction_state" indicatorPanel = nitrous_control_stateIndicatorPanel, 2 indicator = {isArmed}, "isArmed No", "isArmed Yes" + indicator = {isTpsConditionSatisfied}, "isTpsConditionSatisfied No", "isTpsConditionSatisfied Yes" + indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" + indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9749,10 +9761,15 @@ dialog = tcuControls, "Transmission Settings" panel = NitrousControlButtonDialog, {nitrousControlArmingMethod == 0} panel = NitrousControlLuaGaugeDialog, {nitrousControlArmingMethod == 1} + dialog = NitrousControlSettings, "Settings" + field = "Minimum TPS", nitrousMinimumTps + field = "Minimum CLT", nitrousMinimumClt + field = "Maximum MAP", nitrousMaximumMap + dialog = NitrousControlSettingsDialog, "", yAxis field = "Enable Nitrous Control", nitrousControlEnabled panel = NitrousControlArmingMethodDialog, {nitrousControlEnabled == 1} -; panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))} + panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))} dialog = NitrousControlDialog panel = NitrousControlSettingsDialog, West diff --git a/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini b/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini index 229ff49b76..fbd4e4472f 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.11.28.hellen-gm-e67.3243659956" + signature = "rusEFI master.2024.11.28.hellen-gm-e67.2894137260" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.11.28.hellen-gm-e67.3243659956" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.11.28.hellen-gm-e67.2894137260" ; 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 @@ -1432,7 +1432,10 @@ nitrousControlTriggerPinMode = bits, U08, 3936, [0:1], "DEFAULT", "PULLUP", "PUL nitrousLuaGauge = bits, S08, 3937, [0:2], "Lua Gauge 1", "Lua Gauge 2", "Lua Gauge 3", "Lua Gauge 4", "Lua Gauge 5", "Lua Gauge 6", "Lua Gauge 7", "Lua Gauge 8" nitrousLuaGaugeMeaning = bits, S08, 3938, [3:3], "Lower Bound", "Upper Bound" nitrousLuaGaugeArmingValue = scalar, F32, 3940, "", 1, 0, -30000, 30000, 3 -unusedOftenChangesDuringFirmwareUpdate = array, U08, 3944, [94], "units", 1, 0, 0, 1, 0 +nitrousMinimumTps = scalar, S32, 3944, "", 1, 0, 0, 20000, 0 +nitrousMinimumClt = scalar, U08, 3948, "deg C", 1, 0, 0, 250, 0 +nitrousMaximumMap = scalar, S16, 3950, "kPa", 1, 0, 0, 1000, 0 +unusedOftenChangesDuringFirmwareUpdate = array, U08, 3952, [87], "units", 1, 0, 0, 1, 0 postCrankingFactor = array, F32, 4040, [6x6], "mult", 1, 0, 1, 3, 2 postCrankingDurationBins = array, F32, 4184, [6], "count", 1, 0, 0, 1000, 0 postCrankingCLTBins = array, S16, 4208, [6], "C", 1, 0, -100, 250, 0 @@ -3223,6 +3226,9 @@ isAppConditionSatisfied = bits, U32, 1124, [4:4] isFlatShiftConditionSatisfied = bits, U32, 1124, [5:5] ; total TS size = 1128 isArmed = bits, U32, 1128, [0:0] +isTpsConditionSatisfied = bits, U32, 1128, [1:1] +isCltConditionSatisfied = bits, U32, 1128, [2:2] +isMapConditionSatisfied = bits, U32, 1128, [3:3] ; total TS size = 1132 isAntilagCondition = bits, U32, 1132, [0:0] ALSMinRPMCondition = bits, U32, 1132, [1:1] @@ -5801,6 +5807,9 @@ entry = isRpmConditionSatisfied, "isRpmConditionSatisfied", int, "%d" entry = isAppConditionSatisfied, "isAppConditionSatisfied", int, "%d" entry = isFlatShiftConditionSatisfied, "isFlatShiftConditionSatisfied", int, "%d" entry = isArmed, "isArmed", int, "%d" +entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" +entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" +entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" entry = isAntilagCondition, "isAntilagCondition", int, "%d" entry = ALSMinRPMCondition, "ALSMinRPMCondition", int, "%d" entry = ALSMaxRPMCondition, "ALSMaxRPMCondition", int, "%d" @@ -6778,6 +6787,9 @@ dialog = shift_torque_reduction_stateDialog, "shift_torque_reduction_state" indicatorPanel = nitrous_control_stateIndicatorPanel, 2 indicator = {isArmed}, "isArmed No", "isArmed Yes" + indicator = {isTpsConditionSatisfied}, "isTpsConditionSatisfied No", "isTpsConditionSatisfied Yes" + indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" + indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9780,10 +9792,15 @@ dialog = tcuControls, "Transmission Settings" panel = NitrousControlButtonDialog, {nitrousControlArmingMethod == 0} panel = NitrousControlLuaGaugeDialog, {nitrousControlArmingMethod == 1} + dialog = NitrousControlSettings, "Settings" + field = "Minimum TPS", nitrousMinimumTps + field = "Minimum CLT", nitrousMinimumClt + field = "Maximum MAP", nitrousMaximumMap + dialog = NitrousControlSettingsDialog, "", yAxis field = "Enable Nitrous Control", nitrousControlEnabled panel = NitrousControlArmingMethodDialog, {nitrousControlEnabled == 1} -; panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))} + panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))} dialog = NitrousControlDialog panel = NitrousControlSettingsDialog, West diff --git a/firmware/tunerstudio/generated/rusefi_hellen-honda-k.ini b/firmware/tunerstudio/generated/rusefi_hellen-honda-k.ini index 31741d8dbb..b025072fb1 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-honda-k.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-honda-k.ini @@ -4,12 +4,12 @@ enable2ndByteCanID = false [SettingGroups] [MegaTune] - signature = "rusEFI master.2024.11.28.hellen-honda-k.1494632314" + signature = "rusEFI master.2024.11.28.hellen-honda-k.885068386" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.11.28.hellen-honda-k.1494632314" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.11.28.hellen-honda-k.885068386" ; signature is expected to be 7 or more characters. useLegacyFTempUnits = false ignoreMissingBitOptions = true @@ -1381,7 +1381,10 @@ nitrousControlTriggerPinMode = bits, U08, 3936, [0:1], "DEFAULT", "PULLUP", "PUL nitrousLuaGauge = bits, S08, 3937, [0:2], "Lua Gauge 1", "Lua Gauge 2", "Lua Gauge 3", "Lua Gauge 4", "Lua Gauge 5", "Lua Gauge 6", "Lua Gauge 7", "Lua Gauge 8" nitrousLuaGaugeMeaning = bits, S08, 3938, [3:3], "Lower Bound", "Upper Bound" nitrousLuaGaugeArmingValue = scalar, F32, 3940, "", 1, 0, -30000, 30000, 3 -unusedOftenChangesDuringFirmwareUpdate = array, U08, 3944, [94], "units", 1, 0, 0, 1, 0 +nitrousMinimumTps = scalar, S32, 3944, "", 1, 0, 0, 20000, 0 +nitrousMinimumClt = scalar, U08, 3948, "deg C", 1, 0, 0, 125, 0 +nitrousMaximumMap = scalar, S16, 3950, "kPa", 1, 0, 0, 1000, 0 +unusedOftenChangesDuringFirmwareUpdate = array, U08, 3952, [87], "units", 1, 0, 0, 1, 0 postCrankingFactor = array, F32, 4040, [6x6], "mult", 1, 0, 1, 3, 2 postCrankingDurationBins = array, F32, 4184, [6], "count", 1, 0, 0, 1000, 0 postCrankingCLTBins = array, S16, 4208, [6], "C", 1, 0, -100, 125, 0 @@ -3156,6 +3159,9 @@ isAppConditionSatisfied = bits, U32, 1124, [4:4] isFlatShiftConditionSatisfied = bits, U32, 1124, [5:5] ; total TS size = 1128 isArmed = bits, U32, 1128, [0:0] +isTpsConditionSatisfied = bits, U32, 1128, [1:1] +isCltConditionSatisfied = bits, U32, 1128, [2:2] +isMapConditionSatisfied = bits, U32, 1128, [3:3] ; total TS size = 1132 isAntilagCondition = bits, U32, 1132, [0:0] ALSMinRPMCondition = bits, U32, 1132, [1:1] @@ -5655,6 +5661,9 @@ entry = isRpmConditionSatisfied, "isRpmConditionSatisfied", int, "%d" entry = isAppConditionSatisfied, "isAppConditionSatisfied", int, "%d" entry = isFlatShiftConditionSatisfied, "isFlatShiftConditionSatisfied", int, "%d" entry = isArmed, "isArmed", int, "%d" +entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" +entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" +entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" entry = isAntilagCondition, "isAntilagCondition", int, "%d" entry = ALSMinRPMCondition, "ALSMinRPMCondition", int, "%d" entry = ALSMaxRPMCondition, "ALSMaxRPMCondition", int, "%d" @@ -6597,6 +6606,9 @@ dialog = shift_torque_reduction_stateDialog, "shift_torque_reduction_state" indicatorPanel = nitrous_control_stateIndicatorPanel, 2 indicator = {isArmed}, "isArmed No", "isArmed Yes" + indicator = {isTpsConditionSatisfied}, "isTpsConditionSatisfied No", "isTpsConditionSatisfied Yes" + indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" + indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9450,9 +9462,15 @@ dialog = tcuControls, "Transmission Settings" panel = NitrousControlButtonDialog, {nitrousControlArmingMethod == 0} panel = NitrousControlLuaGaugeDialog, {nitrousControlArmingMethod == 1} + dialog = NitrousControlSettings, "Settings" + field = "Minimum TPS", nitrousMinimumTps + field = "Minimum CLT", nitrousMinimumClt + field = "Maximum MAP", nitrousMaximumMap + dialog = NitrousControlSettingsDialog, "", yAxis field = "Enable Nitrous Control", nitrousControlEnabled panel = NitrousControlArmingMethodDialog, {nitrousControlEnabled == 1} + panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))} dialog = NitrousControlDialog panel = NitrousControlSettingsDialog, West diff --git a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini index f8329ea380..44c0d1c03d 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.11.28.hellen-nb1.2391400467" + signature = "rusEFI master.2024.11.28.hellen-nb1.3814634763" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.11.28.hellen-nb1.2391400467" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.11.28.hellen-nb1.3814634763" ; 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 @@ -1432,7 +1432,10 @@ nitrousControlTriggerPinMode = bits, U08, 3936, [0:1], "DEFAULT", "PULLUP", "PUL nitrousLuaGauge = bits, S08, 3937, [0:2], "Lua Gauge 1", "Lua Gauge 2", "Lua Gauge 3", "Lua Gauge 4", "Lua Gauge 5", "Lua Gauge 6", "Lua Gauge 7", "Lua Gauge 8" nitrousLuaGaugeMeaning = bits, S08, 3938, [3:3], "Lower Bound", "Upper Bound" nitrousLuaGaugeArmingValue = scalar, F32, 3940, "", 1, 0, -30000, 30000, 3 -unusedOftenChangesDuringFirmwareUpdate = array, U08, 3944, [94], "units", 1, 0, 0, 1, 0 +nitrousMinimumTps = scalar, S32, 3944, "", 1, 0, 0, 20000, 0 +nitrousMinimumClt = scalar, U08, 3948, "deg C", 1, 0, 0, 250, 0 +nitrousMaximumMap = scalar, S16, 3950, "kPa", 1, 0, 0, 1000, 0 +unusedOftenChangesDuringFirmwareUpdate = array, U08, 3952, [87], "units", 1, 0, 0, 1, 0 postCrankingFactor = array, F32, 4040, [6x6], "mult", 1, 0, 1, 3, 2 postCrankingDurationBins = array, F32, 4184, [6], "count", 1, 0, 0, 1000, 0 postCrankingCLTBins = array, S16, 4208, [6], "C", 1, 0, -100, 250, 0 @@ -3223,6 +3226,9 @@ isAppConditionSatisfied = bits, U32, 1124, [4:4] isFlatShiftConditionSatisfied = bits, U32, 1124, [5:5] ; total TS size = 1128 isArmed = bits, U32, 1128, [0:0] +isTpsConditionSatisfied = bits, U32, 1128, [1:1] +isCltConditionSatisfied = bits, U32, 1128, [2:2] +isMapConditionSatisfied = bits, U32, 1128, [3:3] ; total TS size = 1132 isAntilagCondition = bits, U32, 1132, [0:0] ALSMinRPMCondition = bits, U32, 1132, [1:1] @@ -5801,6 +5807,9 @@ entry = isRpmConditionSatisfied, "isRpmConditionSatisfied", int, "%d" entry = isAppConditionSatisfied, "isAppConditionSatisfied", int, "%d" entry = isFlatShiftConditionSatisfied, "isFlatShiftConditionSatisfied", int, "%d" entry = isArmed, "isArmed", int, "%d" +entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" +entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" +entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" entry = isAntilagCondition, "isAntilagCondition", int, "%d" entry = ALSMinRPMCondition, "ALSMinRPMCondition", int, "%d" entry = ALSMaxRPMCondition, "ALSMaxRPMCondition", int, "%d" @@ -6778,6 +6787,9 @@ dialog = shift_torque_reduction_stateDialog, "shift_torque_reduction_state" indicatorPanel = nitrous_control_stateIndicatorPanel, 2 indicator = {isArmed}, "isArmed No", "isArmed Yes" + indicator = {isTpsConditionSatisfied}, "isTpsConditionSatisfied No", "isTpsConditionSatisfied Yes" + indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" + indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9780,10 +9792,15 @@ dialog = tcuControls, "Transmission Settings" panel = NitrousControlButtonDialog, {nitrousControlArmingMethod == 0} panel = NitrousControlLuaGaugeDialog, {nitrousControlArmingMethod == 1} + dialog = NitrousControlSettings, "Settings" + field = "Minimum TPS", nitrousMinimumTps + field = "Minimum CLT", nitrousMinimumClt + field = "Maximum MAP", nitrousMaximumMap + dialog = NitrousControlSettingsDialog, "", yAxis field = "Enable Nitrous Control", nitrousControlEnabled panel = NitrousControlArmingMethodDialog, {nitrousControlEnabled == 1} -; panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))} + panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))} dialog = NitrousControlDialog panel = NitrousControlSettingsDialog, West diff --git a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini index e89c658603..543312ee48 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.11.28.hellen121nissan.3719604108" + signature = "rusEFI master.2024.11.28.hellen121nissan.2959340180" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.11.28.hellen121nissan.3719604108" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.11.28.hellen121nissan.2959340180" ; 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 @@ -1432,7 +1432,10 @@ nitrousControlTriggerPinMode = bits, U08, 3936, [0:1], "DEFAULT", "PULLUP", "PUL nitrousLuaGauge = bits, S08, 3937, [0:2], "Lua Gauge 1", "Lua Gauge 2", "Lua Gauge 3", "Lua Gauge 4", "Lua Gauge 5", "Lua Gauge 6", "Lua Gauge 7", "Lua Gauge 8" nitrousLuaGaugeMeaning = bits, S08, 3938, [3:3], "Lower Bound", "Upper Bound" nitrousLuaGaugeArmingValue = scalar, F32, 3940, "", 1, 0, -30000, 30000, 3 -unusedOftenChangesDuringFirmwareUpdate = array, U08, 3944, [94], "units", 1, 0, 0, 1, 0 +nitrousMinimumTps = scalar, S32, 3944, "", 1, 0, 0, 20000, 0 +nitrousMinimumClt = scalar, U08, 3948, "deg C", 1, 0, 0, 125, 0 +nitrousMaximumMap = scalar, S16, 3950, "kPa", 1, 0, 0, 1000, 0 +unusedOftenChangesDuringFirmwareUpdate = array, U08, 3952, [87], "units", 1, 0, 0, 1, 0 postCrankingFactor = array, F32, 4040, [6x6], "mult", 1, 0, 1, 3, 2 postCrankingDurationBins = array, F32, 4184, [6], "count", 1, 0, 0, 1000, 0 postCrankingCLTBins = array, S16, 4208, [6], "C", 1, 0, -100, 125, 0 @@ -3223,6 +3226,9 @@ isAppConditionSatisfied = bits, U32, 1124, [4:4] isFlatShiftConditionSatisfied = bits, U32, 1124, [5:5] ; total TS size = 1128 isArmed = bits, U32, 1128, [0:0] +isTpsConditionSatisfied = bits, U32, 1128, [1:1] +isCltConditionSatisfied = bits, U32, 1128, [2:2] +isMapConditionSatisfied = bits, U32, 1128, [3:3] ; total TS size = 1132 isAntilagCondition = bits, U32, 1132, [0:0] ALSMinRPMCondition = bits, U32, 1132, [1:1] @@ -5801,6 +5807,9 @@ entry = isRpmConditionSatisfied, "isRpmConditionSatisfied", int, "%d" entry = isAppConditionSatisfied, "isAppConditionSatisfied", int, "%d" entry = isFlatShiftConditionSatisfied, "isFlatShiftConditionSatisfied", int, "%d" entry = isArmed, "isArmed", int, "%d" +entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" +entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" +entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" entry = isAntilagCondition, "isAntilagCondition", int, "%d" entry = ALSMinRPMCondition, "ALSMinRPMCondition", int, "%d" entry = ALSMaxRPMCondition, "ALSMaxRPMCondition", int, "%d" @@ -6775,6 +6784,9 @@ dialog = shift_torque_reduction_stateDialog, "shift_torque_reduction_state" indicatorPanel = nitrous_control_stateIndicatorPanel, 2 indicator = {isArmed}, "isArmed No", "isArmed Yes" + indicator = {isTpsConditionSatisfied}, "isTpsConditionSatisfied No", "isTpsConditionSatisfied Yes" + indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" + indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9735,10 +9747,15 @@ dialog = tcuControls, "Transmission Settings" panel = NitrousControlButtonDialog, {nitrousControlArmingMethod == 0} panel = NitrousControlLuaGaugeDialog, {nitrousControlArmingMethod == 1} + dialog = NitrousControlSettings, "Settings" + field = "Minimum TPS", nitrousMinimumTps + field = "Minimum CLT", nitrousMinimumClt + field = "Maximum MAP", nitrousMaximumMap + dialog = NitrousControlSettingsDialog, "", yAxis field = "Enable Nitrous Control", nitrousControlEnabled panel = NitrousControlArmingMethodDialog, {nitrousControlEnabled == 1} -; panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))} + panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))} dialog = NitrousControlDialog panel = NitrousControlSettingsDialog, West diff --git a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini index 3c78ce9dc3..f0487f69d6 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.11.28.hellen121vag.2245899723" + signature = "rusEFI master.2024.11.28.hellen121vag.3893027027" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.11.28.hellen121vag.2245899723" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.11.28.hellen121vag.3893027027" ; 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 @@ -1432,7 +1432,10 @@ nitrousControlTriggerPinMode = bits, U08, 3936, [0:1], "DEFAULT", "PULLUP", "PUL nitrousLuaGauge = bits, S08, 3937, [0:2], "Lua Gauge 1", "Lua Gauge 2", "Lua Gauge 3", "Lua Gauge 4", "Lua Gauge 5", "Lua Gauge 6", "Lua Gauge 7", "Lua Gauge 8" nitrousLuaGaugeMeaning = bits, S08, 3938, [3:3], "Lower Bound", "Upper Bound" nitrousLuaGaugeArmingValue = scalar, F32, 3940, "", 1, 0, -30000, 30000, 3 -unusedOftenChangesDuringFirmwareUpdate = array, U08, 3944, [94], "units", 1, 0, 0, 1, 0 +nitrousMinimumTps = scalar, S32, 3944, "", 1, 0, 0, 20000, 0 +nitrousMinimumClt = scalar, U08, 3948, "deg C", 1, 0, 0, 250, 0 +nitrousMaximumMap = scalar, S16, 3950, "kPa", 1, 0, 0, 1000, 0 +unusedOftenChangesDuringFirmwareUpdate = array, U08, 3952, [87], "units", 1, 0, 0, 1, 0 postCrankingFactor = array, F32, 4040, [6x6], "mult", 1, 0, 1, 3, 2 postCrankingDurationBins = array, F32, 4184, [6], "count", 1, 0, 0, 1000, 0 postCrankingCLTBins = array, S16, 4208, [6], "C", 1, 0, -100, 250, 0 @@ -3223,6 +3226,9 @@ isAppConditionSatisfied = bits, U32, 1124, [4:4] isFlatShiftConditionSatisfied = bits, U32, 1124, [5:5] ; total TS size = 1128 isArmed = bits, U32, 1128, [0:0] +isTpsConditionSatisfied = bits, U32, 1128, [1:1] +isCltConditionSatisfied = bits, U32, 1128, [2:2] +isMapConditionSatisfied = bits, U32, 1128, [3:3] ; total TS size = 1132 isAntilagCondition = bits, U32, 1132, [0:0] ALSMinRPMCondition = bits, U32, 1132, [1:1] @@ -5801,6 +5807,9 @@ entry = isRpmConditionSatisfied, "isRpmConditionSatisfied", int, "%d" entry = isAppConditionSatisfied, "isAppConditionSatisfied", int, "%d" entry = isFlatShiftConditionSatisfied, "isFlatShiftConditionSatisfied", int, "%d" entry = isArmed, "isArmed", int, "%d" +entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" +entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" +entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" entry = isAntilagCondition, "isAntilagCondition", int, "%d" entry = ALSMinRPMCondition, "ALSMinRPMCondition", int, "%d" entry = ALSMaxRPMCondition, "ALSMaxRPMCondition", int, "%d" @@ -6777,6 +6786,9 @@ dialog = shift_torque_reduction_stateDialog, "shift_torque_reduction_state" indicatorPanel = nitrous_control_stateIndicatorPanel, 2 indicator = {isArmed}, "isArmed No", "isArmed Yes" + indicator = {isTpsConditionSatisfied}, "isTpsConditionSatisfied No", "isTpsConditionSatisfied Yes" + indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" + indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9770,10 +9782,15 @@ dialog = tcuControls, "Transmission Settings" panel = NitrousControlButtonDialog, {nitrousControlArmingMethod == 0} panel = NitrousControlLuaGaugeDialog, {nitrousControlArmingMethod == 1} + dialog = NitrousControlSettings, "Settings" + field = "Minimum TPS", nitrousMinimumTps + field = "Minimum CLT", nitrousMinimumClt + field = "Maximum MAP", nitrousMaximumMap + dialog = NitrousControlSettingsDialog, "", yAxis field = "Enable Nitrous Control", nitrousControlEnabled panel = NitrousControlArmingMethodDialog, {nitrousControlEnabled == 1} -; panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))} + panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))} dialog = NitrousControlDialog panel = NitrousControlSettingsDialog, West diff --git a/firmware/tunerstudio/generated/rusefi_hellen128.ini b/firmware/tunerstudio/generated/rusefi_hellen128.ini index 8759dfe9ec..0163f24a1c 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen128.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen128.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.11.28.hellen128.3770490875" + signature = "rusEFI master.2024.11.28.hellen128.2372553443" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.11.28.hellen128.3770490875" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.11.28.hellen128.2372553443" ; 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 @@ -1432,7 +1432,10 @@ nitrousControlTriggerPinMode = bits, U08, 3936, [0:1], "DEFAULT", "PULLUP", "PUL nitrousLuaGauge = bits, S08, 3937, [0:2], "Lua Gauge 1", "Lua Gauge 2", "Lua Gauge 3", "Lua Gauge 4", "Lua Gauge 5", "Lua Gauge 6", "Lua Gauge 7", "Lua Gauge 8" nitrousLuaGaugeMeaning = bits, S08, 3938, [3:3], "Lower Bound", "Upper Bound" nitrousLuaGaugeArmingValue = scalar, F32, 3940, "", 1, 0, -30000, 30000, 3 -unusedOftenChangesDuringFirmwareUpdate = array, U08, 3944, [94], "units", 1, 0, 0, 1, 0 +nitrousMinimumTps = scalar, S32, 3944, "", 1, 0, 0, 20000, 0 +nitrousMinimumClt = scalar, U08, 3948, "deg C", 1, 0, 0, 250, 0 +nitrousMaximumMap = scalar, S16, 3950, "kPa", 1, 0, 0, 1000, 0 +unusedOftenChangesDuringFirmwareUpdate = array, U08, 3952, [87], "units", 1, 0, 0, 1, 0 postCrankingFactor = array, F32, 4040, [6x6], "mult", 1, 0, 1, 3, 2 postCrankingDurationBins = array, F32, 4184, [6], "count", 1, 0, 0, 1000, 0 postCrankingCLTBins = array, S16, 4208, [6], "C", 1, 0, -100, 250, 0 @@ -3223,6 +3226,9 @@ isAppConditionSatisfied = bits, U32, 1124, [4:4] isFlatShiftConditionSatisfied = bits, U32, 1124, [5:5] ; total TS size = 1128 isArmed = bits, U32, 1128, [0:0] +isTpsConditionSatisfied = bits, U32, 1128, [1:1] +isCltConditionSatisfied = bits, U32, 1128, [2:2] +isMapConditionSatisfied = bits, U32, 1128, [3:3] ; total TS size = 1132 isAntilagCondition = bits, U32, 1132, [0:0] ALSMinRPMCondition = bits, U32, 1132, [1:1] @@ -5801,6 +5807,9 @@ entry = isRpmConditionSatisfied, "isRpmConditionSatisfied", int, "%d" entry = isAppConditionSatisfied, "isAppConditionSatisfied", int, "%d" entry = isFlatShiftConditionSatisfied, "isFlatShiftConditionSatisfied", int, "%d" entry = isArmed, "isArmed", int, "%d" +entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" +entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" +entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" entry = isAntilagCondition, "isAntilagCondition", int, "%d" entry = ALSMinRPMCondition, "ALSMinRPMCondition", int, "%d" entry = ALSMaxRPMCondition, "ALSMaxRPMCondition", int, "%d" @@ -6778,6 +6787,9 @@ dialog = shift_torque_reduction_stateDialog, "shift_torque_reduction_state" indicatorPanel = nitrous_control_stateIndicatorPanel, 2 indicator = {isArmed}, "isArmed No", "isArmed Yes" + indicator = {isTpsConditionSatisfied}, "isTpsConditionSatisfied No", "isTpsConditionSatisfied Yes" + indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" + indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9778,10 +9790,15 @@ dialog = tcuControls, "Transmission Settings" panel = NitrousControlButtonDialog, {nitrousControlArmingMethod == 0} panel = NitrousControlLuaGaugeDialog, {nitrousControlArmingMethod == 1} + dialog = NitrousControlSettings, "Settings" + field = "Minimum TPS", nitrousMinimumTps + field = "Minimum CLT", nitrousMinimumClt + field = "Maximum MAP", nitrousMaximumMap + dialog = NitrousControlSettingsDialog, "", yAxis field = "Enable Nitrous Control", nitrousControlEnabled panel = NitrousControlArmingMethodDialog, {nitrousControlEnabled == 1} -; panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))} + panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))} dialog = NitrousControlDialog panel = NitrousControlSettingsDialog, West diff --git a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini index 45ce9bf537..797746edd4 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.11.28.hellen154hyundai.729418902" + signature = "rusEFI master.2024.11.28.hellen154hyundai.1185765774" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.11.28.hellen154hyundai.729418902" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.11.28.hellen154hyundai.1185765774" ; 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 @@ -1432,7 +1432,10 @@ nitrousControlTriggerPinMode = bits, U08, 3936, [0:1], "DEFAULT", "PULLUP", "PUL nitrousLuaGauge = bits, S08, 3937, [0:2], "Lua Gauge 1", "Lua Gauge 2", "Lua Gauge 3", "Lua Gauge 4", "Lua Gauge 5", "Lua Gauge 6", "Lua Gauge 7", "Lua Gauge 8" nitrousLuaGaugeMeaning = bits, S08, 3938, [3:3], "Lower Bound", "Upper Bound" nitrousLuaGaugeArmingValue = scalar, F32, 3940, "", 1, 0, -30000, 30000, 3 -unusedOftenChangesDuringFirmwareUpdate = array, U08, 3944, [94], "units", 1, 0, 0, 1, 0 +nitrousMinimumTps = scalar, S32, 3944, "", 1, 0, 0, 20000, 0 +nitrousMinimumClt = scalar, U08, 3948, "deg C", 1, 0, 0, 125, 0 +nitrousMaximumMap = scalar, S16, 3950, "kPa", 1, 0, 0, 1000, 0 +unusedOftenChangesDuringFirmwareUpdate = array, U08, 3952, [87], "units", 1, 0, 0, 1, 0 postCrankingFactor = array, F32, 4040, [6x6], "mult", 1, 0, 1, 3, 2 postCrankingDurationBins = array, F32, 4184, [6], "count", 1, 0, 0, 1000, 0 postCrankingCLTBins = array, S16, 4208, [6], "C", 1, 0, -100, 125, 0 @@ -3223,6 +3226,9 @@ isAppConditionSatisfied = bits, U32, 1124, [4:4] isFlatShiftConditionSatisfied = bits, U32, 1124, [5:5] ; total TS size = 1128 isArmed = bits, U32, 1128, [0:0] +isTpsConditionSatisfied = bits, U32, 1128, [1:1] +isCltConditionSatisfied = bits, U32, 1128, [2:2] +isMapConditionSatisfied = bits, U32, 1128, [3:3] ; total TS size = 1132 isAntilagCondition = bits, U32, 1132, [0:0] ALSMinRPMCondition = bits, U32, 1132, [1:1] @@ -5796,6 +5802,9 @@ entry = isRpmConditionSatisfied, "isRpmConditionSatisfied", int, "%d" entry = isAppConditionSatisfied, "isAppConditionSatisfied", int, "%d" entry = isFlatShiftConditionSatisfied, "isFlatShiftConditionSatisfied", int, "%d" entry = isArmed, "isArmed", int, "%d" +entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" +entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" +entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" entry = isAntilagCondition, "isAntilagCondition", int, "%d" entry = ALSMinRPMCondition, "ALSMinRPMCondition", int, "%d" entry = ALSMaxRPMCondition, "ALSMaxRPMCondition", int, "%d" @@ -6759,6 +6768,9 @@ dialog = shift_torque_reduction_stateDialog, "shift_torque_reduction_state" indicatorPanel = nitrous_control_stateIndicatorPanel, 2 indicator = {isArmed}, "isArmed No", "isArmed Yes" + indicator = {isTpsConditionSatisfied}, "isTpsConditionSatisfied No", "isTpsConditionSatisfied Yes" + indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" + indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9686,10 +9698,15 @@ dialog = tcuControls, "Transmission Settings" panel = NitrousControlButtonDialog, {nitrousControlArmingMethod == 0} panel = NitrousControlLuaGaugeDialog, {nitrousControlArmingMethod == 1} + dialog = NitrousControlSettings, "Settings" + field = "Minimum TPS", nitrousMinimumTps + field = "Minimum CLT", nitrousMinimumClt + field = "Maximum MAP", nitrousMaximumMap + dialog = NitrousControlSettingsDialog, "", yAxis field = "Enable Nitrous Control", nitrousControlEnabled panel = NitrousControlArmingMethodDialog, {nitrousControlEnabled == 1} -; panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))} + panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))} dialog = NitrousControlDialog panel = NitrousControlSettingsDialog, West diff --git a/firmware/tunerstudio/generated/rusefi_hellen154hyundai_f7.ini b/firmware/tunerstudio/generated/rusefi_hellen154hyundai_f7.ini index 8f198899e3..3c886ec039 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen154hyundai_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen154hyundai_f7.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.11.28.hellen154hyundai_f7.1695310101" + signature = "rusEFI master.2024.11.28.hellen154hyundai_f7.148583437" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.11.28.hellen154hyundai_f7.1695310101" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.11.28.hellen154hyundai_f7.148583437" ; 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 @@ -1432,7 +1432,10 @@ nitrousControlTriggerPinMode = bits, U08, 3936, [0:1], "DEFAULT", "PULLUP", "PUL nitrousLuaGauge = bits, S08, 3937, [0:2], "Lua Gauge 1", "Lua Gauge 2", "Lua Gauge 3", "Lua Gauge 4", "Lua Gauge 5", "Lua Gauge 6", "Lua Gauge 7", "Lua Gauge 8" nitrousLuaGaugeMeaning = bits, S08, 3938, [3:3], "Lower Bound", "Upper Bound" nitrousLuaGaugeArmingValue = scalar, F32, 3940, "", 1, 0, -30000, 30000, 3 -unusedOftenChangesDuringFirmwareUpdate = array, U08, 3944, [94], "units", 1, 0, 0, 1, 0 +nitrousMinimumTps = scalar, S32, 3944, "", 1, 0, 0, 20000, 0 +nitrousMinimumClt = scalar, U08, 3948, "deg C", 1, 0, 0, 125, 0 +nitrousMaximumMap = scalar, S16, 3950, "kPa", 1, 0, 0, 1000, 0 +unusedOftenChangesDuringFirmwareUpdate = array, U08, 3952, [87], "units", 1, 0, 0, 1, 0 postCrankingFactor = array, F32, 4040, [6x6], "mult", 1, 0, 1, 3, 2 postCrankingDurationBins = array, F32, 4184, [6], "count", 1, 0, 0, 1000, 0 postCrankingCLTBins = array, S16, 4208, [6], "C", 1, 0, -100, 125, 0 @@ -3223,6 +3226,9 @@ isAppConditionSatisfied = bits, U32, 1124, [4:4] isFlatShiftConditionSatisfied = bits, U32, 1124, [5:5] ; total TS size = 1128 isArmed = bits, U32, 1128, [0:0] +isTpsConditionSatisfied = bits, U32, 1128, [1:1] +isCltConditionSatisfied = bits, U32, 1128, [2:2] +isMapConditionSatisfied = bits, U32, 1128, [3:3] ; total TS size = 1132 isAntilagCondition = bits, U32, 1132, [0:0] ALSMinRPMCondition = bits, U32, 1132, [1:1] @@ -5796,6 +5802,9 @@ entry = isRpmConditionSatisfied, "isRpmConditionSatisfied", int, "%d" entry = isAppConditionSatisfied, "isAppConditionSatisfied", int, "%d" entry = isFlatShiftConditionSatisfied, "isFlatShiftConditionSatisfied", int, "%d" entry = isArmed, "isArmed", int, "%d" +entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" +entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" +entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" entry = isAntilagCondition, "isAntilagCondition", int, "%d" entry = ALSMinRPMCondition, "ALSMinRPMCondition", int, "%d" entry = ALSMaxRPMCondition, "ALSMaxRPMCondition", int, "%d" @@ -6759,6 +6768,9 @@ dialog = shift_torque_reduction_stateDialog, "shift_torque_reduction_state" indicatorPanel = nitrous_control_stateIndicatorPanel, 2 indicator = {isArmed}, "isArmed No", "isArmed Yes" + indicator = {isTpsConditionSatisfied}, "isTpsConditionSatisfied No", "isTpsConditionSatisfied Yes" + indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" + indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9686,10 +9698,15 @@ dialog = tcuControls, "Transmission Settings" panel = NitrousControlButtonDialog, {nitrousControlArmingMethod == 0} panel = NitrousControlLuaGaugeDialog, {nitrousControlArmingMethod == 1} + dialog = NitrousControlSettings, "Settings" + field = "Minimum TPS", nitrousMinimumTps + field = "Minimum CLT", nitrousMinimumClt + field = "Maximum MAP", nitrousMaximumMap + dialog = NitrousControlSettingsDialog, "", yAxis field = "Enable Nitrous Control", nitrousControlEnabled panel = NitrousControlArmingMethodDialog, {nitrousControlEnabled == 1} -; panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))} + panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))} dialog = NitrousControlDialog panel = NitrousControlSettingsDialog, West diff --git a/firmware/tunerstudio/generated/rusefi_hellen72.ini b/firmware/tunerstudio/generated/rusefi_hellen72.ini index c0cf08d498..6c0ab27230 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen72.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen72.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.11.28.hellen72.4027046106" + signature = "rusEFI master.2024.11.28.hellen72.2647690690" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.11.28.hellen72.4027046106" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.11.28.hellen72.2647690690" ; 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 @@ -1432,7 +1432,10 @@ nitrousControlTriggerPinMode = bits, U08, 3936, [0:1], "DEFAULT", "PULLUP", "PUL nitrousLuaGauge = bits, S08, 3937, [0:2], "Lua Gauge 1", "Lua Gauge 2", "Lua Gauge 3", "Lua Gauge 4", "Lua Gauge 5", "Lua Gauge 6", "Lua Gauge 7", "Lua Gauge 8" nitrousLuaGaugeMeaning = bits, S08, 3938, [3:3], "Lower Bound", "Upper Bound" nitrousLuaGaugeArmingValue = scalar, F32, 3940, "", 1, 0, -30000, 30000, 3 -unusedOftenChangesDuringFirmwareUpdate = array, U08, 3944, [94], "units", 1, 0, 0, 1, 0 +nitrousMinimumTps = scalar, S32, 3944, "", 1, 0, 0, 20000, 0 +nitrousMinimumClt = scalar, U08, 3948, "deg C", 1, 0, 0, 250, 0 +nitrousMaximumMap = scalar, S16, 3950, "kPa", 1, 0, 0, 1000, 0 +unusedOftenChangesDuringFirmwareUpdate = array, U08, 3952, [87], "units", 1, 0, 0, 1, 0 postCrankingFactor = array, F32, 4040, [6x6], "mult", 1, 0, 1, 3, 2 postCrankingDurationBins = array, F32, 4184, [6], "count", 1, 0, 0, 1000, 0 postCrankingCLTBins = array, S16, 4208, [6], "C", 1, 0, -100, 250, 0 @@ -3223,6 +3226,9 @@ isAppConditionSatisfied = bits, U32, 1124, [4:4] isFlatShiftConditionSatisfied = bits, U32, 1124, [5:5] ; total TS size = 1128 isArmed = bits, U32, 1128, [0:0] +isTpsConditionSatisfied = bits, U32, 1128, [1:1] +isCltConditionSatisfied = bits, U32, 1128, [2:2] +isMapConditionSatisfied = bits, U32, 1128, [3:3] ; total TS size = 1132 isAntilagCondition = bits, U32, 1132, [0:0] ALSMinRPMCondition = bits, U32, 1132, [1:1] @@ -5801,6 +5807,9 @@ entry = isRpmConditionSatisfied, "isRpmConditionSatisfied", int, "%d" entry = isAppConditionSatisfied, "isAppConditionSatisfied", int, "%d" entry = isFlatShiftConditionSatisfied, "isFlatShiftConditionSatisfied", int, "%d" entry = isArmed, "isArmed", int, "%d" +entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" +entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" +entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" entry = isAntilagCondition, "isAntilagCondition", int, "%d" entry = ALSMinRPMCondition, "ALSMinRPMCondition", int, "%d" entry = ALSMaxRPMCondition, "ALSMaxRPMCondition", int, "%d" @@ -6778,6 +6787,9 @@ dialog = shift_torque_reduction_stateDialog, "shift_torque_reduction_state" indicatorPanel = nitrous_control_stateIndicatorPanel, 2 indicator = {isArmed}, "isArmed No", "isArmed Yes" + indicator = {isTpsConditionSatisfied}, "isTpsConditionSatisfied No", "isTpsConditionSatisfied Yes" + indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" + indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9780,10 +9792,15 @@ dialog = tcuControls, "Transmission Settings" panel = NitrousControlButtonDialog, {nitrousControlArmingMethod == 0} panel = NitrousControlLuaGaugeDialog, {nitrousControlArmingMethod == 1} + dialog = NitrousControlSettings, "Settings" + field = "Minimum TPS", nitrousMinimumTps + field = "Minimum CLT", nitrousMinimumClt + field = "Maximum MAP", nitrousMaximumMap + dialog = NitrousControlSettingsDialog, "", yAxis field = "Enable Nitrous Control", nitrousControlEnabled panel = NitrousControlArmingMethodDialog, {nitrousControlEnabled == 1} -; panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))} + panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))} dialog = NitrousControlDialog panel = NitrousControlSettingsDialog, West diff --git a/firmware/tunerstudio/generated/rusefi_hellen81.ini b/firmware/tunerstudio/generated/rusefi_hellen81.ini index 93c3d967a7..c379d4819e 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen81.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen81.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.11.28.hellen81.1757390314" + signature = "rusEFI master.2024.11.28.hellen81.90763506" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.11.28.hellen81.1757390314" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.11.28.hellen81.90763506" ; 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 @@ -1432,7 +1432,10 @@ nitrousControlTriggerPinMode = bits, U08, 3936, [0:1], "DEFAULT", "PULLUP", "PUL nitrousLuaGauge = bits, S08, 3937, [0:2], "Lua Gauge 1", "Lua Gauge 2", "Lua Gauge 3", "Lua Gauge 4", "Lua Gauge 5", "Lua Gauge 6", "Lua Gauge 7", "Lua Gauge 8" nitrousLuaGaugeMeaning = bits, S08, 3938, [3:3], "Lower Bound", "Upper Bound" nitrousLuaGaugeArmingValue = scalar, F32, 3940, "", 1, 0, -30000, 30000, 3 -unusedOftenChangesDuringFirmwareUpdate = array, U08, 3944, [94], "units", 1, 0, 0, 1, 0 +nitrousMinimumTps = scalar, S32, 3944, "", 1, 0, 0, 20000, 0 +nitrousMinimumClt = scalar, U08, 3948, "deg C", 1, 0, 0, 250, 0 +nitrousMaximumMap = scalar, S16, 3950, "kPa", 1, 0, 0, 1000, 0 +unusedOftenChangesDuringFirmwareUpdate = array, U08, 3952, [87], "units", 1, 0, 0, 1, 0 postCrankingFactor = array, F32, 4040, [6x6], "mult", 1, 0, 1, 3, 2 postCrankingDurationBins = array, F32, 4184, [6], "count", 1, 0, 0, 1000, 0 postCrankingCLTBins = array, S16, 4208, [6], "C", 1, 0, -100, 250, 0 @@ -3223,6 +3226,9 @@ isAppConditionSatisfied = bits, U32, 1124, [4:4] isFlatShiftConditionSatisfied = bits, U32, 1124, [5:5] ; total TS size = 1128 isArmed = bits, U32, 1128, [0:0] +isTpsConditionSatisfied = bits, U32, 1128, [1:1] +isCltConditionSatisfied = bits, U32, 1128, [2:2] +isMapConditionSatisfied = bits, U32, 1128, [3:3] ; total TS size = 1132 isAntilagCondition = bits, U32, 1132, [0:0] ALSMinRPMCondition = bits, U32, 1132, [1:1] @@ -5801,6 +5807,9 @@ entry = isRpmConditionSatisfied, "isRpmConditionSatisfied", int, "%d" entry = isAppConditionSatisfied, "isAppConditionSatisfied", int, "%d" entry = isFlatShiftConditionSatisfied, "isFlatShiftConditionSatisfied", int, "%d" entry = isArmed, "isArmed", int, "%d" +entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" +entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" +entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" entry = isAntilagCondition, "isAntilagCondition", int, "%d" entry = ALSMinRPMCondition, "ALSMinRPMCondition", int, "%d" entry = ALSMaxRPMCondition, "ALSMaxRPMCondition", int, "%d" @@ -6776,6 +6785,9 @@ dialog = shift_torque_reduction_stateDialog, "shift_torque_reduction_state" indicatorPanel = nitrous_control_stateIndicatorPanel, 2 indicator = {isArmed}, "isArmed No", "isArmed Yes" + indicator = {isTpsConditionSatisfied}, "isTpsConditionSatisfied No", "isTpsConditionSatisfied Yes" + indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" + indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9777,10 +9789,15 @@ dialog = tcuControls, "Transmission Settings" panel = NitrousControlButtonDialog, {nitrousControlArmingMethod == 0} panel = NitrousControlLuaGaugeDialog, {nitrousControlArmingMethod == 1} + dialog = NitrousControlSettings, "Settings" + field = "Minimum TPS", nitrousMinimumTps + field = "Minimum CLT", nitrousMinimumClt + field = "Maximum MAP", nitrousMaximumMap + dialog = NitrousControlSettingsDialog, "", yAxis field = "Enable Nitrous Control", nitrousControlEnabled panel = NitrousControlArmingMethodDialog, {nitrousControlEnabled == 1} -; panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))} + panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))} dialog = NitrousControlDialog panel = NitrousControlSettingsDialog, West diff --git a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini index f697a247a3..54d43778ee 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.11.28.hellen88bmw.2140975273" + signature = "rusEFI master.2024.11.28.hellen88bmw.306963889" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.11.28.hellen88bmw.2140975273" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.11.28.hellen88bmw.306963889" ; 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 @@ -1432,7 +1432,10 @@ nitrousControlTriggerPinMode = bits, U08, 3936, [0:1], "DEFAULT", "PULLUP", "PUL nitrousLuaGauge = bits, S08, 3937, [0:2], "Lua Gauge 1", "Lua Gauge 2", "Lua Gauge 3", "Lua Gauge 4", "Lua Gauge 5", "Lua Gauge 6", "Lua Gauge 7", "Lua Gauge 8" nitrousLuaGaugeMeaning = bits, S08, 3938, [3:3], "Lower Bound", "Upper Bound" nitrousLuaGaugeArmingValue = scalar, F32, 3940, "", 1, 0, -30000, 30000, 3 -unusedOftenChangesDuringFirmwareUpdate = array, U08, 3944, [94], "units", 1, 0, 0, 1, 0 +nitrousMinimumTps = scalar, S32, 3944, "", 1, 0, 0, 20000, 0 +nitrousMinimumClt = scalar, U08, 3948, "deg C", 1, 0, 0, 250, 0 +nitrousMaximumMap = scalar, S16, 3950, "kPa", 1, 0, 0, 1000, 0 +unusedOftenChangesDuringFirmwareUpdate = array, U08, 3952, [87], "units", 1, 0, 0, 1, 0 postCrankingFactor = array, F32, 4040, [6x6], "mult", 1, 0, 1, 3, 2 postCrankingDurationBins = array, F32, 4184, [6], "count", 1, 0, 0, 1000, 0 postCrankingCLTBins = array, S16, 4208, [6], "C", 1, 0, -100, 250, 0 @@ -3223,6 +3226,9 @@ isAppConditionSatisfied = bits, U32, 1124, [4:4] isFlatShiftConditionSatisfied = bits, U32, 1124, [5:5] ; total TS size = 1128 isArmed = bits, U32, 1128, [0:0] +isTpsConditionSatisfied = bits, U32, 1128, [1:1] +isCltConditionSatisfied = bits, U32, 1128, [2:2] +isMapConditionSatisfied = bits, U32, 1128, [3:3] ; total TS size = 1132 isAntilagCondition = bits, U32, 1132, [0:0] ALSMinRPMCondition = bits, U32, 1132, [1:1] @@ -5801,6 +5807,9 @@ entry = isRpmConditionSatisfied, "isRpmConditionSatisfied", int, "%d" entry = isAppConditionSatisfied, "isAppConditionSatisfied", int, "%d" entry = isFlatShiftConditionSatisfied, "isFlatShiftConditionSatisfied", int, "%d" entry = isArmed, "isArmed", int, "%d" +entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" +entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" +entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" entry = isAntilagCondition, "isAntilagCondition", int, "%d" entry = ALSMinRPMCondition, "ALSMinRPMCondition", int, "%d" entry = ALSMaxRPMCondition, "ALSMaxRPMCondition", int, "%d" @@ -6775,6 +6784,9 @@ dialog = shift_torque_reduction_stateDialog, "shift_torque_reduction_state" indicatorPanel = nitrous_control_stateIndicatorPanel, 2 indicator = {isArmed}, "isArmed No", "isArmed Yes" + indicator = {isTpsConditionSatisfied}, "isTpsConditionSatisfied No", "isTpsConditionSatisfied Yes" + indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" + indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9773,10 +9785,15 @@ dialog = tcuControls, "Transmission Settings" panel = NitrousControlButtonDialog, {nitrousControlArmingMethod == 0} panel = NitrousControlLuaGaugeDialog, {nitrousControlArmingMethod == 1} + dialog = NitrousControlSettings, "Settings" + field = "Minimum TPS", nitrousMinimumTps + field = "Minimum CLT", nitrousMinimumClt + field = "Maximum MAP", nitrousMaximumMap + dialog = NitrousControlSettingsDialog, "", yAxis field = "Enable Nitrous Control", nitrousControlEnabled panel = NitrousControlArmingMethodDialog, {nitrousControlEnabled == 1} -; panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))} + panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))} dialog = NitrousControlDialog panel = NitrousControlSettingsDialog, West diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini index 08b7a6dcb1..5d14ed90b6 100644 --- a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini +++ b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.11.28.hellenNA6.2576013036" + signature = "rusEFI master.2024.11.28.hellenNA6.4099769332" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.11.28.hellenNA6.2576013036" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.11.28.hellenNA6.4099769332" ; 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 @@ -1432,7 +1432,10 @@ nitrousControlTriggerPinMode = bits, U08, 3936, [0:1], "DEFAULT", "PULLUP", "PUL nitrousLuaGauge = bits, S08, 3937, [0:2], "Lua Gauge 1", "Lua Gauge 2", "Lua Gauge 3", "Lua Gauge 4", "Lua Gauge 5", "Lua Gauge 6", "Lua Gauge 7", "Lua Gauge 8" nitrousLuaGaugeMeaning = bits, S08, 3938, [3:3], "Lower Bound", "Upper Bound" nitrousLuaGaugeArmingValue = scalar, F32, 3940, "", 1, 0, -30000, 30000, 3 -unusedOftenChangesDuringFirmwareUpdate = array, U08, 3944, [94], "units", 1, 0, 0, 1, 0 +nitrousMinimumTps = scalar, S32, 3944, "", 1, 0, 0, 20000, 0 +nitrousMinimumClt = scalar, U08, 3948, "deg C", 1, 0, 0, 250, 0 +nitrousMaximumMap = scalar, S16, 3950, "kPa", 1, 0, 0, 1000, 0 +unusedOftenChangesDuringFirmwareUpdate = array, U08, 3952, [87], "units", 1, 0, 0, 1, 0 postCrankingFactor = array, F32, 4040, [6x6], "mult", 1, 0, 1, 3, 2 postCrankingDurationBins = array, F32, 4184, [6], "count", 1, 0, 0, 1000, 0 postCrankingCLTBins = array, S16, 4208, [6], "C", 1, 0, -100, 250, 0 @@ -3223,6 +3226,9 @@ isAppConditionSatisfied = bits, U32, 1124, [4:4] isFlatShiftConditionSatisfied = bits, U32, 1124, [5:5] ; total TS size = 1128 isArmed = bits, U32, 1128, [0:0] +isTpsConditionSatisfied = bits, U32, 1128, [1:1] +isCltConditionSatisfied = bits, U32, 1128, [2:2] +isMapConditionSatisfied = bits, U32, 1128, [3:3] ; total TS size = 1132 isAntilagCondition = bits, U32, 1132, [0:0] ALSMinRPMCondition = bits, U32, 1132, [1:1] @@ -5801,6 +5807,9 @@ entry = isRpmConditionSatisfied, "isRpmConditionSatisfied", int, "%d" entry = isAppConditionSatisfied, "isAppConditionSatisfied", int, "%d" entry = isFlatShiftConditionSatisfied, "isFlatShiftConditionSatisfied", int, "%d" entry = isArmed, "isArmed", int, "%d" +entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" +entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" +entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" entry = isAntilagCondition, "isAntilagCondition", int, "%d" entry = ALSMinRPMCondition, "ALSMinRPMCondition", int, "%d" entry = ALSMaxRPMCondition, "ALSMaxRPMCondition", int, "%d" @@ -6778,6 +6787,9 @@ dialog = shift_torque_reduction_stateDialog, "shift_torque_reduction_state" indicatorPanel = nitrous_control_stateIndicatorPanel, 2 indicator = {isArmed}, "isArmed No", "isArmed Yes" + indicator = {isTpsConditionSatisfied}, "isTpsConditionSatisfied No", "isTpsConditionSatisfied Yes" + indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" + indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9780,10 +9792,15 @@ dialog = tcuControls, "Transmission Settings" panel = NitrousControlButtonDialog, {nitrousControlArmingMethod == 0} panel = NitrousControlLuaGaugeDialog, {nitrousControlArmingMethod == 1} + dialog = NitrousControlSettings, "Settings" + field = "Minimum TPS", nitrousMinimumTps + field = "Minimum CLT", nitrousMinimumClt + field = "Maximum MAP", nitrousMaximumMap + dialog = NitrousControlSettingsDialog, "", yAxis field = "Enable Nitrous Control", nitrousControlEnabled panel = NitrousControlArmingMethodDialog, {nitrousControlEnabled == 1} -; panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))} + panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))} dialog = NitrousControlDialog panel = NitrousControlSettingsDialog, West diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini b/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini index 5f8a0925be..901c3743c2 100644 --- a/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini +++ b/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.11.28.hellenNA8_96.1716556834" + signature = "rusEFI master.2024.11.28.hellenNA8_96.193446202" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.11.28.hellenNA8_96.1716556834" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.11.28.hellenNA8_96.193446202" ; 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 @@ -1432,7 +1432,10 @@ nitrousControlTriggerPinMode = bits, U08, 3936, [0:1], "DEFAULT", "PULLUP", "PUL nitrousLuaGauge = bits, S08, 3937, [0:2], "Lua Gauge 1", "Lua Gauge 2", "Lua Gauge 3", "Lua Gauge 4", "Lua Gauge 5", "Lua Gauge 6", "Lua Gauge 7", "Lua Gauge 8" nitrousLuaGaugeMeaning = bits, S08, 3938, [3:3], "Lower Bound", "Upper Bound" nitrousLuaGaugeArmingValue = scalar, F32, 3940, "", 1, 0, -30000, 30000, 3 -unusedOftenChangesDuringFirmwareUpdate = array, U08, 3944, [94], "units", 1, 0, 0, 1, 0 +nitrousMinimumTps = scalar, S32, 3944, "", 1, 0, 0, 20000, 0 +nitrousMinimumClt = scalar, U08, 3948, "deg C", 1, 0, 0, 250, 0 +nitrousMaximumMap = scalar, S16, 3950, "kPa", 1, 0, 0, 1000, 0 +unusedOftenChangesDuringFirmwareUpdate = array, U08, 3952, [87], "units", 1, 0, 0, 1, 0 postCrankingFactor = array, F32, 4040, [6x6], "mult", 1, 0, 1, 3, 2 postCrankingDurationBins = array, F32, 4184, [6], "count", 1, 0, 0, 1000, 0 postCrankingCLTBins = array, S16, 4208, [6], "C", 1, 0, -100, 250, 0 @@ -3223,6 +3226,9 @@ isAppConditionSatisfied = bits, U32, 1124, [4:4] isFlatShiftConditionSatisfied = bits, U32, 1124, [5:5] ; total TS size = 1128 isArmed = bits, U32, 1128, [0:0] +isTpsConditionSatisfied = bits, U32, 1128, [1:1] +isCltConditionSatisfied = bits, U32, 1128, [2:2] +isMapConditionSatisfied = bits, U32, 1128, [3:3] ; total TS size = 1132 isAntilagCondition = bits, U32, 1132, [0:0] ALSMinRPMCondition = bits, U32, 1132, [1:1] @@ -5801,6 +5807,9 @@ entry = isRpmConditionSatisfied, "isRpmConditionSatisfied", int, "%d" entry = isAppConditionSatisfied, "isAppConditionSatisfied", int, "%d" entry = isFlatShiftConditionSatisfied, "isFlatShiftConditionSatisfied", int, "%d" entry = isArmed, "isArmed", int, "%d" +entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" +entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" +entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" entry = isAntilagCondition, "isAntilagCondition", int, "%d" entry = ALSMinRPMCondition, "ALSMinRPMCondition", int, "%d" entry = ALSMaxRPMCondition, "ALSMaxRPMCondition", int, "%d" @@ -6778,6 +6787,9 @@ dialog = shift_torque_reduction_stateDialog, "shift_torque_reduction_state" indicatorPanel = nitrous_control_stateIndicatorPanel, 2 indicator = {isArmed}, "isArmed No", "isArmed Yes" + indicator = {isTpsConditionSatisfied}, "isTpsConditionSatisfied No", "isTpsConditionSatisfied Yes" + indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" + indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9780,10 +9792,15 @@ dialog = tcuControls, "Transmission Settings" panel = NitrousControlButtonDialog, {nitrousControlArmingMethod == 0} panel = NitrousControlLuaGaugeDialog, {nitrousControlArmingMethod == 1} + dialog = NitrousControlSettings, "Settings" + field = "Minimum TPS", nitrousMinimumTps + field = "Minimum CLT", nitrousMinimumClt + field = "Maximum MAP", nitrousMaximumMap + dialog = NitrousControlSettingsDialog, "", yAxis field = "Enable Nitrous Control", nitrousControlEnabled panel = NitrousControlArmingMethodDialog, {nitrousControlEnabled == 1} -; panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))} + panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))} dialog = NitrousControlDialog panel = NitrousControlSettingsDialog, West diff --git a/firmware/tunerstudio/generated/rusefi_m74_9.ini b/firmware/tunerstudio/generated/rusefi_m74_9.ini index 5d67802d24..1369e5c834 100644 --- a/firmware/tunerstudio/generated/rusefi_m74_9.ini +++ b/firmware/tunerstudio/generated/rusefi_m74_9.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.11.28.m74_9.3113553363" + signature = "rusEFI master.2024.11.28.m74_9.3561117899" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.11.28.m74_9.3113553363" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.11.28.m74_9.3561117899" ; 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 @@ -1432,7 +1432,10 @@ nitrousControlTriggerPinMode = bits, U08, 3936, [0:1], "DEFAULT", "PULLUP", "PUL nitrousLuaGauge = bits, S08, 3937, [0:2], "Lua Gauge 1", "Lua Gauge 2", "Lua Gauge 3", "Lua Gauge 4", "Lua Gauge 5", "Lua Gauge 6", "Lua Gauge 7", "Lua Gauge 8" nitrousLuaGaugeMeaning = bits, S08, 3938, [3:3], "Lower Bound", "Upper Bound" nitrousLuaGaugeArmingValue = scalar, F32, 3940, "", 1, 0, -30000, 30000, 3 -unusedOftenChangesDuringFirmwareUpdate = array, U08, 3944, [94], "units", 1, 0, 0, 1, 0 +nitrousMinimumTps = scalar, S32, 3944, "", 1, 0, 0, 20000, 0 +nitrousMinimumClt = scalar, U08, 3948, "deg C", 1, 0, 0, 250, 0 +nitrousMaximumMap = scalar, S16, 3950, "kPa", 1, 0, 0, 1000, 0 +unusedOftenChangesDuringFirmwareUpdate = array, U08, 3952, [87], "units", 1, 0, 0, 1, 0 postCrankingFactor = array, F32, 4040, [6x6], "mult", 1, 0, 1, 3, 2 postCrankingDurationBins = array, F32, 4184, [6], "count", 1, 0, 0, 1000, 0 postCrankingCLTBins = array, S16, 4208, [6], "C", 1, 0, -100, 250, 0 @@ -3223,6 +3226,9 @@ isAppConditionSatisfied = bits, U32, 1124, [4:4] isFlatShiftConditionSatisfied = bits, U32, 1124, [5:5] ; total TS size = 1128 isArmed = bits, U32, 1128, [0:0] +isTpsConditionSatisfied = bits, U32, 1128, [1:1] +isCltConditionSatisfied = bits, U32, 1128, [2:2] +isMapConditionSatisfied = bits, U32, 1128, [3:3] ; total TS size = 1132 isAntilagCondition = bits, U32, 1132, [0:0] ALSMinRPMCondition = bits, U32, 1132, [1:1] @@ -5801,6 +5807,9 @@ entry = isRpmConditionSatisfied, "isRpmConditionSatisfied", int, "%d" entry = isAppConditionSatisfied, "isAppConditionSatisfied", int, "%d" entry = isFlatShiftConditionSatisfied, "isFlatShiftConditionSatisfied", int, "%d" entry = isArmed, "isArmed", int, "%d" +entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" +entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" +entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" entry = isAntilagCondition, "isAntilagCondition", int, "%d" entry = ALSMinRPMCondition, "ALSMinRPMCondition", int, "%d" entry = ALSMaxRPMCondition, "ALSMaxRPMCondition", int, "%d" @@ -6780,6 +6789,9 @@ dialog = shift_torque_reduction_stateDialog, "shift_torque_reduction_state" indicatorPanel = nitrous_control_stateIndicatorPanel, 2 indicator = {isArmed}, "isArmed No", "isArmed Yes" + indicator = {isTpsConditionSatisfied}, "isTpsConditionSatisfied No", "isTpsConditionSatisfied Yes" + indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" + indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9784,10 +9796,15 @@ dialog = tcuControls, "Transmission Settings" panel = NitrousControlButtonDialog, {nitrousControlArmingMethod == 0} panel = NitrousControlLuaGaugeDialog, {nitrousControlArmingMethod == 1} + dialog = NitrousControlSettings, "Settings" + field = "Minimum TPS", nitrousMinimumTps + field = "Minimum CLT", nitrousMinimumClt + field = "Maximum MAP", nitrousMaximumMap + dialog = NitrousControlSettingsDialog, "", yAxis field = "Enable Nitrous Control", nitrousControlEnabled panel = NitrousControlArmingMethodDialog, {nitrousControlEnabled == 1} -; panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))} + panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))} dialog = NitrousControlDialog panel = NitrousControlSettingsDialog, West diff --git a/firmware/tunerstudio/generated/rusefi_mre-legacy_f4.ini b/firmware/tunerstudio/generated/rusefi_mre-legacy_f4.ini index 30fca091bd..441a99c816 100644 --- a/firmware/tunerstudio/generated/rusefi_mre-legacy_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_mre-legacy_f4.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.11.28.mre-legacy_f4.1179776207" + signature = "rusEFI master.2024.11.28.mre-legacy_f4.730243543" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.11.28.mre-legacy_f4.1179776207" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.11.28.mre-legacy_f4.730243543" ; 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 @@ -1432,7 +1432,10 @@ nitrousControlTriggerPinMode = bits, U08, 3936, [0:1], "DEFAULT", "PULLUP", "PUL nitrousLuaGauge = bits, S08, 3937, [0:2], "Lua Gauge 1", "Lua Gauge 2", "Lua Gauge 3", "Lua Gauge 4", "Lua Gauge 5", "Lua Gauge 6", "Lua Gauge 7", "Lua Gauge 8" nitrousLuaGaugeMeaning = bits, S08, 3938, [3:3], "Lower Bound", "Upper Bound" nitrousLuaGaugeArmingValue = scalar, F32, 3940, "", 1, 0, -30000, 30000, 3 -unusedOftenChangesDuringFirmwareUpdate = array, U08, 3944, [94], "units", 1, 0, 0, 1, 0 +nitrousMinimumTps = scalar, S32, 3944, "", 1, 0, 0, 20000, 0 +nitrousMinimumClt = scalar, U08, 3948, "deg C", 1, 0, 0, 250, 0 +nitrousMaximumMap = scalar, S16, 3950, "kPa", 1, 0, 0, 1000, 0 +unusedOftenChangesDuringFirmwareUpdate = array, U08, 3952, [87], "units", 1, 0, 0, 1, 0 postCrankingFactor = array, F32, 4040, [6x6], "mult", 1, 0, 1, 3, 2 postCrankingDurationBins = array, F32, 4184, [6], "count", 1, 0, 0, 1000, 0 postCrankingCLTBins = array, S16, 4208, [6], "C", 1, 0, -100, 250, 0 @@ -3223,6 +3226,9 @@ isAppConditionSatisfied = bits, U32, 1124, [4:4] isFlatShiftConditionSatisfied = bits, U32, 1124, [5:5] ; total TS size = 1128 isArmed = bits, U32, 1128, [0:0] +isTpsConditionSatisfied = bits, U32, 1128, [1:1] +isCltConditionSatisfied = bits, U32, 1128, [2:2] +isMapConditionSatisfied = bits, U32, 1128, [3:3] ; total TS size = 1132 isAntilagCondition = bits, U32, 1132, [0:0] ALSMinRPMCondition = bits, U32, 1132, [1:1] @@ -5799,6 +5805,9 @@ entry = isRpmConditionSatisfied, "isRpmConditionSatisfied", int, "%d" entry = isAppConditionSatisfied, "isAppConditionSatisfied", int, "%d" entry = isFlatShiftConditionSatisfied, "isFlatShiftConditionSatisfied", int, "%d" entry = isArmed, "isArmed", int, "%d" +entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" +entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" +entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" entry = isAntilagCondition, "isAntilagCondition", int, "%d" entry = ALSMinRPMCondition, "ALSMinRPMCondition", int, "%d" entry = ALSMaxRPMCondition, "ALSMaxRPMCondition", int, "%d" @@ -6793,6 +6802,9 @@ dialog = shift_torque_reduction_stateDialog, "shift_torque_reduction_state" indicatorPanel = nitrous_control_stateIndicatorPanel, 2 indicator = {isArmed}, "isArmed No", "isArmed Yes" + indicator = {isTpsConditionSatisfied}, "isTpsConditionSatisfied No", "isTpsConditionSatisfied Yes" + indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" + indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9755,10 +9767,15 @@ commandButton = "microRusEFI M111", cmd_set_engine_type_MERCEDES_M11 panel = NitrousControlButtonDialog, {nitrousControlArmingMethod == 0} panel = NitrousControlLuaGaugeDialog, {nitrousControlArmingMethod == 1} + dialog = NitrousControlSettings, "Settings" + field = "Minimum TPS", nitrousMinimumTps + field = "Minimum CLT", nitrousMinimumClt + field = "Maximum MAP", nitrousMaximumMap + dialog = NitrousControlSettingsDialog, "", yAxis field = "Enable Nitrous Control", nitrousControlEnabled panel = NitrousControlArmingMethodDialog, {nitrousControlEnabled == 1} -; panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))} + panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))} dialog = NitrousControlDialog panel = NitrousControlSettingsDialog, West diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index ec72413e8b..cbd9b7f913 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f4.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.11.28.mre_f4.1179776207" + signature = "rusEFI master.2024.11.28.mre_f4.730243543" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.11.28.mre_f4.1179776207" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.11.28.mre_f4.730243543" ; 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 @@ -1432,7 +1432,10 @@ nitrousControlTriggerPinMode = bits, U08, 3936, [0:1], "DEFAULT", "PULLUP", "PUL nitrousLuaGauge = bits, S08, 3937, [0:2], "Lua Gauge 1", "Lua Gauge 2", "Lua Gauge 3", "Lua Gauge 4", "Lua Gauge 5", "Lua Gauge 6", "Lua Gauge 7", "Lua Gauge 8" nitrousLuaGaugeMeaning = bits, S08, 3938, [3:3], "Lower Bound", "Upper Bound" nitrousLuaGaugeArmingValue = scalar, F32, 3940, "", 1, 0, -30000, 30000, 3 -unusedOftenChangesDuringFirmwareUpdate = array, U08, 3944, [94], "units", 1, 0, 0, 1, 0 +nitrousMinimumTps = scalar, S32, 3944, "", 1, 0, 0, 20000, 0 +nitrousMinimumClt = scalar, U08, 3948, "deg C", 1, 0, 0, 250, 0 +nitrousMaximumMap = scalar, S16, 3950, "kPa", 1, 0, 0, 1000, 0 +unusedOftenChangesDuringFirmwareUpdate = array, U08, 3952, [87], "units", 1, 0, 0, 1, 0 postCrankingFactor = array, F32, 4040, [6x6], "mult", 1, 0, 1, 3, 2 postCrankingDurationBins = array, F32, 4184, [6], "count", 1, 0, 0, 1000, 0 postCrankingCLTBins = array, S16, 4208, [6], "C", 1, 0, -100, 250, 0 @@ -3223,6 +3226,9 @@ isAppConditionSatisfied = bits, U32, 1124, [4:4] isFlatShiftConditionSatisfied = bits, U32, 1124, [5:5] ; total TS size = 1128 isArmed = bits, U32, 1128, [0:0] +isTpsConditionSatisfied = bits, U32, 1128, [1:1] +isCltConditionSatisfied = bits, U32, 1128, [2:2] +isMapConditionSatisfied = bits, U32, 1128, [3:3] ; total TS size = 1132 isAntilagCondition = bits, U32, 1132, [0:0] ALSMinRPMCondition = bits, U32, 1132, [1:1] @@ -5799,6 +5805,9 @@ entry = isRpmConditionSatisfied, "isRpmConditionSatisfied", int, "%d" entry = isAppConditionSatisfied, "isAppConditionSatisfied", int, "%d" entry = isFlatShiftConditionSatisfied, "isFlatShiftConditionSatisfied", int, "%d" entry = isArmed, "isArmed", int, "%d" +entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" +entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" +entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" entry = isAntilagCondition, "isAntilagCondition", int, "%d" entry = ALSMinRPMCondition, "ALSMinRPMCondition", int, "%d" entry = ALSMaxRPMCondition, "ALSMaxRPMCondition", int, "%d" @@ -6793,6 +6802,9 @@ dialog = shift_torque_reduction_stateDialog, "shift_torque_reduction_state" indicatorPanel = nitrous_control_stateIndicatorPanel, 2 indicator = {isArmed}, "isArmed No", "isArmed Yes" + indicator = {isTpsConditionSatisfied}, "isTpsConditionSatisfied No", "isTpsConditionSatisfied Yes" + indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" + indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9755,10 +9767,15 @@ commandButton = "microRusEFI M111", cmd_set_engine_type_MERCEDES_M11 panel = NitrousControlButtonDialog, {nitrousControlArmingMethod == 0} panel = NitrousControlLuaGaugeDialog, {nitrousControlArmingMethod == 1} + dialog = NitrousControlSettings, "Settings" + field = "Minimum TPS", nitrousMinimumTps + field = "Minimum CLT", nitrousMinimumClt + field = "Maximum MAP", nitrousMaximumMap + dialog = NitrousControlSettingsDialog, "", yAxis field = "Enable Nitrous Control", nitrousControlEnabled panel = NitrousControlArmingMethodDialog, {nitrousControlEnabled == 1} -; panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))} + panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))} dialog = NitrousControlDialog panel = NitrousControlSettingsDialog, West diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index 9faabe9706..bd8e01d403 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f7.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.11.28.mre_f7.1179776207" + signature = "rusEFI master.2024.11.28.mre_f7.730243543" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.11.28.mre_f7.1179776207" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.11.28.mre_f7.730243543" ; 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 @@ -1432,7 +1432,10 @@ nitrousControlTriggerPinMode = bits, U08, 3936, [0:1], "DEFAULT", "PULLUP", "PUL nitrousLuaGauge = bits, S08, 3937, [0:2], "Lua Gauge 1", "Lua Gauge 2", "Lua Gauge 3", "Lua Gauge 4", "Lua Gauge 5", "Lua Gauge 6", "Lua Gauge 7", "Lua Gauge 8" nitrousLuaGaugeMeaning = bits, S08, 3938, [3:3], "Lower Bound", "Upper Bound" nitrousLuaGaugeArmingValue = scalar, F32, 3940, "", 1, 0, -30000, 30000, 3 -unusedOftenChangesDuringFirmwareUpdate = array, U08, 3944, [94], "units", 1, 0, 0, 1, 0 +nitrousMinimumTps = scalar, S32, 3944, "", 1, 0, 0, 20000, 0 +nitrousMinimumClt = scalar, U08, 3948, "deg C", 1, 0, 0, 250, 0 +nitrousMaximumMap = scalar, S16, 3950, "kPa", 1, 0, 0, 1000, 0 +unusedOftenChangesDuringFirmwareUpdate = array, U08, 3952, [87], "units", 1, 0, 0, 1, 0 postCrankingFactor = array, F32, 4040, [6x6], "mult", 1, 0, 1, 3, 2 postCrankingDurationBins = array, F32, 4184, [6], "count", 1, 0, 0, 1000, 0 postCrankingCLTBins = array, S16, 4208, [6], "C", 1, 0, -100, 250, 0 @@ -3223,6 +3226,9 @@ isAppConditionSatisfied = bits, U32, 1124, [4:4] isFlatShiftConditionSatisfied = bits, U32, 1124, [5:5] ; total TS size = 1128 isArmed = bits, U32, 1128, [0:0] +isTpsConditionSatisfied = bits, U32, 1128, [1:1] +isCltConditionSatisfied = bits, U32, 1128, [2:2] +isMapConditionSatisfied = bits, U32, 1128, [3:3] ; total TS size = 1132 isAntilagCondition = bits, U32, 1132, [0:0] ALSMinRPMCondition = bits, U32, 1132, [1:1] @@ -5799,6 +5805,9 @@ entry = isRpmConditionSatisfied, "isRpmConditionSatisfied", int, "%d" entry = isAppConditionSatisfied, "isAppConditionSatisfied", int, "%d" entry = isFlatShiftConditionSatisfied, "isFlatShiftConditionSatisfied", int, "%d" entry = isArmed, "isArmed", int, "%d" +entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" +entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" +entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" entry = isAntilagCondition, "isAntilagCondition", int, "%d" entry = ALSMinRPMCondition, "ALSMinRPMCondition", int, "%d" entry = ALSMaxRPMCondition, "ALSMaxRPMCondition", int, "%d" @@ -6793,6 +6802,9 @@ dialog = shift_torque_reduction_stateDialog, "shift_torque_reduction_state" indicatorPanel = nitrous_control_stateIndicatorPanel, 2 indicator = {isArmed}, "isArmed No", "isArmed Yes" + indicator = {isTpsConditionSatisfied}, "isTpsConditionSatisfied No", "isTpsConditionSatisfied Yes" + indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" + indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9755,10 +9767,15 @@ commandButton = "microRusEFI M111", cmd_set_engine_type_MERCEDES_M11 panel = NitrousControlButtonDialog, {nitrousControlArmingMethod == 0} panel = NitrousControlLuaGaugeDialog, {nitrousControlArmingMethod == 1} + dialog = NitrousControlSettings, "Settings" + field = "Minimum TPS", nitrousMinimumTps + field = "Minimum CLT", nitrousMinimumClt + field = "Maximum MAP", nitrousMaximumMap + dialog = NitrousControlSettingsDialog, "", yAxis field = "Enable Nitrous Control", nitrousControlEnabled panel = NitrousControlArmingMethodDialog, {nitrousControlEnabled == 1} -; panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))} + panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))} dialog = NitrousControlDialog panel = NitrousControlSettingsDialog, West diff --git a/firmware/tunerstudio/generated/rusefi_nucleo_f413.ini b/firmware/tunerstudio/generated/rusefi_nucleo_f413.ini index 24a5f48852..ed605ad4a6 100644 --- a/firmware/tunerstudio/generated/rusefi_nucleo_f413.ini +++ b/firmware/tunerstudio/generated/rusefi_nucleo_f413.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.11.28.nucleo_f413.221197580" + signature = "rusEFI master.2024.11.28.nucleo_f413.1626890260" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.11.28.nucleo_f413.221197580" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.11.28.nucleo_f413.1626890260" ; 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 @@ -1432,7 +1432,10 @@ nitrousControlTriggerPinMode = bits, U08, 3936, [0:1], "DEFAULT", "PULLUP", "PUL nitrousLuaGauge = bits, S08, 3937, [0:2], "Lua Gauge 1", "Lua Gauge 2", "Lua Gauge 3", "Lua Gauge 4", "Lua Gauge 5", "Lua Gauge 6", "Lua Gauge 7", "Lua Gauge 8" nitrousLuaGaugeMeaning = bits, S08, 3938, [3:3], "Lower Bound", "Upper Bound" nitrousLuaGaugeArmingValue = scalar, F32, 3940, "", 1, 0, -30000, 30000, 3 -unusedOftenChangesDuringFirmwareUpdate = array, U08, 3944, [94], "units", 1, 0, 0, 1, 0 +nitrousMinimumTps = scalar, S32, 3944, "", 1, 0, 0, 20000, 0 +nitrousMinimumClt = scalar, U08, 3948, "deg C", 1, 0, 0, 250, 0 +nitrousMaximumMap = scalar, S16, 3950, "kPa", 1, 0, 0, 1000, 0 +unusedOftenChangesDuringFirmwareUpdate = array, U08, 3952, [87], "units", 1, 0, 0, 1, 0 postCrankingFactor = array, F32, 4040, [6x6], "mult", 1, 0, 1, 3, 2 postCrankingDurationBins = array, F32, 4184, [6], "count", 1, 0, 0, 1000, 0 postCrankingCLTBins = array, S16, 4208, [6], "C", 1, 0, -100, 250, 0 @@ -3223,6 +3226,9 @@ isAppConditionSatisfied = bits, U32, 1124, [4:4] isFlatShiftConditionSatisfied = bits, U32, 1124, [5:5] ; total TS size = 1128 isArmed = bits, U32, 1128, [0:0] +isTpsConditionSatisfied = bits, U32, 1128, [1:1] +isCltConditionSatisfied = bits, U32, 1128, [2:2] +isMapConditionSatisfied = bits, U32, 1128, [3:3] ; total TS size = 1132 isAntilagCondition = bits, U32, 1132, [0:0] ALSMinRPMCondition = bits, U32, 1132, [1:1] @@ -5801,6 +5807,9 @@ entry = isRpmConditionSatisfied, "isRpmConditionSatisfied", int, "%d" entry = isAppConditionSatisfied, "isAppConditionSatisfied", int, "%d" entry = isFlatShiftConditionSatisfied, "isFlatShiftConditionSatisfied", int, "%d" entry = isArmed, "isArmed", int, "%d" +entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" +entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" +entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" entry = isAntilagCondition, "isAntilagCondition", int, "%d" entry = ALSMinRPMCondition, "ALSMinRPMCondition", int, "%d" entry = ALSMaxRPMCondition, "ALSMaxRPMCondition", int, "%d" @@ -6777,6 +6786,9 @@ dialog = shift_torque_reduction_stateDialog, "shift_torque_reduction_state" indicatorPanel = nitrous_control_stateIndicatorPanel, 2 indicator = {isArmed}, "isArmed No", "isArmed Yes" + indicator = {isTpsConditionSatisfied}, "isTpsConditionSatisfied No", "isTpsConditionSatisfied Yes" + indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" + indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9806,10 +9818,15 @@ dialog = tcuControls, "Transmission Settings" panel = NitrousControlButtonDialog, {nitrousControlArmingMethod == 0} panel = NitrousControlLuaGaugeDialog, {nitrousControlArmingMethod == 1} + dialog = NitrousControlSettings, "Settings" + field = "Minimum TPS", nitrousMinimumTps + field = "Minimum CLT", nitrousMinimumClt + field = "Maximum MAP", nitrousMaximumMap + dialog = NitrousControlSettingsDialog, "", yAxis field = "Enable Nitrous Control", nitrousControlEnabled panel = NitrousControlArmingMethodDialog, {nitrousControlEnabled == 1} -; panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))} + panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))} dialog = NitrousControlDialog panel = NitrousControlSettingsDialog, West diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index 2d5cc7a8e5..211e97931a 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.11.28.proteus_f4.2919678414" + signature = "rusEFI master.2024.11.28.proteus_f4.3285292246" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.11.28.proteus_f4.2919678414" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.11.28.proteus_f4.3285292246" ; 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 @@ -1432,7 +1432,10 @@ nitrousControlTriggerPinMode = bits, U08, 3936, [0:1], "DEFAULT", "PULLUP", "PUL nitrousLuaGauge = bits, S08, 3937, [0:2], "Lua Gauge 1", "Lua Gauge 2", "Lua Gauge 3", "Lua Gauge 4", "Lua Gauge 5", "Lua Gauge 6", "Lua Gauge 7", "Lua Gauge 8" nitrousLuaGaugeMeaning = bits, S08, 3938, [3:3], "Lower Bound", "Upper Bound" nitrousLuaGaugeArmingValue = scalar, F32, 3940, "", 1, 0, -30000, 30000, 3 -unusedOftenChangesDuringFirmwareUpdate = array, U08, 3944, [94], "units", 1, 0, 0, 1, 0 +nitrousMinimumTps = scalar, S32, 3944, "", 1, 0, 0, 20000, 0 +nitrousMinimumClt = scalar, U08, 3948, "deg C", 1, 0, 0, 250, 0 +nitrousMaximumMap = scalar, S16, 3950, "kPa", 1, 0, 0, 1000, 0 +unusedOftenChangesDuringFirmwareUpdate = array, U08, 3952, [87], "units", 1, 0, 0, 1, 0 postCrankingFactor = array, F32, 4040, [6x6], "mult", 1, 0, 1, 3, 2 postCrankingDurationBins = array, F32, 4184, [6], "count", 1, 0, 0, 1000, 0 postCrankingCLTBins = array, S16, 4208, [6], "C", 1, 0, -100, 250, 0 @@ -3223,6 +3226,9 @@ isAppConditionSatisfied = bits, U32, 1124, [4:4] isFlatShiftConditionSatisfied = bits, U32, 1124, [5:5] ; total TS size = 1128 isArmed = bits, U32, 1128, [0:0] +isTpsConditionSatisfied = bits, U32, 1128, [1:1] +isCltConditionSatisfied = bits, U32, 1128, [2:2] +isMapConditionSatisfied = bits, U32, 1128, [3:3] ; total TS size = 1132 isAntilagCondition = bits, U32, 1132, [0:0] ALSMinRPMCondition = bits, U32, 1132, [1:1] @@ -5802,6 +5808,9 @@ entry = isRpmConditionSatisfied, "isRpmConditionSatisfied", int, "%d" entry = isAppConditionSatisfied, "isAppConditionSatisfied", int, "%d" entry = isFlatShiftConditionSatisfied, "isFlatShiftConditionSatisfied", int, "%d" entry = isArmed, "isArmed", int, "%d" +entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" +entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" +entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" entry = isAntilagCondition, "isAntilagCondition", int, "%d" entry = ALSMinRPMCondition, "ALSMinRPMCondition", int, "%d" entry = ALSMaxRPMCondition, "ALSMaxRPMCondition", int, "%d" @@ -6805,6 +6814,9 @@ dialog = shift_torque_reduction_stateDialog, "shift_torque_reduction_state" indicatorPanel = nitrous_control_stateIndicatorPanel, 2 indicator = {isArmed}, "isArmed No", "isArmed Yes" + indicator = {isTpsConditionSatisfied}, "isTpsConditionSatisfied No", "isTpsConditionSatisfied Yes" + indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" + indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9817,10 +9829,15 @@ commandButton = "Fuel Bench", cmd_set_engine_type_FUEL_BENCH panel = NitrousControlButtonDialog, {nitrousControlArmingMethod == 0} panel = NitrousControlLuaGaugeDialog, {nitrousControlArmingMethod == 1} + dialog = NitrousControlSettings, "Settings" + field = "Minimum TPS", nitrousMinimumTps + field = "Minimum CLT", nitrousMinimumClt + field = "Maximum MAP", nitrousMaximumMap + dialog = NitrousControlSettingsDialog, "", yAxis field = "Enable Nitrous Control", nitrousControlEnabled panel = NitrousControlArmingMethodDialog, {nitrousControlEnabled == 1} -; panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))} + panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))} dialog = NitrousControlDialog panel = NitrousControlSettingsDialog, West diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index 81917f117b..8f5a98a488 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.11.28.proteus_f7.2919678414" + signature = "rusEFI master.2024.11.28.proteus_f7.3285292246" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.11.28.proteus_f7.2919678414" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.11.28.proteus_f7.3285292246" ; 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 @@ -1432,7 +1432,10 @@ nitrousControlTriggerPinMode = bits, U08, 3936, [0:1], "DEFAULT", "PULLUP", "PUL nitrousLuaGauge = bits, S08, 3937, [0:2], "Lua Gauge 1", "Lua Gauge 2", "Lua Gauge 3", "Lua Gauge 4", "Lua Gauge 5", "Lua Gauge 6", "Lua Gauge 7", "Lua Gauge 8" nitrousLuaGaugeMeaning = bits, S08, 3938, [3:3], "Lower Bound", "Upper Bound" nitrousLuaGaugeArmingValue = scalar, F32, 3940, "", 1, 0, -30000, 30000, 3 -unusedOftenChangesDuringFirmwareUpdate = array, U08, 3944, [94], "units", 1, 0, 0, 1, 0 +nitrousMinimumTps = scalar, S32, 3944, "", 1, 0, 0, 20000, 0 +nitrousMinimumClt = scalar, U08, 3948, "deg C", 1, 0, 0, 250, 0 +nitrousMaximumMap = scalar, S16, 3950, "kPa", 1, 0, 0, 1000, 0 +unusedOftenChangesDuringFirmwareUpdate = array, U08, 3952, [87], "units", 1, 0, 0, 1, 0 postCrankingFactor = array, F32, 4040, [6x6], "mult", 1, 0, 1, 3, 2 postCrankingDurationBins = array, F32, 4184, [6], "count", 1, 0, 0, 1000, 0 postCrankingCLTBins = array, S16, 4208, [6], "C", 1, 0, -100, 250, 0 @@ -3223,6 +3226,9 @@ isAppConditionSatisfied = bits, U32, 1124, [4:4] isFlatShiftConditionSatisfied = bits, U32, 1124, [5:5] ; total TS size = 1128 isArmed = bits, U32, 1128, [0:0] +isTpsConditionSatisfied = bits, U32, 1128, [1:1] +isCltConditionSatisfied = bits, U32, 1128, [2:2] +isMapConditionSatisfied = bits, U32, 1128, [3:3] ; total TS size = 1132 isAntilagCondition = bits, U32, 1132, [0:0] ALSMinRPMCondition = bits, U32, 1132, [1:1] @@ -5802,6 +5808,9 @@ entry = isRpmConditionSatisfied, "isRpmConditionSatisfied", int, "%d" entry = isAppConditionSatisfied, "isAppConditionSatisfied", int, "%d" entry = isFlatShiftConditionSatisfied, "isFlatShiftConditionSatisfied", int, "%d" entry = isArmed, "isArmed", int, "%d" +entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" +entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" +entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" entry = isAntilagCondition, "isAntilagCondition", int, "%d" entry = ALSMinRPMCondition, "ALSMinRPMCondition", int, "%d" entry = ALSMaxRPMCondition, "ALSMaxRPMCondition", int, "%d" @@ -6805,6 +6814,9 @@ dialog = shift_torque_reduction_stateDialog, "shift_torque_reduction_state" indicatorPanel = nitrous_control_stateIndicatorPanel, 2 indicator = {isArmed}, "isArmed No", "isArmed Yes" + indicator = {isTpsConditionSatisfied}, "isTpsConditionSatisfied No", "isTpsConditionSatisfied Yes" + indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" + indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9817,10 +9829,15 @@ commandButton = "Fuel Bench", cmd_set_engine_type_FUEL_BENCH panel = NitrousControlButtonDialog, {nitrousControlArmingMethod == 0} panel = NitrousControlLuaGaugeDialog, {nitrousControlArmingMethod == 1} + dialog = NitrousControlSettings, "Settings" + field = "Minimum TPS", nitrousMinimumTps + field = "Minimum CLT", nitrousMinimumClt + field = "Maximum MAP", nitrousMaximumMap + dialog = NitrousControlSettingsDialog, "", yAxis field = "Enable Nitrous Control", nitrousControlEnabled panel = NitrousControlArmingMethodDialog, {nitrousControlEnabled == 1} -; panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))} + panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))} dialog = NitrousControlDialog panel = NitrousControlSettingsDialog, West diff --git a/firmware/tunerstudio/generated/rusefi_proteus_h7.ini b/firmware/tunerstudio/generated/rusefi_proteus_h7.ini index e28e97c684..d505f836cd 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_h7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_h7.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.11.28.proteus_h7.2919678414" + signature = "rusEFI master.2024.11.28.proteus_h7.3285292246" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.11.28.proteus_h7.2919678414" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.11.28.proteus_h7.3285292246" ; 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 @@ -1432,7 +1432,10 @@ nitrousControlTriggerPinMode = bits, U08, 3936, [0:1], "DEFAULT", "PULLUP", "PUL nitrousLuaGauge = bits, S08, 3937, [0:2], "Lua Gauge 1", "Lua Gauge 2", "Lua Gauge 3", "Lua Gauge 4", "Lua Gauge 5", "Lua Gauge 6", "Lua Gauge 7", "Lua Gauge 8" nitrousLuaGaugeMeaning = bits, S08, 3938, [3:3], "Lower Bound", "Upper Bound" nitrousLuaGaugeArmingValue = scalar, F32, 3940, "", 1, 0, -30000, 30000, 3 -unusedOftenChangesDuringFirmwareUpdate = array, U08, 3944, [94], "units", 1, 0, 0, 1, 0 +nitrousMinimumTps = scalar, S32, 3944, "", 1, 0, 0, 20000, 0 +nitrousMinimumClt = scalar, U08, 3948, "deg C", 1, 0, 0, 250, 0 +nitrousMaximumMap = scalar, S16, 3950, "kPa", 1, 0, 0, 1000, 0 +unusedOftenChangesDuringFirmwareUpdate = array, U08, 3952, [87], "units", 1, 0, 0, 1, 0 postCrankingFactor = array, F32, 4040, [6x6], "mult", 1, 0, 1, 3, 2 postCrankingDurationBins = array, F32, 4184, [6], "count", 1, 0, 0, 1000, 0 postCrankingCLTBins = array, S16, 4208, [6], "C", 1, 0, -100, 250, 0 @@ -3223,6 +3226,9 @@ isAppConditionSatisfied = bits, U32, 1124, [4:4] isFlatShiftConditionSatisfied = bits, U32, 1124, [5:5] ; total TS size = 1128 isArmed = bits, U32, 1128, [0:0] +isTpsConditionSatisfied = bits, U32, 1128, [1:1] +isCltConditionSatisfied = bits, U32, 1128, [2:2] +isMapConditionSatisfied = bits, U32, 1128, [3:3] ; total TS size = 1132 isAntilagCondition = bits, U32, 1132, [0:0] ALSMinRPMCondition = bits, U32, 1132, [1:1] @@ -5802,6 +5808,9 @@ entry = isRpmConditionSatisfied, "isRpmConditionSatisfied", int, "%d" entry = isAppConditionSatisfied, "isAppConditionSatisfied", int, "%d" entry = isFlatShiftConditionSatisfied, "isFlatShiftConditionSatisfied", int, "%d" entry = isArmed, "isArmed", int, "%d" +entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" +entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" +entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" entry = isAntilagCondition, "isAntilagCondition", int, "%d" entry = ALSMinRPMCondition, "ALSMinRPMCondition", int, "%d" entry = ALSMaxRPMCondition, "ALSMaxRPMCondition", int, "%d" @@ -6805,6 +6814,9 @@ dialog = shift_torque_reduction_stateDialog, "shift_torque_reduction_state" indicatorPanel = nitrous_control_stateIndicatorPanel, 2 indicator = {isArmed}, "isArmed No", "isArmed Yes" + indicator = {isTpsConditionSatisfied}, "isTpsConditionSatisfied No", "isTpsConditionSatisfied Yes" + indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" + indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9817,10 +9829,15 @@ commandButton = "Fuel Bench", cmd_set_engine_type_FUEL_BENCH panel = NitrousControlButtonDialog, {nitrousControlArmingMethod == 0} panel = NitrousControlLuaGaugeDialog, {nitrousControlArmingMethod == 1} + dialog = NitrousControlSettings, "Settings" + field = "Minimum TPS", nitrousMinimumTps + field = "Minimum CLT", nitrousMinimumClt + field = "Maximum MAP", nitrousMaximumMap + dialog = NitrousControlSettingsDialog, "", yAxis field = "Enable Nitrous Control", nitrousControlEnabled panel = NitrousControlArmingMethodDialog, {nitrousControlEnabled == 1} -; panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))} + panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))} dialog = NitrousControlDialog panel = NitrousControlSettingsDialog, West diff --git a/firmware/tunerstudio/generated/rusefi_s105.ini b/firmware/tunerstudio/generated/rusefi_s105.ini index 491d1f906d..eabe518cee 100644 --- a/firmware/tunerstudio/generated/rusefi_s105.ini +++ b/firmware/tunerstudio/generated/rusefi_s105.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.11.28.s105.2997138894" + signature = "rusEFI master.2024.11.28.s105.3748913366" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.11.28.s105.2997138894" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.11.28.s105.3748913366" ; 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 @@ -1432,7 +1432,10 @@ nitrousControlTriggerPinMode = bits, U08, 3936, [0:1], "DEFAULT", "PULLUP", "PUL nitrousLuaGauge = bits, S08, 3937, [0:2], "Lua Gauge 1", "Lua Gauge 2", "Lua Gauge 3", "Lua Gauge 4", "Lua Gauge 5", "Lua Gauge 6", "Lua Gauge 7", "Lua Gauge 8" nitrousLuaGaugeMeaning = bits, S08, 3938, [3:3], "Lower Bound", "Upper Bound" nitrousLuaGaugeArmingValue = scalar, F32, 3940, "", 1, 0, -30000, 30000, 3 -unusedOftenChangesDuringFirmwareUpdate = array, U08, 3944, [94], "units", 1, 0, 0, 1, 0 +nitrousMinimumTps = scalar, S32, 3944, "", 1, 0, 0, 20000, 0 +nitrousMinimumClt = scalar, U08, 3948, "deg C", 1, 0, 0, 250, 0 +nitrousMaximumMap = scalar, S16, 3950, "kPa", 1, 0, 0, 1000, 0 +unusedOftenChangesDuringFirmwareUpdate = array, U08, 3952, [87], "units", 1, 0, 0, 1, 0 postCrankingFactor = array, F32, 4040, [6x6], "mult", 1, 0, 1, 3, 2 postCrankingDurationBins = array, F32, 4184, [6], "count", 1, 0, 0, 1000, 0 postCrankingCLTBins = array, S16, 4208, [6], "C", 1, 0, -100, 250, 0 @@ -3223,6 +3226,9 @@ isAppConditionSatisfied = bits, U32, 1124, [4:4] isFlatShiftConditionSatisfied = bits, U32, 1124, [5:5] ; total TS size = 1128 isArmed = bits, U32, 1128, [0:0] +isTpsConditionSatisfied = bits, U32, 1128, [1:1] +isCltConditionSatisfied = bits, U32, 1128, [2:2] +isMapConditionSatisfied = bits, U32, 1128, [3:3] ; total TS size = 1132 isAntilagCondition = bits, U32, 1132, [0:0] ALSMinRPMCondition = bits, U32, 1132, [1:1] @@ -5801,6 +5807,9 @@ entry = isRpmConditionSatisfied, "isRpmConditionSatisfied", int, "%d" entry = isAppConditionSatisfied, "isAppConditionSatisfied", int, "%d" entry = isFlatShiftConditionSatisfied, "isFlatShiftConditionSatisfied", int, "%d" entry = isArmed, "isArmed", int, "%d" +entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" +entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" +entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" entry = isAntilagCondition, "isAntilagCondition", int, "%d" entry = ALSMinRPMCondition, "ALSMinRPMCondition", int, "%d" entry = ALSMaxRPMCondition, "ALSMaxRPMCondition", int, "%d" @@ -6778,6 +6787,9 @@ dialog = shift_torque_reduction_stateDialog, "shift_torque_reduction_state" indicatorPanel = nitrous_control_stateIndicatorPanel, 2 indicator = {isArmed}, "isArmed No", "isArmed Yes" + indicator = {isTpsConditionSatisfied}, "isTpsConditionSatisfied No", "isTpsConditionSatisfied Yes" + indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" + indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9782,10 +9794,15 @@ dialog = tcuControls, "Transmission Settings" panel = NitrousControlButtonDialog, {nitrousControlArmingMethod == 0} panel = NitrousControlLuaGaugeDialog, {nitrousControlArmingMethod == 1} + dialog = NitrousControlSettings, "Settings" + field = "Minimum TPS", nitrousMinimumTps + field = "Minimum CLT", nitrousMinimumClt + field = "Maximum MAP", nitrousMaximumMap + dialog = NitrousControlSettingsDialog, "", yAxis field = "Enable Nitrous Control", nitrousControlEnabled panel = NitrousControlArmingMethodDialog, {nitrousControlEnabled == 1} -; panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))} + panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))} dialog = NitrousControlDialog panel = NitrousControlSettingsDialog, West diff --git a/firmware/tunerstudio/generated/rusefi_small-can-board.ini b/firmware/tunerstudio/generated/rusefi_small-can-board.ini index 8d3b2bce87..2c24cc97cf 100644 --- a/firmware/tunerstudio/generated/rusefi_small-can-board.ini +++ b/firmware/tunerstudio/generated/rusefi_small-can-board.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.11.28.small-can-board.1372854305" + signature = "rusEFI master.2024.11.28.small-can-board.1006849337" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.11.28.small-can-board.1372854305" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.11.28.small-can-board.1006849337" ; 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 @@ -1432,7 +1432,10 @@ nitrousControlTriggerPinMode = bits, U08, 3936, [0:1], "DEFAULT", "PULLUP", "PUL nitrousLuaGauge = bits, S08, 3937, [0:2], "Lua Gauge 1", "Lua Gauge 2", "Lua Gauge 3", "Lua Gauge 4", "Lua Gauge 5", "Lua Gauge 6", "Lua Gauge 7", "Lua Gauge 8" nitrousLuaGaugeMeaning = bits, S08, 3938, [3:3], "Lower Bound", "Upper Bound" nitrousLuaGaugeArmingValue = scalar, F32, 3940, "", 1, 0, -30000, 30000, 3 -unusedOftenChangesDuringFirmwareUpdate = array, U08, 3944, [94], "units", 1, 0, 0, 1, 0 +nitrousMinimumTps = scalar, S32, 3944, "", 1, 0, 0, 20000, 0 +nitrousMinimumClt = scalar, U08, 3948, "deg C", 1, 0, 0, 250, 0 +nitrousMaximumMap = scalar, S16, 3950, "kPa", 1, 0, 0, 1000, 0 +unusedOftenChangesDuringFirmwareUpdate = array, U08, 3952, [87], "units", 1, 0, 0, 1, 0 postCrankingFactor = array, F32, 4040, [6x6], "mult", 1, 0, 1, 3, 2 postCrankingDurationBins = array, F32, 4184, [6], "count", 1, 0, 0, 1000, 0 postCrankingCLTBins = array, S16, 4208, [6], "C", 1, 0, -100, 250, 0 @@ -3223,6 +3226,9 @@ isAppConditionSatisfied = bits, U32, 1124, [4:4] isFlatShiftConditionSatisfied = bits, U32, 1124, [5:5] ; total TS size = 1128 isArmed = bits, U32, 1128, [0:0] +isTpsConditionSatisfied = bits, U32, 1128, [1:1] +isCltConditionSatisfied = bits, U32, 1128, [2:2] +isMapConditionSatisfied = bits, U32, 1128, [3:3] ; total TS size = 1132 isAntilagCondition = bits, U32, 1132, [0:0] ALSMinRPMCondition = bits, U32, 1132, [1:1] @@ -5801,6 +5807,9 @@ entry = isRpmConditionSatisfied, "isRpmConditionSatisfied", int, "%d" entry = isAppConditionSatisfied, "isAppConditionSatisfied", int, "%d" entry = isFlatShiftConditionSatisfied, "isFlatShiftConditionSatisfied", int, "%d" entry = isArmed, "isArmed", int, "%d" +entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" +entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" +entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" entry = isAntilagCondition, "isAntilagCondition", int, "%d" entry = ALSMinRPMCondition, "ALSMinRPMCondition", int, "%d" entry = ALSMaxRPMCondition, "ALSMaxRPMCondition", int, "%d" @@ -6777,6 +6786,9 @@ dialog = shift_torque_reduction_stateDialog, "shift_torque_reduction_state" indicatorPanel = nitrous_control_stateIndicatorPanel, 2 indicator = {isArmed}, "isArmed No", "isArmed Yes" + indicator = {isTpsConditionSatisfied}, "isTpsConditionSatisfied No", "isTpsConditionSatisfied Yes" + indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" + indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9797,10 +9809,15 @@ commandButton = "Honda BCM", cmd_set_engine_type_SMALL_CB_HONDA_BCM panel = NitrousControlButtonDialog, {nitrousControlArmingMethod == 0} panel = NitrousControlLuaGaugeDialog, {nitrousControlArmingMethod == 1} + dialog = NitrousControlSettings, "Settings" + field = "Minimum TPS", nitrousMinimumTps + field = "Minimum CLT", nitrousMinimumClt + field = "Maximum MAP", nitrousMaximumMap + dialog = NitrousControlSettingsDialog, "", yAxis field = "Enable Nitrous Control", nitrousControlEnabled panel = NitrousControlArmingMethodDialog, {nitrousControlEnabled == 1} -; panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))} + panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))} dialog = NitrousControlDialog panel = NitrousControlSettingsDialog, West diff --git a/firmware/tunerstudio/generated/rusefi_stm32f429_nucleo.ini b/firmware/tunerstudio/generated/rusefi_stm32f429_nucleo.ini index 66111d6d95..82123f9ffd 100644 --- a/firmware/tunerstudio/generated/rusefi_stm32f429_nucleo.ini +++ b/firmware/tunerstudio/generated/rusefi_stm32f429_nucleo.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.11.28.stm32f429_nucleo.221197580" + signature = "rusEFI master.2024.11.28.stm32f429_nucleo.1626890260" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.11.28.stm32f429_nucleo.221197580" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.11.28.stm32f429_nucleo.1626890260" ; 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 @@ -1432,7 +1432,10 @@ nitrousControlTriggerPinMode = bits, U08, 3936, [0:1], "DEFAULT", "PULLUP", "PUL nitrousLuaGauge = bits, S08, 3937, [0:2], "Lua Gauge 1", "Lua Gauge 2", "Lua Gauge 3", "Lua Gauge 4", "Lua Gauge 5", "Lua Gauge 6", "Lua Gauge 7", "Lua Gauge 8" nitrousLuaGaugeMeaning = bits, S08, 3938, [3:3], "Lower Bound", "Upper Bound" nitrousLuaGaugeArmingValue = scalar, F32, 3940, "", 1, 0, -30000, 30000, 3 -unusedOftenChangesDuringFirmwareUpdate = array, U08, 3944, [94], "units", 1, 0, 0, 1, 0 +nitrousMinimumTps = scalar, S32, 3944, "", 1, 0, 0, 20000, 0 +nitrousMinimumClt = scalar, U08, 3948, "deg C", 1, 0, 0, 250, 0 +nitrousMaximumMap = scalar, S16, 3950, "kPa", 1, 0, 0, 1000, 0 +unusedOftenChangesDuringFirmwareUpdate = array, U08, 3952, [87], "units", 1, 0, 0, 1, 0 postCrankingFactor = array, F32, 4040, [6x6], "mult", 1, 0, 1, 3, 2 postCrankingDurationBins = array, F32, 4184, [6], "count", 1, 0, 0, 1000, 0 postCrankingCLTBins = array, S16, 4208, [6], "C", 1, 0, -100, 250, 0 @@ -3223,6 +3226,9 @@ isAppConditionSatisfied = bits, U32, 1124, [4:4] isFlatShiftConditionSatisfied = bits, U32, 1124, [5:5] ; total TS size = 1128 isArmed = bits, U32, 1128, [0:0] +isTpsConditionSatisfied = bits, U32, 1128, [1:1] +isCltConditionSatisfied = bits, U32, 1128, [2:2] +isMapConditionSatisfied = bits, U32, 1128, [3:3] ; total TS size = 1132 isAntilagCondition = bits, U32, 1132, [0:0] ALSMinRPMCondition = bits, U32, 1132, [1:1] @@ -5801,6 +5807,9 @@ entry = isRpmConditionSatisfied, "isRpmConditionSatisfied", int, "%d" entry = isAppConditionSatisfied, "isAppConditionSatisfied", int, "%d" entry = isFlatShiftConditionSatisfied, "isFlatShiftConditionSatisfied", int, "%d" entry = isArmed, "isArmed", int, "%d" +entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" +entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" +entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" entry = isAntilagCondition, "isAntilagCondition", int, "%d" entry = ALSMinRPMCondition, "ALSMinRPMCondition", int, "%d" entry = ALSMaxRPMCondition, "ALSMaxRPMCondition", int, "%d" @@ -6777,6 +6786,9 @@ dialog = shift_torque_reduction_stateDialog, "shift_torque_reduction_state" indicatorPanel = nitrous_control_stateIndicatorPanel, 2 indicator = {isArmed}, "isArmed No", "isArmed Yes" + indicator = {isTpsConditionSatisfied}, "isTpsConditionSatisfied No", "isTpsConditionSatisfied Yes" + indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" + indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9806,10 +9818,15 @@ dialog = tcuControls, "Transmission Settings" panel = NitrousControlButtonDialog, {nitrousControlArmingMethod == 0} panel = NitrousControlLuaGaugeDialog, {nitrousControlArmingMethod == 1} + dialog = NitrousControlSettings, "Settings" + field = "Minimum TPS", nitrousMinimumTps + field = "Minimum CLT", nitrousMinimumClt + field = "Maximum MAP", nitrousMaximumMap + dialog = NitrousControlSettingsDialog, "", yAxis field = "Enable Nitrous Control", nitrousControlEnabled panel = NitrousControlArmingMethodDialog, {nitrousControlEnabled == 1} -; panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))} + panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))} dialog = NitrousControlDialog panel = NitrousControlSettingsDialog, West diff --git a/firmware/tunerstudio/generated/rusefi_stm32f767_nucleo.ini b/firmware/tunerstudio/generated/rusefi_stm32f767_nucleo.ini index c0fe29308c..3e3e4c7a98 100644 --- a/firmware/tunerstudio/generated/rusefi_stm32f767_nucleo.ini +++ b/firmware/tunerstudio/generated/rusefi_stm32f767_nucleo.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.11.28.stm32f767_nucleo.221197580" + signature = "rusEFI master.2024.11.28.stm32f767_nucleo.1626890260" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.11.28.stm32f767_nucleo.221197580" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.11.28.stm32f767_nucleo.1626890260" ; 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 @@ -1432,7 +1432,10 @@ nitrousControlTriggerPinMode = bits, U08, 3936, [0:1], "DEFAULT", "PULLUP", "PUL nitrousLuaGauge = bits, S08, 3937, [0:2], "Lua Gauge 1", "Lua Gauge 2", "Lua Gauge 3", "Lua Gauge 4", "Lua Gauge 5", "Lua Gauge 6", "Lua Gauge 7", "Lua Gauge 8" nitrousLuaGaugeMeaning = bits, S08, 3938, [3:3], "Lower Bound", "Upper Bound" nitrousLuaGaugeArmingValue = scalar, F32, 3940, "", 1, 0, -30000, 30000, 3 -unusedOftenChangesDuringFirmwareUpdate = array, U08, 3944, [94], "units", 1, 0, 0, 1, 0 +nitrousMinimumTps = scalar, S32, 3944, "", 1, 0, 0, 20000, 0 +nitrousMinimumClt = scalar, U08, 3948, "deg C", 1, 0, 0, 250, 0 +nitrousMaximumMap = scalar, S16, 3950, "kPa", 1, 0, 0, 1000, 0 +unusedOftenChangesDuringFirmwareUpdate = array, U08, 3952, [87], "units", 1, 0, 0, 1, 0 postCrankingFactor = array, F32, 4040, [6x6], "mult", 1, 0, 1, 3, 2 postCrankingDurationBins = array, F32, 4184, [6], "count", 1, 0, 0, 1000, 0 postCrankingCLTBins = array, S16, 4208, [6], "C", 1, 0, -100, 250, 0 @@ -3223,6 +3226,9 @@ isAppConditionSatisfied = bits, U32, 1124, [4:4] isFlatShiftConditionSatisfied = bits, U32, 1124, [5:5] ; total TS size = 1128 isArmed = bits, U32, 1128, [0:0] +isTpsConditionSatisfied = bits, U32, 1128, [1:1] +isCltConditionSatisfied = bits, U32, 1128, [2:2] +isMapConditionSatisfied = bits, U32, 1128, [3:3] ; total TS size = 1132 isAntilagCondition = bits, U32, 1132, [0:0] ALSMinRPMCondition = bits, U32, 1132, [1:1] @@ -5801,6 +5807,9 @@ entry = isRpmConditionSatisfied, "isRpmConditionSatisfied", int, "%d" entry = isAppConditionSatisfied, "isAppConditionSatisfied", int, "%d" entry = isFlatShiftConditionSatisfied, "isFlatShiftConditionSatisfied", int, "%d" entry = isArmed, "isArmed", int, "%d" +entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" +entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" +entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" entry = isAntilagCondition, "isAntilagCondition", int, "%d" entry = ALSMinRPMCondition, "ALSMinRPMCondition", int, "%d" entry = ALSMaxRPMCondition, "ALSMaxRPMCondition", int, "%d" @@ -6777,6 +6786,9 @@ dialog = shift_torque_reduction_stateDialog, "shift_torque_reduction_state" indicatorPanel = nitrous_control_stateIndicatorPanel, 2 indicator = {isArmed}, "isArmed No", "isArmed Yes" + indicator = {isTpsConditionSatisfied}, "isTpsConditionSatisfied No", "isTpsConditionSatisfied Yes" + indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" + indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9806,10 +9818,15 @@ dialog = tcuControls, "Transmission Settings" panel = NitrousControlButtonDialog, {nitrousControlArmingMethod == 0} panel = NitrousControlLuaGaugeDialog, {nitrousControlArmingMethod == 1} + dialog = NitrousControlSettings, "Settings" + field = "Minimum TPS", nitrousMinimumTps + field = "Minimum CLT", nitrousMinimumClt + field = "Maximum MAP", nitrousMaximumMap + dialog = NitrousControlSettingsDialog, "", yAxis field = "Enable Nitrous Control", nitrousControlEnabled panel = NitrousControlArmingMethodDialog, {nitrousControlEnabled == 1} -; panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))} + panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))} dialog = NitrousControlDialog panel = NitrousControlSettingsDialog, West diff --git a/firmware/tunerstudio/generated/rusefi_stm32h743_nucleo.ini b/firmware/tunerstudio/generated/rusefi_stm32h743_nucleo.ini index 25312baca4..7e8f6bea63 100644 --- a/firmware/tunerstudio/generated/rusefi_stm32h743_nucleo.ini +++ b/firmware/tunerstudio/generated/rusefi_stm32h743_nucleo.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.11.28.stm32h743_nucleo.221197580" + signature = "rusEFI master.2024.11.28.stm32h743_nucleo.1626890260" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.11.28.stm32h743_nucleo.221197580" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.11.28.stm32h743_nucleo.1626890260" ; 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 @@ -1432,7 +1432,10 @@ nitrousControlTriggerPinMode = bits, U08, 3936, [0:1], "DEFAULT", "PULLUP", "PUL nitrousLuaGauge = bits, S08, 3937, [0:2], "Lua Gauge 1", "Lua Gauge 2", "Lua Gauge 3", "Lua Gauge 4", "Lua Gauge 5", "Lua Gauge 6", "Lua Gauge 7", "Lua Gauge 8" nitrousLuaGaugeMeaning = bits, S08, 3938, [3:3], "Lower Bound", "Upper Bound" nitrousLuaGaugeArmingValue = scalar, F32, 3940, "", 1, 0, -30000, 30000, 3 -unusedOftenChangesDuringFirmwareUpdate = array, U08, 3944, [94], "units", 1, 0, 0, 1, 0 +nitrousMinimumTps = scalar, S32, 3944, "", 1, 0, 0, 20000, 0 +nitrousMinimumClt = scalar, U08, 3948, "deg C", 1, 0, 0, 250, 0 +nitrousMaximumMap = scalar, S16, 3950, "kPa", 1, 0, 0, 1000, 0 +unusedOftenChangesDuringFirmwareUpdate = array, U08, 3952, [87], "units", 1, 0, 0, 1, 0 postCrankingFactor = array, F32, 4040, [6x6], "mult", 1, 0, 1, 3, 2 postCrankingDurationBins = array, F32, 4184, [6], "count", 1, 0, 0, 1000, 0 postCrankingCLTBins = array, S16, 4208, [6], "C", 1, 0, -100, 250, 0 @@ -3223,6 +3226,9 @@ isAppConditionSatisfied = bits, U32, 1124, [4:4] isFlatShiftConditionSatisfied = bits, U32, 1124, [5:5] ; total TS size = 1128 isArmed = bits, U32, 1128, [0:0] +isTpsConditionSatisfied = bits, U32, 1128, [1:1] +isCltConditionSatisfied = bits, U32, 1128, [2:2] +isMapConditionSatisfied = bits, U32, 1128, [3:3] ; total TS size = 1132 isAntilagCondition = bits, U32, 1132, [0:0] ALSMinRPMCondition = bits, U32, 1132, [1:1] @@ -5801,6 +5807,9 @@ entry = isRpmConditionSatisfied, "isRpmConditionSatisfied", int, "%d" entry = isAppConditionSatisfied, "isAppConditionSatisfied", int, "%d" entry = isFlatShiftConditionSatisfied, "isFlatShiftConditionSatisfied", int, "%d" entry = isArmed, "isArmed", int, "%d" +entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" +entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" +entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" entry = isAntilagCondition, "isAntilagCondition", int, "%d" entry = ALSMinRPMCondition, "ALSMinRPMCondition", int, "%d" entry = ALSMaxRPMCondition, "ALSMaxRPMCondition", int, "%d" @@ -6777,6 +6786,9 @@ dialog = shift_torque_reduction_stateDialog, "shift_torque_reduction_state" indicatorPanel = nitrous_control_stateIndicatorPanel, 2 indicator = {isArmed}, "isArmed No", "isArmed Yes" + indicator = {isTpsConditionSatisfied}, "isTpsConditionSatisfied No", "isTpsConditionSatisfied Yes" + indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" + indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9806,10 +9818,15 @@ dialog = tcuControls, "Transmission Settings" panel = NitrousControlButtonDialog, {nitrousControlArmingMethod == 0} panel = NitrousControlLuaGaugeDialog, {nitrousControlArmingMethod == 1} + dialog = NitrousControlSettings, "Settings" + field = "Minimum TPS", nitrousMinimumTps + field = "Minimum CLT", nitrousMinimumClt + field = "Maximum MAP", nitrousMaximumMap + dialog = NitrousControlSettingsDialog, "", yAxis field = "Enable Nitrous Control", nitrousControlEnabled panel = NitrousControlArmingMethodDialog, {nitrousControlEnabled == 1} -; panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))} + panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))} dialog = NitrousControlDialog panel = NitrousControlSettingsDialog, West diff --git a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini index ee1818f8cf..212919a834 100644 --- a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.11.28.subaru_eg33_f7.1376652626" + signature = "rusEFI master.2024.11.28.subaru_eg33_f7.1071208522" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.11.28.subaru_eg33_f7.1376652626" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.11.28.subaru_eg33_f7.1071208522" ; 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 @@ -1432,7 +1432,10 @@ nitrousControlTriggerPinMode = bits, U08, 3936, [0:1], "DEFAULT", "PULLUP", "PUL nitrousLuaGauge = bits, S08, 3937, [0:2], "Lua Gauge 1", "Lua Gauge 2", "Lua Gauge 3", "Lua Gauge 4", "Lua Gauge 5", "Lua Gauge 6", "Lua Gauge 7", "Lua Gauge 8" nitrousLuaGaugeMeaning = bits, S08, 3938, [3:3], "Lower Bound", "Upper Bound" nitrousLuaGaugeArmingValue = scalar, F32, 3940, "", 1, 0, -30000, 30000, 3 -unusedOftenChangesDuringFirmwareUpdate = array, U08, 3944, [94], "units", 1, 0, 0, 1, 0 +nitrousMinimumTps = scalar, S32, 3944, "", 1, 0, 0, 20000, 0 +nitrousMinimumClt = scalar, U08, 3948, "deg C", 1, 0, 0, 125, 0 +nitrousMaximumMap = scalar, S16, 3950, "kPa", 1, 0, 0, 1000, 0 +unusedOftenChangesDuringFirmwareUpdate = array, U08, 3952, [87], "units", 1, 0, 0, 1, 0 postCrankingFactor = array, F32, 4040, [6x6], "mult", 1, 0, 1, 3, 2 postCrankingDurationBins = array, F32, 4184, [6], "count", 1, 0, 0, 1000, 0 postCrankingCLTBins = array, S16, 4208, [6], "C", 1, 0, -100, 125, 0 @@ -3223,6 +3226,9 @@ isAppConditionSatisfied = bits, U32, 1124, [4:4] isFlatShiftConditionSatisfied = bits, U32, 1124, [5:5] ; total TS size = 1128 isArmed = bits, U32, 1128, [0:0] +isTpsConditionSatisfied = bits, U32, 1128, [1:1] +isCltConditionSatisfied = bits, U32, 1128, [2:2] +isMapConditionSatisfied = bits, U32, 1128, [3:3] ; total TS size = 1132 isAntilagCondition = bits, U32, 1132, [0:0] ALSMinRPMCondition = bits, U32, 1132, [1:1] @@ -5801,6 +5807,9 @@ entry = isRpmConditionSatisfied, "isRpmConditionSatisfied", int, "%d" entry = isAppConditionSatisfied, "isAppConditionSatisfied", int, "%d" entry = isFlatShiftConditionSatisfied, "isFlatShiftConditionSatisfied", int, "%d" entry = isArmed, "isArmed", int, "%d" +entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" +entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" +entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" entry = isAntilagCondition, "isAntilagCondition", int, "%d" entry = ALSMinRPMCondition, "ALSMinRPMCondition", int, "%d" entry = ALSMaxRPMCondition, "ALSMaxRPMCondition", int, "%d" @@ -6779,6 +6788,9 @@ dialog = shift_torque_reduction_stateDialog, "shift_torque_reduction_state" indicatorPanel = nitrous_control_stateIndicatorPanel, 2 indicator = {isArmed}, "isArmed No", "isArmed Yes" + indicator = {isTpsConditionSatisfied}, "isTpsConditionSatisfied No", "isTpsConditionSatisfied Yes" + indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" + indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9800,10 +9812,15 @@ dialog = tcuControls, "Transmission Settings" panel = NitrousControlButtonDialog, {nitrousControlArmingMethod == 0} panel = NitrousControlLuaGaugeDialog, {nitrousControlArmingMethod == 1} + dialog = NitrousControlSettings, "Settings" + field = "Minimum TPS", nitrousMinimumTps + field = "Minimum CLT", nitrousMinimumClt + field = "Maximum MAP", nitrousMaximumMap + dialog = NitrousControlSettingsDialog, "", yAxis field = "Enable Nitrous Control", nitrousControlEnabled panel = NitrousControlArmingMethodDialog, {nitrousControlEnabled == 1} -; panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))} + panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))} dialog = NitrousControlDialog panel = NitrousControlSettingsDialog, West diff --git a/firmware/tunerstudio/generated/rusefi_t-b-g.ini b/firmware/tunerstudio/generated/rusefi_t-b-g.ini index e2dc54bc4e..fcfc8d7171 100644 --- a/firmware/tunerstudio/generated/rusefi_t-b-g.ini +++ b/firmware/tunerstudio/generated/rusefi_t-b-g.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.11.28.t-b-g.221197580" + signature = "rusEFI master.2024.11.28.t-b-g.1626890260" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.11.28.t-b-g.221197580" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.11.28.t-b-g.1626890260" ; 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 @@ -1432,7 +1432,10 @@ nitrousControlTriggerPinMode = bits, U08, 3936, [0:1], "DEFAULT", "PULLUP", "PUL nitrousLuaGauge = bits, S08, 3937, [0:2], "Lua Gauge 1", "Lua Gauge 2", "Lua Gauge 3", "Lua Gauge 4", "Lua Gauge 5", "Lua Gauge 6", "Lua Gauge 7", "Lua Gauge 8" nitrousLuaGaugeMeaning = bits, S08, 3938, [3:3], "Lower Bound", "Upper Bound" nitrousLuaGaugeArmingValue = scalar, F32, 3940, "", 1, 0, -30000, 30000, 3 -unusedOftenChangesDuringFirmwareUpdate = array, U08, 3944, [94], "units", 1, 0, 0, 1, 0 +nitrousMinimumTps = scalar, S32, 3944, "", 1, 0, 0, 20000, 0 +nitrousMinimumClt = scalar, U08, 3948, "deg C", 1, 0, 0, 250, 0 +nitrousMaximumMap = scalar, S16, 3950, "kPa", 1, 0, 0, 1000, 0 +unusedOftenChangesDuringFirmwareUpdate = array, U08, 3952, [87], "units", 1, 0, 0, 1, 0 postCrankingFactor = array, F32, 4040, [6x6], "mult", 1, 0, 1, 3, 2 postCrankingDurationBins = array, F32, 4184, [6], "count", 1, 0, 0, 1000, 0 postCrankingCLTBins = array, S16, 4208, [6], "C", 1, 0, -100, 250, 0 @@ -3223,6 +3226,9 @@ isAppConditionSatisfied = bits, U32, 1124, [4:4] isFlatShiftConditionSatisfied = bits, U32, 1124, [5:5] ; total TS size = 1128 isArmed = bits, U32, 1128, [0:0] +isTpsConditionSatisfied = bits, U32, 1128, [1:1] +isCltConditionSatisfied = bits, U32, 1128, [2:2] +isMapConditionSatisfied = bits, U32, 1128, [3:3] ; total TS size = 1132 isAntilagCondition = bits, U32, 1132, [0:0] ALSMinRPMCondition = bits, U32, 1132, [1:1] @@ -5801,6 +5807,9 @@ entry = isRpmConditionSatisfied, "isRpmConditionSatisfied", int, "%d" entry = isAppConditionSatisfied, "isAppConditionSatisfied", int, "%d" entry = isFlatShiftConditionSatisfied, "isFlatShiftConditionSatisfied", int, "%d" entry = isArmed, "isArmed", int, "%d" +entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" +entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" +entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" entry = isAntilagCondition, "isAntilagCondition", int, "%d" entry = ALSMinRPMCondition, "ALSMinRPMCondition", int, "%d" entry = ALSMaxRPMCondition, "ALSMaxRPMCondition", int, "%d" @@ -6777,6 +6786,9 @@ dialog = shift_torque_reduction_stateDialog, "shift_torque_reduction_state" indicatorPanel = nitrous_control_stateIndicatorPanel, 2 indicator = {isArmed}, "isArmed No", "isArmed Yes" + indicator = {isTpsConditionSatisfied}, "isTpsConditionSatisfied No", "isTpsConditionSatisfied Yes" + indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" + indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9806,10 +9818,15 @@ dialog = tcuControls, "Transmission Settings" panel = NitrousControlButtonDialog, {nitrousControlArmingMethod == 0} panel = NitrousControlLuaGaugeDialog, {nitrousControlArmingMethod == 1} + dialog = NitrousControlSettings, "Settings" + field = "Minimum TPS", nitrousMinimumTps + field = "Minimum CLT", nitrousMinimumClt + field = "Maximum MAP", nitrousMaximumMap + dialog = NitrousControlSettingsDialog, "", yAxis field = "Enable Nitrous Control", nitrousControlEnabled panel = NitrousControlArmingMethodDialog, {nitrousControlEnabled == 1} -; panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))} + panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))} dialog = NitrousControlDialog panel = NitrousControlSettingsDialog, West diff --git a/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini b/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini index 6f81b16642..d84d5dc09d 100644 --- a/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini +++ b/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.11.28.tdg-pdm8.922913156" + signature = "rusEFI master.2024.11.28.tdg-pdm8.1523965084" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.11.28.tdg-pdm8.922913156" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.11.28.tdg-pdm8.1523965084" ; 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 @@ -1432,7 +1432,10 @@ nitrousControlTriggerPinMode = bits, U08, 3936, [0:1], "DEFAULT", "PULLUP", "PUL nitrousLuaGauge = bits, S08, 3937, [0:2], "Lua Gauge 1", "Lua Gauge 2", "Lua Gauge 3", "Lua Gauge 4", "Lua Gauge 5", "Lua Gauge 6", "Lua Gauge 7", "Lua Gauge 8" nitrousLuaGaugeMeaning = bits, S08, 3938, [3:3], "Lower Bound", "Upper Bound" nitrousLuaGaugeArmingValue = scalar, F32, 3940, "", 1, 0, -30000, 30000, 3 -unusedOftenChangesDuringFirmwareUpdate = array, U08, 3944, [94], "units", 1, 0, 0, 1, 0 +nitrousMinimumTps = scalar, S32, 3944, "", 1, 0, 0, 20000, 0 +nitrousMinimumClt = scalar, U08, 3948, "deg C", 1, 0, 0, 250, 0 +nitrousMaximumMap = scalar, S16, 3950, "kPa", 1, 0, 0, 1000, 0 +unusedOftenChangesDuringFirmwareUpdate = array, U08, 3952, [87], "units", 1, 0, 0, 1, 0 postCrankingFactor = array, F32, 4040, [6x6], "mult", 1, 0, 1, 3, 2 postCrankingDurationBins = array, F32, 4184, [6], "count", 1, 0, 0, 1000, 0 postCrankingCLTBins = array, S16, 4208, [6], "C", 1, 0, -100, 250, 0 @@ -3223,6 +3226,9 @@ isAppConditionSatisfied = bits, U32, 1124, [4:4] isFlatShiftConditionSatisfied = bits, U32, 1124, [5:5] ; total TS size = 1128 isArmed = bits, U32, 1128, [0:0] +isTpsConditionSatisfied = bits, U32, 1128, [1:1] +isCltConditionSatisfied = bits, U32, 1128, [2:2] +isMapConditionSatisfied = bits, U32, 1128, [3:3] ; total TS size = 1132 isAntilagCondition = bits, U32, 1132, [0:0] ALSMinRPMCondition = bits, U32, 1132, [1:1] @@ -5801,6 +5807,9 @@ entry = isRpmConditionSatisfied, "isRpmConditionSatisfied", int, "%d" entry = isAppConditionSatisfied, "isAppConditionSatisfied", int, "%d" entry = isFlatShiftConditionSatisfied, "isFlatShiftConditionSatisfied", int, "%d" entry = isArmed, "isArmed", int, "%d" +entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" +entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" +entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" entry = isAntilagCondition, "isAntilagCondition", int, "%d" entry = ALSMinRPMCondition, "ALSMinRPMCondition", int, "%d" entry = ALSMaxRPMCondition, "ALSMaxRPMCondition", int, "%d" @@ -6777,6 +6786,9 @@ dialog = shift_torque_reduction_stateDialog, "shift_torque_reduction_state" indicatorPanel = nitrous_control_stateIndicatorPanel, 2 indicator = {isArmed}, "isArmed No", "isArmed Yes" + indicator = {isTpsConditionSatisfied}, "isTpsConditionSatisfied No", "isTpsConditionSatisfied Yes" + indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" + indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9806,10 +9818,15 @@ dialog = tcuControls, "Transmission Settings" panel = NitrousControlButtonDialog, {nitrousControlArmingMethod == 0} panel = NitrousControlLuaGaugeDialog, {nitrousControlArmingMethod == 1} + dialog = NitrousControlSettings, "Settings" + field = "Minimum TPS", nitrousMinimumTps + field = "Minimum CLT", nitrousMinimumClt + field = "Maximum MAP", nitrousMaximumMap + dialog = NitrousControlSettingsDialog, "", yAxis field = "Enable Nitrous Control", nitrousControlEnabled panel = NitrousControlArmingMethodDialog, {nitrousControlEnabled == 1} -; panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))} + panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))} dialog = NitrousControlDialog panel = NitrousControlSettingsDialog, West diff --git a/firmware/tunerstudio/generated/rusefi_uaefi.ini b/firmware/tunerstudio/generated/rusefi_uaefi.ini index 4652eb4bab..1bbdf628de 100644 --- a/firmware/tunerstudio/generated/rusefi_uaefi.ini +++ b/firmware/tunerstudio/generated/rusefi_uaefi.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.11.28.uaefi.1428073999" + signature = "rusEFI master.2024.11.28.uaefi.952761111" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.11.28.uaefi.1428073999" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.11.28.uaefi.952761111" ; 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 @@ -1432,7 +1432,10 @@ nitrousControlTriggerPinMode = bits, U08, 3936, [0:1], "DEFAULT", "PULLUP", "PUL nitrousLuaGauge = bits, S08, 3937, [0:2], "Lua Gauge 1", "Lua Gauge 2", "Lua Gauge 3", "Lua Gauge 4", "Lua Gauge 5", "Lua Gauge 6", "Lua Gauge 7", "Lua Gauge 8" nitrousLuaGaugeMeaning = bits, S08, 3938, [3:3], "Lower Bound", "Upper Bound" nitrousLuaGaugeArmingValue = scalar, F32, 3940, "", 1, 0, -30000, 30000, 3 -unusedOftenChangesDuringFirmwareUpdate = array, U08, 3944, [94], "units", 1, 0, 0, 1, 0 +nitrousMinimumTps = scalar, S32, 3944, "", 1, 0, 0, 20000, 0 +nitrousMinimumClt = scalar, U08, 3948, "deg C", 1, 0, 0, 250, 0 +nitrousMaximumMap = scalar, S16, 3950, "kPa", 1, 0, 0, 1000, 0 +unusedOftenChangesDuringFirmwareUpdate = array, U08, 3952, [87], "units", 1, 0, 0, 1, 0 postCrankingFactor = array, F32, 4040, [6x6], "mult", 1, 0, 1, 3, 2 postCrankingDurationBins = array, F32, 4184, [6], "count", 1, 0, 0, 1000, 0 postCrankingCLTBins = array, S16, 4208, [6], "C", 1, 0, -100, 250, 0 @@ -3226,6 +3229,9 @@ isAppConditionSatisfied = bits, U32, 1124, [4:4] isFlatShiftConditionSatisfied = bits, U32, 1124, [5:5] ; total TS size = 1128 isArmed = bits, U32, 1128, [0:0] +isTpsConditionSatisfied = bits, U32, 1128, [1:1] +isCltConditionSatisfied = bits, U32, 1128, [2:2] +isMapConditionSatisfied = bits, U32, 1128, [3:3] ; total TS size = 1132 isAntilagCondition = bits, U32, 1132, [0:0] ALSMinRPMCondition = bits, U32, 1132, [1:1] @@ -5812,6 +5818,9 @@ entry = isRpmConditionSatisfied, "isRpmConditionSatisfied", int, "%d" entry = isAppConditionSatisfied, "isAppConditionSatisfied", int, "%d" entry = isFlatShiftConditionSatisfied, "isFlatShiftConditionSatisfied", int, "%d" entry = isArmed, "isArmed", int, "%d" +entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" +entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" +entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" entry = isAntilagCondition, "isAntilagCondition", int, "%d" entry = ALSMinRPMCondition, "ALSMinRPMCondition", int, "%d" entry = ALSMaxRPMCondition, "ALSMaxRPMCondition", int, "%d" @@ -6809,6 +6818,9 @@ dialog = shift_torque_reduction_stateDialog, "shift_torque_reduction_state" indicatorPanel = nitrous_control_stateIndicatorPanel, 2 indicator = {isArmed}, "isArmed No", "isArmed Yes" + indicator = {isTpsConditionSatisfied}, "isTpsConditionSatisfied No", "isTpsConditionSatisfied Yes" + indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" + indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9798,10 +9810,15 @@ commandButton = "VAG i5", cmd_set_engine_type_vag_5 panel = NitrousControlButtonDialog, {nitrousControlArmingMethod == 0} panel = NitrousControlLuaGaugeDialog, {nitrousControlArmingMethod == 1} + dialog = NitrousControlSettings, "Settings" + field = "Minimum TPS", nitrousMinimumTps + field = "Minimum CLT", nitrousMinimumClt + field = "Maximum MAP", nitrousMaximumMap + dialog = NitrousControlSettingsDialog, "", yAxis field = "Enable Nitrous Control", nitrousControlEnabled panel = NitrousControlArmingMethodDialog, {nitrousControlEnabled == 1} -; panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))} + panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))} dialog = NitrousControlDialog panel = NitrousControlSettingsDialog, West diff --git a/firmware/tunerstudio/generated/rusefi_uaefi121.ini b/firmware/tunerstudio/generated/rusefi_uaefi121.ini index ae9c750d91..aabb0e8a12 100644 --- a/firmware/tunerstudio/generated/rusefi_uaefi121.ini +++ b/firmware/tunerstudio/generated/rusefi_uaefi121.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.11.28.uaefi121.3959186340" + signature = "rusEFI master.2024.11.28.uaefi121.2250979004" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.11.28.uaefi121.3959186340" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.11.28.uaefi121.2250979004" ; 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 @@ -1432,7 +1432,10 @@ nitrousControlTriggerPinMode = bits, U08, 3936, [0:1], "DEFAULT", "PULLUP", "PUL nitrousLuaGauge = bits, S08, 3937, [0:2], "Lua Gauge 1", "Lua Gauge 2", "Lua Gauge 3", "Lua Gauge 4", "Lua Gauge 5", "Lua Gauge 6", "Lua Gauge 7", "Lua Gauge 8" nitrousLuaGaugeMeaning = bits, S08, 3938, [3:3], "Lower Bound", "Upper Bound" nitrousLuaGaugeArmingValue = scalar, F32, 3940, "", 1, 0, -30000, 30000, 3 -unusedOftenChangesDuringFirmwareUpdate = array, U08, 3944, [94], "units", 1, 0, 0, 1, 0 +nitrousMinimumTps = scalar, S32, 3944, "", 1, 0, 0, 20000, 0 +nitrousMinimumClt = scalar, U08, 3948, "deg C", 1, 0, 0, 250, 0 +nitrousMaximumMap = scalar, S16, 3950, "kPa", 1, 0, 0, 1000, 0 +unusedOftenChangesDuringFirmwareUpdate = array, U08, 3952, [87], "units", 1, 0, 0, 1, 0 postCrankingFactor = array, F32, 4040, [6x6], "mult", 1, 0, 1, 3, 2 postCrankingDurationBins = array, F32, 4184, [6], "count", 1, 0, 0, 1000, 0 postCrankingCLTBins = array, S16, 4208, [6], "C", 1, 0, -100, 250, 0 @@ -3223,6 +3226,9 @@ isAppConditionSatisfied = bits, U32, 1124, [4:4] isFlatShiftConditionSatisfied = bits, U32, 1124, [5:5] ; total TS size = 1128 isArmed = bits, U32, 1128, [0:0] +isTpsConditionSatisfied = bits, U32, 1128, [1:1] +isCltConditionSatisfied = bits, U32, 1128, [2:2] +isMapConditionSatisfied = bits, U32, 1128, [3:3] ; total TS size = 1132 isAntilagCondition = bits, U32, 1132, [0:0] ALSMinRPMCondition = bits, U32, 1132, [1:1] @@ -5802,6 +5808,9 @@ entry = isRpmConditionSatisfied, "isRpmConditionSatisfied", int, "%d" entry = isAppConditionSatisfied, "isAppConditionSatisfied", int, "%d" entry = isFlatShiftConditionSatisfied, "isFlatShiftConditionSatisfied", int, "%d" entry = isArmed, "isArmed", int, "%d" +entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" +entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" +entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" entry = isAntilagCondition, "isAntilagCondition", int, "%d" entry = ALSMinRPMCondition, "ALSMinRPMCondition", int, "%d" entry = ALSMaxRPMCondition, "ALSMaxRPMCondition", int, "%d" @@ -6798,6 +6807,9 @@ dialog = shift_torque_reduction_stateDialog, "shift_torque_reduction_state" indicatorPanel = nitrous_control_stateIndicatorPanel, 2 indicator = {isArmed}, "isArmed No", "isArmed Yes" + indicator = {isTpsConditionSatisfied}, "isTpsConditionSatisfied No", "isTpsConditionSatisfied Yes" + indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" + indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9784,10 +9796,15 @@ commandButton = "VAG i5", cmd_set_engine_type_vag_5 panel = NitrousControlButtonDialog, {nitrousControlArmingMethod == 0} panel = NitrousControlLuaGaugeDialog, {nitrousControlArmingMethod == 1} + dialog = NitrousControlSettings, "Settings" + field = "Minimum TPS", nitrousMinimumTps + field = "Minimum CLT", nitrousMinimumClt + field = "Maximum MAP", nitrousMaximumMap + dialog = NitrousControlSettingsDialog, "", yAxis field = "Enable Nitrous Control", nitrousControlEnabled panel = NitrousControlArmingMethodDialog, {nitrousControlEnabled == 1} -; panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))} + panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))} dialog = NitrousControlDialog panel = NitrousControlSettingsDialog, West 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 0444b176cc..36efcd82d7 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 @@ -318,7 +318,7 @@ public class Fields { public static final int ego_sensor_e_ES_Innovate_MTX_L = 1; public static final int ego_sensor_e_ES_PLX = 4; public static final int EGT_CHANNEL_COUNT = 8; - public static final int END_OF_CALIBRATION_PADDING = 94; + public static final int END_OF_CALIBRATION_PADDING = 87; public static final int engine_configuration_s_size = 4040; public static final int engine_load_mode_e_LM_ALPHA_N = 2; public static final int engine_load_mode_e_LM_LUA = 3; @@ -1499,7 +1499,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.11.28.f407-discovery.3986160817"; + public static final String TS_SIGNATURE = "rusEFI master.2024.11.28.f407-discovery.2151721385"; public static final char TS_SIMULATE_CAN = '>'; public static final char TS_SINGLE_WRITE_COMMAND = 'W'; public static final char TS_TEST_COMMAND = 't'; @@ -2998,7 +2998,11 @@ public class Fields { public static final Field NITROUSLUAGAUGEMEANING = Field.create("NITROUSLUAGAUGEMEANING", 3938, FieldType.INT8, lua_gauge_meaning_e).setScale(1.0).setBaseOffset(0); public static final Field ALIGNMENTFILL_AT_3939 = Field.create("ALIGNMENTFILL_AT_3939", 3939, FieldType.INT8).setScale(1.0).setBaseOffset(0); public static final Field NITROUSLUAGAUGEARMINGVALUE = Field.create("NITROUSLUAGAUGEARMINGVALUE", 3940, FieldType.FLOAT).setBaseOffset(0); - public static final Field ALIGNMENTFILL_AT_4038 = Field.create("ALIGNMENTFILL_AT_4038", 4038, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field NITROUSMINIMUMTPS = Field.create("NITROUSMINIMUMTPS", 3944, FieldType.INT).setScale(1.0).setBaseOffset(0); + public static final Field NITROUSMINIMUMCLT = Field.create("NITROUSMINIMUMCLT", 3948, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field ALIGNMENTFILL_AT_3949 = Field.create("ALIGNMENTFILL_AT_3949", 3949, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field NITROUSMAXIMUMMAP = Field.create("NITROUSMAXIMUMMAP", 3950, FieldType.INT16).setScale(1.0).setBaseOffset(0); + public static final Field ALIGNMENTFILL_AT_4039 = Field.create("ALIGNMENTFILL_AT_4039", 4039, FieldType.INT8).setScale(1.0).setBaseOffset(0); public static final Field POSTCRANKINGFACTOR = Field.create("POSTCRANKINGFACTOR", 4040, FieldType.FLOAT).setBaseOffset(0); public static final Field POSTCRANKINGDURATIONBINS = Field.create("POSTCRANKINGDURATIONBINS", 4184, FieldType.FLOAT).setBaseOffset(0); public static final Field POSTCRANKINGCLTBINS = Field.create("POSTCRANKINGCLTBINS", 4208, FieldType.INT16).setScale(1.0).setBaseOffset(0); @@ -4716,7 +4720,11 @@ public class Fields { NITROUSLUAGAUGEMEANING, ALIGNMENTFILL_AT_3939, NITROUSLUAGAUGEARMINGVALUE, - ALIGNMENTFILL_AT_4038, + NITROUSMINIMUMTPS, + NITROUSMINIMUMCLT, + ALIGNMENTFILL_AT_3949, + NITROUSMAXIMUMMAP, + ALIGNMENTFILL_AT_4039, POSTCRANKINGFACTOR, POSTCRANKINGDURATIONBINS, POSTCRANKINGCLTBINS, diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/NitrousController.java b/java_console/models/src/main/java/com/rusefi/config/generated/NitrousController.java index b81485d041..a8977bd517 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/NitrousController.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/NitrousController.java @@ -7,7 +7,13 @@ import com.rusefi.config.*; public class NitrousController { public static final Field ISARMED = Field.create("ISARMED", 0, FieldType.BIT, 0).setBaseOffset(1128); + public static final Field ISTPSCONDITIONSATISFIED = Field.create("ISTPSCONDITIONSATISFIED", 0, FieldType.BIT, 1).setBaseOffset(1128); + public static final Field ISCLTCONDITIONSATISFIED = Field.create("ISCLTCONDITIONSATISFIED", 0, FieldType.BIT, 2).setBaseOffset(1128); + public static final Field ISMAPCONDITIONSATISFIED = Field.create("ISMAPCONDITIONSATISFIED", 0, FieldType.BIT, 3).setBaseOffset(1128); public static final Field[] VALUES = { ISARMED, + ISTPSCONDITIONSATISFIED, + ISCLTCONDITIONSATISFIED, + ISMAPCONDITIONSATISFIED, }; }