From 649345194a04b072a97d646390ceccc913e64ab0 Mon Sep 17 00:00:00 2001 From: GitHub gen-configs Action Date: Sun, 1 Dec 2024 22:30:01 +0000 Subject: [PATCH] Auto-generated configs and docs --- .../console/binary/generated/data_logs.ini | 1 + .../binary/generated/fancy_content.ini | 1 + .../binary/generated/output_channels.ini | 1 + ...ration_generated_structures_alphax-2chan.h | 25 +++++++-- ...ration_generated_structures_alphax-4chan.h | 25 +++++++-- ...ion_generated_structures_alphax-4chan_f7.h | 25 +++++++-- ...ation_generated_structures_alphax-4k-gdi.h | 25 +++++++-- ...n_generated_structures_alphax-8chan-revA.h | 25 +++++++-- ...ration_generated_structures_alphax-8chan.h | 25 +++++++-- ...ion_generated_structures_alphax-8chan_f7.h | 25 +++++++-- ...ation_generated_structures_alphax-silver.h | 25 +++++++-- ...ation_generated_structures_at_start_f435.h | 25 +++++++-- ...configuration_generated_structures_atlas.h | 25 +++++++-- ...tion_generated_structures_f407-discovery.h | 25 +++++++-- ...tion_generated_structures_f429-discovery.h | 25 +++++++-- ...tion_generated_structures_f469-discovery.h | 25 +++++++-- ...ation_generated_structures_frankenso_na6.h | 25 +++++++-- ...nfiguration_generated_structures_haba208.h | 25 +++++++-- ...ation_generated_structures_hellen-112-17.h | 25 +++++++-- ...ation_generated_structures_hellen-gm-e67.h | 25 +++++++-- ...tion_generated_structures_hellen-honda-k.h | 25 +++++++-- ...guration_generated_structures_hellen-nb1.h | 25 +++++++-- ...ion_generated_structures_hellen121nissan.h | 25 +++++++-- ...ration_generated_structures_hellen121vag.h | 25 +++++++-- ...iguration_generated_structures_hellen128.h | 25 +++++++-- ...on_generated_structures_hellen154hyundai.h | 25 +++++++-- ...generated_structures_hellen154hyundai_f7.h | 25 +++++++-- ...figuration_generated_structures_hellen72.h | 25 +++++++-- ...figuration_generated_structures_hellen81.h | 25 +++++++-- ...uration_generated_structures_hellen88bmw.h | 25 +++++++-- ...iguration_generated_structures_hellenNA6.h | 25 +++++++-- ...ration_generated_structures_hellenNA8_96.h | 25 +++++++-- ...configuration_generated_structures_m74_9.h | 25 +++++++-- ...ation_generated_structures_mre-legacy_f4.h | 25 +++++++-- ...onfiguration_generated_structures_mre_f4.h | 25 +++++++-- ...onfiguration_generated_structures_mre_f7.h | 25 +++++++-- ...uration_generated_structures_nucleo_f413.h | 25 +++++++-- ...guration_generated_structures_proteus_f4.h | 25 +++++++-- ...guration_generated_structures_proteus_f7.h | 25 +++++++-- ...guration_generated_structures_proteus_h7.h | 25 +++++++-- ..._configuration_generated_structures_s105.h | 25 +++++++-- ...ion_generated_structures_small-can-board.h | 25 +++++++-- ...on_generated_structures_stm32f429_nucleo.h | 25 +++++++-- ...on_generated_structures_stm32f767_nucleo.h | 25 +++++++-- ...on_generated_structures_stm32h743_nucleo.h | 25 +++++++-- ...tion_generated_structures_subaru_eg33_f7.h | 25 +++++++-- ...configuration_generated_structures_t-b-g.h | 25 +++++++-- ...figuration_generated_structures_tdg-pdm8.h | 25 +++++++-- ...configuration_generated_structures_uaefi.h | 25 +++++++-- ...figuration_generated_structures_uaefi121.h | 25 +++++++-- .../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 | 5 ++ .../lua/generated/value_lookup_generated.cpp | 24 +++++++++ .../lua/generated/value_lookup_generated.md | 9 ++++ .../nitrous_control_state_generated.h | 54 +++++++++---------- firmware/tunerstudio/generated/rusefi.ini | 23 +++++--- .../generated/rusefi_alphax-2chan.ini | 23 +++++--- .../generated/rusefi_alphax-4chan.ini | 23 +++++--- .../generated/rusefi_alphax-4chan_f7.ini | 23 +++++--- .../generated/rusefi_alphax-4k-gdi.ini | 23 +++++--- .../generated/rusefi_alphax-8chan-revA.ini | 23 +++++--- .../generated/rusefi_alphax-8chan.ini | 23 +++++--- .../generated/rusefi_alphax-8chan_f7.ini | 23 +++++--- .../generated/rusefi_alphax-silver.ini | 23 +++++--- .../generated/rusefi_at_start_f435.ini | 23 +++++--- .../tunerstudio/generated/rusefi_atlas.ini | 23 +++++--- .../generated/rusefi_f407-discovery.ini | 23 +++++--- .../generated/rusefi_f429-discovery.ini | 23 +++++--- .../generated/rusefi_f469-discovery.ini | 23 +++++--- .../generated/rusefi_frankenso_na6.ini | 23 +++++--- .../tunerstudio/generated/rusefi_haba208.ini | 23 +++++--- .../generated/rusefi_hellen-112-17.ini | 23 +++++--- .../generated/rusefi_hellen-gm-e67.ini | 23 +++++--- .../generated/rusefi_hellen-honda-k.ini | 23 +++++--- .../generated/rusefi_hellen-nb1.ini | 23 +++++--- .../generated/rusefi_hellen121nissan.ini | 23 +++++--- .../generated/rusefi_hellen121vag.ini | 23 +++++--- .../generated/rusefi_hellen128.ini | 23 +++++--- .../generated/rusefi_hellen154hyundai.ini | 23 +++++--- .../generated/rusefi_hellen154hyundai_f7.ini | 23 +++++--- .../tunerstudio/generated/rusefi_hellen72.ini | 23 +++++--- .../tunerstudio/generated/rusefi_hellen81.ini | 23 +++++--- .../generated/rusefi_hellen88bmw.ini | 23 +++++--- .../generated/rusefi_hellenNA6.ini | 23 +++++--- .../generated/rusefi_hellenNA8_96.ini | 23 +++++--- .../tunerstudio/generated/rusefi_m74_9.ini | 23 +++++--- .../generated/rusefi_mre-legacy_f4.ini | 23 +++++--- .../tunerstudio/generated/rusefi_mre_f4.ini | 23 +++++--- .../tunerstudio/generated/rusefi_mre_f7.ini | 23 +++++--- .../generated/rusefi_nucleo_f413.ini | 23 +++++--- .../generated/rusefi_proteus_f4.ini | 23 +++++--- .../generated/rusefi_proteus_f7.ini | 23 +++++--- .../generated/rusefi_proteus_h7.ini | 23 +++++--- .../tunerstudio/generated/rusefi_s105.ini | 23 +++++--- .../generated/rusefi_small-can-board.ini | 23 +++++--- .../generated/rusefi_stm32f429_nucleo.ini | 23 +++++--- .../generated/rusefi_stm32f767_nucleo.ini | 23 +++++--- .../generated/rusefi_stm32h743_nucleo.ini | 23 +++++--- .../generated/rusefi_subaru_eg33_f7.ini | 23 +++++--- .../tunerstudio/generated/rusefi_t-b-g.ini | 23 +++++--- .../tunerstudio/generated/rusefi_tdg-pdm8.ini | 23 +++++--- .../tunerstudio/generated/rusefi_uaefi.ini | 23 +++++--- .../tunerstudio/generated/rusefi_uaefi121.ini | 23 +++++--- .../com/rusefi/config/generated/Fields.java | 16 ++++-- .../config/generated/NitrousController.java | 2 + 198 files changed, 2024 insertions(+), 838 deletions(-) diff --git a/firmware/console/binary/generated/data_logs.ini b/firmware/console/binary/generated/data_logs.ini index 78419f4b63..d62c444d0c 100644 --- a/firmware/console/binary/generated/data_logs.ini +++ b/firmware/console/binary/generated/data_logs.ini @@ -531,6 +531,7 @@ entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" entry = isAfrConditionSatisfied, "isAfrConditionSatisfied", int, "%d" +entry = isNitrousRpmConditionSatisfied, "isNitrousRpmConditionSatisfied", 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 f377a84621..c198492a15 100644 --- a/firmware/console/binary/generated/fancy_content.ini +++ b/firmware/console/binary/generated/fancy_content.ini @@ -179,6 +179,7 @@ indicatorPanel = nitrous_control_stateIndicatorPanel, 2 indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" indicator = {isAfrConditionSatisfied}, "isAfrConditionSatisfied No", "isAfrConditionSatisfied Yes" + indicator = {isNitrousRpmConditionSatisfied}, "isNitrousRpmConditionSatisfied No", "isNitrousRpmConditionSatisfied 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 5a4520d632..13f51695e8 100644 --- a/firmware/console/binary/generated/output_channels.ini +++ b/firmware/console/binary/generated/output_channels.ini @@ -595,6 +595,7 @@ isTpsConditionSatisfied = bits, U32, 1128, [1:1] isCltConditionSatisfied = bits, U32, 1128, [2:2] isMapConditionSatisfied = bits, U32, 1128, [3:3] isAfrConditionSatisfied = bits, U32, 1128, [4:4] +isNitrousRpmConditionSatisfied = bits, U32, 1128, [5:5] ; 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 5c9360945c..acabd2fdde 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_alphax-2chan.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_alphax-2chan.h @@ -4877,16 +4877,31 @@ struct engine_configuration_s { */ scaled_channel nitrousMaximumAfr; /** + * need 4 byte alignment * units: units * offset 3953 */ - uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; + uint8_t alignmentFill_at_3953[1]; /** - * need 4 byte alignment - * units: units - * offset 4039 + * units: rpm + * offset 3954 */ - uint8_t alignmentFill_at_4039[1]; + uint16_t nitrousActivationRpm; + /** + * units: rpm + * offset 3956 + */ + uint16_t nitrousDeactivationRpm; + /** + * units: rpm + * offset 3958 + */ + uint16_t nitrousDeactivationRpmWindow; + /** + * units: units + * offset 3960 + */ + uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; }; 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 a7b2e299cd..ef46de03e6 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_alphax-4chan.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_alphax-4chan.h @@ -4877,16 +4877,31 @@ struct engine_configuration_s { */ scaled_channel nitrousMaximumAfr; /** + * need 4 byte alignment * units: units * offset 3953 */ - uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; + uint8_t alignmentFill_at_3953[1]; /** - * need 4 byte alignment - * units: units - * offset 4039 + * units: rpm + * offset 3954 */ - uint8_t alignmentFill_at_4039[1]; + uint16_t nitrousActivationRpm; + /** + * units: rpm + * offset 3956 + */ + uint16_t nitrousDeactivationRpm; + /** + * units: rpm + * offset 3958 + */ + uint16_t nitrousDeactivationRpmWindow; + /** + * units: units + * offset 3960 + */ + uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; }; 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 a7b2e299cd..ef46de03e6 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 @@ -4877,16 +4877,31 @@ struct engine_configuration_s { */ scaled_channel nitrousMaximumAfr; /** + * need 4 byte alignment * units: units * offset 3953 */ - uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; + uint8_t alignmentFill_at_3953[1]; /** - * need 4 byte alignment - * units: units - * offset 4039 + * units: rpm + * offset 3954 */ - uint8_t alignmentFill_at_4039[1]; + uint16_t nitrousActivationRpm; + /** + * units: rpm + * offset 3956 + */ + uint16_t nitrousDeactivationRpm; + /** + * units: rpm + * offset 3958 + */ + uint16_t nitrousDeactivationRpmWindow; + /** + * units: units + * offset 3960 + */ + uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; }; 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 25e9576385..459d472239 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 @@ -4877,16 +4877,31 @@ struct engine_configuration_s { */ scaled_channel nitrousMaximumAfr; /** + * need 4 byte alignment * units: units * offset 3953 */ - uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; + uint8_t alignmentFill_at_3953[1]; /** - * need 4 byte alignment - * units: units - * offset 4039 + * units: rpm + * offset 3954 */ - uint8_t alignmentFill_at_4039[1]; + uint16_t nitrousActivationRpm; + /** + * units: rpm + * offset 3956 + */ + uint16_t nitrousDeactivationRpm; + /** + * units: rpm + * offset 3958 + */ + uint16_t nitrousDeactivationRpmWindow; + /** + * units: units + * offset 3960 + */ + uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; }; 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 a12d922737..750e2c0dfb 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 @@ -4877,16 +4877,31 @@ struct engine_configuration_s { */ scaled_channel nitrousMaximumAfr; /** + * need 4 byte alignment * units: units * offset 3953 */ - uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; + uint8_t alignmentFill_at_3953[1]; /** - * need 4 byte alignment - * units: units - * offset 4039 + * units: rpm + * offset 3954 */ - uint8_t alignmentFill_at_4039[1]; + uint16_t nitrousActivationRpm; + /** + * units: rpm + * offset 3956 + */ + uint16_t nitrousDeactivationRpm; + /** + * units: rpm + * offset 3958 + */ + uint16_t nitrousDeactivationRpmWindow; + /** + * units: units + * offset 3960 + */ + uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; }; 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 0abbaebb9f..5b157dd8d4 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_alphax-8chan.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_alphax-8chan.h @@ -4877,16 +4877,31 @@ struct engine_configuration_s { */ scaled_channel nitrousMaximumAfr; /** + * need 4 byte alignment * units: units * offset 3969 */ - uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; + uint8_t alignmentFill_at_3969[1]; /** - * need 4 byte alignment - * units: units - * offset 4055 + * units: rpm + * offset 3970 */ - uint8_t alignmentFill_at_4055[1]; + uint16_t nitrousActivationRpm; + /** + * units: rpm + * offset 3972 + */ + uint16_t nitrousDeactivationRpm; + /** + * units: rpm + * offset 3974 + */ + uint16_t nitrousDeactivationRpmWindow; + /** + * units: units + * offset 3976 + */ + uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; }; 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 0abbaebb9f..5b157dd8d4 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 @@ -4877,16 +4877,31 @@ struct engine_configuration_s { */ scaled_channel nitrousMaximumAfr; /** + * need 4 byte alignment * units: units * offset 3969 */ - uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; + uint8_t alignmentFill_at_3969[1]; /** - * need 4 byte alignment - * units: units - * offset 4055 + * units: rpm + * offset 3970 */ - uint8_t alignmentFill_at_4055[1]; + uint16_t nitrousActivationRpm; + /** + * units: rpm + * offset 3972 + */ + uint16_t nitrousDeactivationRpm; + /** + * units: rpm + * offset 3974 + */ + uint16_t nitrousDeactivationRpmWindow; + /** + * units: units + * offset 3976 + */ + uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; }; 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 a02ed19b47..8f37f32e4b 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_alphax-silver.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_alphax-silver.h @@ -4973,16 +4973,31 @@ struct engine_configuration_s { */ scaled_channel nitrousMaximumAfr; /** + * need 4 byte alignment * units: units * offset 3957 */ - uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; + uint8_t alignmentFill_at_3957[1]; /** - * need 4 byte alignment - * units: units - * offset 4043 + * units: rpm + * offset 3958 */ - uint8_t alignmentFill_at_4043[1]; + uint16_t nitrousActivationRpm; + /** + * units: rpm + * offset 3960 + */ + uint16_t nitrousDeactivationRpm; + /** + * units: rpm + * offset 3962 + */ + uint16_t nitrousDeactivationRpmWindow; + /** + * units: units + * offset 3964 + */ + uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; }; 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 f492651313..f6b0e71fc7 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 @@ -4877,16 +4877,31 @@ struct engine_configuration_s { */ scaled_channel nitrousMaximumAfr; /** + * need 4 byte alignment * units: units * offset 3953 */ - uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; + uint8_t alignmentFill_at_3953[1]; /** - * need 4 byte alignment - * units: units - * offset 4039 + * units: rpm + * offset 3954 */ - uint8_t alignmentFill_at_4039[1]; + uint16_t nitrousActivationRpm; + /** + * units: rpm + * offset 3956 + */ + uint16_t nitrousDeactivationRpm; + /** + * units: rpm + * offset 3958 + */ + uint16_t nitrousDeactivationRpmWindow; + /** + * units: units + * offset 3960 + */ + uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; }; 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 4f26b4f6ab..c3c6ae55e6 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_atlas.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_atlas.h @@ -4877,16 +4877,31 @@ struct engine_configuration_s { */ scaled_channel nitrousMaximumAfr; /** + * need 4 byte alignment * units: units * offset 3793 */ - uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; + uint8_t alignmentFill_at_3793[1]; /** - * need 4 byte alignment - * units: units - * offset 3879 + * units: rpm + * offset 3794 */ - uint8_t alignmentFill_at_3879[1]; + uint16_t nitrousActivationRpm; + /** + * units: rpm + * offset 3796 + */ + uint16_t nitrousDeactivationRpm; + /** + * units: rpm + * offset 3798 + */ + uint16_t nitrousDeactivationRpmWindow; + /** + * units: units + * offset 3800 + */ + uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; }; 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 31ff1d5395..c10ec00942 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_f407-discovery.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_f407-discovery.h @@ -4877,16 +4877,31 @@ struct engine_configuration_s { */ scaled_channel nitrousMaximumAfr; /** + * need 4 byte alignment * units: units * offset 3953 */ - uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; + uint8_t alignmentFill_at_3953[1]; /** - * need 4 byte alignment - * units: units - * offset 4039 + * units: rpm + * offset 3954 */ - uint8_t alignmentFill_at_4039[1]; + uint16_t nitrousActivationRpm; + /** + * units: rpm + * offset 3956 + */ + uint16_t nitrousDeactivationRpm; + /** + * units: rpm + * offset 3958 + */ + uint16_t nitrousDeactivationRpmWindow; + /** + * units: units + * offset 3960 + */ + uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; }; 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 f492651313..f6b0e71fc7 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_f429-discovery.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_f429-discovery.h @@ -4877,16 +4877,31 @@ struct engine_configuration_s { */ scaled_channel nitrousMaximumAfr; /** + * need 4 byte alignment * units: units * offset 3953 */ - uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; + uint8_t alignmentFill_at_3953[1]; /** - * need 4 byte alignment - * units: units - * offset 4039 + * units: rpm + * offset 3954 */ - uint8_t alignmentFill_at_4039[1]; + uint16_t nitrousActivationRpm; + /** + * units: rpm + * offset 3956 + */ + uint16_t nitrousDeactivationRpm; + /** + * units: rpm + * offset 3958 + */ + uint16_t nitrousDeactivationRpmWindow; + /** + * units: units + * offset 3960 + */ + uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; }; 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 f492651313..f6b0e71fc7 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_f469-discovery.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_f469-discovery.h @@ -4877,16 +4877,31 @@ struct engine_configuration_s { */ scaled_channel nitrousMaximumAfr; /** + * need 4 byte alignment * units: units * offset 3953 */ - uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; + uint8_t alignmentFill_at_3953[1]; /** - * need 4 byte alignment - * units: units - * offset 4039 + * units: rpm + * offset 3954 */ - uint8_t alignmentFill_at_4039[1]; + uint16_t nitrousActivationRpm; + /** + * units: rpm + * offset 3956 + */ + uint16_t nitrousDeactivationRpm; + /** + * units: rpm + * offset 3958 + */ + uint16_t nitrousDeactivationRpmWindow; + /** + * units: units + * offset 3960 + */ + uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; }; 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 f492651313..f6b0e71fc7 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_frankenso_na6.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_frankenso_na6.h @@ -4877,16 +4877,31 @@ struct engine_configuration_s { */ scaled_channel nitrousMaximumAfr; /** + * need 4 byte alignment * units: units * offset 3953 */ - uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; + uint8_t alignmentFill_at_3953[1]; /** - * need 4 byte alignment - * units: units - * offset 4039 + * units: rpm + * offset 3954 */ - uint8_t alignmentFill_at_4039[1]; + uint16_t nitrousActivationRpm; + /** + * units: rpm + * offset 3956 + */ + uint16_t nitrousDeactivationRpm; + /** + * units: rpm + * offset 3958 + */ + uint16_t nitrousDeactivationRpmWindow; + /** + * units: units + * offset 3960 + */ + uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; }; 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 f492651313..f6b0e71fc7 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_haba208.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_haba208.h @@ -4877,16 +4877,31 @@ struct engine_configuration_s { */ scaled_channel nitrousMaximumAfr; /** + * need 4 byte alignment * units: units * offset 3953 */ - uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; + uint8_t alignmentFill_at_3953[1]; /** - * need 4 byte alignment - * units: units - * offset 4039 + * units: rpm + * offset 3954 */ - uint8_t alignmentFill_at_4039[1]; + uint16_t nitrousActivationRpm; + /** + * units: rpm + * offset 3956 + */ + uint16_t nitrousDeactivationRpm; + /** + * units: rpm + * offset 3958 + */ + uint16_t nitrousDeactivationRpmWindow; + /** + * units: units + * offset 3960 + */ + uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; }; 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 f492651313..f6b0e71fc7 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 @@ -4877,16 +4877,31 @@ struct engine_configuration_s { */ scaled_channel nitrousMaximumAfr; /** + * need 4 byte alignment * units: units * offset 3953 */ - uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; + uint8_t alignmentFill_at_3953[1]; /** - * need 4 byte alignment - * units: units - * offset 4039 + * units: rpm + * offset 3954 */ - uint8_t alignmentFill_at_4039[1]; + uint16_t nitrousActivationRpm; + /** + * units: rpm + * offset 3956 + */ + uint16_t nitrousDeactivationRpm; + /** + * units: rpm + * offset 3958 + */ + uint16_t nitrousDeactivationRpmWindow; + /** + * units: units + * offset 3960 + */ + uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; }; 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 f492651313..f6b0e71fc7 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 @@ -4877,16 +4877,31 @@ struct engine_configuration_s { */ scaled_channel nitrousMaximumAfr; /** + * need 4 byte alignment * units: units * offset 3953 */ - uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; + uint8_t alignmentFill_at_3953[1]; /** - * need 4 byte alignment - * units: units - * offset 4039 + * units: rpm + * offset 3954 */ - uint8_t alignmentFill_at_4039[1]; + uint16_t nitrousActivationRpm; + /** + * units: rpm + * offset 3956 + */ + uint16_t nitrousDeactivationRpm; + /** + * units: rpm + * offset 3958 + */ + uint16_t nitrousDeactivationRpmWindow; + /** + * units: units + * offset 3960 + */ + uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; }; 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 f3ead9f931..92c2cf9f06 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 @@ -4877,16 +4877,31 @@ struct engine_configuration_s { */ scaled_channel nitrousMaximumAfr; /** + * need 4 byte alignment * units: units * offset 3953 */ - uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; + uint8_t alignmentFill_at_3953[1]; /** - * need 4 byte alignment - * units: units - * offset 4039 + * units: rpm + * offset 3954 */ - uint8_t alignmentFill_at_4039[1]; + uint16_t nitrousActivationRpm; + /** + * units: rpm + * offset 3956 + */ + uint16_t nitrousDeactivationRpm; + /** + * units: rpm + * offset 3958 + */ + uint16_t nitrousDeactivationRpmWindow; + /** + * units: units + * offset 3960 + */ + uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; }; 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 f492651313..f6b0e71fc7 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_hellen-nb1.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_hellen-nb1.h @@ -4877,16 +4877,31 @@ struct engine_configuration_s { */ scaled_channel nitrousMaximumAfr; /** + * need 4 byte alignment * units: units * offset 3953 */ - uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; + uint8_t alignmentFill_at_3953[1]; /** - * need 4 byte alignment - * units: units - * offset 4039 + * units: rpm + * offset 3954 */ - uint8_t alignmentFill_at_4039[1]; + uint16_t nitrousActivationRpm; + /** + * units: rpm + * offset 3956 + */ + uint16_t nitrousDeactivationRpm; + /** + * units: rpm + * offset 3958 + */ + uint16_t nitrousDeactivationRpmWindow; + /** + * units: units + * offset 3960 + */ + uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; }; 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 f492651313..f6b0e71fc7 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_hellen121nissan.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_hellen121nissan.h @@ -4877,16 +4877,31 @@ struct engine_configuration_s { */ scaled_channel nitrousMaximumAfr; /** + * need 4 byte alignment * units: units * offset 3953 */ - uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; + uint8_t alignmentFill_at_3953[1]; /** - * need 4 byte alignment - * units: units - * offset 4039 + * units: rpm + * offset 3954 */ - uint8_t alignmentFill_at_4039[1]; + uint16_t nitrousActivationRpm; + /** + * units: rpm + * offset 3956 + */ + uint16_t nitrousDeactivationRpm; + /** + * units: rpm + * offset 3958 + */ + uint16_t nitrousDeactivationRpmWindow; + /** + * units: units + * offset 3960 + */ + uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; }; 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 f492651313..f6b0e71fc7 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_hellen121vag.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_hellen121vag.h @@ -4877,16 +4877,31 @@ struct engine_configuration_s { */ scaled_channel nitrousMaximumAfr; /** + * need 4 byte alignment * units: units * offset 3953 */ - uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; + uint8_t alignmentFill_at_3953[1]; /** - * need 4 byte alignment - * units: units - * offset 4039 + * units: rpm + * offset 3954 */ - uint8_t alignmentFill_at_4039[1]; + uint16_t nitrousActivationRpm; + /** + * units: rpm + * offset 3956 + */ + uint16_t nitrousDeactivationRpm; + /** + * units: rpm + * offset 3958 + */ + uint16_t nitrousDeactivationRpmWindow; + /** + * units: units + * offset 3960 + */ + uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; }; 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 f492651313..f6b0e71fc7 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_hellen128.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_hellen128.h @@ -4877,16 +4877,31 @@ struct engine_configuration_s { */ scaled_channel nitrousMaximumAfr; /** + * need 4 byte alignment * units: units * offset 3953 */ - uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; + uint8_t alignmentFill_at_3953[1]; /** - * need 4 byte alignment - * units: units - * offset 4039 + * units: rpm + * offset 3954 */ - uint8_t alignmentFill_at_4039[1]; + uint16_t nitrousActivationRpm; + /** + * units: rpm + * offset 3956 + */ + uint16_t nitrousDeactivationRpm; + /** + * units: rpm + * offset 3958 + */ + uint16_t nitrousDeactivationRpmWindow; + /** + * units: units + * offset 3960 + */ + uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; }; 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 f492651313..f6b0e71fc7 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_hellen154hyundai.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_hellen154hyundai.h @@ -4877,16 +4877,31 @@ struct engine_configuration_s { */ scaled_channel nitrousMaximumAfr; /** + * need 4 byte alignment * units: units * offset 3953 */ - uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; + uint8_t alignmentFill_at_3953[1]; /** - * need 4 byte alignment - * units: units - * offset 4039 + * units: rpm + * offset 3954 */ - uint8_t alignmentFill_at_4039[1]; + uint16_t nitrousActivationRpm; + /** + * units: rpm + * offset 3956 + */ + uint16_t nitrousDeactivationRpm; + /** + * units: rpm + * offset 3958 + */ + uint16_t nitrousDeactivationRpmWindow; + /** + * units: units + * offset 3960 + */ + uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; }; 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 f492651313..f6b0e71fc7 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_hellen154hyundai_f7.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_hellen154hyundai_f7.h @@ -4877,16 +4877,31 @@ struct engine_configuration_s { */ scaled_channel nitrousMaximumAfr; /** + * need 4 byte alignment * units: units * offset 3953 */ - uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; + uint8_t alignmentFill_at_3953[1]; /** - * need 4 byte alignment - * units: units - * offset 4039 + * units: rpm + * offset 3954 */ - uint8_t alignmentFill_at_4039[1]; + uint16_t nitrousActivationRpm; + /** + * units: rpm + * offset 3956 + */ + uint16_t nitrousDeactivationRpm; + /** + * units: rpm + * offset 3958 + */ + uint16_t nitrousDeactivationRpmWindow; + /** + * units: units + * offset 3960 + */ + uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; }; 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 f492651313..f6b0e71fc7 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_hellen72.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_hellen72.h @@ -4877,16 +4877,31 @@ struct engine_configuration_s { */ scaled_channel nitrousMaximumAfr; /** + * need 4 byte alignment * units: units * offset 3953 */ - uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; + uint8_t alignmentFill_at_3953[1]; /** - * need 4 byte alignment - * units: units - * offset 4039 + * units: rpm + * offset 3954 */ - uint8_t alignmentFill_at_4039[1]; + uint16_t nitrousActivationRpm; + /** + * units: rpm + * offset 3956 + */ + uint16_t nitrousDeactivationRpm; + /** + * units: rpm + * offset 3958 + */ + uint16_t nitrousDeactivationRpmWindow; + /** + * units: units + * offset 3960 + */ + uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; }; 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 f492651313..f6b0e71fc7 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_hellen81.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_hellen81.h @@ -4877,16 +4877,31 @@ struct engine_configuration_s { */ scaled_channel nitrousMaximumAfr; /** + * need 4 byte alignment * units: units * offset 3953 */ - uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; + uint8_t alignmentFill_at_3953[1]; /** - * need 4 byte alignment - * units: units - * offset 4039 + * units: rpm + * offset 3954 */ - uint8_t alignmentFill_at_4039[1]; + uint16_t nitrousActivationRpm; + /** + * units: rpm + * offset 3956 + */ + uint16_t nitrousDeactivationRpm; + /** + * units: rpm + * offset 3958 + */ + uint16_t nitrousDeactivationRpmWindow; + /** + * units: units + * offset 3960 + */ + uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; }; 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 f492651313..f6b0e71fc7 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_hellen88bmw.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_hellen88bmw.h @@ -4877,16 +4877,31 @@ struct engine_configuration_s { */ scaled_channel nitrousMaximumAfr; /** + * need 4 byte alignment * units: units * offset 3953 */ - uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; + uint8_t alignmentFill_at_3953[1]; /** - * need 4 byte alignment - * units: units - * offset 4039 + * units: rpm + * offset 3954 */ - uint8_t alignmentFill_at_4039[1]; + uint16_t nitrousActivationRpm; + /** + * units: rpm + * offset 3956 + */ + uint16_t nitrousDeactivationRpm; + /** + * units: rpm + * offset 3958 + */ + uint16_t nitrousDeactivationRpmWindow; + /** + * units: units + * offset 3960 + */ + uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; }; 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 f492651313..f6b0e71fc7 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_hellenNA6.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_hellenNA6.h @@ -4877,16 +4877,31 @@ struct engine_configuration_s { */ scaled_channel nitrousMaximumAfr; /** + * need 4 byte alignment * units: units * offset 3953 */ - uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; + uint8_t alignmentFill_at_3953[1]; /** - * need 4 byte alignment - * units: units - * offset 4039 + * units: rpm + * offset 3954 */ - uint8_t alignmentFill_at_4039[1]; + uint16_t nitrousActivationRpm; + /** + * units: rpm + * offset 3956 + */ + uint16_t nitrousDeactivationRpm; + /** + * units: rpm + * offset 3958 + */ + uint16_t nitrousDeactivationRpmWindow; + /** + * units: units + * offset 3960 + */ + uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; }; 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 f492651313..f6b0e71fc7 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_hellenNA8_96.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_hellenNA8_96.h @@ -4877,16 +4877,31 @@ struct engine_configuration_s { */ scaled_channel nitrousMaximumAfr; /** + * need 4 byte alignment * units: units * offset 3953 */ - uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; + uint8_t alignmentFill_at_3953[1]; /** - * need 4 byte alignment - * units: units - * offset 4039 + * units: rpm + * offset 3954 */ - uint8_t alignmentFill_at_4039[1]; + uint16_t nitrousActivationRpm; + /** + * units: rpm + * offset 3956 + */ + uint16_t nitrousDeactivationRpm; + /** + * units: rpm + * offset 3958 + */ + uint16_t nitrousDeactivationRpmWindow; + /** + * units: units + * offset 3960 + */ + uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; }; 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 f492651313..f6b0e71fc7 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_m74_9.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_m74_9.h @@ -4877,16 +4877,31 @@ struct engine_configuration_s { */ scaled_channel nitrousMaximumAfr; /** + * need 4 byte alignment * units: units * offset 3953 */ - uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; + uint8_t alignmentFill_at_3953[1]; /** - * need 4 byte alignment - * units: units - * offset 4039 + * units: rpm + * offset 3954 */ - uint8_t alignmentFill_at_4039[1]; + uint16_t nitrousActivationRpm; + /** + * units: rpm + * offset 3956 + */ + uint16_t nitrousDeactivationRpm; + /** + * units: rpm + * offset 3958 + */ + uint16_t nitrousDeactivationRpmWindow; + /** + * units: units + * offset 3960 + */ + uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; }; 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 a33bcd89bd..68c56c788c 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 @@ -4877,16 +4877,31 @@ struct engine_configuration_s { */ scaled_channel nitrousMaximumAfr; /** + * need 4 byte alignment * units: units * offset 3953 */ - uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; + uint8_t alignmentFill_at_3953[1]; /** - * need 4 byte alignment - * units: units - * offset 4039 + * units: rpm + * offset 3954 */ - uint8_t alignmentFill_at_4039[1]; + uint16_t nitrousActivationRpm; + /** + * units: rpm + * offset 3956 + */ + uint16_t nitrousDeactivationRpm; + /** + * units: rpm + * offset 3958 + */ + uint16_t nitrousDeactivationRpmWindow; + /** + * units: units + * offset 3960 + */ + uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; }; 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 a33bcd89bd..68c56c788c 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_mre_f4.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_mre_f4.h @@ -4877,16 +4877,31 @@ struct engine_configuration_s { */ scaled_channel nitrousMaximumAfr; /** + * need 4 byte alignment * units: units * offset 3953 */ - uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; + uint8_t alignmentFill_at_3953[1]; /** - * need 4 byte alignment - * units: units - * offset 4039 + * units: rpm + * offset 3954 */ - uint8_t alignmentFill_at_4039[1]; + uint16_t nitrousActivationRpm; + /** + * units: rpm + * offset 3956 + */ + uint16_t nitrousDeactivationRpm; + /** + * units: rpm + * offset 3958 + */ + uint16_t nitrousDeactivationRpmWindow; + /** + * units: units + * offset 3960 + */ + uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; }; 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 a33bcd89bd..68c56c788c 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_mre_f7.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_mre_f7.h @@ -4877,16 +4877,31 @@ struct engine_configuration_s { */ scaled_channel nitrousMaximumAfr; /** + * need 4 byte alignment * units: units * offset 3953 */ - uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; + uint8_t alignmentFill_at_3953[1]; /** - * need 4 byte alignment - * units: units - * offset 4039 + * units: rpm + * offset 3954 */ - uint8_t alignmentFill_at_4039[1]; + uint16_t nitrousActivationRpm; + /** + * units: rpm + * offset 3956 + */ + uint16_t nitrousDeactivationRpm; + /** + * units: rpm + * offset 3958 + */ + uint16_t nitrousDeactivationRpmWindow; + /** + * units: units + * offset 3960 + */ + uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; }; 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 f492651313..f6b0e71fc7 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_nucleo_f413.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_nucleo_f413.h @@ -4877,16 +4877,31 @@ struct engine_configuration_s { */ scaled_channel nitrousMaximumAfr; /** + * need 4 byte alignment * units: units * offset 3953 */ - uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; + uint8_t alignmentFill_at_3953[1]; /** - * need 4 byte alignment - * units: units - * offset 4039 + * units: rpm + * offset 3954 */ - uint8_t alignmentFill_at_4039[1]; + uint16_t nitrousActivationRpm; + /** + * units: rpm + * offset 3956 + */ + uint16_t nitrousDeactivationRpm; + /** + * units: rpm + * offset 3958 + */ + uint16_t nitrousDeactivationRpmWindow; + /** + * units: units + * offset 3960 + */ + uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; }; 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 f2d2bf6402..cab6fbb70f 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_proteus_f4.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_proteus_f4.h @@ -4877,16 +4877,31 @@ struct engine_configuration_s { */ scaled_channel nitrousMaximumAfr; /** + * need 4 byte alignment * units: units * offset 3953 */ - uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; + uint8_t alignmentFill_at_3953[1]; /** - * need 4 byte alignment - * units: units - * offset 4039 + * units: rpm + * offset 3954 */ - uint8_t alignmentFill_at_4039[1]; + uint16_t nitrousActivationRpm; + /** + * units: rpm + * offset 3956 + */ + uint16_t nitrousDeactivationRpm; + /** + * units: rpm + * offset 3958 + */ + uint16_t nitrousDeactivationRpmWindow; + /** + * units: units + * offset 3960 + */ + uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; }; 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 f2d2bf6402..cab6fbb70f 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_proteus_f7.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_proteus_f7.h @@ -4877,16 +4877,31 @@ struct engine_configuration_s { */ scaled_channel nitrousMaximumAfr; /** + * need 4 byte alignment * units: units * offset 3953 */ - uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; + uint8_t alignmentFill_at_3953[1]; /** - * need 4 byte alignment - * units: units - * offset 4039 + * units: rpm + * offset 3954 */ - uint8_t alignmentFill_at_4039[1]; + uint16_t nitrousActivationRpm; + /** + * units: rpm + * offset 3956 + */ + uint16_t nitrousDeactivationRpm; + /** + * units: rpm + * offset 3958 + */ + uint16_t nitrousDeactivationRpmWindow; + /** + * units: units + * offset 3960 + */ + uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; }; 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 f2d2bf6402..cab6fbb70f 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_proteus_h7.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_proteus_h7.h @@ -4877,16 +4877,31 @@ struct engine_configuration_s { */ scaled_channel nitrousMaximumAfr; /** + * need 4 byte alignment * units: units * offset 3953 */ - uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; + uint8_t alignmentFill_at_3953[1]; /** - * need 4 byte alignment - * units: units - * offset 4039 + * units: rpm + * offset 3954 */ - uint8_t alignmentFill_at_4039[1]; + uint16_t nitrousActivationRpm; + /** + * units: rpm + * offset 3956 + */ + uint16_t nitrousDeactivationRpm; + /** + * units: rpm + * offset 3958 + */ + uint16_t nitrousDeactivationRpmWindow; + /** + * units: units + * offset 3960 + */ + uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; }; 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 f492651313..f6b0e71fc7 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_s105.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_s105.h @@ -4877,16 +4877,31 @@ struct engine_configuration_s { */ scaled_channel nitrousMaximumAfr; /** + * need 4 byte alignment * units: units * offset 3953 */ - uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; + uint8_t alignmentFill_at_3953[1]; /** - * need 4 byte alignment - * units: units - * offset 4039 + * units: rpm + * offset 3954 */ - uint8_t alignmentFill_at_4039[1]; + uint16_t nitrousActivationRpm; + /** + * units: rpm + * offset 3956 + */ + uint16_t nitrousDeactivationRpm; + /** + * units: rpm + * offset 3958 + */ + uint16_t nitrousDeactivationRpmWindow; + /** + * units: units + * offset 3960 + */ + uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; }; 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 f492651313..f6b0e71fc7 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 @@ -4877,16 +4877,31 @@ struct engine_configuration_s { */ scaled_channel nitrousMaximumAfr; /** + * need 4 byte alignment * units: units * offset 3953 */ - uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; + uint8_t alignmentFill_at_3953[1]; /** - * need 4 byte alignment - * units: units - * offset 4039 + * units: rpm + * offset 3954 */ - uint8_t alignmentFill_at_4039[1]; + uint16_t nitrousActivationRpm; + /** + * units: rpm + * offset 3956 + */ + uint16_t nitrousDeactivationRpm; + /** + * units: rpm + * offset 3958 + */ + uint16_t nitrousDeactivationRpmWindow; + /** + * units: units + * offset 3960 + */ + uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; }; 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 f492651313..f6b0e71fc7 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_stm32f429_nucleo.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_stm32f429_nucleo.h @@ -4877,16 +4877,31 @@ struct engine_configuration_s { */ scaled_channel nitrousMaximumAfr; /** + * need 4 byte alignment * units: units * offset 3953 */ - uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; + uint8_t alignmentFill_at_3953[1]; /** - * need 4 byte alignment - * units: units - * offset 4039 + * units: rpm + * offset 3954 */ - uint8_t alignmentFill_at_4039[1]; + uint16_t nitrousActivationRpm; + /** + * units: rpm + * offset 3956 + */ + uint16_t nitrousDeactivationRpm; + /** + * units: rpm + * offset 3958 + */ + uint16_t nitrousDeactivationRpmWindow; + /** + * units: units + * offset 3960 + */ + uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; }; 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 f492651313..f6b0e71fc7 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_stm32f767_nucleo.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_stm32f767_nucleo.h @@ -4877,16 +4877,31 @@ struct engine_configuration_s { */ scaled_channel nitrousMaximumAfr; /** + * need 4 byte alignment * units: units * offset 3953 */ - uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; + uint8_t alignmentFill_at_3953[1]; /** - * need 4 byte alignment - * units: units - * offset 4039 + * units: rpm + * offset 3954 */ - uint8_t alignmentFill_at_4039[1]; + uint16_t nitrousActivationRpm; + /** + * units: rpm + * offset 3956 + */ + uint16_t nitrousDeactivationRpm; + /** + * units: rpm + * offset 3958 + */ + uint16_t nitrousDeactivationRpmWindow; + /** + * units: units + * offset 3960 + */ + uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; }; 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 f492651313..f6b0e71fc7 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_stm32h743_nucleo.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_stm32h743_nucleo.h @@ -4877,16 +4877,31 @@ struct engine_configuration_s { */ scaled_channel nitrousMaximumAfr; /** + * need 4 byte alignment * units: units * offset 3953 */ - uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; + uint8_t alignmentFill_at_3953[1]; /** - * need 4 byte alignment - * units: units - * offset 4039 + * units: rpm + * offset 3954 */ - uint8_t alignmentFill_at_4039[1]; + uint16_t nitrousActivationRpm; + /** + * units: rpm + * offset 3956 + */ + uint16_t nitrousDeactivationRpm; + /** + * units: rpm + * offset 3958 + */ + uint16_t nitrousDeactivationRpmWindow; + /** + * units: units + * offset 3960 + */ + uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; }; 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 f492651313..f6b0e71fc7 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 @@ -4877,16 +4877,31 @@ struct engine_configuration_s { */ scaled_channel nitrousMaximumAfr; /** + * need 4 byte alignment * units: units * offset 3953 */ - uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; + uint8_t alignmentFill_at_3953[1]; /** - * need 4 byte alignment - * units: units - * offset 4039 + * units: rpm + * offset 3954 */ - uint8_t alignmentFill_at_4039[1]; + uint16_t nitrousActivationRpm; + /** + * units: rpm + * offset 3956 + */ + uint16_t nitrousDeactivationRpm; + /** + * units: rpm + * offset 3958 + */ + uint16_t nitrousDeactivationRpmWindow; + /** + * units: units + * offset 3960 + */ + uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; }; 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 f492651313..f6b0e71fc7 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 @@ -4877,16 +4877,31 @@ struct engine_configuration_s { */ scaled_channel nitrousMaximumAfr; /** + * need 4 byte alignment * units: units * offset 3953 */ - uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; + uint8_t alignmentFill_at_3953[1]; /** - * need 4 byte alignment - * units: units - * offset 4039 + * units: rpm + * offset 3954 */ - uint8_t alignmentFill_at_4039[1]; + uint16_t nitrousActivationRpm; + /** + * units: rpm + * offset 3956 + */ + uint16_t nitrousDeactivationRpm; + /** + * units: rpm + * offset 3958 + */ + uint16_t nitrousDeactivationRpmWindow; + /** + * units: units + * offset 3960 + */ + uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; }; 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 f492651313..f6b0e71fc7 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_tdg-pdm8.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_tdg-pdm8.h @@ -4877,16 +4877,31 @@ struct engine_configuration_s { */ scaled_channel nitrousMaximumAfr; /** + * need 4 byte alignment * units: units * offset 3953 */ - uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; + uint8_t alignmentFill_at_3953[1]; /** - * need 4 byte alignment - * units: units - * offset 4039 + * units: rpm + * offset 3954 */ - uint8_t alignmentFill_at_4039[1]; + uint16_t nitrousActivationRpm; + /** + * units: rpm + * offset 3956 + */ + uint16_t nitrousDeactivationRpm; + /** + * units: rpm + * offset 3958 + */ + uint16_t nitrousDeactivationRpmWindow; + /** + * units: units + * offset 3960 + */ + uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; }; 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 71afd325bb..f67cd07726 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_uaefi.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_uaefi.h @@ -4877,16 +4877,31 @@ struct engine_configuration_s { */ scaled_channel nitrousMaximumAfr; /** + * need 4 byte alignment * units: units * offset 3953 */ - uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; + uint8_t alignmentFill_at_3953[1]; /** - * need 4 byte alignment - * units: units - * offset 4039 + * units: rpm + * offset 3954 */ - uint8_t alignmentFill_at_4039[1]; + uint16_t nitrousActivationRpm; + /** + * units: rpm + * offset 3956 + */ + uint16_t nitrousDeactivationRpm; + /** + * units: rpm + * offset 3958 + */ + uint16_t nitrousDeactivationRpmWindow; + /** + * units: units + * offset 3960 + */ + uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; }; 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 f492651313..f6b0e71fc7 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_uaefi121.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_uaefi121.h @@ -4877,16 +4877,31 @@ struct engine_configuration_s { */ scaled_channel nitrousMaximumAfr; /** + * need 4 byte alignment * units: units * offset 3953 */ - uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; + uint8_t alignmentFill_at_3953[1]; /** - * need 4 byte alignment - * units: units - * offset 4039 + * units: rpm + * offset 3954 */ - uint8_t alignmentFill_at_4039[1]; + uint16_t nitrousActivationRpm; + /** + * units: rpm + * offset 3956 + */ + uint16_t nitrousDeactivationRpm; + /** + * units: rpm + * offset 3958 + */ + uint16_t nitrousDeactivationRpmWindow; + /** + * units: units + * offset 3960 + */ + uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; }; 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 54f8a07904..ae547ac75a 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 86 +#define END_OF_CALIBRATION_PADDING 80 #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 3810128067 +#define SIGNATURE_HASH 3066660401 #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.12.01.alphax-2chan.3810128067" +#define TS_SIGNATURE "rusEFI master.2024.12.01.alphax-2chan.3066660401" #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 27ffca68ec..d4892767cd 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 86 +#define END_OF_CALIBRATION_PADDING 80 #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 869800486 +#define SIGNATURE_HASH 1711828180 #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.12.01.alphax-4chan.869800486" +#define TS_SIGNATURE "rusEFI master.2024.12.01.alphax-4chan.1711828180" #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 6e4f7d8138..697c3f1b0b 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 86 +#define END_OF_CALIBRATION_PADDING 80 #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 869800486 +#define SIGNATURE_HASH 1711828180 #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.12.01.alphax-4chan_f7.869800486" +#define TS_SIGNATURE "rusEFI master.2024.12.01.alphax-4chan_f7.1711828180" #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 baea852bc7..f31ceda01f 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 86 +#define END_OF_CALIBRATION_PADDING 80 #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 625910367 +#define SIGNATURE_HASH 1889457325 #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.12.01.alphax-4k-gdi.625910367" +#define TS_SIGNATURE "rusEFI master.2024.12.01.alphax-4k-gdi.1889457325" #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 626a6e9f20..ae84634f6b 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 86 +#define END_OF_CALIBRATION_PADDING 80 #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 236590369 +#define SIGNATURE_HASH 1539990483 #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.12.01.alphax-8chan-revA.236590369" +#define TS_SIGNATURE "rusEFI master.2024.12.01.alphax-8chan-revA.1539990483" #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 d1aec32da7..ca80e4fdac 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 86 +#define END_OF_CALIBRATION_PADDING 80 #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 4058647861 +#define SIGNATURE_HASH 2755296199 #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.12.01.alphax-8chan.4058647861" +#define TS_SIGNATURE "rusEFI master.2024.12.01.alphax-8chan.2755296199" #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 cd420f8391..80b7d4d957 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 86 +#define END_OF_CALIBRATION_PADDING 80 #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 4058647861 +#define SIGNATURE_HASH 2755296199 #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.12.01.alphax-8chan_f7.4058647861" +#define TS_SIGNATURE "rusEFI master.2024.12.01.alphax-8chan_f7.2755296199" #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 ec41184228..8bf7b50a10 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 86 +#define END_OF_CALIBRATION_PADDING 80 #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 2540563730 +#define SIGNATURE_HASH 3267206112 #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.12.01.alphax-silver.2540563730" +#define TS_SIGNATURE "rusEFI master.2024.12.01.alphax-silver.3267206112" #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 d679ff8d47..43b285ba87 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 86 +#define END_OF_CALIBRATION_PADDING 80 #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 2866013876 +#define SIGNATURE_HASH 4278423622 #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.12.01.at_start_f435.2866013876" +#define TS_SIGNATURE "rusEFI master.2024.12.01.at_start_f435.4278423622" #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 dfededab2c..88415cc2ba 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 86 +#define END_OF_CALIBRATION_PADDING 80 #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 4006884090 +#define SIGNATURE_HASH 3137618952 #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.12.01.atlas.4006884090" +#define TS_SIGNATURE "rusEFI master.2024.12.01.atlas.3137618952" #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 95d951e258..4444d38585 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 86 +#define END_OF_CALIBRATION_PADDING 80 #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 1248538377 +#define SIGNATURE_HASH 532371963 #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.12.01.f407-discovery.1248538377" +#define TS_SIGNATURE "rusEFI master.2024.12.01.f407-discovery.532371963" #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 ff883b4b84..883e1b8ce9 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 86 +#define END_OF_CALIBRATION_PADDING 80 #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 2866013876 +#define SIGNATURE_HASH 4278423622 #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.12.01.f429-discovery.2866013876" +#define TS_SIGNATURE "rusEFI master.2024.12.01.f429-discovery.4278423622" #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 c2ab6d5a0d..57cf03fa4e 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 86 +#define END_OF_CALIBRATION_PADDING 80 #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 2550456359 +#define SIGNATURE_HASH 3453261525 #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.12.01.f469-discovery.2550456359" +#define TS_SIGNATURE "rusEFI master.2024.12.01.f469-discovery.3453261525" #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 0f1e325704..da1151c768 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 86 +#define END_OF_CALIBRATION_PADDING 80 #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 4233138863 +#define SIGNATURE_HASH 2843796573 #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.12.01.frankenso_na6.4233138863" +#define TS_SIGNATURE "rusEFI master.2024.12.01.frankenso_na6.2843796573" #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 47eb508977..38e058eedc 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 86 +#define END_OF_CALIBRATION_PADDING 80 #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 2866013876 +#define SIGNATURE_HASH 4278423622 #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.12.01.haba208.2866013876" +#define TS_SIGNATURE "rusEFI master.2024.12.01.haba208.4278423622" #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 bd257c5ff9..8a0d5aabf7 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 86 +#define END_OF_CALIBRATION_PADDING 80 #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 601587248 +#define SIGNATURE_HASH 1980434626 #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.12.01.hellen-112-17.601587248" +#define TS_SIGNATURE "rusEFI master.2024.12.01.hellen-112-17.1980434626" #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 36ee6f5de8..ea42e4b208 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 86 +#define END_OF_CALIBRATION_PADDING 80 #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 1722450188 +#define SIGNATURE_HASH 863696894 #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.12.01.hellen-gm-e67.1722450188" +#define TS_SIGNATURE "rusEFI master.2024.12.01.hellen-gm-e67.863696894" #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 1cea2e5606..cbcb046398 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 86 +#define END_OF_CALIBRATION_PADDING 80 #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 4276786370 +#define SIGNATURE_HASH 2872762928 #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.12.01.hellen-honda-k.4276786370" +#define TS_SIGNATURE "rusEFI master.2024.12.01.hellen-honda-k.2872762928" #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 4fa5163309..63e73bd1da 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 86 +#define END_OF_CALIBRATION_PADDING 80 #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 695546795 +#define SIGNATURE_HASH 2091205977 #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.12.01.hellen-nb1.695546795" +#define TS_SIGNATURE "rusEFI master.2024.12.01.hellen-nb1.2091205977" #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 e160c876c9..add02eecdb 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 86 +#define END_OF_CALIBRATION_PADDING 80 #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 2051568692 +#define SIGNATURE_HASH 798491334 #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.12.01.hellen121nissan.2051568692" +#define TS_SIGNATURE "rusEFI master.2024.12.01.hellen121nissan.798491334" #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 63a435d6da..9a73d94f40 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 86 +#define END_OF_CALIBRATION_PADDING 80 #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 572614259 +#define SIGNATURE_HASH 2012287105 #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.12.01.hellen121vag.572614259" +#define TS_SIGNATURE "rusEFI master.2024.12.01.hellen121vag.2012287105" #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 4ea5adb71e..eb78db3c86 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 86 +#define END_OF_CALIBRATION_PADDING 80 #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 1195494467 +#define SIGNATURE_HASH 311540401 #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.12.01.hellen128.1195494467" +#define TS_SIGNATURE "rusEFI master.2024.12.01.hellen128.311540401" #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 bc91150669..8035ba929f 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 86 +#define END_OF_CALIBRATION_PADDING 80 #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 2357649198 +#define SIGNATURE_HASH 3646335452 #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.12.01.hellen154hyundai.2357649198" +#define TS_SIGNATURE "rusEFI master.2024.12.01.hellen154hyundai.3646335452" #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 8028f311a3..213c7796d9 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 86 +#define END_OF_CALIBRATION_PADDING 80 #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 3270554285 +#define SIGNATURE_HASH 2535507039 #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.12.01.hellen154hyundai_f7.3270554285" +#define TS_SIGNATURE "rusEFI master.2024.12.01.hellen154hyundai_f7.2535507039" #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 a39085ca51..2165f5ee30 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 86 +#define END_OF_CALIBRATION_PADDING 80 #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 1476070242 +#define SIGNATURE_HASH 36404624 #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.12.01.hellen72.1476070242" +#define TS_SIGNATURE "rusEFI master.2024.12.01.hellen72.36404624" #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 013d7c37e3..8485a0f01a 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 86 +#define END_OF_CALIBRATION_PADDING 80 #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 3477304914 +#define SIGNATURE_HASH 2593325216 #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.12.01.hellen81.3477304914" +#define TS_SIGNATURE "rusEFI master.2024.12.01.hellen81.2593325216" #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 f8ffd4ea1a..4bfdf7a69b 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 86 +#define END_OF_CALIBRATION_PADDING 80 #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 3630195473 +#define SIGNATURE_HASH 2377127395 #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.12.01.hellen88bmw.3630195473" +#define TS_SIGNATURE "rusEFI master.2024.12.01.hellen88bmw.2377127395" #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 b825fbce19..9e603a2555 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 86 +#define END_OF_CALIBRATION_PADDING 80 #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 1047922004 +#define SIGNATURE_HASH 1806070694 #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.12.01.hellenNA6.1047922004" +#define TS_SIGNATURE "rusEFI master.2024.12.01.hellenNA6.1806070694" #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 62129e0c2c..3cf3c97cf9 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 86 +#define END_OF_CALIBRATION_PADDING 80 #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 3249293210 +#define SIGNATURE_HASH 2491167080 #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.12.01.hellenNA8_96.3249293210" +#define TS_SIGNATURE "rusEFI master.2024.12.01.hellenNA8_96.2491167080" #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 d2e2c82a14..3170a4929b 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 86 +#define END_OF_CALIBRATION_PADDING 80 #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 510254699 +#define SIGNATURE_HASH 1270458521 #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.12.01.m74_9.510254699" +#define TS_SIGNATURE "rusEFI master.2024.12.01.m74_9.1270458521" #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 ff22c426b6..fa19a21a09 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 86 +#define END_OF_CALIBRATION_PADDING 80 #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 3786221431 +#define SIGNATURE_HASH 3028111749 #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.12.01.mre-legacy_f4.3786221431" +#define TS_SIGNATURE "rusEFI master.2024.12.01.mre-legacy_f4.3028111749" #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 20c0ceae55..9c43f7be78 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 86 +#define END_OF_CALIBRATION_PADDING 80 #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 3786221431 +#define SIGNATURE_HASH 3028111749 #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.12.01.mre_f4.3786221431" +#define TS_SIGNATURE "rusEFI master.2024.12.01.mre_f4.3028111749" #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 e048ab271a..186bb7aa57 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 86 +#define END_OF_CALIBRATION_PADDING 80 #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 3786221431 +#define SIGNATURE_HASH 3028111749 #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.12.01.mre_f7.3786221431" +#define TS_SIGNATURE "rusEFI master.2024.12.01.mre_f7.3028111749" #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 c5f41def1c..582aa2eaf9 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 86 +#define END_OF_CALIBRATION_PADDING 80 #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 2866013876 +#define SIGNATURE_HASH 4278423622 #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.12.01.nucleo_f413.2866013876" +#define TS_SIGNATURE "rusEFI master.2024.12.01.nucleo_f413.4278423622" #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 b9c55f39e4..b5574f1ac7 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 86 +#define END_OF_CALIBRATION_PADDING 80 #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 167383670 +#define SIGNATURE_HASH 1546282116 #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.12.01.proteus_f4.167383670" +#define TS_SIGNATURE "rusEFI master.2024.12.01.proteus_f4.1546282116" #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 3b328c122a..c1f0181938 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 86 +#define END_OF_CALIBRATION_PADDING 80 #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 167383670 +#define SIGNATURE_HASH 1546282116 #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.12.01.proteus_f7.167383670" +#define TS_SIGNATURE "rusEFI master.2024.12.01.proteus_f7.1546282116" #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 f3421e1065..2b661e0297 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 86 +#define END_OF_CALIBRATION_PADDING 80 #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 167383670 +#define SIGNATURE_HASH 1546282116 #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.12.01.proteus_h7.167383670" +#define TS_SIGNATURE "rusEFI master.2024.12.01.proteus_h7.1546282116" #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 b518821319..e6ef12b09b 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 86 +#define END_OF_CALIBRATION_PADDING 80 #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 358114934 +#define SIGNATURE_HASH 1082658948 #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.12.01.s105.358114934" +#define TS_SIGNATURE "rusEFI master.2024.12.01.s105.1082658948" #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 fea56e0d82..2a9c10a926 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 86 +#define END_OF_CALIBRATION_PADDING 80 #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 4129868697 +#define SIGNATURE_HASH 2750987627 #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.12.01.small-can-board.4129868697" +#define TS_SIGNATURE "rusEFI master.2024.12.01.small-can-board.2750987627" #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 dba727a8b8..9661f40e79 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 86 +#define END_OF_CALIBRATION_PADDING 80 #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 2866013876 +#define SIGNATURE_HASH 4278423622 #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.12.01.stm32f429_nucleo.2866013876" +#define TS_SIGNATURE "rusEFI master.2024.12.01.stm32f429_nucleo.4278423622" #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 8fb73da901..8ac84795a3 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 86 +#define END_OF_CALIBRATION_PADDING 80 #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 2866013876 +#define SIGNATURE_HASH 4278423622 #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.12.01.stm32f767_nucleo.2866013876" +#define TS_SIGNATURE "rusEFI master.2024.12.01.stm32f767_nucleo.4278423622" #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 569d440114..43525b1c49 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 86 +#define END_OF_CALIBRATION_PADDING 80 #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 2866013876 +#define SIGNATURE_HASH 4278423622 #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.12.01.stm32h743_nucleo.2866013876" +#define TS_SIGNATURE "rusEFI master.2024.12.01.stm32h743_nucleo.4278423622" #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 6764a59fda..6277104e4d 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 86 +#define END_OF_CALIBRATION_PADDING 80 #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 4126334698 +#define SIGNATURE_HASH 2686625816 #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.12.01.subaru_eg33_f7.4126334698" +#define TS_SIGNATURE "rusEFI master.2024.12.01.subaru_eg33_f7.2686625816" #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 5227858f1e..1fe5c47547 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 86 +#define END_OF_CALIBRATION_PADDING 80 #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 2866013876 +#define SIGNATURE_HASH 4278423622 #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.12.01.t-b-g.2866013876" +#define TS_SIGNATURE "rusEFI master.2024.12.01.t-b-g.4278423622" #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 f9587e0200..2484d6133a 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 86 +#define END_OF_CALIBRATION_PADDING 80 #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 2432588348 +#define SIGNATURE_HASH 3308137678 #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.12.01.tdg-pdm8.2432588348" +#define TS_SIGNATURE "rusEFI master.2024.12.01.tdg-pdm8.3308137678" #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 b5a46accc1..803f4f26fb 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 86 +#define END_OF_CALIBRATION_PADDING 80 #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 4074929591 +#define SIGNATURE_HASH 2805074757 #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.12.01.uaefi.4074929591" +#define TS_SIGNATURE "rusEFI master.2024.12.01.uaefi.2805074757" #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 f772157768..ab144062a4 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 86 +#define END_OF_CALIBRATION_PADDING 80 #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 1275113500 +#define SIGNATURE_HASH 433112814 #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.12.01.uaefi121.1275113500" +#define TS_SIGNATURE "rusEFI master.2024.12.01.uaefi121.433112814" #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 e265549d65..a1ff508155 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 3810128067 -#define TS_SIGNATURE "rusEFI master.2024.12.01.alphax-2chan.3810128067" +#define SIGNATURE_HASH 3066660401 +#define TS_SIGNATURE "rusEFI master.2024.12.01.alphax-2chan.3066660401" diff --git a/firmware/controllers/generated/signature_alphax-4chan.h b/firmware/controllers/generated/signature_alphax-4chan.h index e72aae55eb..615c11052c 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 869800486 -#define TS_SIGNATURE "rusEFI master.2024.12.01.alphax-4chan.869800486" +#define SIGNATURE_HASH 1711828180 +#define TS_SIGNATURE "rusEFI master.2024.12.01.alphax-4chan.1711828180" diff --git a/firmware/controllers/generated/signature_alphax-4chan_f7.h b/firmware/controllers/generated/signature_alphax-4chan_f7.h index 9206cfa435..f06bb011bf 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 869800486 -#define TS_SIGNATURE "rusEFI master.2024.12.01.alphax-4chan_f7.869800486" +#define SIGNATURE_HASH 1711828180 +#define TS_SIGNATURE "rusEFI master.2024.12.01.alphax-4chan_f7.1711828180" diff --git a/firmware/controllers/generated/signature_alphax-4k-gdi.h b/firmware/controllers/generated/signature_alphax-4k-gdi.h index 9aa157f11a..2af195e968 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 625910367 -#define TS_SIGNATURE "rusEFI master.2024.12.01.alphax-4k-gdi.625910367" +#define SIGNATURE_HASH 1889457325 +#define TS_SIGNATURE "rusEFI master.2024.12.01.alphax-4k-gdi.1889457325" diff --git a/firmware/controllers/generated/signature_alphax-8chan-revA.h b/firmware/controllers/generated/signature_alphax-8chan-revA.h index 01e163079c..7e25847b12 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 236590369 -#define TS_SIGNATURE "rusEFI master.2024.12.01.alphax-8chan-revA.236590369" +#define SIGNATURE_HASH 1539990483 +#define TS_SIGNATURE "rusEFI master.2024.12.01.alphax-8chan-revA.1539990483" diff --git a/firmware/controllers/generated/signature_alphax-8chan.h b/firmware/controllers/generated/signature_alphax-8chan.h index bfd35e9b2c..e6df7a46ce 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 4058647861 -#define TS_SIGNATURE "rusEFI master.2024.12.01.alphax-8chan.4058647861" +#define SIGNATURE_HASH 2755296199 +#define TS_SIGNATURE "rusEFI master.2024.12.01.alphax-8chan.2755296199" diff --git a/firmware/controllers/generated/signature_alphax-8chan_f7.h b/firmware/controllers/generated/signature_alphax-8chan_f7.h index 423b076d34..43ac793353 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 4058647861 -#define TS_SIGNATURE "rusEFI master.2024.12.01.alphax-8chan_f7.4058647861" +#define SIGNATURE_HASH 2755296199 +#define TS_SIGNATURE "rusEFI master.2024.12.01.alphax-8chan_f7.2755296199" diff --git a/firmware/controllers/generated/signature_alphax-silver.h b/firmware/controllers/generated/signature_alphax-silver.h index 35d4726832..ced84ab776 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 2540563730 -#define TS_SIGNATURE "rusEFI master.2024.12.01.alphax-silver.2540563730" +#define SIGNATURE_HASH 3267206112 +#define TS_SIGNATURE "rusEFI master.2024.12.01.alphax-silver.3267206112" diff --git a/firmware/controllers/generated/signature_at_start_f435.h b/firmware/controllers/generated/signature_at_start_f435.h index 3d90e07acd..03d2175e18 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 2866013876 -#define TS_SIGNATURE "rusEFI master.2024.12.01.at_start_f435.2866013876" +#define SIGNATURE_HASH 4278423622 +#define TS_SIGNATURE "rusEFI master.2024.12.01.at_start_f435.4278423622" diff --git a/firmware/controllers/generated/signature_atlas.h b/firmware/controllers/generated/signature_atlas.h index f770993ba9..e242c83c66 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 4006884090 -#define TS_SIGNATURE "rusEFI master.2024.12.01.atlas.4006884090" +#define SIGNATURE_HASH 3137618952 +#define TS_SIGNATURE "rusEFI master.2024.12.01.atlas.3137618952" diff --git a/firmware/controllers/generated/signature_f407-discovery.h b/firmware/controllers/generated/signature_f407-discovery.h index b1a13554cb..d022c7d886 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 1248538377 -#define TS_SIGNATURE "rusEFI master.2024.12.01.f407-discovery.1248538377" +#define SIGNATURE_HASH 532371963 +#define TS_SIGNATURE "rusEFI master.2024.12.01.f407-discovery.532371963" diff --git a/firmware/controllers/generated/signature_f429-discovery.h b/firmware/controllers/generated/signature_f429-discovery.h index fbcfeedb4c..9016fd42c6 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 2866013876 -#define TS_SIGNATURE "rusEFI master.2024.12.01.f429-discovery.2866013876" +#define SIGNATURE_HASH 4278423622 +#define TS_SIGNATURE "rusEFI master.2024.12.01.f429-discovery.4278423622" diff --git a/firmware/controllers/generated/signature_f469-discovery.h b/firmware/controllers/generated/signature_f469-discovery.h index 221d939af6..25042881e0 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 2550456359 -#define TS_SIGNATURE "rusEFI master.2024.12.01.f469-discovery.2550456359" +#define SIGNATURE_HASH 3453261525 +#define TS_SIGNATURE "rusEFI master.2024.12.01.f469-discovery.3453261525" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index ae5877c6e7..89c0ef6e90 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 4233138863 -#define TS_SIGNATURE "rusEFI master.2024.12.01.frankenso_na6.4233138863" +#define SIGNATURE_HASH 2843796573 +#define TS_SIGNATURE "rusEFI master.2024.12.01.frankenso_na6.2843796573" diff --git a/firmware/controllers/generated/signature_haba208.h b/firmware/controllers/generated/signature_haba208.h index 066996e01b..493df3ee53 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 2866013876 -#define TS_SIGNATURE "rusEFI master.2024.12.01.haba208.2866013876" +#define SIGNATURE_HASH 4278423622 +#define TS_SIGNATURE "rusEFI master.2024.12.01.haba208.4278423622" diff --git a/firmware/controllers/generated/signature_hellen-112-17.h b/firmware/controllers/generated/signature_hellen-112-17.h index f2b947bae6..aaa8cb8f13 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 601587248 -#define TS_SIGNATURE "rusEFI master.2024.12.01.hellen-112-17.601587248" +#define SIGNATURE_HASH 1980434626 +#define TS_SIGNATURE "rusEFI master.2024.12.01.hellen-112-17.1980434626" diff --git a/firmware/controllers/generated/signature_hellen-gm-e67.h b/firmware/controllers/generated/signature_hellen-gm-e67.h index b152a0d9ae..91f0bde292 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 1722450188 -#define TS_SIGNATURE "rusEFI master.2024.12.01.hellen-gm-e67.1722450188" +#define SIGNATURE_HASH 863696894 +#define TS_SIGNATURE "rusEFI master.2024.12.01.hellen-gm-e67.863696894" diff --git a/firmware/controllers/generated/signature_hellen-honda-k.h b/firmware/controllers/generated/signature_hellen-honda-k.h index 14dbd0484e..0a3baa6934 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 4276786370 -#define TS_SIGNATURE "rusEFI master.2024.12.01.hellen-honda-k.4276786370" +#define SIGNATURE_HASH 2872762928 +#define TS_SIGNATURE "rusEFI master.2024.12.01.hellen-honda-k.2872762928" diff --git a/firmware/controllers/generated/signature_hellen-nb1.h b/firmware/controllers/generated/signature_hellen-nb1.h index 78d6c22ab1..7587884529 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 695546795 -#define TS_SIGNATURE "rusEFI master.2024.12.01.hellen-nb1.695546795" +#define SIGNATURE_HASH 2091205977 +#define TS_SIGNATURE "rusEFI master.2024.12.01.hellen-nb1.2091205977" diff --git a/firmware/controllers/generated/signature_hellen121nissan.h b/firmware/controllers/generated/signature_hellen121nissan.h index 084a92e3d9..0d0c616261 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 2051568692 -#define TS_SIGNATURE "rusEFI master.2024.12.01.hellen121nissan.2051568692" +#define SIGNATURE_HASH 798491334 +#define TS_SIGNATURE "rusEFI master.2024.12.01.hellen121nissan.798491334" diff --git a/firmware/controllers/generated/signature_hellen121vag.h b/firmware/controllers/generated/signature_hellen121vag.h index 71336f5fed..7125df73c9 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 572614259 -#define TS_SIGNATURE "rusEFI master.2024.12.01.hellen121vag.572614259" +#define SIGNATURE_HASH 2012287105 +#define TS_SIGNATURE "rusEFI master.2024.12.01.hellen121vag.2012287105" diff --git a/firmware/controllers/generated/signature_hellen128.h b/firmware/controllers/generated/signature_hellen128.h index 697f3b6769..8582322482 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 1195494467 -#define TS_SIGNATURE "rusEFI master.2024.12.01.hellen128.1195494467" +#define SIGNATURE_HASH 311540401 +#define TS_SIGNATURE "rusEFI master.2024.12.01.hellen128.311540401" diff --git a/firmware/controllers/generated/signature_hellen154hyundai.h b/firmware/controllers/generated/signature_hellen154hyundai.h index 6b036982b1..4f7b537968 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 2357649198 -#define TS_SIGNATURE "rusEFI master.2024.12.01.hellen154hyundai.2357649198" +#define SIGNATURE_HASH 3646335452 +#define TS_SIGNATURE "rusEFI master.2024.12.01.hellen154hyundai.3646335452" diff --git a/firmware/controllers/generated/signature_hellen154hyundai_f7.h b/firmware/controllers/generated/signature_hellen154hyundai_f7.h index 32d07b18e6..b84d3be3bd 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 3270554285 -#define TS_SIGNATURE "rusEFI master.2024.12.01.hellen154hyundai_f7.3270554285" +#define SIGNATURE_HASH 2535507039 +#define TS_SIGNATURE "rusEFI master.2024.12.01.hellen154hyundai_f7.2535507039" diff --git a/firmware/controllers/generated/signature_hellen72.h b/firmware/controllers/generated/signature_hellen72.h index 39e75fda54..55cd0cd714 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 1476070242 -#define TS_SIGNATURE "rusEFI master.2024.12.01.hellen72.1476070242" +#define SIGNATURE_HASH 36404624 +#define TS_SIGNATURE "rusEFI master.2024.12.01.hellen72.36404624" diff --git a/firmware/controllers/generated/signature_hellen81.h b/firmware/controllers/generated/signature_hellen81.h index 473d7fc95d..44d75e4d55 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 3477304914 -#define TS_SIGNATURE "rusEFI master.2024.12.01.hellen81.3477304914" +#define SIGNATURE_HASH 2593325216 +#define TS_SIGNATURE "rusEFI master.2024.12.01.hellen81.2593325216" diff --git a/firmware/controllers/generated/signature_hellen88bmw.h b/firmware/controllers/generated/signature_hellen88bmw.h index 42fc51976d..6d12fc1fcc 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 3630195473 -#define TS_SIGNATURE "rusEFI master.2024.12.01.hellen88bmw.3630195473" +#define SIGNATURE_HASH 2377127395 +#define TS_SIGNATURE "rusEFI master.2024.12.01.hellen88bmw.2377127395" diff --git a/firmware/controllers/generated/signature_hellenNA6.h b/firmware/controllers/generated/signature_hellenNA6.h index dce47ebe64..e0a840003f 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 1047922004 -#define TS_SIGNATURE "rusEFI master.2024.12.01.hellenNA6.1047922004" +#define SIGNATURE_HASH 1806070694 +#define TS_SIGNATURE "rusEFI master.2024.12.01.hellenNA6.1806070694" diff --git a/firmware/controllers/generated/signature_hellenNA8_96.h b/firmware/controllers/generated/signature_hellenNA8_96.h index 827818d03e..65c67989a8 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 3249293210 -#define TS_SIGNATURE "rusEFI master.2024.12.01.hellenNA8_96.3249293210" +#define SIGNATURE_HASH 2491167080 +#define TS_SIGNATURE "rusEFI master.2024.12.01.hellenNA8_96.2491167080" diff --git a/firmware/controllers/generated/signature_m74_9.h b/firmware/controllers/generated/signature_m74_9.h index 2f708dc039..1ba979844c 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 510254699 -#define TS_SIGNATURE "rusEFI master.2024.12.01.m74_9.510254699" +#define SIGNATURE_HASH 1270458521 +#define TS_SIGNATURE "rusEFI master.2024.12.01.m74_9.1270458521" diff --git a/firmware/controllers/generated/signature_mre-legacy_f4.h b/firmware/controllers/generated/signature_mre-legacy_f4.h index 3129099232..3cd4a01503 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 3786221431 -#define TS_SIGNATURE "rusEFI master.2024.12.01.mre-legacy_f4.3786221431" +#define SIGNATURE_HASH 3028111749 +#define TS_SIGNATURE "rusEFI master.2024.12.01.mre-legacy_f4.3028111749" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index dc29dc19d2..5fa33abff2 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 3786221431 -#define TS_SIGNATURE "rusEFI master.2024.12.01.mre_f4.3786221431" +#define SIGNATURE_HASH 3028111749 +#define TS_SIGNATURE "rusEFI master.2024.12.01.mre_f4.3028111749" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index d3a4b5ecda..a29bb73bf5 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 3786221431 -#define TS_SIGNATURE "rusEFI master.2024.12.01.mre_f7.3786221431" +#define SIGNATURE_HASH 3028111749 +#define TS_SIGNATURE "rusEFI master.2024.12.01.mre_f7.3028111749" diff --git a/firmware/controllers/generated/signature_nucleo_f413.h b/firmware/controllers/generated/signature_nucleo_f413.h index 45ff4192de..f7881d5fd6 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 2866013876 -#define TS_SIGNATURE "rusEFI master.2024.12.01.nucleo_f413.2866013876" +#define SIGNATURE_HASH 4278423622 +#define TS_SIGNATURE "rusEFI master.2024.12.01.nucleo_f413.4278423622" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index 16b692bbc4..de863f234d 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 167383670 -#define TS_SIGNATURE "rusEFI master.2024.12.01.proteus_f4.167383670" +#define SIGNATURE_HASH 1546282116 +#define TS_SIGNATURE "rusEFI master.2024.12.01.proteus_f4.1546282116" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index ec1e1b793d..7e53b21772 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 167383670 -#define TS_SIGNATURE "rusEFI master.2024.12.01.proteus_f7.167383670" +#define SIGNATURE_HASH 1546282116 +#define TS_SIGNATURE "rusEFI master.2024.12.01.proteus_f7.1546282116" diff --git a/firmware/controllers/generated/signature_proteus_h7.h b/firmware/controllers/generated/signature_proteus_h7.h index 6e1f5b2f4f..0b88b2da6b 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 167383670 -#define TS_SIGNATURE "rusEFI master.2024.12.01.proteus_h7.167383670" +#define SIGNATURE_HASH 1546282116 +#define TS_SIGNATURE "rusEFI master.2024.12.01.proteus_h7.1546282116" diff --git a/firmware/controllers/generated/signature_s105.h b/firmware/controllers/generated/signature_s105.h index b268c41264..fd482af5b6 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 358114934 -#define TS_SIGNATURE "rusEFI master.2024.12.01.s105.358114934" +#define SIGNATURE_HASH 1082658948 +#define TS_SIGNATURE "rusEFI master.2024.12.01.s105.1082658948" diff --git a/firmware/controllers/generated/signature_small-can-board.h b/firmware/controllers/generated/signature_small-can-board.h index 0ea6c22217..a082950f81 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 4129868697 -#define TS_SIGNATURE "rusEFI master.2024.12.01.small-can-board.4129868697" +#define SIGNATURE_HASH 2750987627 +#define TS_SIGNATURE "rusEFI master.2024.12.01.small-can-board.2750987627" diff --git a/firmware/controllers/generated/signature_stm32f429_nucleo.h b/firmware/controllers/generated/signature_stm32f429_nucleo.h index e13e733fd6..9d1271cb07 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 2866013876 -#define TS_SIGNATURE "rusEFI master.2024.12.01.stm32f429_nucleo.2866013876" +#define SIGNATURE_HASH 4278423622 +#define TS_SIGNATURE "rusEFI master.2024.12.01.stm32f429_nucleo.4278423622" diff --git a/firmware/controllers/generated/signature_stm32f767_nucleo.h b/firmware/controllers/generated/signature_stm32f767_nucleo.h index 497a363dd9..2566b0d597 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 2866013876 -#define TS_SIGNATURE "rusEFI master.2024.12.01.stm32f767_nucleo.2866013876" +#define SIGNATURE_HASH 4278423622 +#define TS_SIGNATURE "rusEFI master.2024.12.01.stm32f767_nucleo.4278423622" diff --git a/firmware/controllers/generated/signature_stm32h743_nucleo.h b/firmware/controllers/generated/signature_stm32h743_nucleo.h index 009e9da5aa..6ac327cf0b 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 2866013876 -#define TS_SIGNATURE "rusEFI master.2024.12.01.stm32h743_nucleo.2866013876" +#define SIGNATURE_HASH 4278423622 +#define TS_SIGNATURE "rusEFI master.2024.12.01.stm32h743_nucleo.4278423622" diff --git a/firmware/controllers/generated/signature_subaru_eg33_f7.h b/firmware/controllers/generated/signature_subaru_eg33_f7.h index 46416cfafd..0b9ce0fc1b 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 4126334698 -#define TS_SIGNATURE "rusEFI master.2024.12.01.subaru_eg33_f7.4126334698" +#define SIGNATURE_HASH 2686625816 +#define TS_SIGNATURE "rusEFI master.2024.12.01.subaru_eg33_f7.2686625816" diff --git a/firmware/controllers/generated/signature_t-b-g.h b/firmware/controllers/generated/signature_t-b-g.h index b72c7efcd7..ad95f1aa41 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 2866013876 -#define TS_SIGNATURE "rusEFI master.2024.12.01.t-b-g.2866013876" +#define SIGNATURE_HASH 4278423622 +#define TS_SIGNATURE "rusEFI master.2024.12.01.t-b-g.4278423622" diff --git a/firmware/controllers/generated/signature_tdg-pdm8.h b/firmware/controllers/generated/signature_tdg-pdm8.h index dc04919305..0b1d6ac2d7 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 2432588348 -#define TS_SIGNATURE "rusEFI master.2024.12.01.tdg-pdm8.2432588348" +#define SIGNATURE_HASH 3308137678 +#define TS_SIGNATURE "rusEFI master.2024.12.01.tdg-pdm8.3308137678" diff --git a/firmware/controllers/generated/signature_uaefi.h b/firmware/controllers/generated/signature_uaefi.h index a60b9c268f..3a038e44da 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 4074929591 -#define TS_SIGNATURE "rusEFI master.2024.12.01.uaefi.4074929591" +#define SIGNATURE_HASH 2805074757 +#define TS_SIGNATURE "rusEFI master.2024.12.01.uaefi.2805074757" diff --git a/firmware/controllers/generated/signature_uaefi121.h b/firmware/controllers/generated/signature_uaefi121.h index f1d0f68124..96eb0bed8b 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 1275113500 -#define TS_SIGNATURE "rusEFI master.2024.12.01.uaefi121.1275113500" +#define SIGNATURE_HASH 433112814 +#define TS_SIGNATURE "rusEFI master.2024.12.01.uaefi121.433112814" diff --git a/firmware/controllers/lua/generated/output_lookup_generated.cpp b/firmware/controllers/lua/generated/output_lookup_generated.cpp index 2857c67a91..4dc951b91d 100644 --- a/firmware/controllers/lua/generated/output_lookup_generated.cpp +++ b/firmware/controllers/lua/generated/output_lookup_generated.cpp @@ -1114,6 +1114,11 @@ float getOutputValueByName(const char *name) { case 112999709: return engine->nitrousController.isAfrConditionSatisfied; #endif +// isNitrousRpmConditionSatisfied +#if EFI_LAUNCH_CONTROL + case 1138724839: + return engine->nitrousController.isNitrousRpmConditionSatisfied; +#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 f18cf1fcc1..bddd33787f 100644 --- a/firmware/controllers/lua/generated/value_lookup_generated.cpp +++ b/firmware/controllers/lua/generated/value_lookup_generated.cpp @@ -1925,6 +1925,15 @@ float getConfigValueByName(const char *name) { // nitrousMaximumAfr case -677584112: return engineConfiguration->nitrousMaximumAfr; +// nitrousActivationRpm + case -469950118: + return engineConfiguration->nitrousActivationRpm; +// nitrousDeactivationRpm + case 1072117635: + return engineConfiguration->nitrousDeactivationRpm; +// nitrousDeactivationRpmWindow + case -1786673317: + return engineConfiguration->nitrousDeactivationRpmWindow; // tcu_shiftTime case -1658957891: return config->tcu_shiftTime; @@ -5133,6 +5142,21 @@ bool setConfigValueByName(const char *name, float value) { { engineConfiguration->nitrousMaximumAfr = (int)value; return 1; + } + case -469950118: + { + engineConfiguration->nitrousActivationRpm = (int)value; + return 1; + } + case 1072117635: + { + engineConfiguration->nitrousDeactivationRpm = (int)value; + return 1; + } + case -1786673317: + { + engineConfiguration->nitrousDeactivationRpmWindow = (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 e93d2fb3e1..eada5147ee 100644 --- a/firmware/controllers/lua/generated/value_lookup_generated.md +++ b/firmware/controllers/lua/generated/value_lookup_generated.md @@ -1918,6 +1918,15 @@ This is the pressure at which your injector flow is known.\nFor example if your ### nitrousMaximumAfr +### nitrousActivationRpm + + +### nitrousDeactivationRpm + + +### nitrousDeactivationRpmWindow + + ### 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 9d77b751c4..27ed97f789 100644 --- a/firmware/live_data_generated/nitrous_control_state_generated.h +++ b/firmware/live_data_generated/nitrous_control_state_generated.h @@ -22,85 +22,85 @@ struct nitrous_control_state_s { bool isAfrConditionSatisfied : 1 {}; /** offset 0 bit 5 */ - bool unusedBit_5_5 : 1 {}; + bool isNitrousRpmConditionSatisfied : 1 {}; /** offset 0 bit 6 */ - bool unusedBit_5_6 : 1 {}; + bool unusedBit_6_6 : 1 {}; /** offset 0 bit 7 */ - bool unusedBit_5_7 : 1 {}; + bool unusedBit_6_7 : 1 {}; /** offset 0 bit 8 */ - bool unusedBit_5_8 : 1 {}; + bool unusedBit_6_8 : 1 {}; /** offset 0 bit 9 */ - bool unusedBit_5_9 : 1 {}; + bool unusedBit_6_9 : 1 {}; /** offset 0 bit 10 */ - bool unusedBit_5_10 : 1 {}; + bool unusedBit_6_10 : 1 {}; /** offset 0 bit 11 */ - bool unusedBit_5_11 : 1 {}; + bool unusedBit_6_11 : 1 {}; /** offset 0 bit 12 */ - bool unusedBit_5_12 : 1 {}; + bool unusedBit_6_12 : 1 {}; /** offset 0 bit 13 */ - bool unusedBit_5_13 : 1 {}; + bool unusedBit_6_13 : 1 {}; /** offset 0 bit 14 */ - bool unusedBit_5_14 : 1 {}; + bool unusedBit_6_14 : 1 {}; /** offset 0 bit 15 */ - bool unusedBit_5_15 : 1 {}; + bool unusedBit_6_15 : 1 {}; /** offset 0 bit 16 */ - bool unusedBit_5_16 : 1 {}; + bool unusedBit_6_16 : 1 {}; /** offset 0 bit 17 */ - bool unusedBit_5_17 : 1 {}; + bool unusedBit_6_17 : 1 {}; /** offset 0 bit 18 */ - bool unusedBit_5_18 : 1 {}; + bool unusedBit_6_18 : 1 {}; /** offset 0 bit 19 */ - bool unusedBit_5_19 : 1 {}; + bool unusedBit_6_19 : 1 {}; /** offset 0 bit 20 */ - bool unusedBit_5_20 : 1 {}; + bool unusedBit_6_20 : 1 {}; /** offset 0 bit 21 */ - bool unusedBit_5_21 : 1 {}; + bool unusedBit_6_21 : 1 {}; /** offset 0 bit 22 */ - bool unusedBit_5_22 : 1 {}; + bool unusedBit_6_22 : 1 {}; /** offset 0 bit 23 */ - bool unusedBit_5_23 : 1 {}; + bool unusedBit_6_23 : 1 {}; /** offset 0 bit 24 */ - bool unusedBit_5_24 : 1 {}; + bool unusedBit_6_24 : 1 {}; /** offset 0 bit 25 */ - bool unusedBit_5_25 : 1 {}; + bool unusedBit_6_25 : 1 {}; /** offset 0 bit 26 */ - bool unusedBit_5_26 : 1 {}; + bool unusedBit_6_26 : 1 {}; /** offset 0 bit 27 */ - bool unusedBit_5_27 : 1 {}; + bool unusedBit_6_27 : 1 {}; /** offset 0 bit 28 */ - bool unusedBit_5_28 : 1 {}; + bool unusedBit_6_28 : 1 {}; /** offset 0 bit 29 */ - bool unusedBit_5_29 : 1 {}; + bool unusedBit_6_29 : 1 {}; /** offset 0 bit 30 */ - bool unusedBit_5_30 : 1 {}; + bool unusedBit_6_30 : 1 {}; /** offset 0 bit 31 */ - bool unusedBit_5_31 : 1 {}; + bool unusedBit_6_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 1ffde12a81..da414739f4 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.12.01.f407-discovery.1248538377" + signature = "rusEFI master.2024.12.01.f407-discovery.532371963" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.01.f407-discovery.1248538377" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.01.f407-discovery.532371963" ; 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 @@ -1436,7 +1436,10 @@ 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 nitrousMaximumAfr = scalar, U08, 3952, "afr", 0.1, 0, 10, 20, 1 -unusedOftenChangesDuringFirmwareUpdate = array, U08, 3953, [86], "units", 1, 0, 0, 1, 0 +nitrousActivationRpm = scalar, U16, 3954, "rpm", 1, 0, 0, 20000, 0 +nitrousDeactivationRpm = scalar, U16, 3956, "rpm", 1, 0, 0, 20000, 0 +nitrousDeactivationRpmWindow = scalar, U16, 3958, "rpm", 1, 0, 0, 20000, 0 +unusedOftenChangesDuringFirmwareUpdate = array, U08, 3960, [80], "units", 1, 0, 0, 1, 0 postCrankingFactor = array, F32, 4040, [6x6], "mult", 1, 0, 1, 3, 2 postCrankingDurationBins = array, U16, 4184, [6], "count", 1, 0, 0, 64000, 0 postCrankingCLTBins = array, S16, 4196, [6], "C", 1, 0, -100, 250, 0 @@ -3232,6 +3235,7 @@ isTpsConditionSatisfied = bits, U32, 1128, [1:1] isCltConditionSatisfied = bits, U32, 1128, [2:2] isMapConditionSatisfied = bits, U32, 1128, [3:3] isAfrConditionSatisfied = bits, U32, 1128, [4:4] +isNitrousRpmConditionSatisfied = bits, U32, 1128, [5:5] ; total TS size = 1132 isAntilagCondition = bits, U32, 1132, [0:0] ALSMinRPMCondition = bits, U32, 1132, [1:1] @@ -5815,6 +5819,7 @@ entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" entry = isAfrConditionSatisfied, "isAfrConditionSatisfied", int, "%d" +entry = isNitrousRpmConditionSatisfied, "isNitrousRpmConditionSatisfied", int, "%d" entry = isAntilagCondition, "isAntilagCondition", int, "%d" entry = ALSMinRPMCondition, "ALSMinRPMCondition", int, "%d" entry = ALSMaxRPMCondition, "ALSMaxRPMCondition", int, "%d" @@ -6800,6 +6805,7 @@ indicatorPanel = nitrous_control_stateIndicatorPanel, 2 indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" indicator = {isAfrConditionSatisfied}, "isAfrConditionSatisfied No", "isAfrConditionSatisfied Yes" + indicator = {isNitrousRpmConditionSatisfied}, "isNitrousRpmConditionSatisfied No", "isNitrousRpmConditionSatisfied Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9836,10 +9842,13 @@ dialog = tcuControls, "Transmission Settings" panel = NitrousControlLuaGaugeDialog, {nitrousControlArmingMethod == 1} dialog = NitrousControlSettings, "Settings" - field = "Minimum TPS", nitrousMinimumTps - field = "Minimum CLT", nitrousMinimumClt - field = "Maximum MAP", nitrousMaximumMap - field = "Maximum AFR", nitrousMaximumAfr + field = "Minimum TPS", nitrousMinimumTps + field = "Minimum CLT", nitrousMinimumClt + field = "Maximum MAP", nitrousMaximumMap + field = "Maximum AFR", nitrousMaximumAfr + field = "Activation RPM", nitrousActivationRpm + field = "Dectivation RPM", nitrousDeactivationRpm + field = "Dectivation RPM Window", nitrousDeactivationRpmWindow dialog = NitrousControlSettingsDialog, "", yAxis field = "Enable Nitrous Control", nitrousControlEnabled diff --git a/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini index 4e23f62a04..67fc89ddb0 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.12.01.alphax-2chan.3810128067" + signature = "rusEFI master.2024.12.01.alphax-2chan.3066660401" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.01.alphax-2chan.3810128067" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.01.alphax-2chan.3066660401" ; 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 @@ -1436,7 +1436,10 @@ 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 nitrousMaximumAfr = scalar, U08, 3952, "afr", 0.1, 0, 10, 20, 1 -unusedOftenChangesDuringFirmwareUpdate = array, U08, 3953, [86], "units", 1, 0, 0, 1, 0 +nitrousActivationRpm = scalar, U16, 3954, "rpm", 1, 0, 0, 20000, 0 +nitrousDeactivationRpm = scalar, U16, 3956, "rpm", 1, 0, 0, 20000, 0 +nitrousDeactivationRpmWindow = scalar, U16, 3958, "rpm", 1, 0, 0, 20000, 0 +unusedOftenChangesDuringFirmwareUpdate = array, U08, 3960, [80], "units", 1, 0, 0, 1, 0 postCrankingFactor = array, F32, 4040, [6x6], "mult", 1, 0, 1, 3, 2 postCrankingDurationBins = array, U16, 4184, [6], "count", 1, 0, 0, 64000, 0 postCrankingCLTBins = array, S16, 4196, [6], "C", 1, 0, -100, 250, 0 @@ -3236,6 +3239,7 @@ isTpsConditionSatisfied = bits, U32, 1128, [1:1] isCltConditionSatisfied = bits, U32, 1128, [2:2] isMapConditionSatisfied = bits, U32, 1128, [3:3] isAfrConditionSatisfied = bits, U32, 1128, [4:4] +isNitrousRpmConditionSatisfied = bits, U32, 1128, [5:5] ; total TS size = 1132 isAntilagCondition = bits, U32, 1132, [0:0] ALSMinRPMCondition = bits, U32, 1132, [1:1] @@ -5812,6 +5816,7 @@ entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" entry = isAfrConditionSatisfied, "isAfrConditionSatisfied", int, "%d" +entry = isNitrousRpmConditionSatisfied, "isNitrousRpmConditionSatisfied", int, "%d" entry = isAntilagCondition, "isAntilagCondition", int, "%d" entry = ALSMinRPMCondition, "ALSMinRPMCondition", int, "%d" entry = ALSMaxRPMCondition, "ALSMaxRPMCondition", int, "%d" @@ -6781,6 +6786,7 @@ indicatorPanel = nitrous_control_stateIndicatorPanel, 2 indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" indicator = {isAfrConditionSatisfied}, "isAfrConditionSatisfied No", "isAfrConditionSatisfied Yes" + indicator = {isNitrousRpmConditionSatisfied}, "isNitrousRpmConditionSatisfied No", "isNitrousRpmConditionSatisfied Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9719,10 +9725,13 @@ dialog = tcuControls, "Transmission Settings" panel = NitrousControlLuaGaugeDialog, {nitrousControlArmingMethod == 1} dialog = NitrousControlSettings, "Settings" - field = "Minimum TPS", nitrousMinimumTps - field = "Minimum CLT", nitrousMinimumClt - field = "Maximum MAP", nitrousMaximumMap - field = "Maximum AFR", nitrousMaximumAfr + field = "Minimum TPS", nitrousMinimumTps + field = "Minimum CLT", nitrousMinimumClt + field = "Maximum MAP", nitrousMaximumMap + field = "Maximum AFR", nitrousMaximumAfr + field = "Activation RPM", nitrousActivationRpm + field = "Dectivation RPM", nitrousDeactivationRpm + field = "Dectivation RPM Window", nitrousDeactivationRpmWindow dialog = NitrousControlSettingsDialog, "", yAxis field = "Enable Nitrous Control", nitrousControlEnabled diff --git a/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini index 77c4098624..923f189899 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.12.01.alphax-4chan.869800486" + signature = "rusEFI master.2024.12.01.alphax-4chan.1711828180" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.01.alphax-4chan.869800486" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.01.alphax-4chan.1711828180" ; 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 @@ -1436,7 +1436,10 @@ 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 nitrousMaximumAfr = scalar, U08, 3952, "afr", 0.1, 0, 10, 20, 1 -unusedOftenChangesDuringFirmwareUpdate = array, U08, 3953, [86], "units", 1, 0, 0, 1, 0 +nitrousActivationRpm = scalar, U16, 3954, "rpm", 1, 0, 0, 20000, 0 +nitrousDeactivationRpm = scalar, U16, 3956, "rpm", 1, 0, 0, 20000, 0 +nitrousDeactivationRpmWindow = scalar, U16, 3958, "rpm", 1, 0, 0, 20000, 0 +unusedOftenChangesDuringFirmwareUpdate = array, U08, 3960, [80], "units", 1, 0, 0, 1, 0 postCrankingFactor = array, F32, 4040, [6x6], "mult", 1, 0, 1, 3, 2 postCrankingDurationBins = array, U16, 4184, [6], "count", 1, 0, 0, 64000, 0 postCrankingCLTBins = array, S16, 4196, [6], "C", 1, 0, -100, 250, 0 @@ -3241,6 +3244,7 @@ isTpsConditionSatisfied = bits, U32, 1128, [1:1] isCltConditionSatisfied = bits, U32, 1128, [2:2] isMapConditionSatisfied = bits, U32, 1128, [3:3] isAfrConditionSatisfied = bits, U32, 1128, [4:4] +isNitrousRpmConditionSatisfied = bits, U32, 1128, [5:5] ; total TS size = 1132 isAntilagCondition = bits, U32, 1132, [0:0] ALSMinRPMCondition = bits, U32, 1132, [1:1] @@ -5824,6 +5828,7 @@ entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" entry = isAfrConditionSatisfied, "isAfrConditionSatisfied", int, "%d" +entry = isNitrousRpmConditionSatisfied, "isNitrousRpmConditionSatisfied", int, "%d" entry = isAntilagCondition, "isAntilagCondition", int, "%d" entry = ALSMinRPMCondition, "ALSMinRPMCondition", int, "%d" entry = ALSMaxRPMCondition, "ALSMaxRPMCondition", int, "%d" @@ -6822,6 +6827,7 @@ indicatorPanel = nitrous_control_stateIndicatorPanel, 2 indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" indicator = {isAfrConditionSatisfied}, "isAfrConditionSatisfied No", "isAfrConditionSatisfied Yes" + indicator = {isNitrousRpmConditionSatisfied}, "isNitrousRpmConditionSatisfied No", "isNitrousRpmConditionSatisfied Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9798,10 +9804,13 @@ dialog = tcuControls, "Transmission Settings" panel = NitrousControlLuaGaugeDialog, {nitrousControlArmingMethod == 1} dialog = NitrousControlSettings, "Settings" - field = "Minimum TPS", nitrousMinimumTps - field = "Minimum CLT", nitrousMinimumClt - field = "Maximum MAP", nitrousMaximumMap - field = "Maximum AFR", nitrousMaximumAfr + field = "Minimum TPS", nitrousMinimumTps + field = "Minimum CLT", nitrousMinimumClt + field = "Maximum MAP", nitrousMaximumMap + field = "Maximum AFR", nitrousMaximumAfr + field = "Activation RPM", nitrousActivationRpm + field = "Dectivation RPM", nitrousDeactivationRpm + field = "Dectivation RPM Window", nitrousDeactivationRpmWindow dialog = NitrousControlSettingsDialog, "", yAxis field = "Enable Nitrous Control", nitrousControlEnabled diff --git a/firmware/tunerstudio/generated/rusefi_alphax-4chan_f7.ini b/firmware/tunerstudio/generated/rusefi_alphax-4chan_f7.ini index bc65c72509..2315eb9588 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.12.01.alphax-4chan_f7.869800486" + signature = "rusEFI master.2024.12.01.alphax-4chan_f7.1711828180" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.01.alphax-4chan_f7.869800486" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.01.alphax-4chan_f7.1711828180" ; 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 @@ -1436,7 +1436,10 @@ 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 nitrousMaximumAfr = scalar, U08, 3952, "afr", 0.1, 0, 10, 20, 1 -unusedOftenChangesDuringFirmwareUpdate = array, U08, 3953, [86], "units", 1, 0, 0, 1, 0 +nitrousActivationRpm = scalar, U16, 3954, "rpm", 1, 0, 0, 20000, 0 +nitrousDeactivationRpm = scalar, U16, 3956, "rpm", 1, 0, 0, 20000, 0 +nitrousDeactivationRpmWindow = scalar, U16, 3958, "rpm", 1, 0, 0, 20000, 0 +unusedOftenChangesDuringFirmwareUpdate = array, U08, 3960, [80], "units", 1, 0, 0, 1, 0 postCrankingFactor = array, F32, 4040, [6x6], "mult", 1, 0, 1, 3, 2 postCrankingDurationBins = array, U16, 4184, [6], "count", 1, 0, 0, 64000, 0 postCrankingCLTBins = array, S16, 4196, [6], "C", 1, 0, -100, 250, 0 @@ -3241,6 +3244,7 @@ isTpsConditionSatisfied = bits, U32, 1128, [1:1] isCltConditionSatisfied = bits, U32, 1128, [2:2] isMapConditionSatisfied = bits, U32, 1128, [3:3] isAfrConditionSatisfied = bits, U32, 1128, [4:4] +isNitrousRpmConditionSatisfied = bits, U32, 1128, [5:5] ; total TS size = 1132 isAntilagCondition = bits, U32, 1132, [0:0] ALSMinRPMCondition = bits, U32, 1132, [1:1] @@ -5824,6 +5828,7 @@ entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" entry = isAfrConditionSatisfied, "isAfrConditionSatisfied", int, "%d" +entry = isNitrousRpmConditionSatisfied, "isNitrousRpmConditionSatisfied", int, "%d" entry = isAntilagCondition, "isAntilagCondition", int, "%d" entry = ALSMinRPMCondition, "ALSMinRPMCondition", int, "%d" entry = ALSMaxRPMCondition, "ALSMaxRPMCondition", int, "%d" @@ -6822,6 +6827,7 @@ indicatorPanel = nitrous_control_stateIndicatorPanel, 2 indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" indicator = {isAfrConditionSatisfied}, "isAfrConditionSatisfied No", "isAfrConditionSatisfied Yes" + indicator = {isNitrousRpmConditionSatisfied}, "isNitrousRpmConditionSatisfied No", "isNitrousRpmConditionSatisfied Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9798,10 +9804,13 @@ dialog = tcuControls, "Transmission Settings" panel = NitrousControlLuaGaugeDialog, {nitrousControlArmingMethod == 1} dialog = NitrousControlSettings, "Settings" - field = "Minimum TPS", nitrousMinimumTps - field = "Minimum CLT", nitrousMinimumClt - field = "Maximum MAP", nitrousMaximumMap - field = "Maximum AFR", nitrousMaximumAfr + field = "Minimum TPS", nitrousMinimumTps + field = "Minimum CLT", nitrousMinimumClt + field = "Maximum MAP", nitrousMaximumMap + field = "Maximum AFR", nitrousMaximumAfr + field = "Activation RPM", nitrousActivationRpm + field = "Dectivation RPM", nitrousDeactivationRpm + field = "Dectivation RPM Window", nitrousDeactivationRpmWindow dialog = NitrousControlSettingsDialog, "", yAxis field = "Enable Nitrous Control", nitrousControlEnabled diff --git a/firmware/tunerstudio/generated/rusefi_alphax-4k-gdi.ini b/firmware/tunerstudio/generated/rusefi_alphax-4k-gdi.ini index e1a90492ac..a2dea67e54 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.12.01.alphax-4k-gdi.625910367" + signature = "rusEFI master.2024.12.01.alphax-4k-gdi.1889457325" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.01.alphax-4k-gdi.625910367" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.01.alphax-4k-gdi.1889457325" ; 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 @@ -1436,7 +1436,10 @@ 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 nitrousMaximumAfr = scalar, U08, 3952, "afr", 0.1, 0, 10, 20, 1 -unusedOftenChangesDuringFirmwareUpdate = array, U08, 3953, [86], "units", 1, 0, 0, 1, 0 +nitrousActivationRpm = scalar, U16, 3954, "rpm", 1, 0, 0, 20000, 0 +nitrousDeactivationRpm = scalar, U16, 3956, "rpm", 1, 0, 0, 20000, 0 +nitrousDeactivationRpmWindow = scalar, U16, 3958, "rpm", 1, 0, 0, 20000, 0 +unusedOftenChangesDuringFirmwareUpdate = array, U08, 3960, [80], "units", 1, 0, 0, 1, 0 postCrankingFactor = array, F32, 4040, [6x6], "mult", 1, 0, 1, 3, 2 postCrankingDurationBins = array, U16, 4184, [6], "count", 1, 0, 0, 64000, 0 postCrankingCLTBins = array, S16, 4196, [6], "C", 1, 0, -100, 250, 0 @@ -3231,6 +3234,7 @@ isTpsConditionSatisfied = bits, U32, 1128, [1:1] isCltConditionSatisfied = bits, U32, 1128, [2:2] isMapConditionSatisfied = bits, U32, 1128, [3:3] isAfrConditionSatisfied = bits, U32, 1128, [4:4] +isNitrousRpmConditionSatisfied = bits, U32, 1128, [5:5] ; total TS size = 1132 isAntilagCondition = bits, U32, 1132, [0:0] ALSMinRPMCondition = bits, U32, 1132, [1:1] @@ -5810,6 +5814,7 @@ entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" entry = isAfrConditionSatisfied, "isAfrConditionSatisfied", int, "%d" +entry = isNitrousRpmConditionSatisfied, "isNitrousRpmConditionSatisfied", int, "%d" entry = isAntilagCondition, "isAntilagCondition", int, "%d" entry = ALSMinRPMCondition, "ALSMinRPMCondition", int, "%d" entry = ALSMaxRPMCondition, "ALSMaxRPMCondition", int, "%d" @@ -6798,6 +6803,7 @@ indicatorPanel = nitrous_control_stateIndicatorPanel, 2 indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" indicator = {isAfrConditionSatisfied}, "isAfrConditionSatisfied No", "isAfrConditionSatisfied Yes" + indicator = {isNitrousRpmConditionSatisfied}, "isNitrousRpmConditionSatisfied No", "isNitrousRpmConditionSatisfied Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9770,10 +9776,13 @@ commandButton = "GM LCV", cmd_set_engine_type_GM_LCV panel = NitrousControlLuaGaugeDialog, {nitrousControlArmingMethod == 1} dialog = NitrousControlSettings, "Settings" - field = "Minimum TPS", nitrousMinimumTps - field = "Minimum CLT", nitrousMinimumClt - field = "Maximum MAP", nitrousMaximumMap - field = "Maximum AFR", nitrousMaximumAfr + field = "Minimum TPS", nitrousMinimumTps + field = "Minimum CLT", nitrousMinimumClt + field = "Maximum MAP", nitrousMaximumMap + field = "Maximum AFR", nitrousMaximumAfr + field = "Activation RPM", nitrousActivationRpm + field = "Dectivation RPM", nitrousDeactivationRpm + field = "Dectivation RPM Window", nitrousDeactivationRpmWindow dialog = NitrousControlSettingsDialog, "", yAxis field = "Enable Nitrous Control", nitrousControlEnabled diff --git a/firmware/tunerstudio/generated/rusefi_alphax-8chan-revA.ini b/firmware/tunerstudio/generated/rusefi_alphax-8chan-revA.ini index 6262626c07..3985613c66 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.12.01.alphax-8chan-revA.236590369" + signature = "rusEFI master.2024.12.01.alphax-8chan-revA.1539990483" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.01.alphax-8chan-revA.236590369" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.01.alphax-8chan-revA.1539990483" ; 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 @@ -1436,7 +1436,10 @@ 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 nitrousMaximumAfr = scalar, U08, 3952, "afr", 0.1, 0, 10, 20, 1 -unusedOftenChangesDuringFirmwareUpdate = array, U08, 3953, [86], "units", 1, 0, 0, 1, 0 +nitrousActivationRpm = scalar, U16, 3954, "rpm", 1, 0, 0, 20000, 0 +nitrousDeactivationRpm = scalar, U16, 3956, "rpm", 1, 0, 0, 20000, 0 +nitrousDeactivationRpmWindow = scalar, U16, 3958, "rpm", 1, 0, 0, 20000, 0 +unusedOftenChangesDuringFirmwareUpdate = array, U08, 3960, [80], "units", 1, 0, 0, 1, 0 postCrankingFactor = array, F32, 4040, [6x6], "mult", 1, 0, 1, 3, 2 postCrankingDurationBins = array, U16, 4184, [6], "count", 1, 0, 0, 64000, 0 postCrankingCLTBins = array, S16, 4196, [6], "C", 1, 0, -100, 250, 0 @@ -3236,6 +3239,7 @@ isTpsConditionSatisfied = bits, U32, 1128, [1:1] isCltConditionSatisfied = bits, U32, 1128, [2:2] isMapConditionSatisfied = bits, U32, 1128, [3:3] isAfrConditionSatisfied = bits, U32, 1128, [4:4] +isNitrousRpmConditionSatisfied = bits, U32, 1128, [5:5] ; total TS size = 1132 isAntilagCondition = bits, U32, 1132, [0:0] ALSMinRPMCondition = bits, U32, 1132, [1:1] @@ -5818,6 +5822,7 @@ entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" entry = isAfrConditionSatisfied, "isAfrConditionSatisfied", int, "%d" +entry = isNitrousRpmConditionSatisfied, "isNitrousRpmConditionSatisfied", int, "%d" entry = isAntilagCondition, "isAntilagCondition", int, "%d" entry = ALSMinRPMCondition, "ALSMinRPMCondition", int, "%d" entry = ALSMaxRPMCondition, "ALSMaxRPMCondition", int, "%d" @@ -6798,6 +6803,7 @@ indicatorPanel = nitrous_control_stateIndicatorPanel, 2 indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" indicator = {isAfrConditionSatisfied}, "isAfrConditionSatisfied No", "isAfrConditionSatisfied Yes" + indicator = {isNitrousRpmConditionSatisfied}, "isNitrousRpmConditionSatisfied No", "isNitrousRpmConditionSatisfied Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9774,10 +9780,13 @@ dialog = tcuControls, "Transmission Settings" panel = NitrousControlLuaGaugeDialog, {nitrousControlArmingMethod == 1} dialog = NitrousControlSettings, "Settings" - field = "Minimum TPS", nitrousMinimumTps - field = "Minimum CLT", nitrousMinimumClt - field = "Maximum MAP", nitrousMaximumMap - field = "Maximum AFR", nitrousMaximumAfr + field = "Minimum TPS", nitrousMinimumTps + field = "Minimum CLT", nitrousMinimumClt + field = "Maximum MAP", nitrousMaximumMap + field = "Maximum AFR", nitrousMaximumAfr + field = "Activation RPM", nitrousActivationRpm + field = "Dectivation RPM", nitrousDeactivationRpm + field = "Dectivation RPM Window", nitrousDeactivationRpmWindow dialog = NitrousControlSettingsDialog, "", yAxis field = "Enable Nitrous Control", nitrousControlEnabled diff --git a/firmware/tunerstudio/generated/rusefi_alphax-8chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-8chan.ini index 2eef2b051d..37ea0113d0 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.12.01.alphax-8chan.4058647861" + signature = "rusEFI master.2024.12.01.alphax-8chan.2755296199" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.01.alphax-8chan.4058647861" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.01.alphax-8chan.2755296199" ; 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 @@ -1439,7 +1439,10 @@ 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 nitrousMaximumAfr = scalar, U08, 3968, "afr", 0.1, 0, 10, 20, 1 -unusedOftenChangesDuringFirmwareUpdate = array, U08, 3969, [86], "units", 1, 0, 0, 1, 0 +nitrousActivationRpm = scalar, U16, 3970, "rpm", 1, 0, 0, 20000, 0 +nitrousDeactivationRpm = scalar, U16, 3972, "rpm", 1, 0, 0, 20000, 0 +nitrousDeactivationRpmWindow = scalar, U16, 3974, "rpm", 1, 0, 0, 20000, 0 +unusedOftenChangesDuringFirmwareUpdate = array, U08, 3976, [80], "units", 1, 0, 0, 1, 0 postCrankingFactor = array, F32, 4056, [6x6], "mult", 1, 0, 1, 3, 2 postCrankingDurationBins = array, U16, 4200, [6], "count", 1, 0, 0, 64000, 0 postCrankingCLTBins = array, S16, 4212, [6], "C", 1, 0, -100, 250, 0 @@ -3245,6 +3248,7 @@ isTpsConditionSatisfied = bits, U32, 1128, [1:1] isCltConditionSatisfied = bits, U32, 1128, [2:2] isMapConditionSatisfied = bits, U32, 1128, [3:3] isAfrConditionSatisfied = bits, U32, 1128, [4:4] +isNitrousRpmConditionSatisfied = bits, U32, 1128, [5:5] ; total TS size = 1132 isAntilagCondition = bits, U32, 1132, [0:0] ALSMinRPMCondition = bits, U32, 1132, [1:1] @@ -5828,6 +5832,7 @@ entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" entry = isAfrConditionSatisfied, "isAfrConditionSatisfied", int, "%d" +entry = isNitrousRpmConditionSatisfied, "isNitrousRpmConditionSatisfied", int, "%d" entry = isAntilagCondition, "isAntilagCondition", int, "%d" entry = ALSMinRPMCondition, "ALSMinRPMCondition", int, "%d" entry = ALSMaxRPMCondition, "ALSMaxRPMCondition", int, "%d" @@ -6821,6 +6826,7 @@ indicatorPanel = nitrous_control_stateIndicatorPanel, 2 indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" indicator = {isAfrConditionSatisfied}, "isAfrConditionSatisfied No", "isAfrConditionSatisfied Yes" + indicator = {isNitrousRpmConditionSatisfied}, "isNitrousRpmConditionSatisfied No", "isNitrousRpmConditionSatisfied Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9799,10 +9805,13 @@ commandButton = "GM LCV", cmd_set_engine_type_GM_LCV panel = NitrousControlLuaGaugeDialog, {nitrousControlArmingMethod == 1} dialog = NitrousControlSettings, "Settings" - field = "Minimum TPS", nitrousMinimumTps - field = "Minimum CLT", nitrousMinimumClt - field = "Maximum MAP", nitrousMaximumMap - field = "Maximum AFR", nitrousMaximumAfr + field = "Minimum TPS", nitrousMinimumTps + field = "Minimum CLT", nitrousMinimumClt + field = "Maximum MAP", nitrousMaximumMap + field = "Maximum AFR", nitrousMaximumAfr + field = "Activation RPM", nitrousActivationRpm + field = "Dectivation RPM", nitrousDeactivationRpm + field = "Dectivation RPM Window", nitrousDeactivationRpmWindow dialog = NitrousControlSettingsDialog, "", yAxis field = "Enable Nitrous Control", nitrousControlEnabled diff --git a/firmware/tunerstudio/generated/rusefi_alphax-8chan_f7.ini b/firmware/tunerstudio/generated/rusefi_alphax-8chan_f7.ini index ea0a5d5dd6..52206874e0 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.12.01.alphax-8chan_f7.4058647861" + signature = "rusEFI master.2024.12.01.alphax-8chan_f7.2755296199" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.01.alphax-8chan_f7.4058647861" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.01.alphax-8chan_f7.2755296199" ; 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 @@ -1439,7 +1439,10 @@ 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 nitrousMaximumAfr = scalar, U08, 3968, "afr", 0.1, 0, 10, 20, 1 -unusedOftenChangesDuringFirmwareUpdate = array, U08, 3969, [86], "units", 1, 0, 0, 1, 0 +nitrousActivationRpm = scalar, U16, 3970, "rpm", 1, 0, 0, 20000, 0 +nitrousDeactivationRpm = scalar, U16, 3972, "rpm", 1, 0, 0, 20000, 0 +nitrousDeactivationRpmWindow = scalar, U16, 3974, "rpm", 1, 0, 0, 20000, 0 +unusedOftenChangesDuringFirmwareUpdate = array, U08, 3976, [80], "units", 1, 0, 0, 1, 0 postCrankingFactor = array, F32, 4056, [6x6], "mult", 1, 0, 1, 3, 2 postCrankingDurationBins = array, U16, 4200, [6], "count", 1, 0, 0, 64000, 0 postCrankingCLTBins = array, S16, 4212, [6], "C", 1, 0, -100, 250, 0 @@ -3245,6 +3248,7 @@ isTpsConditionSatisfied = bits, U32, 1128, [1:1] isCltConditionSatisfied = bits, U32, 1128, [2:2] isMapConditionSatisfied = bits, U32, 1128, [3:3] isAfrConditionSatisfied = bits, U32, 1128, [4:4] +isNitrousRpmConditionSatisfied = bits, U32, 1128, [5:5] ; total TS size = 1132 isAntilagCondition = bits, U32, 1132, [0:0] ALSMinRPMCondition = bits, U32, 1132, [1:1] @@ -5828,6 +5832,7 @@ entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" entry = isAfrConditionSatisfied, "isAfrConditionSatisfied", int, "%d" +entry = isNitrousRpmConditionSatisfied, "isNitrousRpmConditionSatisfied", int, "%d" entry = isAntilagCondition, "isAntilagCondition", int, "%d" entry = ALSMinRPMCondition, "ALSMinRPMCondition", int, "%d" entry = ALSMaxRPMCondition, "ALSMaxRPMCondition", int, "%d" @@ -6821,6 +6826,7 @@ indicatorPanel = nitrous_control_stateIndicatorPanel, 2 indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" indicator = {isAfrConditionSatisfied}, "isAfrConditionSatisfied No", "isAfrConditionSatisfied Yes" + indicator = {isNitrousRpmConditionSatisfied}, "isNitrousRpmConditionSatisfied No", "isNitrousRpmConditionSatisfied Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9799,10 +9805,13 @@ commandButton = "GM LCV", cmd_set_engine_type_GM_LCV panel = NitrousControlLuaGaugeDialog, {nitrousControlArmingMethod == 1} dialog = NitrousControlSettings, "Settings" - field = "Minimum TPS", nitrousMinimumTps - field = "Minimum CLT", nitrousMinimumClt - field = "Maximum MAP", nitrousMaximumMap - field = "Maximum AFR", nitrousMaximumAfr + field = "Minimum TPS", nitrousMinimumTps + field = "Minimum CLT", nitrousMinimumClt + field = "Maximum MAP", nitrousMaximumMap + field = "Maximum AFR", nitrousMaximumAfr + field = "Activation RPM", nitrousActivationRpm + field = "Dectivation RPM", nitrousDeactivationRpm + field = "Dectivation RPM Window", nitrousDeactivationRpmWindow dialog = NitrousControlSettingsDialog, "", yAxis field = "Enable Nitrous Control", nitrousControlEnabled diff --git a/firmware/tunerstudio/generated/rusefi_alphax-silver.ini b/firmware/tunerstudio/generated/rusefi_alphax-silver.ini index aef5bed128..ffc95f2875 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.12.01.alphax-silver.2540563730" + signature = "rusEFI master.2024.12.01.alphax-silver.3267206112" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.01.alphax-silver.2540563730" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.01.alphax-silver.3267206112" ; 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 @@ -1437,7 +1437,10 @@ 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 nitrousMaximumAfr = scalar, U08, 3956, "afr", 0.1, 0, 10, 20, 1 -unusedOftenChangesDuringFirmwareUpdate = array, U08, 3957, [86], "units", 1, 0, 0, 1, 0 +nitrousActivationRpm = scalar, U16, 3958, "rpm", 1, 0, 0, 20000, 0 +nitrousDeactivationRpm = scalar, U16, 3960, "rpm", 1, 0, 0, 20000, 0 +nitrousDeactivationRpmWindow = scalar, U16, 3962, "rpm", 1, 0, 0, 20000, 0 +unusedOftenChangesDuringFirmwareUpdate = array, U08, 3964, [80], "units", 1, 0, 0, 1, 0 postCrankingFactor = array, F32, 4044, [6x6], "mult", 1, 0, 1, 3, 2 postCrankingDurationBins = array, U16, 4188, [6], "count", 1, 0, 0, 64000, 0 postCrankingCLTBins = array, S16, 4200, [6], "C", 1, 0, -100, 250, 0 @@ -3232,6 +3235,7 @@ isTpsConditionSatisfied = bits, U32, 1128, [1:1] isCltConditionSatisfied = bits, U32, 1128, [2:2] isMapConditionSatisfied = bits, U32, 1128, [3:3] isAfrConditionSatisfied = bits, U32, 1128, [4:4] +isNitrousRpmConditionSatisfied = bits, U32, 1128, [5:5] ; total TS size = 1132 isAntilagCondition = bits, U32, 1132, [0:0] ALSMinRPMCondition = bits, U32, 1132, [1:1] @@ -5808,6 +5812,7 @@ entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" entry = isAfrConditionSatisfied, "isAfrConditionSatisfied", int, "%d" +entry = isNitrousRpmConditionSatisfied, "isNitrousRpmConditionSatisfied", int, "%d" entry = isAntilagCondition, "isAntilagCondition", int, "%d" entry = ALSMinRPMCondition, "ALSMinRPMCondition", int, "%d" entry = ALSMaxRPMCondition, "ALSMaxRPMCondition", int, "%d" @@ -6778,6 +6783,7 @@ indicatorPanel = nitrous_control_stateIndicatorPanel, 2 indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" indicator = {isAfrConditionSatisfied}, "isAfrConditionSatisfied No", "isAfrConditionSatisfied Yes" + indicator = {isNitrousRpmConditionSatisfied}, "isNitrousRpmConditionSatisfied No", "isNitrousRpmConditionSatisfied Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9712,10 +9718,13 @@ dialog = tcuControls, "Transmission Settings" panel = NitrousControlLuaGaugeDialog, {nitrousControlArmingMethod == 1} dialog = NitrousControlSettings, "Settings" - field = "Minimum TPS", nitrousMinimumTps - field = "Minimum CLT", nitrousMinimumClt - field = "Maximum MAP", nitrousMaximumMap - field = "Maximum AFR", nitrousMaximumAfr + field = "Minimum TPS", nitrousMinimumTps + field = "Minimum CLT", nitrousMinimumClt + field = "Maximum MAP", nitrousMaximumMap + field = "Maximum AFR", nitrousMaximumAfr + field = "Activation RPM", nitrousActivationRpm + field = "Dectivation RPM", nitrousDeactivationRpm + field = "Dectivation RPM Window", nitrousDeactivationRpmWindow dialog = NitrousControlSettingsDialog, "", yAxis field = "Enable Nitrous Control", nitrousControlEnabled diff --git a/firmware/tunerstudio/generated/rusefi_at_start_f435.ini b/firmware/tunerstudio/generated/rusefi_at_start_f435.ini index 2aeb5efc83..ad3e72fb4a 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.12.01.at_start_f435.2866013876" + signature = "rusEFI master.2024.12.01.at_start_f435.4278423622" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.01.at_start_f435.2866013876" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.01.at_start_f435.4278423622" ; 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 @@ -1436,7 +1436,10 @@ 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 nitrousMaximumAfr = scalar, U08, 3952, "afr", 0.1, 0, 10, 20, 1 -unusedOftenChangesDuringFirmwareUpdate = array, U08, 3953, [86], "units", 1, 0, 0, 1, 0 +nitrousActivationRpm = scalar, U16, 3954, "rpm", 1, 0, 0, 20000, 0 +nitrousDeactivationRpm = scalar, U16, 3956, "rpm", 1, 0, 0, 20000, 0 +nitrousDeactivationRpmWindow = scalar, U16, 3958, "rpm", 1, 0, 0, 20000, 0 +unusedOftenChangesDuringFirmwareUpdate = array, U08, 3960, [80], "units", 1, 0, 0, 1, 0 postCrankingFactor = array, F32, 4040, [6x6], "mult", 1, 0, 1, 3, 2 postCrankingDurationBins = array, U16, 4184, [6], "count", 1, 0, 0, 64000, 0 postCrankingCLTBins = array, S16, 4196, [6], "C", 1, 0, -100, 250, 0 @@ -3231,6 +3234,7 @@ isTpsConditionSatisfied = bits, U32, 1128, [1:1] isCltConditionSatisfied = bits, U32, 1128, [2:2] isMapConditionSatisfied = bits, U32, 1128, [3:3] isAfrConditionSatisfied = bits, U32, 1128, [4:4] +isNitrousRpmConditionSatisfied = bits, U32, 1128, [5:5] ; total TS size = 1132 isAntilagCondition = bits, U32, 1132, [0:0] ALSMinRPMCondition = bits, U32, 1132, [1:1] @@ -5813,6 +5817,7 @@ entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" entry = isAfrConditionSatisfied, "isAfrConditionSatisfied", int, "%d" +entry = isNitrousRpmConditionSatisfied, "isNitrousRpmConditionSatisfied", int, "%d" entry = isAntilagCondition, "isAntilagCondition", int, "%d" entry = ALSMinRPMCondition, "ALSMinRPMCondition", int, "%d" entry = ALSMaxRPMCondition, "ALSMaxRPMCondition", int, "%d" @@ -6793,6 +6798,7 @@ indicatorPanel = nitrous_control_stateIndicatorPanel, 2 indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" indicator = {isAfrConditionSatisfied}, "isAfrConditionSatisfied No", "isAfrConditionSatisfied Yes" + indicator = {isNitrousRpmConditionSatisfied}, "isNitrousRpmConditionSatisfied No", "isNitrousRpmConditionSatisfied Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9823,10 +9829,13 @@ dialog = tcuControls, "Transmission Settings" panel = NitrousControlLuaGaugeDialog, {nitrousControlArmingMethod == 1} dialog = NitrousControlSettings, "Settings" - field = "Minimum TPS", nitrousMinimumTps - field = "Minimum CLT", nitrousMinimumClt - field = "Maximum MAP", nitrousMaximumMap - field = "Maximum AFR", nitrousMaximumAfr + field = "Minimum TPS", nitrousMinimumTps + field = "Minimum CLT", nitrousMinimumClt + field = "Maximum MAP", nitrousMaximumMap + field = "Maximum AFR", nitrousMaximumAfr + field = "Activation RPM", nitrousActivationRpm + field = "Dectivation RPM", nitrousDeactivationRpm + field = "Dectivation RPM Window", nitrousDeactivationRpmWindow dialog = NitrousControlSettingsDialog, "", yAxis field = "Enable Nitrous Control", nitrousControlEnabled diff --git a/firmware/tunerstudio/generated/rusefi_atlas.ini b/firmware/tunerstudio/generated/rusefi_atlas.ini index bc060d05ba..43b8c8de14 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.12.01.atlas.4006884090" + signature = "rusEFI master.2024.12.01.atlas.3137618952" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.01.atlas.4006884090" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.01.atlas.3137618952" ; 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 @@ -1436,7 +1436,10 @@ 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 nitrousMaximumAfr = scalar, U08, 3792, "afr", 0.1, 0, 10, 20, 1 -unusedOftenChangesDuringFirmwareUpdate = array, U08, 3793, [86], "units", 1, 0, 0, 1, 0 +nitrousActivationRpm = scalar, U16, 3794, "rpm", 1, 0, 0, 20000, 0 +nitrousDeactivationRpm = scalar, U16, 3796, "rpm", 1, 0, 0, 20000, 0 +nitrousDeactivationRpmWindow = scalar, U16, 3798, "rpm", 1, 0, 0, 20000, 0 +unusedOftenChangesDuringFirmwareUpdate = array, U08, 3800, [80], "units", 1, 0, 0, 1, 0 postCrankingFactor = array, F32, 3880, [6x6], "mult", 1, 0, 1, 3, 2 postCrankingDurationBins = array, U16, 4024, [6], "count", 1, 0, 0, 64000, 0 postCrankingCLTBins = array, S16, 4036, [6], "C", 1, 0, -100, 250, 0 @@ -3231,6 +3234,7 @@ isTpsConditionSatisfied = bits, U32, 1128, [1:1] isCltConditionSatisfied = bits, U32, 1128, [2:2] isMapConditionSatisfied = bits, U32, 1128, [3:3] isAfrConditionSatisfied = bits, U32, 1128, [4:4] +isNitrousRpmConditionSatisfied = bits, U32, 1128, [5:5] ; total TS size = 1132 isAntilagCondition = bits, U32, 1132, [0:0] ALSMinRPMCondition = bits, U32, 1132, [1:1] @@ -5813,6 +5817,7 @@ entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" entry = isAfrConditionSatisfied, "isAfrConditionSatisfied", int, "%d" +entry = isNitrousRpmConditionSatisfied, "isNitrousRpmConditionSatisfied", int, "%d" entry = isAntilagCondition, "isAntilagCondition", int, "%d" entry = ALSMinRPMCondition, "ALSMinRPMCondition", int, "%d" entry = ALSMaxRPMCondition, "ALSMaxRPMCondition", int, "%d" @@ -6793,6 +6798,7 @@ indicatorPanel = nitrous_control_stateIndicatorPanel, 2 indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" indicator = {isAfrConditionSatisfied}, "isAfrConditionSatisfied No", "isAfrConditionSatisfied Yes" + indicator = {isNitrousRpmConditionSatisfied}, "isNitrousRpmConditionSatisfied No", "isNitrousRpmConditionSatisfied Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9814,10 +9820,13 @@ dialog = tcuControls, "Transmission Settings" panel = NitrousControlLuaGaugeDialog, {nitrousControlArmingMethod == 1} dialog = NitrousControlSettings, "Settings" - field = "Minimum TPS", nitrousMinimumTps - field = "Minimum CLT", nitrousMinimumClt - field = "Maximum MAP", nitrousMaximumMap - field = "Maximum AFR", nitrousMaximumAfr + field = "Minimum TPS", nitrousMinimumTps + field = "Minimum CLT", nitrousMinimumClt + field = "Maximum MAP", nitrousMaximumMap + field = "Maximum AFR", nitrousMaximumAfr + field = "Activation RPM", nitrousActivationRpm + field = "Dectivation RPM", nitrousDeactivationRpm + field = "Dectivation RPM Window", nitrousDeactivationRpmWindow dialog = NitrousControlSettingsDialog, "", yAxis field = "Enable Nitrous Control", nitrousControlEnabled diff --git a/firmware/tunerstudio/generated/rusefi_f407-discovery.ini b/firmware/tunerstudio/generated/rusefi_f407-discovery.ini index 1ffde12a81..da414739f4 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.12.01.f407-discovery.1248538377" + signature = "rusEFI master.2024.12.01.f407-discovery.532371963" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.01.f407-discovery.1248538377" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.01.f407-discovery.532371963" ; 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 @@ -1436,7 +1436,10 @@ 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 nitrousMaximumAfr = scalar, U08, 3952, "afr", 0.1, 0, 10, 20, 1 -unusedOftenChangesDuringFirmwareUpdate = array, U08, 3953, [86], "units", 1, 0, 0, 1, 0 +nitrousActivationRpm = scalar, U16, 3954, "rpm", 1, 0, 0, 20000, 0 +nitrousDeactivationRpm = scalar, U16, 3956, "rpm", 1, 0, 0, 20000, 0 +nitrousDeactivationRpmWindow = scalar, U16, 3958, "rpm", 1, 0, 0, 20000, 0 +unusedOftenChangesDuringFirmwareUpdate = array, U08, 3960, [80], "units", 1, 0, 0, 1, 0 postCrankingFactor = array, F32, 4040, [6x6], "mult", 1, 0, 1, 3, 2 postCrankingDurationBins = array, U16, 4184, [6], "count", 1, 0, 0, 64000, 0 postCrankingCLTBins = array, S16, 4196, [6], "C", 1, 0, -100, 250, 0 @@ -3232,6 +3235,7 @@ isTpsConditionSatisfied = bits, U32, 1128, [1:1] isCltConditionSatisfied = bits, U32, 1128, [2:2] isMapConditionSatisfied = bits, U32, 1128, [3:3] isAfrConditionSatisfied = bits, U32, 1128, [4:4] +isNitrousRpmConditionSatisfied = bits, U32, 1128, [5:5] ; total TS size = 1132 isAntilagCondition = bits, U32, 1132, [0:0] ALSMinRPMCondition = bits, U32, 1132, [1:1] @@ -5815,6 +5819,7 @@ entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" entry = isAfrConditionSatisfied, "isAfrConditionSatisfied", int, "%d" +entry = isNitrousRpmConditionSatisfied, "isNitrousRpmConditionSatisfied", int, "%d" entry = isAntilagCondition, "isAntilagCondition", int, "%d" entry = ALSMinRPMCondition, "ALSMinRPMCondition", int, "%d" entry = ALSMaxRPMCondition, "ALSMaxRPMCondition", int, "%d" @@ -6800,6 +6805,7 @@ indicatorPanel = nitrous_control_stateIndicatorPanel, 2 indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" indicator = {isAfrConditionSatisfied}, "isAfrConditionSatisfied No", "isAfrConditionSatisfied Yes" + indicator = {isNitrousRpmConditionSatisfied}, "isNitrousRpmConditionSatisfied No", "isNitrousRpmConditionSatisfied Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9836,10 +9842,13 @@ dialog = tcuControls, "Transmission Settings" panel = NitrousControlLuaGaugeDialog, {nitrousControlArmingMethod == 1} dialog = NitrousControlSettings, "Settings" - field = "Minimum TPS", nitrousMinimumTps - field = "Minimum CLT", nitrousMinimumClt - field = "Maximum MAP", nitrousMaximumMap - field = "Maximum AFR", nitrousMaximumAfr + field = "Minimum TPS", nitrousMinimumTps + field = "Minimum CLT", nitrousMinimumClt + field = "Maximum MAP", nitrousMaximumMap + field = "Maximum AFR", nitrousMaximumAfr + field = "Activation RPM", nitrousActivationRpm + field = "Dectivation RPM", nitrousDeactivationRpm + field = "Dectivation RPM Window", nitrousDeactivationRpmWindow dialog = NitrousControlSettingsDialog, "", yAxis field = "Enable Nitrous Control", nitrousControlEnabled diff --git a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini index df80b54303..4576cb7d36 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.12.01.f429-discovery.2866013876" + signature = "rusEFI master.2024.12.01.f429-discovery.4278423622" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.01.f429-discovery.2866013876" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.01.f429-discovery.4278423622" ; 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 @@ -1436,7 +1436,10 @@ 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 nitrousMaximumAfr = scalar, U08, 3952, "afr", 0.1, 0, 10, 20, 1 -unusedOftenChangesDuringFirmwareUpdate = array, U08, 3953, [86], "units", 1, 0, 0, 1, 0 +nitrousActivationRpm = scalar, U16, 3954, "rpm", 1, 0, 0, 20000, 0 +nitrousDeactivationRpm = scalar, U16, 3956, "rpm", 1, 0, 0, 20000, 0 +nitrousDeactivationRpmWindow = scalar, U16, 3958, "rpm", 1, 0, 0, 20000, 0 +unusedOftenChangesDuringFirmwareUpdate = array, U08, 3960, [80], "units", 1, 0, 0, 1, 0 postCrankingFactor = array, F32, 4040, [6x6], "mult", 1, 0, 1, 3, 2 postCrankingDurationBins = array, U16, 4184, [6], "count", 1, 0, 0, 64000, 0 postCrankingCLTBins = array, S16, 4196, [6], "C", 1, 0, -100, 250, 0 @@ -3231,6 +3234,7 @@ isTpsConditionSatisfied = bits, U32, 1128, [1:1] isCltConditionSatisfied = bits, U32, 1128, [2:2] isMapConditionSatisfied = bits, U32, 1128, [3:3] isAfrConditionSatisfied = bits, U32, 1128, [4:4] +isNitrousRpmConditionSatisfied = bits, U32, 1128, [5:5] ; total TS size = 1132 isAntilagCondition = bits, U32, 1132, [0:0] ALSMinRPMCondition = bits, U32, 1132, [1:1] @@ -5813,6 +5817,7 @@ entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" entry = isAfrConditionSatisfied, "isAfrConditionSatisfied", int, "%d" +entry = isNitrousRpmConditionSatisfied, "isNitrousRpmConditionSatisfied", int, "%d" entry = isAntilagCondition, "isAntilagCondition", int, "%d" entry = ALSMinRPMCondition, "ALSMinRPMCondition", int, "%d" entry = ALSMaxRPMCondition, "ALSMaxRPMCondition", int, "%d" @@ -6793,6 +6798,7 @@ indicatorPanel = nitrous_control_stateIndicatorPanel, 2 indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" indicator = {isAfrConditionSatisfied}, "isAfrConditionSatisfied No", "isAfrConditionSatisfied Yes" + indicator = {isNitrousRpmConditionSatisfied}, "isNitrousRpmConditionSatisfied No", "isNitrousRpmConditionSatisfied Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9823,10 +9829,13 @@ dialog = tcuControls, "Transmission Settings" panel = NitrousControlLuaGaugeDialog, {nitrousControlArmingMethod == 1} dialog = NitrousControlSettings, "Settings" - field = "Minimum TPS", nitrousMinimumTps - field = "Minimum CLT", nitrousMinimumClt - field = "Maximum MAP", nitrousMaximumMap - field = "Maximum AFR", nitrousMaximumAfr + field = "Minimum TPS", nitrousMinimumTps + field = "Minimum CLT", nitrousMinimumClt + field = "Maximum MAP", nitrousMaximumMap + field = "Maximum AFR", nitrousMaximumAfr + field = "Activation RPM", nitrousActivationRpm + field = "Dectivation RPM", nitrousDeactivationRpm + field = "Dectivation RPM Window", nitrousDeactivationRpmWindow dialog = NitrousControlSettingsDialog, "", yAxis field = "Enable Nitrous Control", nitrousControlEnabled diff --git a/firmware/tunerstudio/generated/rusefi_f469-discovery.ini b/firmware/tunerstudio/generated/rusefi_f469-discovery.ini index 777b763d9d..fa8fcdd14f 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.12.01.f469-discovery.2550456359" + signature = "rusEFI master.2024.12.01.f469-discovery.3453261525" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.01.f469-discovery.2550456359" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.01.f469-discovery.3453261525" ; 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 @@ -1436,7 +1436,10 @@ 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 nitrousMaximumAfr = scalar, U08, 3952, "afr", 0.1, 0, 10, 20, 1 -unusedOftenChangesDuringFirmwareUpdate = array, U08, 3953, [86], "units", 1, 0, 0, 1, 0 +nitrousActivationRpm = scalar, U16, 3954, "rpm", 1, 0, 0, 20000, 0 +nitrousDeactivationRpm = scalar, U16, 3956, "rpm", 1, 0, 0, 20000, 0 +nitrousDeactivationRpmWindow = scalar, U16, 3958, "rpm", 1, 0, 0, 20000, 0 +unusedOftenChangesDuringFirmwareUpdate = array, U08, 3960, [80], "units", 1, 0, 0, 1, 0 postCrankingFactor = array, F32, 4040, [6x6], "mult", 1, 0, 1, 3, 2 postCrankingDurationBins = array, U16, 4184, [6], "count", 1, 0, 0, 64000, 0 postCrankingCLTBins = array, S16, 4196, [6], "C", 1, 0, -100, 250, 0 @@ -3231,6 +3234,7 @@ isTpsConditionSatisfied = bits, U32, 1128, [1:1] isCltConditionSatisfied = bits, U32, 1128, [2:2] isMapConditionSatisfied = bits, U32, 1128, [3:3] isAfrConditionSatisfied = bits, U32, 1128, [4:4] +isNitrousRpmConditionSatisfied = bits, U32, 1128, [5:5] ; total TS size = 1132 isAntilagCondition = bits, U32, 1132, [0:0] ALSMinRPMCondition = bits, U32, 1132, [1:1] @@ -5813,6 +5817,7 @@ entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" entry = isAfrConditionSatisfied, "isAfrConditionSatisfied", int, "%d" +entry = isNitrousRpmConditionSatisfied, "isNitrousRpmConditionSatisfied", int, "%d" entry = isAntilagCondition, "isAntilagCondition", int, "%d" entry = ALSMinRPMCondition, "ALSMinRPMCondition", int, "%d" entry = ALSMaxRPMCondition, "ALSMaxRPMCondition", int, "%d" @@ -6793,6 +6798,7 @@ indicatorPanel = nitrous_control_stateIndicatorPanel, 2 indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" indicator = {isAfrConditionSatisfied}, "isAfrConditionSatisfied No", "isAfrConditionSatisfied Yes" + indicator = {isNitrousRpmConditionSatisfied}, "isNitrousRpmConditionSatisfied No", "isNitrousRpmConditionSatisfied Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9823,10 +9829,13 @@ dialog = tcuControls, "Transmission Settings" panel = NitrousControlLuaGaugeDialog, {nitrousControlArmingMethod == 1} dialog = NitrousControlSettings, "Settings" - field = "Minimum TPS", nitrousMinimumTps - field = "Minimum CLT", nitrousMinimumClt - field = "Maximum MAP", nitrousMaximumMap - field = "Maximum AFR", nitrousMaximumAfr + field = "Minimum TPS", nitrousMinimumTps + field = "Minimum CLT", nitrousMinimumClt + field = "Maximum MAP", nitrousMaximumMap + field = "Maximum AFR", nitrousMaximumAfr + field = "Activation RPM", nitrousActivationRpm + field = "Dectivation RPM", nitrousDeactivationRpm + field = "Dectivation RPM Window", nitrousDeactivationRpmWindow dialog = NitrousControlSettingsDialog, "", yAxis field = "Enable Nitrous Control", nitrousControlEnabled diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index 2dfe560bcb..57063aff9c 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.12.01.frankenso_na6.4233138863" + signature = "rusEFI master.2024.12.01.frankenso_na6.2843796573" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.01.frankenso_na6.4233138863" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.01.frankenso_na6.2843796573" ; 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 @@ -1436,7 +1436,10 @@ 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 nitrousMaximumAfr = scalar, U08, 3952, "afr", 0.1, 0, 10, 20, 1 -unusedOftenChangesDuringFirmwareUpdate = array, U08, 3953, [86], "units", 1, 0, 0, 1, 0 +nitrousActivationRpm = scalar, U16, 3954, "rpm", 1, 0, 0, 20000, 0 +nitrousDeactivationRpm = scalar, U16, 3956, "rpm", 1, 0, 0, 20000, 0 +nitrousDeactivationRpmWindow = scalar, U16, 3958, "rpm", 1, 0, 0, 20000, 0 +unusedOftenChangesDuringFirmwareUpdate = array, U08, 3960, [80], "units", 1, 0, 0, 1, 0 postCrankingFactor = array, F32, 4040, [6x6], "mult", 1, 0, 1, 3, 2 postCrankingDurationBins = array, U16, 4184, [6], "count", 1, 0, 0, 64000, 0 postCrankingCLTBins = array, S16, 4196, [6], "C", 1, 0, -100, 250, 0 @@ -3231,6 +3234,7 @@ isTpsConditionSatisfied = bits, U32, 1128, [1:1] isCltConditionSatisfied = bits, U32, 1128, [2:2] isMapConditionSatisfied = bits, U32, 1128, [3:3] isAfrConditionSatisfied = bits, U32, 1128, [4:4] +isNitrousRpmConditionSatisfied = bits, U32, 1128, [5:5] ; total TS size = 1132 isAntilagCondition = bits, U32, 1132, [0:0] ALSMinRPMCondition = bits, U32, 1132, [1:1] @@ -5813,6 +5817,7 @@ entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" entry = isAfrConditionSatisfied, "isAfrConditionSatisfied", int, "%d" +entry = isNitrousRpmConditionSatisfied, "isNitrousRpmConditionSatisfied", int, "%d" entry = isAntilagCondition, "isAntilagCondition", int, "%d" entry = ALSMinRPMCondition, "ALSMinRPMCondition", int, "%d" entry = ALSMaxRPMCondition, "ALSMaxRPMCondition", int, "%d" @@ -6793,6 +6798,7 @@ indicatorPanel = nitrous_control_stateIndicatorPanel, 2 indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" indicator = {isAfrConditionSatisfied}, "isAfrConditionSatisfied No", "isAfrConditionSatisfied Yes" + indicator = {isNitrousRpmConditionSatisfied}, "isNitrousRpmConditionSatisfied No", "isNitrousRpmConditionSatisfied Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9824,10 +9830,13 @@ dialog = tcuControls, "Transmission Settings" panel = NitrousControlLuaGaugeDialog, {nitrousControlArmingMethod == 1} dialog = NitrousControlSettings, "Settings" - field = "Minimum TPS", nitrousMinimumTps - field = "Minimum CLT", nitrousMinimumClt - field = "Maximum MAP", nitrousMaximumMap - field = "Maximum AFR", nitrousMaximumAfr + field = "Minimum TPS", nitrousMinimumTps + field = "Minimum CLT", nitrousMinimumClt + field = "Maximum MAP", nitrousMaximumMap + field = "Maximum AFR", nitrousMaximumAfr + field = "Activation RPM", nitrousActivationRpm + field = "Dectivation RPM", nitrousDeactivationRpm + field = "Dectivation RPM Window", nitrousDeactivationRpmWindow dialog = NitrousControlSettingsDialog, "", yAxis field = "Enable Nitrous Control", nitrousControlEnabled diff --git a/firmware/tunerstudio/generated/rusefi_haba208.ini b/firmware/tunerstudio/generated/rusefi_haba208.ini index a789029c81..6187dbf53d 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.12.01.haba208.2866013876" + signature = "rusEFI master.2024.12.01.haba208.4278423622" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.01.haba208.2866013876" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.01.haba208.4278423622" ; 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 @@ -1436,7 +1436,10 @@ 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 nitrousMaximumAfr = scalar, U08, 3952, "afr", 0.1, 0, 10, 20, 1 -unusedOftenChangesDuringFirmwareUpdate = array, U08, 3953, [86], "units", 1, 0, 0, 1, 0 +nitrousActivationRpm = scalar, U16, 3954, "rpm", 1, 0, 0, 20000, 0 +nitrousDeactivationRpm = scalar, U16, 3956, "rpm", 1, 0, 0, 20000, 0 +nitrousDeactivationRpmWindow = scalar, U16, 3958, "rpm", 1, 0, 0, 20000, 0 +unusedOftenChangesDuringFirmwareUpdate = array, U08, 3960, [80], "units", 1, 0, 0, 1, 0 postCrankingFactor = array, F32, 4040, [6x6], "mult", 1, 0, 1, 3, 2 postCrankingDurationBins = array, U16, 4184, [6], "count", 1, 0, 0, 64000, 0 postCrankingCLTBins = array, S16, 4196, [6], "C", 1, 0, -100, 250, 0 @@ -3231,6 +3234,7 @@ isTpsConditionSatisfied = bits, U32, 1128, [1:1] isCltConditionSatisfied = bits, U32, 1128, [2:2] isMapConditionSatisfied = bits, U32, 1128, [3:3] isAfrConditionSatisfied = bits, U32, 1128, [4:4] +isNitrousRpmConditionSatisfied = bits, U32, 1128, [5:5] ; total TS size = 1132 isAntilagCondition = bits, U32, 1132, [0:0] ALSMinRPMCondition = bits, U32, 1132, [1:1] @@ -5813,6 +5817,7 @@ entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" entry = isAfrConditionSatisfied, "isAfrConditionSatisfied", int, "%d" +entry = isNitrousRpmConditionSatisfied, "isNitrousRpmConditionSatisfied", int, "%d" entry = isAntilagCondition, "isAntilagCondition", int, "%d" entry = ALSMinRPMCondition, "ALSMinRPMCondition", int, "%d" entry = ALSMaxRPMCondition, "ALSMaxRPMCondition", int, "%d" @@ -6793,6 +6798,7 @@ indicatorPanel = nitrous_control_stateIndicatorPanel, 2 indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" indicator = {isAfrConditionSatisfied}, "isAfrConditionSatisfied No", "isAfrConditionSatisfied Yes" + indicator = {isNitrousRpmConditionSatisfied}, "isNitrousRpmConditionSatisfied No", "isNitrousRpmConditionSatisfied Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9823,10 +9829,13 @@ dialog = tcuControls, "Transmission Settings" panel = NitrousControlLuaGaugeDialog, {nitrousControlArmingMethod == 1} dialog = NitrousControlSettings, "Settings" - field = "Minimum TPS", nitrousMinimumTps - field = "Minimum CLT", nitrousMinimumClt - field = "Maximum MAP", nitrousMaximumMap - field = "Maximum AFR", nitrousMaximumAfr + field = "Minimum TPS", nitrousMinimumTps + field = "Minimum CLT", nitrousMinimumClt + field = "Maximum MAP", nitrousMaximumMap + field = "Maximum AFR", nitrousMaximumAfr + field = "Activation RPM", nitrousActivationRpm + field = "Dectivation RPM", nitrousDeactivationRpm + field = "Dectivation RPM Window", nitrousDeactivationRpmWindow dialog = NitrousControlSettingsDialog, "", yAxis field = "Enable Nitrous Control", nitrousControlEnabled diff --git a/firmware/tunerstudio/generated/rusefi_hellen-112-17.ini b/firmware/tunerstudio/generated/rusefi_hellen-112-17.ini index 6b769d4a0c..d3e528b979 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.12.01.hellen-112-17.601587248" + signature = "rusEFI master.2024.12.01.hellen-112-17.1980434626" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.01.hellen-112-17.601587248" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.01.hellen-112-17.1980434626" ; 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 @@ -1436,7 +1436,10 @@ 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 nitrousMaximumAfr = scalar, U08, 3952, "afr", 0.1, 0, 10, 20, 1 -unusedOftenChangesDuringFirmwareUpdate = array, U08, 3953, [86], "units", 1, 0, 0, 1, 0 +nitrousActivationRpm = scalar, U16, 3954, "rpm", 1, 0, 0, 20000, 0 +nitrousDeactivationRpm = scalar, U16, 3956, "rpm", 1, 0, 0, 20000, 0 +nitrousDeactivationRpmWindow = scalar, U16, 3958, "rpm", 1, 0, 0, 20000, 0 +unusedOftenChangesDuringFirmwareUpdate = array, U08, 3960, [80], "units", 1, 0, 0, 1, 0 postCrankingFactor = array, F32, 4040, [6x6], "mult", 1, 0, 1, 3, 2 postCrankingDurationBins = array, U16, 4184, [6], "count", 1, 0, 0, 64000, 0 postCrankingCLTBins = array, S16, 4196, [6], "C", 1, 0, -100, 250, 0 @@ -3231,6 +3234,7 @@ isTpsConditionSatisfied = bits, U32, 1128, [1:1] isCltConditionSatisfied = bits, U32, 1128, [2:2] isMapConditionSatisfied = bits, U32, 1128, [3:3] isAfrConditionSatisfied = bits, U32, 1128, [4:4] +isNitrousRpmConditionSatisfied = bits, U32, 1128, [5:5] ; total TS size = 1132 isAntilagCondition = bits, U32, 1132, [0:0] ALSMinRPMCondition = bits, U32, 1132, [1:1] @@ -5813,6 +5817,7 @@ entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" entry = isAfrConditionSatisfied, "isAfrConditionSatisfied", int, "%d" +entry = isNitrousRpmConditionSatisfied, "isNitrousRpmConditionSatisfied", int, "%d" entry = isAntilagCondition, "isAntilagCondition", int, "%d" entry = ALSMinRPMCondition, "ALSMinRPMCondition", int, "%d" entry = ALSMaxRPMCondition, "ALSMaxRPMCondition", int, "%d" @@ -6792,6 +6797,7 @@ indicatorPanel = nitrous_control_stateIndicatorPanel, 2 indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" indicator = {isAfrConditionSatisfied}, "isAfrConditionSatisfied No", "isAfrConditionSatisfied Yes" + indicator = {isNitrousRpmConditionSatisfied}, "isNitrousRpmConditionSatisfied No", "isNitrousRpmConditionSatisfied Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9766,10 +9772,13 @@ dialog = tcuControls, "Transmission Settings" panel = NitrousControlLuaGaugeDialog, {nitrousControlArmingMethod == 1} dialog = NitrousControlSettings, "Settings" - field = "Minimum TPS", nitrousMinimumTps - field = "Minimum CLT", nitrousMinimumClt - field = "Maximum MAP", nitrousMaximumMap - field = "Maximum AFR", nitrousMaximumAfr + field = "Minimum TPS", nitrousMinimumTps + field = "Minimum CLT", nitrousMinimumClt + field = "Maximum MAP", nitrousMaximumMap + field = "Maximum AFR", nitrousMaximumAfr + field = "Activation RPM", nitrousActivationRpm + field = "Dectivation RPM", nitrousDeactivationRpm + field = "Dectivation RPM Window", nitrousDeactivationRpmWindow dialog = NitrousControlSettingsDialog, "", yAxis field = "Enable Nitrous Control", nitrousControlEnabled diff --git a/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini b/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini index f01ba06f36..dfa7308571 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.12.01.hellen-gm-e67.1722450188" + signature = "rusEFI master.2024.12.01.hellen-gm-e67.863696894" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.01.hellen-gm-e67.1722450188" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.01.hellen-gm-e67.863696894" ; 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 @@ -1436,7 +1436,10 @@ 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 nitrousMaximumAfr = scalar, U08, 3952, "afr", 0.1, 0, 10, 20, 1 -unusedOftenChangesDuringFirmwareUpdate = array, U08, 3953, [86], "units", 1, 0, 0, 1, 0 +nitrousActivationRpm = scalar, U16, 3954, "rpm", 1, 0, 0, 20000, 0 +nitrousDeactivationRpm = scalar, U16, 3956, "rpm", 1, 0, 0, 20000, 0 +nitrousDeactivationRpmWindow = scalar, U16, 3958, "rpm", 1, 0, 0, 20000, 0 +unusedOftenChangesDuringFirmwareUpdate = array, U08, 3960, [80], "units", 1, 0, 0, 1, 0 postCrankingFactor = array, F32, 4040, [6x6], "mult", 1, 0, 1, 3, 2 postCrankingDurationBins = array, U16, 4184, [6], "count", 1, 0, 0, 64000, 0 postCrankingCLTBins = array, S16, 4196, [6], "C", 1, 0, -100, 250, 0 @@ -3231,6 +3234,7 @@ isTpsConditionSatisfied = bits, U32, 1128, [1:1] isCltConditionSatisfied = bits, U32, 1128, [2:2] isMapConditionSatisfied = bits, U32, 1128, [3:3] isAfrConditionSatisfied = bits, U32, 1128, [4:4] +isNitrousRpmConditionSatisfied = bits, U32, 1128, [5:5] ; total TS size = 1132 isAntilagCondition = bits, U32, 1132, [0:0] ALSMinRPMCondition = bits, U32, 1132, [1:1] @@ -5813,6 +5817,7 @@ entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" entry = isAfrConditionSatisfied, "isAfrConditionSatisfied", int, "%d" +entry = isNitrousRpmConditionSatisfied, "isNitrousRpmConditionSatisfied", int, "%d" entry = isAntilagCondition, "isAntilagCondition", int, "%d" entry = ALSMinRPMCondition, "ALSMinRPMCondition", int, "%d" entry = ALSMaxRPMCondition, "ALSMaxRPMCondition", int, "%d" @@ -6794,6 +6799,7 @@ indicatorPanel = nitrous_control_stateIndicatorPanel, 2 indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" indicator = {isAfrConditionSatisfied}, "isAfrConditionSatisfied No", "isAfrConditionSatisfied Yes" + indicator = {isNitrousRpmConditionSatisfied}, "isNitrousRpmConditionSatisfied No", "isNitrousRpmConditionSatisfied Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9797,10 +9803,13 @@ dialog = tcuControls, "Transmission Settings" panel = NitrousControlLuaGaugeDialog, {nitrousControlArmingMethod == 1} dialog = NitrousControlSettings, "Settings" - field = "Minimum TPS", nitrousMinimumTps - field = "Minimum CLT", nitrousMinimumClt - field = "Maximum MAP", nitrousMaximumMap - field = "Maximum AFR", nitrousMaximumAfr + field = "Minimum TPS", nitrousMinimumTps + field = "Minimum CLT", nitrousMinimumClt + field = "Maximum MAP", nitrousMaximumMap + field = "Maximum AFR", nitrousMaximumAfr + field = "Activation RPM", nitrousActivationRpm + field = "Dectivation RPM", nitrousDeactivationRpm + field = "Dectivation RPM Window", nitrousDeactivationRpmWindow dialog = NitrousControlSettingsDialog, "", yAxis field = "Enable Nitrous Control", nitrousControlEnabled diff --git a/firmware/tunerstudio/generated/rusefi_hellen-honda-k.ini b/firmware/tunerstudio/generated/rusefi_hellen-honda-k.ini index 79bced877a..18733d84b5 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.12.01.hellen-honda-k.4276786370" + signature = "rusEFI master.2024.12.01.hellen-honda-k.2872762928" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.01.hellen-honda-k.4276786370" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.01.hellen-honda-k.2872762928" ; signature is expected to be 7 or more characters. useLegacyFTempUnits = false ignoreMissingBitOptions = true @@ -1385,7 +1385,10 @@ 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 nitrousMaximumAfr = scalar, U08, 3952, "afr", 0.1, 0, 10, 20, 1 -unusedOftenChangesDuringFirmwareUpdate = array, U08, 3953, [86], "units", 1, 0, 0, 1, 0 +nitrousActivationRpm = scalar, U16, 3954, "rpm", 1, 0, 0, 20000, 0 +nitrousDeactivationRpm = scalar, U16, 3956, "rpm", 1, 0, 0, 20000, 0 +nitrousDeactivationRpmWindow = scalar, U16, 3958, "rpm", 1, 0, 0, 20000, 0 +unusedOftenChangesDuringFirmwareUpdate = array, U08, 3960, [80], "units", 1, 0, 0, 1, 0 postCrankingFactor = array, F32, 4040, [6x6], "mult", 1, 0, 1, 3, 2 postCrankingDurationBins = array, U16, 4184, [6], "count", 1, 0, 0, 64000, 0 postCrankingCLTBins = array, S16, 4196, [6], "C", 1, 0, -100, 125, 0 @@ -3164,6 +3167,7 @@ isTpsConditionSatisfied = bits, U32, 1128, [1:1] isCltConditionSatisfied = bits, U32, 1128, [2:2] isMapConditionSatisfied = bits, U32, 1128, [3:3] isAfrConditionSatisfied = bits, U32, 1128, [4:4] +isNitrousRpmConditionSatisfied = bits, U32, 1128, [5:5] ; total TS size = 1132 isAntilagCondition = bits, U32, 1132, [0:0] ALSMinRPMCondition = bits, U32, 1132, [1:1] @@ -5667,6 +5671,7 @@ entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" entry = isAfrConditionSatisfied, "isAfrConditionSatisfied", int, "%d" +entry = isNitrousRpmConditionSatisfied, "isNitrousRpmConditionSatisfied", int, "%d" entry = isAntilagCondition, "isAntilagCondition", int, "%d" entry = ALSMinRPMCondition, "ALSMinRPMCondition", int, "%d" entry = ALSMaxRPMCondition, "ALSMaxRPMCondition", int, "%d" @@ -6613,6 +6618,7 @@ indicatorPanel = nitrous_control_stateIndicatorPanel, 2 indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" indicator = {isAfrConditionSatisfied}, "isAfrConditionSatisfied No", "isAfrConditionSatisfied Yes" + indicator = {isNitrousRpmConditionSatisfied}, "isNitrousRpmConditionSatisfied No", "isNitrousRpmConditionSatisfied Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9467,10 +9473,13 @@ dialog = tcuControls, "Transmission Settings" panel = NitrousControlLuaGaugeDialog, {nitrousControlArmingMethod == 1} dialog = NitrousControlSettings, "Settings" - field = "Minimum TPS", nitrousMinimumTps - field = "Minimum CLT", nitrousMinimumClt - field = "Maximum MAP", nitrousMaximumMap - field = "Maximum AFR", nitrousMaximumAfr + field = "Minimum TPS", nitrousMinimumTps + field = "Minimum CLT", nitrousMinimumClt + field = "Maximum MAP", nitrousMaximumMap + field = "Maximum AFR", nitrousMaximumAfr + field = "Activation RPM", nitrousActivationRpm + field = "Dectivation RPM", nitrousDeactivationRpm + field = "Dectivation RPM Window", nitrousDeactivationRpmWindow dialog = NitrousControlSettingsDialog, "", yAxis field = "Enable Nitrous Control", nitrousControlEnabled diff --git a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini index 9bd5d27cdf..fa54bc2fae 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.12.01.hellen-nb1.695546795" + signature = "rusEFI master.2024.12.01.hellen-nb1.2091205977" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.01.hellen-nb1.695546795" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.01.hellen-nb1.2091205977" ; 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 @@ -1436,7 +1436,10 @@ 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 nitrousMaximumAfr = scalar, U08, 3952, "afr", 0.1, 0, 10, 20, 1 -unusedOftenChangesDuringFirmwareUpdate = array, U08, 3953, [86], "units", 1, 0, 0, 1, 0 +nitrousActivationRpm = scalar, U16, 3954, "rpm", 1, 0, 0, 20000, 0 +nitrousDeactivationRpm = scalar, U16, 3956, "rpm", 1, 0, 0, 20000, 0 +nitrousDeactivationRpmWindow = scalar, U16, 3958, "rpm", 1, 0, 0, 20000, 0 +unusedOftenChangesDuringFirmwareUpdate = array, U08, 3960, [80], "units", 1, 0, 0, 1, 0 postCrankingFactor = array, F32, 4040, [6x6], "mult", 1, 0, 1, 3, 2 postCrankingDurationBins = array, U16, 4184, [6], "count", 1, 0, 0, 64000, 0 postCrankingCLTBins = array, S16, 4196, [6], "C", 1, 0, -100, 250, 0 @@ -3231,6 +3234,7 @@ isTpsConditionSatisfied = bits, U32, 1128, [1:1] isCltConditionSatisfied = bits, U32, 1128, [2:2] isMapConditionSatisfied = bits, U32, 1128, [3:3] isAfrConditionSatisfied = bits, U32, 1128, [4:4] +isNitrousRpmConditionSatisfied = bits, U32, 1128, [5:5] ; total TS size = 1132 isAntilagCondition = bits, U32, 1132, [0:0] ALSMinRPMCondition = bits, U32, 1132, [1:1] @@ -5813,6 +5817,7 @@ entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" entry = isAfrConditionSatisfied, "isAfrConditionSatisfied", int, "%d" +entry = isNitrousRpmConditionSatisfied, "isNitrousRpmConditionSatisfied", int, "%d" entry = isAntilagCondition, "isAntilagCondition", int, "%d" entry = ALSMinRPMCondition, "ALSMinRPMCondition", int, "%d" entry = ALSMaxRPMCondition, "ALSMaxRPMCondition", int, "%d" @@ -6794,6 +6799,7 @@ indicatorPanel = nitrous_control_stateIndicatorPanel, 2 indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" indicator = {isAfrConditionSatisfied}, "isAfrConditionSatisfied No", "isAfrConditionSatisfied Yes" + indicator = {isNitrousRpmConditionSatisfied}, "isNitrousRpmConditionSatisfied No", "isNitrousRpmConditionSatisfied Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9797,10 +9803,13 @@ dialog = tcuControls, "Transmission Settings" panel = NitrousControlLuaGaugeDialog, {nitrousControlArmingMethod == 1} dialog = NitrousControlSettings, "Settings" - field = "Minimum TPS", nitrousMinimumTps - field = "Minimum CLT", nitrousMinimumClt - field = "Maximum MAP", nitrousMaximumMap - field = "Maximum AFR", nitrousMaximumAfr + field = "Minimum TPS", nitrousMinimumTps + field = "Minimum CLT", nitrousMinimumClt + field = "Maximum MAP", nitrousMaximumMap + field = "Maximum AFR", nitrousMaximumAfr + field = "Activation RPM", nitrousActivationRpm + field = "Dectivation RPM", nitrousDeactivationRpm + field = "Dectivation RPM Window", nitrousDeactivationRpmWindow dialog = NitrousControlSettingsDialog, "", yAxis field = "Enable Nitrous Control", nitrousControlEnabled diff --git a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini index fe780619fc..f1785903ff 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.12.01.hellen121nissan.2051568692" + signature = "rusEFI master.2024.12.01.hellen121nissan.798491334" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.01.hellen121nissan.2051568692" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.01.hellen121nissan.798491334" ; 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 @@ -1436,7 +1436,10 @@ 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 nitrousMaximumAfr = scalar, U08, 3952, "afr", 0.1, 0, 10, 20, 1 -unusedOftenChangesDuringFirmwareUpdate = array, U08, 3953, [86], "units", 1, 0, 0, 1, 0 +nitrousActivationRpm = scalar, U16, 3954, "rpm", 1, 0, 0, 20000, 0 +nitrousDeactivationRpm = scalar, U16, 3956, "rpm", 1, 0, 0, 20000, 0 +nitrousDeactivationRpmWindow = scalar, U16, 3958, "rpm", 1, 0, 0, 20000, 0 +unusedOftenChangesDuringFirmwareUpdate = array, U08, 3960, [80], "units", 1, 0, 0, 1, 0 postCrankingFactor = array, F32, 4040, [6x6], "mult", 1, 0, 1, 3, 2 postCrankingDurationBins = array, U16, 4184, [6], "count", 1, 0, 0, 64000, 0 postCrankingCLTBins = array, S16, 4196, [6], "C", 1, 0, -100, 125, 0 @@ -3231,6 +3234,7 @@ isTpsConditionSatisfied = bits, U32, 1128, [1:1] isCltConditionSatisfied = bits, U32, 1128, [2:2] isMapConditionSatisfied = bits, U32, 1128, [3:3] isAfrConditionSatisfied = bits, U32, 1128, [4:4] +isNitrousRpmConditionSatisfied = bits, U32, 1128, [5:5] ; total TS size = 1132 isAntilagCondition = bits, U32, 1132, [0:0] ALSMinRPMCondition = bits, U32, 1132, [1:1] @@ -5813,6 +5817,7 @@ entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" entry = isAfrConditionSatisfied, "isAfrConditionSatisfied", int, "%d" +entry = isNitrousRpmConditionSatisfied, "isNitrousRpmConditionSatisfied", int, "%d" entry = isAntilagCondition, "isAntilagCondition", int, "%d" entry = ALSMinRPMCondition, "ALSMinRPMCondition", int, "%d" entry = ALSMaxRPMCondition, "ALSMaxRPMCondition", int, "%d" @@ -6791,6 +6796,7 @@ indicatorPanel = nitrous_control_stateIndicatorPanel, 2 indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" indicator = {isAfrConditionSatisfied}, "isAfrConditionSatisfied No", "isAfrConditionSatisfied Yes" + indicator = {isNitrousRpmConditionSatisfied}, "isNitrousRpmConditionSatisfied No", "isNitrousRpmConditionSatisfied Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9752,10 +9758,13 @@ dialog = tcuControls, "Transmission Settings" panel = NitrousControlLuaGaugeDialog, {nitrousControlArmingMethod == 1} dialog = NitrousControlSettings, "Settings" - field = "Minimum TPS", nitrousMinimumTps - field = "Minimum CLT", nitrousMinimumClt - field = "Maximum MAP", nitrousMaximumMap - field = "Maximum AFR", nitrousMaximumAfr + field = "Minimum TPS", nitrousMinimumTps + field = "Minimum CLT", nitrousMinimumClt + field = "Maximum MAP", nitrousMaximumMap + field = "Maximum AFR", nitrousMaximumAfr + field = "Activation RPM", nitrousActivationRpm + field = "Dectivation RPM", nitrousDeactivationRpm + field = "Dectivation RPM Window", nitrousDeactivationRpmWindow dialog = NitrousControlSettingsDialog, "", yAxis field = "Enable Nitrous Control", nitrousControlEnabled diff --git a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini index 606f6c5063..e6474b3942 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.12.01.hellen121vag.572614259" + signature = "rusEFI master.2024.12.01.hellen121vag.2012287105" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.01.hellen121vag.572614259" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.01.hellen121vag.2012287105" ; 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 @@ -1436,7 +1436,10 @@ 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 nitrousMaximumAfr = scalar, U08, 3952, "afr", 0.1, 0, 10, 20, 1 -unusedOftenChangesDuringFirmwareUpdate = array, U08, 3953, [86], "units", 1, 0, 0, 1, 0 +nitrousActivationRpm = scalar, U16, 3954, "rpm", 1, 0, 0, 20000, 0 +nitrousDeactivationRpm = scalar, U16, 3956, "rpm", 1, 0, 0, 20000, 0 +nitrousDeactivationRpmWindow = scalar, U16, 3958, "rpm", 1, 0, 0, 20000, 0 +unusedOftenChangesDuringFirmwareUpdate = array, U08, 3960, [80], "units", 1, 0, 0, 1, 0 postCrankingFactor = array, F32, 4040, [6x6], "mult", 1, 0, 1, 3, 2 postCrankingDurationBins = array, U16, 4184, [6], "count", 1, 0, 0, 64000, 0 postCrankingCLTBins = array, S16, 4196, [6], "C", 1, 0, -100, 250, 0 @@ -3231,6 +3234,7 @@ isTpsConditionSatisfied = bits, U32, 1128, [1:1] isCltConditionSatisfied = bits, U32, 1128, [2:2] isMapConditionSatisfied = bits, U32, 1128, [3:3] isAfrConditionSatisfied = bits, U32, 1128, [4:4] +isNitrousRpmConditionSatisfied = bits, U32, 1128, [5:5] ; total TS size = 1132 isAntilagCondition = bits, U32, 1132, [0:0] ALSMinRPMCondition = bits, U32, 1132, [1:1] @@ -5813,6 +5817,7 @@ entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" entry = isAfrConditionSatisfied, "isAfrConditionSatisfied", int, "%d" +entry = isNitrousRpmConditionSatisfied, "isNitrousRpmConditionSatisfied", int, "%d" entry = isAntilagCondition, "isAntilagCondition", int, "%d" entry = ALSMinRPMCondition, "ALSMinRPMCondition", int, "%d" entry = ALSMaxRPMCondition, "ALSMaxRPMCondition", int, "%d" @@ -6793,6 +6798,7 @@ indicatorPanel = nitrous_control_stateIndicatorPanel, 2 indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" indicator = {isAfrConditionSatisfied}, "isAfrConditionSatisfied No", "isAfrConditionSatisfied Yes" + indicator = {isNitrousRpmConditionSatisfied}, "isNitrousRpmConditionSatisfied No", "isNitrousRpmConditionSatisfied Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9787,10 +9793,13 @@ dialog = tcuControls, "Transmission Settings" panel = NitrousControlLuaGaugeDialog, {nitrousControlArmingMethod == 1} dialog = NitrousControlSettings, "Settings" - field = "Minimum TPS", nitrousMinimumTps - field = "Minimum CLT", nitrousMinimumClt - field = "Maximum MAP", nitrousMaximumMap - field = "Maximum AFR", nitrousMaximumAfr + field = "Minimum TPS", nitrousMinimumTps + field = "Minimum CLT", nitrousMinimumClt + field = "Maximum MAP", nitrousMaximumMap + field = "Maximum AFR", nitrousMaximumAfr + field = "Activation RPM", nitrousActivationRpm + field = "Dectivation RPM", nitrousDeactivationRpm + field = "Dectivation RPM Window", nitrousDeactivationRpmWindow dialog = NitrousControlSettingsDialog, "", yAxis field = "Enable Nitrous Control", nitrousControlEnabled diff --git a/firmware/tunerstudio/generated/rusefi_hellen128.ini b/firmware/tunerstudio/generated/rusefi_hellen128.ini index 7febc993ff..115efa16bd 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.12.01.hellen128.1195494467" + signature = "rusEFI master.2024.12.01.hellen128.311540401" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.01.hellen128.1195494467" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.01.hellen128.311540401" ; 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 @@ -1436,7 +1436,10 @@ 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 nitrousMaximumAfr = scalar, U08, 3952, "afr", 0.1, 0, 10, 20, 1 -unusedOftenChangesDuringFirmwareUpdate = array, U08, 3953, [86], "units", 1, 0, 0, 1, 0 +nitrousActivationRpm = scalar, U16, 3954, "rpm", 1, 0, 0, 20000, 0 +nitrousDeactivationRpm = scalar, U16, 3956, "rpm", 1, 0, 0, 20000, 0 +nitrousDeactivationRpmWindow = scalar, U16, 3958, "rpm", 1, 0, 0, 20000, 0 +unusedOftenChangesDuringFirmwareUpdate = array, U08, 3960, [80], "units", 1, 0, 0, 1, 0 postCrankingFactor = array, F32, 4040, [6x6], "mult", 1, 0, 1, 3, 2 postCrankingDurationBins = array, U16, 4184, [6], "count", 1, 0, 0, 64000, 0 postCrankingCLTBins = array, S16, 4196, [6], "C", 1, 0, -100, 250, 0 @@ -3231,6 +3234,7 @@ isTpsConditionSatisfied = bits, U32, 1128, [1:1] isCltConditionSatisfied = bits, U32, 1128, [2:2] isMapConditionSatisfied = bits, U32, 1128, [3:3] isAfrConditionSatisfied = bits, U32, 1128, [4:4] +isNitrousRpmConditionSatisfied = bits, U32, 1128, [5:5] ; total TS size = 1132 isAntilagCondition = bits, U32, 1132, [0:0] ALSMinRPMCondition = bits, U32, 1132, [1:1] @@ -5813,6 +5817,7 @@ entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" entry = isAfrConditionSatisfied, "isAfrConditionSatisfied", int, "%d" +entry = isNitrousRpmConditionSatisfied, "isNitrousRpmConditionSatisfied", int, "%d" entry = isAntilagCondition, "isAntilagCondition", int, "%d" entry = ALSMinRPMCondition, "ALSMinRPMCondition", int, "%d" entry = ALSMaxRPMCondition, "ALSMaxRPMCondition", int, "%d" @@ -6794,6 +6799,7 @@ indicatorPanel = nitrous_control_stateIndicatorPanel, 2 indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" indicator = {isAfrConditionSatisfied}, "isAfrConditionSatisfied No", "isAfrConditionSatisfied Yes" + indicator = {isNitrousRpmConditionSatisfied}, "isNitrousRpmConditionSatisfied No", "isNitrousRpmConditionSatisfied Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9795,10 +9801,13 @@ dialog = tcuControls, "Transmission Settings" panel = NitrousControlLuaGaugeDialog, {nitrousControlArmingMethod == 1} dialog = NitrousControlSettings, "Settings" - field = "Minimum TPS", nitrousMinimumTps - field = "Minimum CLT", nitrousMinimumClt - field = "Maximum MAP", nitrousMaximumMap - field = "Maximum AFR", nitrousMaximumAfr + field = "Minimum TPS", nitrousMinimumTps + field = "Minimum CLT", nitrousMinimumClt + field = "Maximum MAP", nitrousMaximumMap + field = "Maximum AFR", nitrousMaximumAfr + field = "Activation RPM", nitrousActivationRpm + field = "Dectivation RPM", nitrousDeactivationRpm + field = "Dectivation RPM Window", nitrousDeactivationRpmWindow dialog = NitrousControlSettingsDialog, "", yAxis field = "Enable Nitrous Control", nitrousControlEnabled diff --git a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini index 1e2716312f..826dd07001 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.12.01.hellen154hyundai.2357649198" + signature = "rusEFI master.2024.12.01.hellen154hyundai.3646335452" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.01.hellen154hyundai.2357649198" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.01.hellen154hyundai.3646335452" ; 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 @@ -1436,7 +1436,10 @@ 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 nitrousMaximumAfr = scalar, U08, 3952, "afr", 0.1, 0, 10, 20, 1 -unusedOftenChangesDuringFirmwareUpdate = array, U08, 3953, [86], "units", 1, 0, 0, 1, 0 +nitrousActivationRpm = scalar, U16, 3954, "rpm", 1, 0, 0, 20000, 0 +nitrousDeactivationRpm = scalar, U16, 3956, "rpm", 1, 0, 0, 20000, 0 +nitrousDeactivationRpmWindow = scalar, U16, 3958, "rpm", 1, 0, 0, 20000, 0 +unusedOftenChangesDuringFirmwareUpdate = array, U08, 3960, [80], "units", 1, 0, 0, 1, 0 postCrankingFactor = array, F32, 4040, [6x6], "mult", 1, 0, 1, 3, 2 postCrankingDurationBins = array, U16, 4184, [6], "count", 1, 0, 0, 64000, 0 postCrankingCLTBins = array, S16, 4196, [6], "C", 1, 0, -100, 125, 0 @@ -3231,6 +3234,7 @@ isTpsConditionSatisfied = bits, U32, 1128, [1:1] isCltConditionSatisfied = bits, U32, 1128, [2:2] isMapConditionSatisfied = bits, U32, 1128, [3:3] isAfrConditionSatisfied = bits, U32, 1128, [4:4] +isNitrousRpmConditionSatisfied = bits, U32, 1128, [5:5] ; total TS size = 1132 isAntilagCondition = bits, U32, 1132, [0:0] ALSMinRPMCondition = bits, U32, 1132, [1:1] @@ -5808,6 +5812,7 @@ entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" entry = isAfrConditionSatisfied, "isAfrConditionSatisfied", int, "%d" +entry = isNitrousRpmConditionSatisfied, "isNitrousRpmConditionSatisfied", int, "%d" entry = isAntilagCondition, "isAntilagCondition", int, "%d" entry = ALSMinRPMCondition, "ALSMinRPMCondition", int, "%d" entry = ALSMaxRPMCondition, "ALSMaxRPMCondition", int, "%d" @@ -6775,6 +6780,7 @@ indicatorPanel = nitrous_control_stateIndicatorPanel, 2 indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" indicator = {isAfrConditionSatisfied}, "isAfrConditionSatisfied No", "isAfrConditionSatisfied Yes" + indicator = {isNitrousRpmConditionSatisfied}, "isNitrousRpmConditionSatisfied No", "isNitrousRpmConditionSatisfied Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9703,10 +9709,13 @@ dialog = tcuControls, "Transmission Settings" panel = NitrousControlLuaGaugeDialog, {nitrousControlArmingMethod == 1} dialog = NitrousControlSettings, "Settings" - field = "Minimum TPS", nitrousMinimumTps - field = "Minimum CLT", nitrousMinimumClt - field = "Maximum MAP", nitrousMaximumMap - field = "Maximum AFR", nitrousMaximumAfr + field = "Minimum TPS", nitrousMinimumTps + field = "Minimum CLT", nitrousMinimumClt + field = "Maximum MAP", nitrousMaximumMap + field = "Maximum AFR", nitrousMaximumAfr + field = "Activation RPM", nitrousActivationRpm + field = "Dectivation RPM", nitrousDeactivationRpm + field = "Dectivation RPM Window", nitrousDeactivationRpmWindow dialog = NitrousControlSettingsDialog, "", yAxis field = "Enable Nitrous Control", nitrousControlEnabled diff --git a/firmware/tunerstudio/generated/rusefi_hellen154hyundai_f7.ini b/firmware/tunerstudio/generated/rusefi_hellen154hyundai_f7.ini index ff09e907e9..2ef4b3aaba 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.12.01.hellen154hyundai_f7.3270554285" + signature = "rusEFI master.2024.12.01.hellen154hyundai_f7.2535507039" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.01.hellen154hyundai_f7.3270554285" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.01.hellen154hyundai_f7.2535507039" ; 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 @@ -1436,7 +1436,10 @@ 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 nitrousMaximumAfr = scalar, U08, 3952, "afr", 0.1, 0, 10, 20, 1 -unusedOftenChangesDuringFirmwareUpdate = array, U08, 3953, [86], "units", 1, 0, 0, 1, 0 +nitrousActivationRpm = scalar, U16, 3954, "rpm", 1, 0, 0, 20000, 0 +nitrousDeactivationRpm = scalar, U16, 3956, "rpm", 1, 0, 0, 20000, 0 +nitrousDeactivationRpmWindow = scalar, U16, 3958, "rpm", 1, 0, 0, 20000, 0 +unusedOftenChangesDuringFirmwareUpdate = array, U08, 3960, [80], "units", 1, 0, 0, 1, 0 postCrankingFactor = array, F32, 4040, [6x6], "mult", 1, 0, 1, 3, 2 postCrankingDurationBins = array, U16, 4184, [6], "count", 1, 0, 0, 64000, 0 postCrankingCLTBins = array, S16, 4196, [6], "C", 1, 0, -100, 125, 0 @@ -3231,6 +3234,7 @@ isTpsConditionSatisfied = bits, U32, 1128, [1:1] isCltConditionSatisfied = bits, U32, 1128, [2:2] isMapConditionSatisfied = bits, U32, 1128, [3:3] isAfrConditionSatisfied = bits, U32, 1128, [4:4] +isNitrousRpmConditionSatisfied = bits, U32, 1128, [5:5] ; total TS size = 1132 isAntilagCondition = bits, U32, 1132, [0:0] ALSMinRPMCondition = bits, U32, 1132, [1:1] @@ -5808,6 +5812,7 @@ entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" entry = isAfrConditionSatisfied, "isAfrConditionSatisfied", int, "%d" +entry = isNitrousRpmConditionSatisfied, "isNitrousRpmConditionSatisfied", int, "%d" entry = isAntilagCondition, "isAntilagCondition", int, "%d" entry = ALSMinRPMCondition, "ALSMinRPMCondition", int, "%d" entry = ALSMaxRPMCondition, "ALSMaxRPMCondition", int, "%d" @@ -6775,6 +6780,7 @@ indicatorPanel = nitrous_control_stateIndicatorPanel, 2 indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" indicator = {isAfrConditionSatisfied}, "isAfrConditionSatisfied No", "isAfrConditionSatisfied Yes" + indicator = {isNitrousRpmConditionSatisfied}, "isNitrousRpmConditionSatisfied No", "isNitrousRpmConditionSatisfied Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9703,10 +9709,13 @@ dialog = tcuControls, "Transmission Settings" panel = NitrousControlLuaGaugeDialog, {nitrousControlArmingMethod == 1} dialog = NitrousControlSettings, "Settings" - field = "Minimum TPS", nitrousMinimumTps - field = "Minimum CLT", nitrousMinimumClt - field = "Maximum MAP", nitrousMaximumMap - field = "Maximum AFR", nitrousMaximumAfr + field = "Minimum TPS", nitrousMinimumTps + field = "Minimum CLT", nitrousMinimumClt + field = "Maximum MAP", nitrousMaximumMap + field = "Maximum AFR", nitrousMaximumAfr + field = "Activation RPM", nitrousActivationRpm + field = "Dectivation RPM", nitrousDeactivationRpm + field = "Dectivation RPM Window", nitrousDeactivationRpmWindow dialog = NitrousControlSettingsDialog, "", yAxis field = "Enable Nitrous Control", nitrousControlEnabled diff --git a/firmware/tunerstudio/generated/rusefi_hellen72.ini b/firmware/tunerstudio/generated/rusefi_hellen72.ini index 61f30e0918..f9f20b2450 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.12.01.hellen72.1476070242" + signature = "rusEFI master.2024.12.01.hellen72.36404624" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.01.hellen72.1476070242" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.01.hellen72.36404624" ; 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 @@ -1436,7 +1436,10 @@ 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 nitrousMaximumAfr = scalar, U08, 3952, "afr", 0.1, 0, 10, 20, 1 -unusedOftenChangesDuringFirmwareUpdate = array, U08, 3953, [86], "units", 1, 0, 0, 1, 0 +nitrousActivationRpm = scalar, U16, 3954, "rpm", 1, 0, 0, 20000, 0 +nitrousDeactivationRpm = scalar, U16, 3956, "rpm", 1, 0, 0, 20000, 0 +nitrousDeactivationRpmWindow = scalar, U16, 3958, "rpm", 1, 0, 0, 20000, 0 +unusedOftenChangesDuringFirmwareUpdate = array, U08, 3960, [80], "units", 1, 0, 0, 1, 0 postCrankingFactor = array, F32, 4040, [6x6], "mult", 1, 0, 1, 3, 2 postCrankingDurationBins = array, U16, 4184, [6], "count", 1, 0, 0, 64000, 0 postCrankingCLTBins = array, S16, 4196, [6], "C", 1, 0, -100, 250, 0 @@ -3231,6 +3234,7 @@ isTpsConditionSatisfied = bits, U32, 1128, [1:1] isCltConditionSatisfied = bits, U32, 1128, [2:2] isMapConditionSatisfied = bits, U32, 1128, [3:3] isAfrConditionSatisfied = bits, U32, 1128, [4:4] +isNitrousRpmConditionSatisfied = bits, U32, 1128, [5:5] ; total TS size = 1132 isAntilagCondition = bits, U32, 1132, [0:0] ALSMinRPMCondition = bits, U32, 1132, [1:1] @@ -5813,6 +5817,7 @@ entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" entry = isAfrConditionSatisfied, "isAfrConditionSatisfied", int, "%d" +entry = isNitrousRpmConditionSatisfied, "isNitrousRpmConditionSatisfied", int, "%d" entry = isAntilagCondition, "isAntilagCondition", int, "%d" entry = ALSMinRPMCondition, "ALSMinRPMCondition", int, "%d" entry = ALSMaxRPMCondition, "ALSMaxRPMCondition", int, "%d" @@ -6794,6 +6799,7 @@ indicatorPanel = nitrous_control_stateIndicatorPanel, 2 indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" indicator = {isAfrConditionSatisfied}, "isAfrConditionSatisfied No", "isAfrConditionSatisfied Yes" + indicator = {isNitrousRpmConditionSatisfied}, "isNitrousRpmConditionSatisfied No", "isNitrousRpmConditionSatisfied Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9797,10 +9803,13 @@ dialog = tcuControls, "Transmission Settings" panel = NitrousControlLuaGaugeDialog, {nitrousControlArmingMethod == 1} dialog = NitrousControlSettings, "Settings" - field = "Minimum TPS", nitrousMinimumTps - field = "Minimum CLT", nitrousMinimumClt - field = "Maximum MAP", nitrousMaximumMap - field = "Maximum AFR", nitrousMaximumAfr + field = "Minimum TPS", nitrousMinimumTps + field = "Minimum CLT", nitrousMinimumClt + field = "Maximum MAP", nitrousMaximumMap + field = "Maximum AFR", nitrousMaximumAfr + field = "Activation RPM", nitrousActivationRpm + field = "Dectivation RPM", nitrousDeactivationRpm + field = "Dectivation RPM Window", nitrousDeactivationRpmWindow dialog = NitrousControlSettingsDialog, "", yAxis field = "Enable Nitrous Control", nitrousControlEnabled diff --git a/firmware/tunerstudio/generated/rusefi_hellen81.ini b/firmware/tunerstudio/generated/rusefi_hellen81.ini index 5d08a2a058..0855bb2b5f 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.12.01.hellen81.3477304914" + signature = "rusEFI master.2024.12.01.hellen81.2593325216" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.01.hellen81.3477304914" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.01.hellen81.2593325216" ; 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 @@ -1436,7 +1436,10 @@ 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 nitrousMaximumAfr = scalar, U08, 3952, "afr", 0.1, 0, 10, 20, 1 -unusedOftenChangesDuringFirmwareUpdate = array, U08, 3953, [86], "units", 1, 0, 0, 1, 0 +nitrousActivationRpm = scalar, U16, 3954, "rpm", 1, 0, 0, 20000, 0 +nitrousDeactivationRpm = scalar, U16, 3956, "rpm", 1, 0, 0, 20000, 0 +nitrousDeactivationRpmWindow = scalar, U16, 3958, "rpm", 1, 0, 0, 20000, 0 +unusedOftenChangesDuringFirmwareUpdate = array, U08, 3960, [80], "units", 1, 0, 0, 1, 0 postCrankingFactor = array, F32, 4040, [6x6], "mult", 1, 0, 1, 3, 2 postCrankingDurationBins = array, U16, 4184, [6], "count", 1, 0, 0, 64000, 0 postCrankingCLTBins = array, S16, 4196, [6], "C", 1, 0, -100, 250, 0 @@ -3231,6 +3234,7 @@ isTpsConditionSatisfied = bits, U32, 1128, [1:1] isCltConditionSatisfied = bits, U32, 1128, [2:2] isMapConditionSatisfied = bits, U32, 1128, [3:3] isAfrConditionSatisfied = bits, U32, 1128, [4:4] +isNitrousRpmConditionSatisfied = bits, U32, 1128, [5:5] ; total TS size = 1132 isAntilagCondition = bits, U32, 1132, [0:0] ALSMinRPMCondition = bits, U32, 1132, [1:1] @@ -5813,6 +5817,7 @@ entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" entry = isAfrConditionSatisfied, "isAfrConditionSatisfied", int, "%d" +entry = isNitrousRpmConditionSatisfied, "isNitrousRpmConditionSatisfied", int, "%d" entry = isAntilagCondition, "isAntilagCondition", int, "%d" entry = ALSMinRPMCondition, "ALSMinRPMCondition", int, "%d" entry = ALSMaxRPMCondition, "ALSMaxRPMCondition", int, "%d" @@ -6792,6 +6797,7 @@ indicatorPanel = nitrous_control_stateIndicatorPanel, 2 indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" indicator = {isAfrConditionSatisfied}, "isAfrConditionSatisfied No", "isAfrConditionSatisfied Yes" + indicator = {isNitrousRpmConditionSatisfied}, "isNitrousRpmConditionSatisfied No", "isNitrousRpmConditionSatisfied Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9794,10 +9800,13 @@ dialog = tcuControls, "Transmission Settings" panel = NitrousControlLuaGaugeDialog, {nitrousControlArmingMethod == 1} dialog = NitrousControlSettings, "Settings" - field = "Minimum TPS", nitrousMinimumTps - field = "Minimum CLT", nitrousMinimumClt - field = "Maximum MAP", nitrousMaximumMap - field = "Maximum AFR", nitrousMaximumAfr + field = "Minimum TPS", nitrousMinimumTps + field = "Minimum CLT", nitrousMinimumClt + field = "Maximum MAP", nitrousMaximumMap + field = "Maximum AFR", nitrousMaximumAfr + field = "Activation RPM", nitrousActivationRpm + field = "Dectivation RPM", nitrousDeactivationRpm + field = "Dectivation RPM Window", nitrousDeactivationRpmWindow dialog = NitrousControlSettingsDialog, "", yAxis field = "Enable Nitrous Control", nitrousControlEnabled diff --git a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini index bbbecf5b59..36a70aef6f 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.12.01.hellen88bmw.3630195473" + signature = "rusEFI master.2024.12.01.hellen88bmw.2377127395" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.01.hellen88bmw.3630195473" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.01.hellen88bmw.2377127395" ; 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 @@ -1436,7 +1436,10 @@ 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 nitrousMaximumAfr = scalar, U08, 3952, "afr", 0.1, 0, 10, 20, 1 -unusedOftenChangesDuringFirmwareUpdate = array, U08, 3953, [86], "units", 1, 0, 0, 1, 0 +nitrousActivationRpm = scalar, U16, 3954, "rpm", 1, 0, 0, 20000, 0 +nitrousDeactivationRpm = scalar, U16, 3956, "rpm", 1, 0, 0, 20000, 0 +nitrousDeactivationRpmWindow = scalar, U16, 3958, "rpm", 1, 0, 0, 20000, 0 +unusedOftenChangesDuringFirmwareUpdate = array, U08, 3960, [80], "units", 1, 0, 0, 1, 0 postCrankingFactor = array, F32, 4040, [6x6], "mult", 1, 0, 1, 3, 2 postCrankingDurationBins = array, U16, 4184, [6], "count", 1, 0, 0, 64000, 0 postCrankingCLTBins = array, S16, 4196, [6], "C", 1, 0, -100, 250, 0 @@ -3231,6 +3234,7 @@ isTpsConditionSatisfied = bits, U32, 1128, [1:1] isCltConditionSatisfied = bits, U32, 1128, [2:2] isMapConditionSatisfied = bits, U32, 1128, [3:3] isAfrConditionSatisfied = bits, U32, 1128, [4:4] +isNitrousRpmConditionSatisfied = bits, U32, 1128, [5:5] ; total TS size = 1132 isAntilagCondition = bits, U32, 1132, [0:0] ALSMinRPMCondition = bits, U32, 1132, [1:1] @@ -5813,6 +5817,7 @@ entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" entry = isAfrConditionSatisfied, "isAfrConditionSatisfied", int, "%d" +entry = isNitrousRpmConditionSatisfied, "isNitrousRpmConditionSatisfied", int, "%d" entry = isAntilagCondition, "isAntilagCondition", int, "%d" entry = ALSMinRPMCondition, "ALSMinRPMCondition", int, "%d" entry = ALSMaxRPMCondition, "ALSMaxRPMCondition", int, "%d" @@ -6791,6 +6796,7 @@ indicatorPanel = nitrous_control_stateIndicatorPanel, 2 indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" indicator = {isAfrConditionSatisfied}, "isAfrConditionSatisfied No", "isAfrConditionSatisfied Yes" + indicator = {isNitrousRpmConditionSatisfied}, "isNitrousRpmConditionSatisfied No", "isNitrousRpmConditionSatisfied Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9790,10 +9796,13 @@ dialog = tcuControls, "Transmission Settings" panel = NitrousControlLuaGaugeDialog, {nitrousControlArmingMethod == 1} dialog = NitrousControlSettings, "Settings" - field = "Minimum TPS", nitrousMinimumTps - field = "Minimum CLT", nitrousMinimumClt - field = "Maximum MAP", nitrousMaximumMap - field = "Maximum AFR", nitrousMaximumAfr + field = "Minimum TPS", nitrousMinimumTps + field = "Minimum CLT", nitrousMinimumClt + field = "Maximum MAP", nitrousMaximumMap + field = "Maximum AFR", nitrousMaximumAfr + field = "Activation RPM", nitrousActivationRpm + field = "Dectivation RPM", nitrousDeactivationRpm + field = "Dectivation RPM Window", nitrousDeactivationRpmWindow dialog = NitrousControlSettingsDialog, "", yAxis field = "Enable Nitrous Control", nitrousControlEnabled diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini index 268d1fe94b..306d8e4a54 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.12.01.hellenNA6.1047922004" + signature = "rusEFI master.2024.12.01.hellenNA6.1806070694" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.01.hellenNA6.1047922004" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.01.hellenNA6.1806070694" ; 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 @@ -1436,7 +1436,10 @@ 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 nitrousMaximumAfr = scalar, U08, 3952, "afr", 0.1, 0, 10, 20, 1 -unusedOftenChangesDuringFirmwareUpdate = array, U08, 3953, [86], "units", 1, 0, 0, 1, 0 +nitrousActivationRpm = scalar, U16, 3954, "rpm", 1, 0, 0, 20000, 0 +nitrousDeactivationRpm = scalar, U16, 3956, "rpm", 1, 0, 0, 20000, 0 +nitrousDeactivationRpmWindow = scalar, U16, 3958, "rpm", 1, 0, 0, 20000, 0 +unusedOftenChangesDuringFirmwareUpdate = array, U08, 3960, [80], "units", 1, 0, 0, 1, 0 postCrankingFactor = array, F32, 4040, [6x6], "mult", 1, 0, 1, 3, 2 postCrankingDurationBins = array, U16, 4184, [6], "count", 1, 0, 0, 64000, 0 postCrankingCLTBins = array, S16, 4196, [6], "C", 1, 0, -100, 250, 0 @@ -3231,6 +3234,7 @@ isTpsConditionSatisfied = bits, U32, 1128, [1:1] isCltConditionSatisfied = bits, U32, 1128, [2:2] isMapConditionSatisfied = bits, U32, 1128, [3:3] isAfrConditionSatisfied = bits, U32, 1128, [4:4] +isNitrousRpmConditionSatisfied = bits, U32, 1128, [5:5] ; total TS size = 1132 isAntilagCondition = bits, U32, 1132, [0:0] ALSMinRPMCondition = bits, U32, 1132, [1:1] @@ -5813,6 +5817,7 @@ entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" entry = isAfrConditionSatisfied, "isAfrConditionSatisfied", int, "%d" +entry = isNitrousRpmConditionSatisfied, "isNitrousRpmConditionSatisfied", int, "%d" entry = isAntilagCondition, "isAntilagCondition", int, "%d" entry = ALSMinRPMCondition, "ALSMinRPMCondition", int, "%d" entry = ALSMaxRPMCondition, "ALSMaxRPMCondition", int, "%d" @@ -6794,6 +6799,7 @@ indicatorPanel = nitrous_control_stateIndicatorPanel, 2 indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" indicator = {isAfrConditionSatisfied}, "isAfrConditionSatisfied No", "isAfrConditionSatisfied Yes" + indicator = {isNitrousRpmConditionSatisfied}, "isNitrousRpmConditionSatisfied No", "isNitrousRpmConditionSatisfied Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9797,10 +9803,13 @@ dialog = tcuControls, "Transmission Settings" panel = NitrousControlLuaGaugeDialog, {nitrousControlArmingMethod == 1} dialog = NitrousControlSettings, "Settings" - field = "Minimum TPS", nitrousMinimumTps - field = "Minimum CLT", nitrousMinimumClt - field = "Maximum MAP", nitrousMaximumMap - field = "Maximum AFR", nitrousMaximumAfr + field = "Minimum TPS", nitrousMinimumTps + field = "Minimum CLT", nitrousMinimumClt + field = "Maximum MAP", nitrousMaximumMap + field = "Maximum AFR", nitrousMaximumAfr + field = "Activation RPM", nitrousActivationRpm + field = "Dectivation RPM", nitrousDeactivationRpm + field = "Dectivation RPM Window", nitrousDeactivationRpmWindow dialog = NitrousControlSettingsDialog, "", yAxis field = "Enable Nitrous Control", nitrousControlEnabled diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini b/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini index 11cf4a2d7d..0d8c0a54b8 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.12.01.hellenNA8_96.3249293210" + signature = "rusEFI master.2024.12.01.hellenNA8_96.2491167080" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.01.hellenNA8_96.3249293210" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.01.hellenNA8_96.2491167080" ; 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 @@ -1436,7 +1436,10 @@ 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 nitrousMaximumAfr = scalar, U08, 3952, "afr", 0.1, 0, 10, 20, 1 -unusedOftenChangesDuringFirmwareUpdate = array, U08, 3953, [86], "units", 1, 0, 0, 1, 0 +nitrousActivationRpm = scalar, U16, 3954, "rpm", 1, 0, 0, 20000, 0 +nitrousDeactivationRpm = scalar, U16, 3956, "rpm", 1, 0, 0, 20000, 0 +nitrousDeactivationRpmWindow = scalar, U16, 3958, "rpm", 1, 0, 0, 20000, 0 +unusedOftenChangesDuringFirmwareUpdate = array, U08, 3960, [80], "units", 1, 0, 0, 1, 0 postCrankingFactor = array, F32, 4040, [6x6], "mult", 1, 0, 1, 3, 2 postCrankingDurationBins = array, U16, 4184, [6], "count", 1, 0, 0, 64000, 0 postCrankingCLTBins = array, S16, 4196, [6], "C", 1, 0, -100, 250, 0 @@ -3231,6 +3234,7 @@ isTpsConditionSatisfied = bits, U32, 1128, [1:1] isCltConditionSatisfied = bits, U32, 1128, [2:2] isMapConditionSatisfied = bits, U32, 1128, [3:3] isAfrConditionSatisfied = bits, U32, 1128, [4:4] +isNitrousRpmConditionSatisfied = bits, U32, 1128, [5:5] ; total TS size = 1132 isAntilagCondition = bits, U32, 1132, [0:0] ALSMinRPMCondition = bits, U32, 1132, [1:1] @@ -5813,6 +5817,7 @@ entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" entry = isAfrConditionSatisfied, "isAfrConditionSatisfied", int, "%d" +entry = isNitrousRpmConditionSatisfied, "isNitrousRpmConditionSatisfied", int, "%d" entry = isAntilagCondition, "isAntilagCondition", int, "%d" entry = ALSMinRPMCondition, "ALSMinRPMCondition", int, "%d" entry = ALSMaxRPMCondition, "ALSMaxRPMCondition", int, "%d" @@ -6794,6 +6799,7 @@ indicatorPanel = nitrous_control_stateIndicatorPanel, 2 indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" indicator = {isAfrConditionSatisfied}, "isAfrConditionSatisfied No", "isAfrConditionSatisfied Yes" + indicator = {isNitrousRpmConditionSatisfied}, "isNitrousRpmConditionSatisfied No", "isNitrousRpmConditionSatisfied Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9797,10 +9803,13 @@ dialog = tcuControls, "Transmission Settings" panel = NitrousControlLuaGaugeDialog, {nitrousControlArmingMethod == 1} dialog = NitrousControlSettings, "Settings" - field = "Minimum TPS", nitrousMinimumTps - field = "Minimum CLT", nitrousMinimumClt - field = "Maximum MAP", nitrousMaximumMap - field = "Maximum AFR", nitrousMaximumAfr + field = "Minimum TPS", nitrousMinimumTps + field = "Minimum CLT", nitrousMinimumClt + field = "Maximum MAP", nitrousMaximumMap + field = "Maximum AFR", nitrousMaximumAfr + field = "Activation RPM", nitrousActivationRpm + field = "Dectivation RPM", nitrousDeactivationRpm + field = "Dectivation RPM Window", nitrousDeactivationRpmWindow dialog = NitrousControlSettingsDialog, "", yAxis field = "Enable Nitrous Control", nitrousControlEnabled diff --git a/firmware/tunerstudio/generated/rusefi_m74_9.ini b/firmware/tunerstudio/generated/rusefi_m74_9.ini index 101d60a9e1..1059f01304 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.12.01.m74_9.510254699" + signature = "rusEFI master.2024.12.01.m74_9.1270458521" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.01.m74_9.510254699" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.01.m74_9.1270458521" ; 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 @@ -1436,7 +1436,10 @@ 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 nitrousMaximumAfr = scalar, U08, 3952, "afr", 0.1, 0, 10, 20, 1 -unusedOftenChangesDuringFirmwareUpdate = array, U08, 3953, [86], "units", 1, 0, 0, 1, 0 +nitrousActivationRpm = scalar, U16, 3954, "rpm", 1, 0, 0, 20000, 0 +nitrousDeactivationRpm = scalar, U16, 3956, "rpm", 1, 0, 0, 20000, 0 +nitrousDeactivationRpmWindow = scalar, U16, 3958, "rpm", 1, 0, 0, 20000, 0 +unusedOftenChangesDuringFirmwareUpdate = array, U08, 3960, [80], "units", 1, 0, 0, 1, 0 postCrankingFactor = array, F32, 4040, [6x6], "mult", 1, 0, 1, 3, 2 postCrankingDurationBins = array, U16, 4184, [6], "count", 1, 0, 0, 64000, 0 postCrankingCLTBins = array, S16, 4196, [6], "C", 1, 0, -100, 250, 0 @@ -3231,6 +3234,7 @@ isTpsConditionSatisfied = bits, U32, 1128, [1:1] isCltConditionSatisfied = bits, U32, 1128, [2:2] isMapConditionSatisfied = bits, U32, 1128, [3:3] isAfrConditionSatisfied = bits, U32, 1128, [4:4] +isNitrousRpmConditionSatisfied = bits, U32, 1128, [5:5] ; total TS size = 1132 isAntilagCondition = bits, U32, 1132, [0:0] ALSMinRPMCondition = bits, U32, 1132, [1:1] @@ -5813,6 +5817,7 @@ entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" entry = isAfrConditionSatisfied, "isAfrConditionSatisfied", int, "%d" +entry = isNitrousRpmConditionSatisfied, "isNitrousRpmConditionSatisfied", int, "%d" entry = isAntilagCondition, "isAntilagCondition", int, "%d" entry = ALSMinRPMCondition, "ALSMinRPMCondition", int, "%d" entry = ALSMaxRPMCondition, "ALSMaxRPMCondition", int, "%d" @@ -6796,6 +6801,7 @@ indicatorPanel = nitrous_control_stateIndicatorPanel, 2 indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" indicator = {isAfrConditionSatisfied}, "isAfrConditionSatisfied No", "isAfrConditionSatisfied Yes" + indicator = {isNitrousRpmConditionSatisfied}, "isNitrousRpmConditionSatisfied No", "isNitrousRpmConditionSatisfied Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9801,10 +9807,13 @@ dialog = tcuControls, "Transmission Settings" panel = NitrousControlLuaGaugeDialog, {nitrousControlArmingMethod == 1} dialog = NitrousControlSettings, "Settings" - field = "Minimum TPS", nitrousMinimumTps - field = "Minimum CLT", nitrousMinimumClt - field = "Maximum MAP", nitrousMaximumMap - field = "Maximum AFR", nitrousMaximumAfr + field = "Minimum TPS", nitrousMinimumTps + field = "Minimum CLT", nitrousMinimumClt + field = "Maximum MAP", nitrousMaximumMap + field = "Maximum AFR", nitrousMaximumAfr + field = "Activation RPM", nitrousActivationRpm + field = "Dectivation RPM", nitrousDeactivationRpm + field = "Dectivation RPM Window", nitrousDeactivationRpmWindow dialog = NitrousControlSettingsDialog, "", yAxis field = "Enable Nitrous Control", nitrousControlEnabled diff --git a/firmware/tunerstudio/generated/rusefi_mre-legacy_f4.ini b/firmware/tunerstudio/generated/rusefi_mre-legacy_f4.ini index 0676b6efb0..54d2b3d677 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.12.01.mre-legacy_f4.3786221431" + signature = "rusEFI master.2024.12.01.mre-legacy_f4.3028111749" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.01.mre-legacy_f4.3786221431" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.01.mre-legacy_f4.3028111749" ; 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 @@ -1436,7 +1436,10 @@ 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 nitrousMaximumAfr = scalar, U08, 3952, "afr", 0.1, 0, 10, 20, 1 -unusedOftenChangesDuringFirmwareUpdate = array, U08, 3953, [86], "units", 1, 0, 0, 1, 0 +nitrousActivationRpm = scalar, U16, 3954, "rpm", 1, 0, 0, 20000, 0 +nitrousDeactivationRpm = scalar, U16, 3956, "rpm", 1, 0, 0, 20000, 0 +nitrousDeactivationRpmWindow = scalar, U16, 3958, "rpm", 1, 0, 0, 20000, 0 +unusedOftenChangesDuringFirmwareUpdate = array, U08, 3960, [80], "units", 1, 0, 0, 1, 0 postCrankingFactor = array, F32, 4040, [6x6], "mult", 1, 0, 1, 3, 2 postCrankingDurationBins = array, U16, 4184, [6], "count", 1, 0, 0, 64000, 0 postCrankingCLTBins = array, S16, 4196, [6], "C", 1, 0, -100, 250, 0 @@ -3231,6 +3234,7 @@ isTpsConditionSatisfied = bits, U32, 1128, [1:1] isCltConditionSatisfied = bits, U32, 1128, [2:2] isMapConditionSatisfied = bits, U32, 1128, [3:3] isAfrConditionSatisfied = bits, U32, 1128, [4:4] +isNitrousRpmConditionSatisfied = bits, U32, 1128, [5:5] ; total TS size = 1132 isAntilagCondition = bits, U32, 1132, [0:0] ALSMinRPMCondition = bits, U32, 1132, [1:1] @@ -5811,6 +5815,7 @@ entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" entry = isAfrConditionSatisfied, "isAfrConditionSatisfied", int, "%d" +entry = isNitrousRpmConditionSatisfied, "isNitrousRpmConditionSatisfied", int, "%d" entry = isAntilagCondition, "isAntilagCondition", int, "%d" entry = ALSMinRPMCondition, "ALSMinRPMCondition", int, "%d" entry = ALSMaxRPMCondition, "ALSMaxRPMCondition", int, "%d" @@ -6809,6 +6814,7 @@ indicatorPanel = nitrous_control_stateIndicatorPanel, 2 indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" indicator = {isAfrConditionSatisfied}, "isAfrConditionSatisfied No", "isAfrConditionSatisfied Yes" + indicator = {isNitrousRpmConditionSatisfied}, "isNitrousRpmConditionSatisfied No", "isNitrousRpmConditionSatisfied Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9772,10 +9778,13 @@ commandButton = "microRusEFI M111", cmd_set_engine_type_MERCEDES_M11 panel = NitrousControlLuaGaugeDialog, {nitrousControlArmingMethod == 1} dialog = NitrousControlSettings, "Settings" - field = "Minimum TPS", nitrousMinimumTps - field = "Minimum CLT", nitrousMinimumClt - field = "Maximum MAP", nitrousMaximumMap - field = "Maximum AFR", nitrousMaximumAfr + field = "Minimum TPS", nitrousMinimumTps + field = "Minimum CLT", nitrousMinimumClt + field = "Maximum MAP", nitrousMaximumMap + field = "Maximum AFR", nitrousMaximumAfr + field = "Activation RPM", nitrousActivationRpm + field = "Dectivation RPM", nitrousDeactivationRpm + field = "Dectivation RPM Window", nitrousDeactivationRpmWindow dialog = NitrousControlSettingsDialog, "", yAxis field = "Enable Nitrous Control", nitrousControlEnabled diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index 359348c134..76d8ec791a 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.12.01.mre_f4.3786221431" + signature = "rusEFI master.2024.12.01.mre_f4.3028111749" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.01.mre_f4.3786221431" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.01.mre_f4.3028111749" ; 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 @@ -1436,7 +1436,10 @@ 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 nitrousMaximumAfr = scalar, U08, 3952, "afr", 0.1, 0, 10, 20, 1 -unusedOftenChangesDuringFirmwareUpdate = array, U08, 3953, [86], "units", 1, 0, 0, 1, 0 +nitrousActivationRpm = scalar, U16, 3954, "rpm", 1, 0, 0, 20000, 0 +nitrousDeactivationRpm = scalar, U16, 3956, "rpm", 1, 0, 0, 20000, 0 +nitrousDeactivationRpmWindow = scalar, U16, 3958, "rpm", 1, 0, 0, 20000, 0 +unusedOftenChangesDuringFirmwareUpdate = array, U08, 3960, [80], "units", 1, 0, 0, 1, 0 postCrankingFactor = array, F32, 4040, [6x6], "mult", 1, 0, 1, 3, 2 postCrankingDurationBins = array, U16, 4184, [6], "count", 1, 0, 0, 64000, 0 postCrankingCLTBins = array, S16, 4196, [6], "C", 1, 0, -100, 250, 0 @@ -3231,6 +3234,7 @@ isTpsConditionSatisfied = bits, U32, 1128, [1:1] isCltConditionSatisfied = bits, U32, 1128, [2:2] isMapConditionSatisfied = bits, U32, 1128, [3:3] isAfrConditionSatisfied = bits, U32, 1128, [4:4] +isNitrousRpmConditionSatisfied = bits, U32, 1128, [5:5] ; total TS size = 1132 isAntilagCondition = bits, U32, 1132, [0:0] ALSMinRPMCondition = bits, U32, 1132, [1:1] @@ -5811,6 +5815,7 @@ entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" entry = isAfrConditionSatisfied, "isAfrConditionSatisfied", int, "%d" +entry = isNitrousRpmConditionSatisfied, "isNitrousRpmConditionSatisfied", int, "%d" entry = isAntilagCondition, "isAntilagCondition", int, "%d" entry = ALSMinRPMCondition, "ALSMinRPMCondition", int, "%d" entry = ALSMaxRPMCondition, "ALSMaxRPMCondition", int, "%d" @@ -6809,6 +6814,7 @@ indicatorPanel = nitrous_control_stateIndicatorPanel, 2 indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" indicator = {isAfrConditionSatisfied}, "isAfrConditionSatisfied No", "isAfrConditionSatisfied Yes" + indicator = {isNitrousRpmConditionSatisfied}, "isNitrousRpmConditionSatisfied No", "isNitrousRpmConditionSatisfied Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9772,10 +9778,13 @@ commandButton = "microRusEFI M111", cmd_set_engine_type_MERCEDES_M11 panel = NitrousControlLuaGaugeDialog, {nitrousControlArmingMethod == 1} dialog = NitrousControlSettings, "Settings" - field = "Minimum TPS", nitrousMinimumTps - field = "Minimum CLT", nitrousMinimumClt - field = "Maximum MAP", nitrousMaximumMap - field = "Maximum AFR", nitrousMaximumAfr + field = "Minimum TPS", nitrousMinimumTps + field = "Minimum CLT", nitrousMinimumClt + field = "Maximum MAP", nitrousMaximumMap + field = "Maximum AFR", nitrousMaximumAfr + field = "Activation RPM", nitrousActivationRpm + field = "Dectivation RPM", nitrousDeactivationRpm + field = "Dectivation RPM Window", nitrousDeactivationRpmWindow dialog = NitrousControlSettingsDialog, "", yAxis field = "Enable Nitrous Control", nitrousControlEnabled diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index 2e2bd804f4..62340f913b 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.12.01.mre_f7.3786221431" + signature = "rusEFI master.2024.12.01.mre_f7.3028111749" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.01.mre_f7.3786221431" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.01.mre_f7.3028111749" ; 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 @@ -1436,7 +1436,10 @@ 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 nitrousMaximumAfr = scalar, U08, 3952, "afr", 0.1, 0, 10, 20, 1 -unusedOftenChangesDuringFirmwareUpdate = array, U08, 3953, [86], "units", 1, 0, 0, 1, 0 +nitrousActivationRpm = scalar, U16, 3954, "rpm", 1, 0, 0, 20000, 0 +nitrousDeactivationRpm = scalar, U16, 3956, "rpm", 1, 0, 0, 20000, 0 +nitrousDeactivationRpmWindow = scalar, U16, 3958, "rpm", 1, 0, 0, 20000, 0 +unusedOftenChangesDuringFirmwareUpdate = array, U08, 3960, [80], "units", 1, 0, 0, 1, 0 postCrankingFactor = array, F32, 4040, [6x6], "mult", 1, 0, 1, 3, 2 postCrankingDurationBins = array, U16, 4184, [6], "count", 1, 0, 0, 64000, 0 postCrankingCLTBins = array, S16, 4196, [6], "C", 1, 0, -100, 250, 0 @@ -3231,6 +3234,7 @@ isTpsConditionSatisfied = bits, U32, 1128, [1:1] isCltConditionSatisfied = bits, U32, 1128, [2:2] isMapConditionSatisfied = bits, U32, 1128, [3:3] isAfrConditionSatisfied = bits, U32, 1128, [4:4] +isNitrousRpmConditionSatisfied = bits, U32, 1128, [5:5] ; total TS size = 1132 isAntilagCondition = bits, U32, 1132, [0:0] ALSMinRPMCondition = bits, U32, 1132, [1:1] @@ -5811,6 +5815,7 @@ entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" entry = isAfrConditionSatisfied, "isAfrConditionSatisfied", int, "%d" +entry = isNitrousRpmConditionSatisfied, "isNitrousRpmConditionSatisfied", int, "%d" entry = isAntilagCondition, "isAntilagCondition", int, "%d" entry = ALSMinRPMCondition, "ALSMinRPMCondition", int, "%d" entry = ALSMaxRPMCondition, "ALSMaxRPMCondition", int, "%d" @@ -6809,6 +6814,7 @@ indicatorPanel = nitrous_control_stateIndicatorPanel, 2 indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" indicator = {isAfrConditionSatisfied}, "isAfrConditionSatisfied No", "isAfrConditionSatisfied Yes" + indicator = {isNitrousRpmConditionSatisfied}, "isNitrousRpmConditionSatisfied No", "isNitrousRpmConditionSatisfied Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9772,10 +9778,13 @@ commandButton = "microRusEFI M111", cmd_set_engine_type_MERCEDES_M11 panel = NitrousControlLuaGaugeDialog, {nitrousControlArmingMethod == 1} dialog = NitrousControlSettings, "Settings" - field = "Minimum TPS", nitrousMinimumTps - field = "Minimum CLT", nitrousMinimumClt - field = "Maximum MAP", nitrousMaximumMap - field = "Maximum AFR", nitrousMaximumAfr + field = "Minimum TPS", nitrousMinimumTps + field = "Minimum CLT", nitrousMinimumClt + field = "Maximum MAP", nitrousMaximumMap + field = "Maximum AFR", nitrousMaximumAfr + field = "Activation RPM", nitrousActivationRpm + field = "Dectivation RPM", nitrousDeactivationRpm + field = "Dectivation RPM Window", nitrousDeactivationRpmWindow dialog = NitrousControlSettingsDialog, "", yAxis field = "Enable Nitrous Control", nitrousControlEnabled diff --git a/firmware/tunerstudio/generated/rusefi_nucleo_f413.ini b/firmware/tunerstudio/generated/rusefi_nucleo_f413.ini index bc4c32239f..a3723d750b 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.12.01.nucleo_f413.2866013876" + signature = "rusEFI master.2024.12.01.nucleo_f413.4278423622" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.01.nucleo_f413.2866013876" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.01.nucleo_f413.4278423622" ; 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 @@ -1436,7 +1436,10 @@ 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 nitrousMaximumAfr = scalar, U08, 3952, "afr", 0.1, 0, 10, 20, 1 -unusedOftenChangesDuringFirmwareUpdate = array, U08, 3953, [86], "units", 1, 0, 0, 1, 0 +nitrousActivationRpm = scalar, U16, 3954, "rpm", 1, 0, 0, 20000, 0 +nitrousDeactivationRpm = scalar, U16, 3956, "rpm", 1, 0, 0, 20000, 0 +nitrousDeactivationRpmWindow = scalar, U16, 3958, "rpm", 1, 0, 0, 20000, 0 +unusedOftenChangesDuringFirmwareUpdate = array, U08, 3960, [80], "units", 1, 0, 0, 1, 0 postCrankingFactor = array, F32, 4040, [6x6], "mult", 1, 0, 1, 3, 2 postCrankingDurationBins = array, U16, 4184, [6], "count", 1, 0, 0, 64000, 0 postCrankingCLTBins = array, S16, 4196, [6], "C", 1, 0, -100, 250, 0 @@ -3231,6 +3234,7 @@ isTpsConditionSatisfied = bits, U32, 1128, [1:1] isCltConditionSatisfied = bits, U32, 1128, [2:2] isMapConditionSatisfied = bits, U32, 1128, [3:3] isAfrConditionSatisfied = bits, U32, 1128, [4:4] +isNitrousRpmConditionSatisfied = bits, U32, 1128, [5:5] ; total TS size = 1132 isAntilagCondition = bits, U32, 1132, [0:0] ALSMinRPMCondition = bits, U32, 1132, [1:1] @@ -5813,6 +5817,7 @@ entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" entry = isAfrConditionSatisfied, "isAfrConditionSatisfied", int, "%d" +entry = isNitrousRpmConditionSatisfied, "isNitrousRpmConditionSatisfied", int, "%d" entry = isAntilagCondition, "isAntilagCondition", int, "%d" entry = ALSMinRPMCondition, "ALSMinRPMCondition", int, "%d" entry = ALSMaxRPMCondition, "ALSMaxRPMCondition", int, "%d" @@ -6793,6 +6798,7 @@ indicatorPanel = nitrous_control_stateIndicatorPanel, 2 indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" indicator = {isAfrConditionSatisfied}, "isAfrConditionSatisfied No", "isAfrConditionSatisfied Yes" + indicator = {isNitrousRpmConditionSatisfied}, "isNitrousRpmConditionSatisfied No", "isNitrousRpmConditionSatisfied Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9823,10 +9829,13 @@ dialog = tcuControls, "Transmission Settings" panel = NitrousControlLuaGaugeDialog, {nitrousControlArmingMethod == 1} dialog = NitrousControlSettings, "Settings" - field = "Minimum TPS", nitrousMinimumTps - field = "Minimum CLT", nitrousMinimumClt - field = "Maximum MAP", nitrousMaximumMap - field = "Maximum AFR", nitrousMaximumAfr + field = "Minimum TPS", nitrousMinimumTps + field = "Minimum CLT", nitrousMinimumClt + field = "Maximum MAP", nitrousMaximumMap + field = "Maximum AFR", nitrousMaximumAfr + field = "Activation RPM", nitrousActivationRpm + field = "Dectivation RPM", nitrousDeactivationRpm + field = "Dectivation RPM Window", nitrousDeactivationRpmWindow dialog = NitrousControlSettingsDialog, "", yAxis field = "Enable Nitrous Control", nitrousControlEnabled diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index 0f91a432c9..d31275530f 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.12.01.proteus_f4.167383670" + signature = "rusEFI master.2024.12.01.proteus_f4.1546282116" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.01.proteus_f4.167383670" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.01.proteus_f4.1546282116" ; 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 @@ -1436,7 +1436,10 @@ 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 nitrousMaximumAfr = scalar, U08, 3952, "afr", 0.1, 0, 10, 20, 1 -unusedOftenChangesDuringFirmwareUpdate = array, U08, 3953, [86], "units", 1, 0, 0, 1, 0 +nitrousActivationRpm = scalar, U16, 3954, "rpm", 1, 0, 0, 20000, 0 +nitrousDeactivationRpm = scalar, U16, 3956, "rpm", 1, 0, 0, 20000, 0 +nitrousDeactivationRpmWindow = scalar, U16, 3958, "rpm", 1, 0, 0, 20000, 0 +unusedOftenChangesDuringFirmwareUpdate = array, U08, 3960, [80], "units", 1, 0, 0, 1, 0 postCrankingFactor = array, F32, 4040, [6x6], "mult", 1, 0, 1, 3, 2 postCrankingDurationBins = array, U16, 4184, [6], "count", 1, 0, 0, 64000, 0 postCrankingCLTBins = array, S16, 4196, [6], "C", 1, 0, -100, 250, 0 @@ -3231,6 +3234,7 @@ isTpsConditionSatisfied = bits, U32, 1128, [1:1] isCltConditionSatisfied = bits, U32, 1128, [2:2] isMapConditionSatisfied = bits, U32, 1128, [3:3] isAfrConditionSatisfied = bits, U32, 1128, [4:4] +isNitrousRpmConditionSatisfied = bits, U32, 1128, [5:5] ; total TS size = 1132 isAntilagCondition = bits, U32, 1132, [0:0] ALSMinRPMCondition = bits, U32, 1132, [1:1] @@ -5814,6 +5818,7 @@ entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" entry = isAfrConditionSatisfied, "isAfrConditionSatisfied", int, "%d" +entry = isNitrousRpmConditionSatisfied, "isNitrousRpmConditionSatisfied", int, "%d" entry = isAntilagCondition, "isAntilagCondition", int, "%d" entry = ALSMinRPMCondition, "ALSMinRPMCondition", int, "%d" entry = ALSMaxRPMCondition, "ALSMaxRPMCondition", int, "%d" @@ -6821,6 +6826,7 @@ indicatorPanel = nitrous_control_stateIndicatorPanel, 2 indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" indicator = {isAfrConditionSatisfied}, "isAfrConditionSatisfied No", "isAfrConditionSatisfied Yes" + indicator = {isNitrousRpmConditionSatisfied}, "isNitrousRpmConditionSatisfied No", "isNitrousRpmConditionSatisfied Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9834,10 +9840,13 @@ commandButton = "Fuel Bench", cmd_set_engine_type_FUEL_BENCH panel = NitrousControlLuaGaugeDialog, {nitrousControlArmingMethod == 1} dialog = NitrousControlSettings, "Settings" - field = "Minimum TPS", nitrousMinimumTps - field = "Minimum CLT", nitrousMinimumClt - field = "Maximum MAP", nitrousMaximumMap - field = "Maximum AFR", nitrousMaximumAfr + field = "Minimum TPS", nitrousMinimumTps + field = "Minimum CLT", nitrousMinimumClt + field = "Maximum MAP", nitrousMaximumMap + field = "Maximum AFR", nitrousMaximumAfr + field = "Activation RPM", nitrousActivationRpm + field = "Dectivation RPM", nitrousDeactivationRpm + field = "Dectivation RPM Window", nitrousDeactivationRpmWindow dialog = NitrousControlSettingsDialog, "", yAxis field = "Enable Nitrous Control", nitrousControlEnabled diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index 28c3fdba4b..aec6346616 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.12.01.proteus_f7.167383670" + signature = "rusEFI master.2024.12.01.proteus_f7.1546282116" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.01.proteus_f7.167383670" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.01.proteus_f7.1546282116" ; 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 @@ -1436,7 +1436,10 @@ 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 nitrousMaximumAfr = scalar, U08, 3952, "afr", 0.1, 0, 10, 20, 1 -unusedOftenChangesDuringFirmwareUpdate = array, U08, 3953, [86], "units", 1, 0, 0, 1, 0 +nitrousActivationRpm = scalar, U16, 3954, "rpm", 1, 0, 0, 20000, 0 +nitrousDeactivationRpm = scalar, U16, 3956, "rpm", 1, 0, 0, 20000, 0 +nitrousDeactivationRpmWindow = scalar, U16, 3958, "rpm", 1, 0, 0, 20000, 0 +unusedOftenChangesDuringFirmwareUpdate = array, U08, 3960, [80], "units", 1, 0, 0, 1, 0 postCrankingFactor = array, F32, 4040, [6x6], "mult", 1, 0, 1, 3, 2 postCrankingDurationBins = array, U16, 4184, [6], "count", 1, 0, 0, 64000, 0 postCrankingCLTBins = array, S16, 4196, [6], "C", 1, 0, -100, 250, 0 @@ -3231,6 +3234,7 @@ isTpsConditionSatisfied = bits, U32, 1128, [1:1] isCltConditionSatisfied = bits, U32, 1128, [2:2] isMapConditionSatisfied = bits, U32, 1128, [3:3] isAfrConditionSatisfied = bits, U32, 1128, [4:4] +isNitrousRpmConditionSatisfied = bits, U32, 1128, [5:5] ; total TS size = 1132 isAntilagCondition = bits, U32, 1132, [0:0] ALSMinRPMCondition = bits, U32, 1132, [1:1] @@ -5814,6 +5818,7 @@ entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" entry = isAfrConditionSatisfied, "isAfrConditionSatisfied", int, "%d" +entry = isNitrousRpmConditionSatisfied, "isNitrousRpmConditionSatisfied", int, "%d" entry = isAntilagCondition, "isAntilagCondition", int, "%d" entry = ALSMinRPMCondition, "ALSMinRPMCondition", int, "%d" entry = ALSMaxRPMCondition, "ALSMaxRPMCondition", int, "%d" @@ -6821,6 +6826,7 @@ indicatorPanel = nitrous_control_stateIndicatorPanel, 2 indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" indicator = {isAfrConditionSatisfied}, "isAfrConditionSatisfied No", "isAfrConditionSatisfied Yes" + indicator = {isNitrousRpmConditionSatisfied}, "isNitrousRpmConditionSatisfied No", "isNitrousRpmConditionSatisfied Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9834,10 +9840,13 @@ commandButton = "Fuel Bench", cmd_set_engine_type_FUEL_BENCH panel = NitrousControlLuaGaugeDialog, {nitrousControlArmingMethod == 1} dialog = NitrousControlSettings, "Settings" - field = "Minimum TPS", nitrousMinimumTps - field = "Minimum CLT", nitrousMinimumClt - field = "Maximum MAP", nitrousMaximumMap - field = "Maximum AFR", nitrousMaximumAfr + field = "Minimum TPS", nitrousMinimumTps + field = "Minimum CLT", nitrousMinimumClt + field = "Maximum MAP", nitrousMaximumMap + field = "Maximum AFR", nitrousMaximumAfr + field = "Activation RPM", nitrousActivationRpm + field = "Dectivation RPM", nitrousDeactivationRpm + field = "Dectivation RPM Window", nitrousDeactivationRpmWindow dialog = NitrousControlSettingsDialog, "", yAxis field = "Enable Nitrous Control", nitrousControlEnabled diff --git a/firmware/tunerstudio/generated/rusefi_proteus_h7.ini b/firmware/tunerstudio/generated/rusefi_proteus_h7.ini index 0b10b556b0..db7b6eeb85 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.12.01.proteus_h7.167383670" + signature = "rusEFI master.2024.12.01.proteus_h7.1546282116" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.01.proteus_h7.167383670" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.01.proteus_h7.1546282116" ; 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 @@ -1436,7 +1436,10 @@ 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 nitrousMaximumAfr = scalar, U08, 3952, "afr", 0.1, 0, 10, 20, 1 -unusedOftenChangesDuringFirmwareUpdate = array, U08, 3953, [86], "units", 1, 0, 0, 1, 0 +nitrousActivationRpm = scalar, U16, 3954, "rpm", 1, 0, 0, 20000, 0 +nitrousDeactivationRpm = scalar, U16, 3956, "rpm", 1, 0, 0, 20000, 0 +nitrousDeactivationRpmWindow = scalar, U16, 3958, "rpm", 1, 0, 0, 20000, 0 +unusedOftenChangesDuringFirmwareUpdate = array, U08, 3960, [80], "units", 1, 0, 0, 1, 0 postCrankingFactor = array, F32, 4040, [6x6], "mult", 1, 0, 1, 3, 2 postCrankingDurationBins = array, U16, 4184, [6], "count", 1, 0, 0, 64000, 0 postCrankingCLTBins = array, S16, 4196, [6], "C", 1, 0, -100, 250, 0 @@ -3231,6 +3234,7 @@ isTpsConditionSatisfied = bits, U32, 1128, [1:1] isCltConditionSatisfied = bits, U32, 1128, [2:2] isMapConditionSatisfied = bits, U32, 1128, [3:3] isAfrConditionSatisfied = bits, U32, 1128, [4:4] +isNitrousRpmConditionSatisfied = bits, U32, 1128, [5:5] ; total TS size = 1132 isAntilagCondition = bits, U32, 1132, [0:0] ALSMinRPMCondition = bits, U32, 1132, [1:1] @@ -5814,6 +5818,7 @@ entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" entry = isAfrConditionSatisfied, "isAfrConditionSatisfied", int, "%d" +entry = isNitrousRpmConditionSatisfied, "isNitrousRpmConditionSatisfied", int, "%d" entry = isAntilagCondition, "isAntilagCondition", int, "%d" entry = ALSMinRPMCondition, "ALSMinRPMCondition", int, "%d" entry = ALSMaxRPMCondition, "ALSMaxRPMCondition", int, "%d" @@ -6821,6 +6826,7 @@ indicatorPanel = nitrous_control_stateIndicatorPanel, 2 indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" indicator = {isAfrConditionSatisfied}, "isAfrConditionSatisfied No", "isAfrConditionSatisfied Yes" + indicator = {isNitrousRpmConditionSatisfied}, "isNitrousRpmConditionSatisfied No", "isNitrousRpmConditionSatisfied Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9834,10 +9840,13 @@ commandButton = "Fuel Bench", cmd_set_engine_type_FUEL_BENCH panel = NitrousControlLuaGaugeDialog, {nitrousControlArmingMethod == 1} dialog = NitrousControlSettings, "Settings" - field = "Minimum TPS", nitrousMinimumTps - field = "Minimum CLT", nitrousMinimumClt - field = "Maximum MAP", nitrousMaximumMap - field = "Maximum AFR", nitrousMaximumAfr + field = "Minimum TPS", nitrousMinimumTps + field = "Minimum CLT", nitrousMinimumClt + field = "Maximum MAP", nitrousMaximumMap + field = "Maximum AFR", nitrousMaximumAfr + field = "Activation RPM", nitrousActivationRpm + field = "Dectivation RPM", nitrousDeactivationRpm + field = "Dectivation RPM Window", nitrousDeactivationRpmWindow dialog = NitrousControlSettingsDialog, "", yAxis field = "Enable Nitrous Control", nitrousControlEnabled diff --git a/firmware/tunerstudio/generated/rusefi_s105.ini b/firmware/tunerstudio/generated/rusefi_s105.ini index a131551ae7..6767509042 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.12.01.s105.358114934" + signature = "rusEFI master.2024.12.01.s105.1082658948" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.01.s105.358114934" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.01.s105.1082658948" ; 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 @@ -1436,7 +1436,10 @@ 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 nitrousMaximumAfr = scalar, U08, 3952, "afr", 0.1, 0, 10, 20, 1 -unusedOftenChangesDuringFirmwareUpdate = array, U08, 3953, [86], "units", 1, 0, 0, 1, 0 +nitrousActivationRpm = scalar, U16, 3954, "rpm", 1, 0, 0, 20000, 0 +nitrousDeactivationRpm = scalar, U16, 3956, "rpm", 1, 0, 0, 20000, 0 +nitrousDeactivationRpmWindow = scalar, U16, 3958, "rpm", 1, 0, 0, 20000, 0 +unusedOftenChangesDuringFirmwareUpdate = array, U08, 3960, [80], "units", 1, 0, 0, 1, 0 postCrankingFactor = array, F32, 4040, [6x6], "mult", 1, 0, 1, 3, 2 postCrankingDurationBins = array, U16, 4184, [6], "count", 1, 0, 0, 64000, 0 postCrankingCLTBins = array, S16, 4196, [6], "C", 1, 0, -100, 250, 0 @@ -3231,6 +3234,7 @@ isTpsConditionSatisfied = bits, U32, 1128, [1:1] isCltConditionSatisfied = bits, U32, 1128, [2:2] isMapConditionSatisfied = bits, U32, 1128, [3:3] isAfrConditionSatisfied = bits, U32, 1128, [4:4] +isNitrousRpmConditionSatisfied = bits, U32, 1128, [5:5] ; total TS size = 1132 isAntilagCondition = bits, U32, 1132, [0:0] ALSMinRPMCondition = bits, U32, 1132, [1:1] @@ -5813,6 +5817,7 @@ entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" entry = isAfrConditionSatisfied, "isAfrConditionSatisfied", int, "%d" +entry = isNitrousRpmConditionSatisfied, "isNitrousRpmConditionSatisfied", int, "%d" entry = isAntilagCondition, "isAntilagCondition", int, "%d" entry = ALSMinRPMCondition, "ALSMinRPMCondition", int, "%d" entry = ALSMaxRPMCondition, "ALSMaxRPMCondition", int, "%d" @@ -6794,6 +6799,7 @@ indicatorPanel = nitrous_control_stateIndicatorPanel, 2 indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" indicator = {isAfrConditionSatisfied}, "isAfrConditionSatisfied No", "isAfrConditionSatisfied Yes" + indicator = {isNitrousRpmConditionSatisfied}, "isNitrousRpmConditionSatisfied No", "isNitrousRpmConditionSatisfied Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9799,10 +9805,13 @@ dialog = tcuControls, "Transmission Settings" panel = NitrousControlLuaGaugeDialog, {nitrousControlArmingMethod == 1} dialog = NitrousControlSettings, "Settings" - field = "Minimum TPS", nitrousMinimumTps - field = "Minimum CLT", nitrousMinimumClt - field = "Maximum MAP", nitrousMaximumMap - field = "Maximum AFR", nitrousMaximumAfr + field = "Minimum TPS", nitrousMinimumTps + field = "Minimum CLT", nitrousMinimumClt + field = "Maximum MAP", nitrousMaximumMap + field = "Maximum AFR", nitrousMaximumAfr + field = "Activation RPM", nitrousActivationRpm + field = "Dectivation RPM", nitrousDeactivationRpm + field = "Dectivation RPM Window", nitrousDeactivationRpmWindow dialog = NitrousControlSettingsDialog, "", yAxis field = "Enable Nitrous Control", nitrousControlEnabled diff --git a/firmware/tunerstudio/generated/rusefi_small-can-board.ini b/firmware/tunerstudio/generated/rusefi_small-can-board.ini index d2bab069d5..a819d467ba 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.12.01.small-can-board.4129868697" + signature = "rusEFI master.2024.12.01.small-can-board.2750987627" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.01.small-can-board.4129868697" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.01.small-can-board.2750987627" ; 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 @@ -1436,7 +1436,10 @@ 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 nitrousMaximumAfr = scalar, U08, 3952, "afr", 0.1, 0, 10, 20, 1 -unusedOftenChangesDuringFirmwareUpdate = array, U08, 3953, [86], "units", 1, 0, 0, 1, 0 +nitrousActivationRpm = scalar, U16, 3954, "rpm", 1, 0, 0, 20000, 0 +nitrousDeactivationRpm = scalar, U16, 3956, "rpm", 1, 0, 0, 20000, 0 +nitrousDeactivationRpmWindow = scalar, U16, 3958, "rpm", 1, 0, 0, 20000, 0 +unusedOftenChangesDuringFirmwareUpdate = array, U08, 3960, [80], "units", 1, 0, 0, 1, 0 postCrankingFactor = array, F32, 4040, [6x6], "mult", 1, 0, 1, 3, 2 postCrankingDurationBins = array, U16, 4184, [6], "count", 1, 0, 0, 64000, 0 postCrankingCLTBins = array, S16, 4196, [6], "C", 1, 0, -100, 250, 0 @@ -3231,6 +3234,7 @@ isTpsConditionSatisfied = bits, U32, 1128, [1:1] isCltConditionSatisfied = bits, U32, 1128, [2:2] isMapConditionSatisfied = bits, U32, 1128, [3:3] isAfrConditionSatisfied = bits, U32, 1128, [4:4] +isNitrousRpmConditionSatisfied = bits, U32, 1128, [5:5] ; total TS size = 1132 isAntilagCondition = bits, U32, 1132, [0:0] ALSMinRPMCondition = bits, U32, 1132, [1:1] @@ -5813,6 +5817,7 @@ entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" entry = isAfrConditionSatisfied, "isAfrConditionSatisfied", int, "%d" +entry = isNitrousRpmConditionSatisfied, "isNitrousRpmConditionSatisfied", int, "%d" entry = isAntilagCondition, "isAntilagCondition", int, "%d" entry = ALSMinRPMCondition, "ALSMinRPMCondition", int, "%d" entry = ALSMaxRPMCondition, "ALSMaxRPMCondition", int, "%d" @@ -6793,6 +6798,7 @@ indicatorPanel = nitrous_control_stateIndicatorPanel, 2 indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" indicator = {isAfrConditionSatisfied}, "isAfrConditionSatisfied No", "isAfrConditionSatisfied Yes" + indicator = {isNitrousRpmConditionSatisfied}, "isNitrousRpmConditionSatisfied No", "isNitrousRpmConditionSatisfied Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9814,10 +9820,13 @@ commandButton = "Honda BCM", cmd_set_engine_type_SMALL_CB_HONDA_BCM panel = NitrousControlLuaGaugeDialog, {nitrousControlArmingMethod == 1} dialog = NitrousControlSettings, "Settings" - field = "Minimum TPS", nitrousMinimumTps - field = "Minimum CLT", nitrousMinimumClt - field = "Maximum MAP", nitrousMaximumMap - field = "Maximum AFR", nitrousMaximumAfr + field = "Minimum TPS", nitrousMinimumTps + field = "Minimum CLT", nitrousMinimumClt + field = "Maximum MAP", nitrousMaximumMap + field = "Maximum AFR", nitrousMaximumAfr + field = "Activation RPM", nitrousActivationRpm + field = "Dectivation RPM", nitrousDeactivationRpm + field = "Dectivation RPM Window", nitrousDeactivationRpmWindow dialog = NitrousControlSettingsDialog, "", yAxis field = "Enable Nitrous Control", nitrousControlEnabled diff --git a/firmware/tunerstudio/generated/rusefi_stm32f429_nucleo.ini b/firmware/tunerstudio/generated/rusefi_stm32f429_nucleo.ini index 62206833f5..6b1ee035d1 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.12.01.stm32f429_nucleo.2866013876" + signature = "rusEFI master.2024.12.01.stm32f429_nucleo.4278423622" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.01.stm32f429_nucleo.2866013876" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.01.stm32f429_nucleo.4278423622" ; 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 @@ -1436,7 +1436,10 @@ 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 nitrousMaximumAfr = scalar, U08, 3952, "afr", 0.1, 0, 10, 20, 1 -unusedOftenChangesDuringFirmwareUpdate = array, U08, 3953, [86], "units", 1, 0, 0, 1, 0 +nitrousActivationRpm = scalar, U16, 3954, "rpm", 1, 0, 0, 20000, 0 +nitrousDeactivationRpm = scalar, U16, 3956, "rpm", 1, 0, 0, 20000, 0 +nitrousDeactivationRpmWindow = scalar, U16, 3958, "rpm", 1, 0, 0, 20000, 0 +unusedOftenChangesDuringFirmwareUpdate = array, U08, 3960, [80], "units", 1, 0, 0, 1, 0 postCrankingFactor = array, F32, 4040, [6x6], "mult", 1, 0, 1, 3, 2 postCrankingDurationBins = array, U16, 4184, [6], "count", 1, 0, 0, 64000, 0 postCrankingCLTBins = array, S16, 4196, [6], "C", 1, 0, -100, 250, 0 @@ -3231,6 +3234,7 @@ isTpsConditionSatisfied = bits, U32, 1128, [1:1] isCltConditionSatisfied = bits, U32, 1128, [2:2] isMapConditionSatisfied = bits, U32, 1128, [3:3] isAfrConditionSatisfied = bits, U32, 1128, [4:4] +isNitrousRpmConditionSatisfied = bits, U32, 1128, [5:5] ; total TS size = 1132 isAntilagCondition = bits, U32, 1132, [0:0] ALSMinRPMCondition = bits, U32, 1132, [1:1] @@ -5813,6 +5817,7 @@ entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" entry = isAfrConditionSatisfied, "isAfrConditionSatisfied", int, "%d" +entry = isNitrousRpmConditionSatisfied, "isNitrousRpmConditionSatisfied", int, "%d" entry = isAntilagCondition, "isAntilagCondition", int, "%d" entry = ALSMinRPMCondition, "ALSMinRPMCondition", int, "%d" entry = ALSMaxRPMCondition, "ALSMaxRPMCondition", int, "%d" @@ -6793,6 +6798,7 @@ indicatorPanel = nitrous_control_stateIndicatorPanel, 2 indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" indicator = {isAfrConditionSatisfied}, "isAfrConditionSatisfied No", "isAfrConditionSatisfied Yes" + indicator = {isNitrousRpmConditionSatisfied}, "isNitrousRpmConditionSatisfied No", "isNitrousRpmConditionSatisfied Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9823,10 +9829,13 @@ dialog = tcuControls, "Transmission Settings" panel = NitrousControlLuaGaugeDialog, {nitrousControlArmingMethod == 1} dialog = NitrousControlSettings, "Settings" - field = "Minimum TPS", nitrousMinimumTps - field = "Minimum CLT", nitrousMinimumClt - field = "Maximum MAP", nitrousMaximumMap - field = "Maximum AFR", nitrousMaximumAfr + field = "Minimum TPS", nitrousMinimumTps + field = "Minimum CLT", nitrousMinimumClt + field = "Maximum MAP", nitrousMaximumMap + field = "Maximum AFR", nitrousMaximumAfr + field = "Activation RPM", nitrousActivationRpm + field = "Dectivation RPM", nitrousDeactivationRpm + field = "Dectivation RPM Window", nitrousDeactivationRpmWindow dialog = NitrousControlSettingsDialog, "", yAxis field = "Enable Nitrous Control", nitrousControlEnabled diff --git a/firmware/tunerstudio/generated/rusefi_stm32f767_nucleo.ini b/firmware/tunerstudio/generated/rusefi_stm32f767_nucleo.ini index 46ce1522a4..c0ff6b9944 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.12.01.stm32f767_nucleo.2866013876" + signature = "rusEFI master.2024.12.01.stm32f767_nucleo.4278423622" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.01.stm32f767_nucleo.2866013876" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.01.stm32f767_nucleo.4278423622" ; 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 @@ -1436,7 +1436,10 @@ 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 nitrousMaximumAfr = scalar, U08, 3952, "afr", 0.1, 0, 10, 20, 1 -unusedOftenChangesDuringFirmwareUpdate = array, U08, 3953, [86], "units", 1, 0, 0, 1, 0 +nitrousActivationRpm = scalar, U16, 3954, "rpm", 1, 0, 0, 20000, 0 +nitrousDeactivationRpm = scalar, U16, 3956, "rpm", 1, 0, 0, 20000, 0 +nitrousDeactivationRpmWindow = scalar, U16, 3958, "rpm", 1, 0, 0, 20000, 0 +unusedOftenChangesDuringFirmwareUpdate = array, U08, 3960, [80], "units", 1, 0, 0, 1, 0 postCrankingFactor = array, F32, 4040, [6x6], "mult", 1, 0, 1, 3, 2 postCrankingDurationBins = array, U16, 4184, [6], "count", 1, 0, 0, 64000, 0 postCrankingCLTBins = array, S16, 4196, [6], "C", 1, 0, -100, 250, 0 @@ -3231,6 +3234,7 @@ isTpsConditionSatisfied = bits, U32, 1128, [1:1] isCltConditionSatisfied = bits, U32, 1128, [2:2] isMapConditionSatisfied = bits, U32, 1128, [3:3] isAfrConditionSatisfied = bits, U32, 1128, [4:4] +isNitrousRpmConditionSatisfied = bits, U32, 1128, [5:5] ; total TS size = 1132 isAntilagCondition = bits, U32, 1132, [0:0] ALSMinRPMCondition = bits, U32, 1132, [1:1] @@ -5813,6 +5817,7 @@ entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" entry = isAfrConditionSatisfied, "isAfrConditionSatisfied", int, "%d" +entry = isNitrousRpmConditionSatisfied, "isNitrousRpmConditionSatisfied", int, "%d" entry = isAntilagCondition, "isAntilagCondition", int, "%d" entry = ALSMinRPMCondition, "ALSMinRPMCondition", int, "%d" entry = ALSMaxRPMCondition, "ALSMaxRPMCondition", int, "%d" @@ -6793,6 +6798,7 @@ indicatorPanel = nitrous_control_stateIndicatorPanel, 2 indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" indicator = {isAfrConditionSatisfied}, "isAfrConditionSatisfied No", "isAfrConditionSatisfied Yes" + indicator = {isNitrousRpmConditionSatisfied}, "isNitrousRpmConditionSatisfied No", "isNitrousRpmConditionSatisfied Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9823,10 +9829,13 @@ dialog = tcuControls, "Transmission Settings" panel = NitrousControlLuaGaugeDialog, {nitrousControlArmingMethod == 1} dialog = NitrousControlSettings, "Settings" - field = "Minimum TPS", nitrousMinimumTps - field = "Minimum CLT", nitrousMinimumClt - field = "Maximum MAP", nitrousMaximumMap - field = "Maximum AFR", nitrousMaximumAfr + field = "Minimum TPS", nitrousMinimumTps + field = "Minimum CLT", nitrousMinimumClt + field = "Maximum MAP", nitrousMaximumMap + field = "Maximum AFR", nitrousMaximumAfr + field = "Activation RPM", nitrousActivationRpm + field = "Dectivation RPM", nitrousDeactivationRpm + field = "Dectivation RPM Window", nitrousDeactivationRpmWindow dialog = NitrousControlSettingsDialog, "", yAxis field = "Enable Nitrous Control", nitrousControlEnabled diff --git a/firmware/tunerstudio/generated/rusefi_stm32h743_nucleo.ini b/firmware/tunerstudio/generated/rusefi_stm32h743_nucleo.ini index 7d7d102a49..903ea71bed 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.12.01.stm32h743_nucleo.2866013876" + signature = "rusEFI master.2024.12.01.stm32h743_nucleo.4278423622" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.01.stm32h743_nucleo.2866013876" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.01.stm32h743_nucleo.4278423622" ; 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 @@ -1436,7 +1436,10 @@ 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 nitrousMaximumAfr = scalar, U08, 3952, "afr", 0.1, 0, 10, 20, 1 -unusedOftenChangesDuringFirmwareUpdate = array, U08, 3953, [86], "units", 1, 0, 0, 1, 0 +nitrousActivationRpm = scalar, U16, 3954, "rpm", 1, 0, 0, 20000, 0 +nitrousDeactivationRpm = scalar, U16, 3956, "rpm", 1, 0, 0, 20000, 0 +nitrousDeactivationRpmWindow = scalar, U16, 3958, "rpm", 1, 0, 0, 20000, 0 +unusedOftenChangesDuringFirmwareUpdate = array, U08, 3960, [80], "units", 1, 0, 0, 1, 0 postCrankingFactor = array, F32, 4040, [6x6], "mult", 1, 0, 1, 3, 2 postCrankingDurationBins = array, U16, 4184, [6], "count", 1, 0, 0, 64000, 0 postCrankingCLTBins = array, S16, 4196, [6], "C", 1, 0, -100, 250, 0 @@ -3231,6 +3234,7 @@ isTpsConditionSatisfied = bits, U32, 1128, [1:1] isCltConditionSatisfied = bits, U32, 1128, [2:2] isMapConditionSatisfied = bits, U32, 1128, [3:3] isAfrConditionSatisfied = bits, U32, 1128, [4:4] +isNitrousRpmConditionSatisfied = bits, U32, 1128, [5:5] ; total TS size = 1132 isAntilagCondition = bits, U32, 1132, [0:0] ALSMinRPMCondition = bits, U32, 1132, [1:1] @@ -5813,6 +5817,7 @@ entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" entry = isAfrConditionSatisfied, "isAfrConditionSatisfied", int, "%d" +entry = isNitrousRpmConditionSatisfied, "isNitrousRpmConditionSatisfied", int, "%d" entry = isAntilagCondition, "isAntilagCondition", int, "%d" entry = ALSMinRPMCondition, "ALSMinRPMCondition", int, "%d" entry = ALSMaxRPMCondition, "ALSMaxRPMCondition", int, "%d" @@ -6793,6 +6798,7 @@ indicatorPanel = nitrous_control_stateIndicatorPanel, 2 indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" indicator = {isAfrConditionSatisfied}, "isAfrConditionSatisfied No", "isAfrConditionSatisfied Yes" + indicator = {isNitrousRpmConditionSatisfied}, "isNitrousRpmConditionSatisfied No", "isNitrousRpmConditionSatisfied Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9823,10 +9829,13 @@ dialog = tcuControls, "Transmission Settings" panel = NitrousControlLuaGaugeDialog, {nitrousControlArmingMethod == 1} dialog = NitrousControlSettings, "Settings" - field = "Minimum TPS", nitrousMinimumTps - field = "Minimum CLT", nitrousMinimumClt - field = "Maximum MAP", nitrousMaximumMap - field = "Maximum AFR", nitrousMaximumAfr + field = "Minimum TPS", nitrousMinimumTps + field = "Minimum CLT", nitrousMinimumClt + field = "Maximum MAP", nitrousMaximumMap + field = "Maximum AFR", nitrousMaximumAfr + field = "Activation RPM", nitrousActivationRpm + field = "Dectivation RPM", nitrousDeactivationRpm + field = "Dectivation RPM Window", nitrousDeactivationRpmWindow dialog = NitrousControlSettingsDialog, "", yAxis field = "Enable Nitrous Control", nitrousControlEnabled diff --git a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini index 4c8ff928f2..9b6e707d4f 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.12.01.subaru_eg33_f7.4126334698" + signature = "rusEFI master.2024.12.01.subaru_eg33_f7.2686625816" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.01.subaru_eg33_f7.4126334698" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.01.subaru_eg33_f7.2686625816" ; 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 @@ -1436,7 +1436,10 @@ 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 nitrousMaximumAfr = scalar, U08, 3952, "afr", 0.1, 0, 10, 20, 1 -unusedOftenChangesDuringFirmwareUpdate = array, U08, 3953, [86], "units", 1, 0, 0, 1, 0 +nitrousActivationRpm = scalar, U16, 3954, "rpm", 1, 0, 0, 20000, 0 +nitrousDeactivationRpm = scalar, U16, 3956, "rpm", 1, 0, 0, 20000, 0 +nitrousDeactivationRpmWindow = scalar, U16, 3958, "rpm", 1, 0, 0, 20000, 0 +unusedOftenChangesDuringFirmwareUpdate = array, U08, 3960, [80], "units", 1, 0, 0, 1, 0 postCrankingFactor = array, F32, 4040, [6x6], "mult", 1, 0, 1, 3, 2 postCrankingDurationBins = array, U16, 4184, [6], "count", 1, 0, 0, 64000, 0 postCrankingCLTBins = array, S16, 4196, [6], "C", 1, 0, -100, 125, 0 @@ -3231,6 +3234,7 @@ isTpsConditionSatisfied = bits, U32, 1128, [1:1] isCltConditionSatisfied = bits, U32, 1128, [2:2] isMapConditionSatisfied = bits, U32, 1128, [3:3] isAfrConditionSatisfied = bits, U32, 1128, [4:4] +isNitrousRpmConditionSatisfied = bits, U32, 1128, [5:5] ; total TS size = 1132 isAntilagCondition = bits, U32, 1132, [0:0] ALSMinRPMCondition = bits, U32, 1132, [1:1] @@ -5813,6 +5817,7 @@ entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" entry = isAfrConditionSatisfied, "isAfrConditionSatisfied", int, "%d" +entry = isNitrousRpmConditionSatisfied, "isNitrousRpmConditionSatisfied", int, "%d" entry = isAntilagCondition, "isAntilagCondition", int, "%d" entry = ALSMinRPMCondition, "ALSMinRPMCondition", int, "%d" entry = ALSMaxRPMCondition, "ALSMaxRPMCondition", int, "%d" @@ -6795,6 +6800,7 @@ indicatorPanel = nitrous_control_stateIndicatorPanel, 2 indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" indicator = {isAfrConditionSatisfied}, "isAfrConditionSatisfied No", "isAfrConditionSatisfied Yes" + indicator = {isNitrousRpmConditionSatisfied}, "isNitrousRpmConditionSatisfied No", "isNitrousRpmConditionSatisfied Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9817,10 +9823,13 @@ dialog = tcuControls, "Transmission Settings" panel = NitrousControlLuaGaugeDialog, {nitrousControlArmingMethod == 1} dialog = NitrousControlSettings, "Settings" - field = "Minimum TPS", nitrousMinimumTps - field = "Minimum CLT", nitrousMinimumClt - field = "Maximum MAP", nitrousMaximumMap - field = "Maximum AFR", nitrousMaximumAfr + field = "Minimum TPS", nitrousMinimumTps + field = "Minimum CLT", nitrousMinimumClt + field = "Maximum MAP", nitrousMaximumMap + field = "Maximum AFR", nitrousMaximumAfr + field = "Activation RPM", nitrousActivationRpm + field = "Dectivation RPM", nitrousDeactivationRpm + field = "Dectivation RPM Window", nitrousDeactivationRpmWindow dialog = NitrousControlSettingsDialog, "", yAxis field = "Enable Nitrous Control", nitrousControlEnabled diff --git a/firmware/tunerstudio/generated/rusefi_t-b-g.ini b/firmware/tunerstudio/generated/rusefi_t-b-g.ini index 9461018626..69e82bbac9 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.12.01.t-b-g.2866013876" + signature = "rusEFI master.2024.12.01.t-b-g.4278423622" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.01.t-b-g.2866013876" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.01.t-b-g.4278423622" ; 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 @@ -1436,7 +1436,10 @@ 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 nitrousMaximumAfr = scalar, U08, 3952, "afr", 0.1, 0, 10, 20, 1 -unusedOftenChangesDuringFirmwareUpdate = array, U08, 3953, [86], "units", 1, 0, 0, 1, 0 +nitrousActivationRpm = scalar, U16, 3954, "rpm", 1, 0, 0, 20000, 0 +nitrousDeactivationRpm = scalar, U16, 3956, "rpm", 1, 0, 0, 20000, 0 +nitrousDeactivationRpmWindow = scalar, U16, 3958, "rpm", 1, 0, 0, 20000, 0 +unusedOftenChangesDuringFirmwareUpdate = array, U08, 3960, [80], "units", 1, 0, 0, 1, 0 postCrankingFactor = array, F32, 4040, [6x6], "mult", 1, 0, 1, 3, 2 postCrankingDurationBins = array, U16, 4184, [6], "count", 1, 0, 0, 64000, 0 postCrankingCLTBins = array, S16, 4196, [6], "C", 1, 0, -100, 250, 0 @@ -3231,6 +3234,7 @@ isTpsConditionSatisfied = bits, U32, 1128, [1:1] isCltConditionSatisfied = bits, U32, 1128, [2:2] isMapConditionSatisfied = bits, U32, 1128, [3:3] isAfrConditionSatisfied = bits, U32, 1128, [4:4] +isNitrousRpmConditionSatisfied = bits, U32, 1128, [5:5] ; total TS size = 1132 isAntilagCondition = bits, U32, 1132, [0:0] ALSMinRPMCondition = bits, U32, 1132, [1:1] @@ -5813,6 +5817,7 @@ entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" entry = isAfrConditionSatisfied, "isAfrConditionSatisfied", int, "%d" +entry = isNitrousRpmConditionSatisfied, "isNitrousRpmConditionSatisfied", int, "%d" entry = isAntilagCondition, "isAntilagCondition", int, "%d" entry = ALSMinRPMCondition, "ALSMinRPMCondition", int, "%d" entry = ALSMaxRPMCondition, "ALSMaxRPMCondition", int, "%d" @@ -6793,6 +6798,7 @@ indicatorPanel = nitrous_control_stateIndicatorPanel, 2 indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" indicator = {isAfrConditionSatisfied}, "isAfrConditionSatisfied No", "isAfrConditionSatisfied Yes" + indicator = {isNitrousRpmConditionSatisfied}, "isNitrousRpmConditionSatisfied No", "isNitrousRpmConditionSatisfied Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9823,10 +9829,13 @@ dialog = tcuControls, "Transmission Settings" panel = NitrousControlLuaGaugeDialog, {nitrousControlArmingMethod == 1} dialog = NitrousControlSettings, "Settings" - field = "Minimum TPS", nitrousMinimumTps - field = "Minimum CLT", nitrousMinimumClt - field = "Maximum MAP", nitrousMaximumMap - field = "Maximum AFR", nitrousMaximumAfr + field = "Minimum TPS", nitrousMinimumTps + field = "Minimum CLT", nitrousMinimumClt + field = "Maximum MAP", nitrousMaximumMap + field = "Maximum AFR", nitrousMaximumAfr + field = "Activation RPM", nitrousActivationRpm + field = "Dectivation RPM", nitrousDeactivationRpm + field = "Dectivation RPM Window", nitrousDeactivationRpmWindow dialog = NitrousControlSettingsDialog, "", yAxis field = "Enable Nitrous Control", nitrousControlEnabled diff --git a/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini b/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini index ea84d2e2ba..96fe2eb09c 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.12.01.tdg-pdm8.2432588348" + signature = "rusEFI master.2024.12.01.tdg-pdm8.3308137678" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.01.tdg-pdm8.2432588348" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.01.tdg-pdm8.3308137678" ; 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 @@ -1436,7 +1436,10 @@ 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 nitrousMaximumAfr = scalar, U08, 3952, "afr", 0.1, 0, 10, 20, 1 -unusedOftenChangesDuringFirmwareUpdate = array, U08, 3953, [86], "units", 1, 0, 0, 1, 0 +nitrousActivationRpm = scalar, U16, 3954, "rpm", 1, 0, 0, 20000, 0 +nitrousDeactivationRpm = scalar, U16, 3956, "rpm", 1, 0, 0, 20000, 0 +nitrousDeactivationRpmWindow = scalar, U16, 3958, "rpm", 1, 0, 0, 20000, 0 +unusedOftenChangesDuringFirmwareUpdate = array, U08, 3960, [80], "units", 1, 0, 0, 1, 0 postCrankingFactor = array, F32, 4040, [6x6], "mult", 1, 0, 1, 3, 2 postCrankingDurationBins = array, U16, 4184, [6], "count", 1, 0, 0, 64000, 0 postCrankingCLTBins = array, S16, 4196, [6], "C", 1, 0, -100, 250, 0 @@ -3231,6 +3234,7 @@ isTpsConditionSatisfied = bits, U32, 1128, [1:1] isCltConditionSatisfied = bits, U32, 1128, [2:2] isMapConditionSatisfied = bits, U32, 1128, [3:3] isAfrConditionSatisfied = bits, U32, 1128, [4:4] +isNitrousRpmConditionSatisfied = bits, U32, 1128, [5:5] ; total TS size = 1132 isAntilagCondition = bits, U32, 1132, [0:0] ALSMinRPMCondition = bits, U32, 1132, [1:1] @@ -5813,6 +5817,7 @@ entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" entry = isAfrConditionSatisfied, "isAfrConditionSatisfied", int, "%d" +entry = isNitrousRpmConditionSatisfied, "isNitrousRpmConditionSatisfied", int, "%d" entry = isAntilagCondition, "isAntilagCondition", int, "%d" entry = ALSMinRPMCondition, "ALSMinRPMCondition", int, "%d" entry = ALSMaxRPMCondition, "ALSMaxRPMCondition", int, "%d" @@ -6793,6 +6798,7 @@ indicatorPanel = nitrous_control_stateIndicatorPanel, 2 indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" indicator = {isAfrConditionSatisfied}, "isAfrConditionSatisfied No", "isAfrConditionSatisfied Yes" + indicator = {isNitrousRpmConditionSatisfied}, "isNitrousRpmConditionSatisfied No", "isNitrousRpmConditionSatisfied Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9823,10 +9829,13 @@ dialog = tcuControls, "Transmission Settings" panel = NitrousControlLuaGaugeDialog, {nitrousControlArmingMethod == 1} dialog = NitrousControlSettings, "Settings" - field = "Minimum TPS", nitrousMinimumTps - field = "Minimum CLT", nitrousMinimumClt - field = "Maximum MAP", nitrousMaximumMap - field = "Maximum AFR", nitrousMaximumAfr + field = "Minimum TPS", nitrousMinimumTps + field = "Minimum CLT", nitrousMinimumClt + field = "Maximum MAP", nitrousMaximumMap + field = "Maximum AFR", nitrousMaximumAfr + field = "Activation RPM", nitrousActivationRpm + field = "Dectivation RPM", nitrousDeactivationRpm + field = "Dectivation RPM Window", nitrousDeactivationRpmWindow dialog = NitrousControlSettingsDialog, "", yAxis field = "Enable Nitrous Control", nitrousControlEnabled diff --git a/firmware/tunerstudio/generated/rusefi_uaefi.ini b/firmware/tunerstudio/generated/rusefi_uaefi.ini index 4fd3b3ecd2..060d76f617 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.12.01.uaefi.4074929591" + signature = "rusEFI master.2024.12.01.uaefi.2805074757" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.01.uaefi.4074929591" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.01.uaefi.2805074757" ; 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 @@ -1436,7 +1436,10 @@ 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 nitrousMaximumAfr = scalar, U08, 3952, "afr", 0.1, 0, 10, 20, 1 -unusedOftenChangesDuringFirmwareUpdate = array, U08, 3953, [86], "units", 1, 0, 0, 1, 0 +nitrousActivationRpm = scalar, U16, 3954, "rpm", 1, 0, 0, 20000, 0 +nitrousDeactivationRpm = scalar, U16, 3956, "rpm", 1, 0, 0, 20000, 0 +nitrousDeactivationRpmWindow = scalar, U16, 3958, "rpm", 1, 0, 0, 20000, 0 +unusedOftenChangesDuringFirmwareUpdate = array, U08, 3960, [80], "units", 1, 0, 0, 1, 0 postCrankingFactor = array, F32, 4040, [6x6], "mult", 1, 0, 1, 3, 2 postCrankingDurationBins = array, U16, 4184, [6], "count", 1, 0, 0, 64000, 0 postCrankingCLTBins = array, S16, 4196, [6], "C", 1, 0, -100, 250, 0 @@ -3234,6 +3237,7 @@ isTpsConditionSatisfied = bits, U32, 1128, [1:1] isCltConditionSatisfied = bits, U32, 1128, [2:2] isMapConditionSatisfied = bits, U32, 1128, [3:3] isAfrConditionSatisfied = bits, U32, 1128, [4:4] +isNitrousRpmConditionSatisfied = bits, U32, 1128, [5:5] ; total TS size = 1132 isAntilagCondition = bits, U32, 1132, [0:0] ALSMinRPMCondition = bits, U32, 1132, [1:1] @@ -5824,6 +5828,7 @@ entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" entry = isAfrConditionSatisfied, "isAfrConditionSatisfied", int, "%d" +entry = isNitrousRpmConditionSatisfied, "isNitrousRpmConditionSatisfied", int, "%d" entry = isAntilagCondition, "isAntilagCondition", int, "%d" entry = ALSMinRPMCondition, "ALSMinRPMCondition", int, "%d" entry = ALSMaxRPMCondition, "ALSMaxRPMCondition", int, "%d" @@ -6825,6 +6830,7 @@ indicatorPanel = nitrous_control_stateIndicatorPanel, 2 indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" indicator = {isAfrConditionSatisfied}, "isAfrConditionSatisfied No", "isAfrConditionSatisfied Yes" + indicator = {isNitrousRpmConditionSatisfied}, "isNitrousRpmConditionSatisfied No", "isNitrousRpmConditionSatisfied Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9815,10 +9821,13 @@ commandButton = "VAG i5", cmd_set_engine_type_vag_5 panel = NitrousControlLuaGaugeDialog, {nitrousControlArmingMethod == 1} dialog = NitrousControlSettings, "Settings" - field = "Minimum TPS", nitrousMinimumTps - field = "Minimum CLT", nitrousMinimumClt - field = "Maximum MAP", nitrousMaximumMap - field = "Maximum AFR", nitrousMaximumAfr + field = "Minimum TPS", nitrousMinimumTps + field = "Minimum CLT", nitrousMinimumClt + field = "Maximum MAP", nitrousMaximumMap + field = "Maximum AFR", nitrousMaximumAfr + field = "Activation RPM", nitrousActivationRpm + field = "Dectivation RPM", nitrousDeactivationRpm + field = "Dectivation RPM Window", nitrousDeactivationRpmWindow dialog = NitrousControlSettingsDialog, "", yAxis field = "Enable Nitrous Control", nitrousControlEnabled diff --git a/firmware/tunerstudio/generated/rusefi_uaefi121.ini b/firmware/tunerstudio/generated/rusefi_uaefi121.ini index 3c731af48b..b8ac4ef5a5 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.12.01.uaefi121.1275113500" + signature = "rusEFI master.2024.12.01.uaefi121.433112814" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.01.uaefi121.1275113500" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.01.uaefi121.433112814" ; 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 @@ -1436,7 +1436,10 @@ 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 nitrousMaximumAfr = scalar, U08, 3952, "afr", 0.1, 0, 10, 20, 1 -unusedOftenChangesDuringFirmwareUpdate = array, U08, 3953, [86], "units", 1, 0, 0, 1, 0 +nitrousActivationRpm = scalar, U16, 3954, "rpm", 1, 0, 0, 20000, 0 +nitrousDeactivationRpm = scalar, U16, 3956, "rpm", 1, 0, 0, 20000, 0 +nitrousDeactivationRpmWindow = scalar, U16, 3958, "rpm", 1, 0, 0, 20000, 0 +unusedOftenChangesDuringFirmwareUpdate = array, U08, 3960, [80], "units", 1, 0, 0, 1, 0 postCrankingFactor = array, F32, 4040, [6x6], "mult", 1, 0, 1, 3, 2 postCrankingDurationBins = array, U16, 4184, [6], "count", 1, 0, 0, 64000, 0 postCrankingCLTBins = array, S16, 4196, [6], "C", 1, 0, -100, 250, 0 @@ -3231,6 +3234,7 @@ isTpsConditionSatisfied = bits, U32, 1128, [1:1] isCltConditionSatisfied = bits, U32, 1128, [2:2] isMapConditionSatisfied = bits, U32, 1128, [3:3] isAfrConditionSatisfied = bits, U32, 1128, [4:4] +isNitrousRpmConditionSatisfied = bits, U32, 1128, [5:5] ; total TS size = 1132 isAntilagCondition = bits, U32, 1132, [0:0] ALSMinRPMCondition = bits, U32, 1132, [1:1] @@ -5814,6 +5818,7 @@ entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" entry = isAfrConditionSatisfied, "isAfrConditionSatisfied", int, "%d" +entry = isNitrousRpmConditionSatisfied, "isNitrousRpmConditionSatisfied", int, "%d" entry = isAntilagCondition, "isAntilagCondition", int, "%d" entry = ALSMinRPMCondition, "ALSMinRPMCondition", int, "%d" entry = ALSMaxRPMCondition, "ALSMaxRPMCondition", int, "%d" @@ -6814,6 +6819,7 @@ indicatorPanel = nitrous_control_stateIndicatorPanel, 2 indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" indicator = {isAfrConditionSatisfied}, "isAfrConditionSatisfied No", "isAfrConditionSatisfied Yes" + indicator = {isNitrousRpmConditionSatisfied}, "isNitrousRpmConditionSatisfied No", "isNitrousRpmConditionSatisfied Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9801,10 +9807,13 @@ commandButton = "VAG i5", cmd_set_engine_type_vag_5 panel = NitrousControlLuaGaugeDialog, {nitrousControlArmingMethod == 1} dialog = NitrousControlSettings, "Settings" - field = "Minimum TPS", nitrousMinimumTps - field = "Minimum CLT", nitrousMinimumClt - field = "Maximum MAP", nitrousMaximumMap - field = "Maximum AFR", nitrousMaximumAfr + field = "Minimum TPS", nitrousMinimumTps + field = "Minimum CLT", nitrousMinimumClt + field = "Maximum MAP", nitrousMaximumMap + field = "Maximum AFR", nitrousMaximumAfr + field = "Activation RPM", nitrousActivationRpm + field = "Dectivation RPM", nitrousDeactivationRpm + field = "Dectivation RPM Window", nitrousDeactivationRpmWindow dialog = NitrousControlSettingsDialog, "", yAxis field = "Enable Nitrous Control", nitrousControlEnabled 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 2534d06bab..1b77e9214e 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 = 86; + public static final int END_OF_CALIBRATION_PADDING = 80; 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; @@ -1237,7 +1237,7 @@ public class Fields { public static final int SentInput_INPUT6 = 6; public static final int SentInput_INPUT7 = 7; public static final int SentInput_NONE = 0; - public static final int SIGNATURE_HASH = 1248538377; + public static final int SIGNATURE_HASH = 532371963; public static final String SIMULATOR_TUNE_BIN_FILE_NAME = "generated/simulator_tune_image.bin"; public static final String SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX = "generated/simulator_tune_image"; public static final String SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX = ".bin"; @@ -1500,7 +1500,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.12.01.f407-discovery.1248538377"; + public static final String TS_SIGNATURE = "rusEFI master.2024.12.01.f407-discovery.532371963"; public static final char TS_SIMULATE_CAN = '>'; public static final char TS_SINGLE_WRITE_COMMAND = 'W'; public static final char TS_TEST_COMMAND = 't'; @@ -3004,7 +3004,10 @@ public class Fields { 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 NITROUSMAXIMUMAFR = Field.create("NITROUSMAXIMUMAFR", 3952, FieldType.INT8).setScale(0.1).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 ALIGNMENTFILL_AT_3953 = Field.create("ALIGNMENTFILL_AT_3953", 3953, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field NITROUSACTIVATIONRPM = Field.create("NITROUSACTIVATIONRPM", 3954, FieldType.INT16).setScale(1.0).setBaseOffset(0); + public static final Field NITROUSDEACTIVATIONRPM = Field.create("NITROUSDEACTIVATIONRPM", 3956, FieldType.INT16).setScale(1.0).setBaseOffset(0); + public static final Field NITROUSDEACTIVATIONRPMWINDOW = Field.create("NITROUSDEACTIVATIONRPMWINDOW", 3958, FieldType.INT16).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.INT16).setScale(1.0).setBaseOffset(0); public static final Field POSTCRANKINGCLTBINS = Field.create("POSTCRANKINGCLTBINS", 4196, FieldType.INT16).setScale(1.0).setBaseOffset(0); @@ -4727,7 +4730,10 @@ public class Fields { ALIGNMENTFILL_AT_3949, NITROUSMAXIMUMMAP, NITROUSMAXIMUMAFR, - ALIGNMENTFILL_AT_4039, + ALIGNMENTFILL_AT_3953, + NITROUSACTIVATIONRPM, + NITROUSDEACTIVATIONRPM, + NITROUSDEACTIVATIONRPMWINDOW, 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 7640f6c894..015d5c129c 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 @@ -11,11 +11,13 @@ public class NitrousController { 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 ISAFRCONDITIONSATISFIED = Field.create("ISAFRCONDITIONSATISFIED", 0, FieldType.BIT, 4).setBaseOffset(1128); + public static final Field ISNITROUSRPMCONDITIONSATISFIED = Field.create("ISNITROUSRPMCONDITIONSATISFIED", 0, FieldType.BIT, 5).setBaseOffset(1128); public static final Field[] VALUES = { ISARMED, ISTPSCONDITIONSATISFIED, ISCLTCONDITIONSATISFIED, ISMAPCONDITIONSATISFIED, ISAFRCONDITIONSATISFIED, + ISNITROUSRPMCONDITIONSATISFIED, }; }