From bde76832bb738f4dc13259631daa27675f9a2bcd Mon Sep 17 00:00:00 2001 From: GitHub build-firmware Action Date: Mon, 20 Dec 2021 18:59:55 +0000 Subject: [PATCH] Auto-generated configs and docs --- ...ngine_configuration_generated_structures.h | 24 +++++++++++++------ .../controllers/algo/rusefi_generated.h | 11 +++++---- ...ngine_configuration_generated_structures.h | 24 +++++++++++++------ .../controllers/algo/rusefi_generated.h | 11 +++++---- ...ngine_configuration_generated_structures.h | 24 +++++++++++++------ .../controllers/algo/rusefi_generated.h | 11 +++++---- ...ngine_configuration_generated_structures.h | 24 +++++++++++++------ .../controllers/generated/rusefi_generated.h | 11 +++++---- .../controllers/generated/signature_all.h | 4 ++-- .../controllers/generated/signature_atlas.h | 4 ++-- .../generated/signature_f429-discovery.h | 4 ++-- .../generated/signature_frankenso_na6.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_hellen72.h | 4 ++-- .../generated/signature_hellen81.h | 4 ++-- .../generated/signature_hellen88bmw.h | 4 ++-- .../generated/signature_hellenNA6.h | 4 ++-- .../generated/signature_hellen_cypress.h | 4 ++-- .../controllers/generated/signature_kin.h | 4 ++-- .../controllers/generated/signature_mre_f4.h | 4 ++-- .../controllers/generated/signature_mre_f7.h | 4 ++-- .../generated/signature_prometheus_405.h | 4 ++-- .../generated/signature_prometheus_469.h | 4 ++-- .../generated/signature_proteus_f4.h | 4 ++-- .../generated/signature_proteus_f7.h | 4 ++-- .../generated/signature_subaru_eg33_f7.h | 4 ++-- firmware/tunerstudio/generated/rusefi.ini | 23 +++++++++++++----- .../tunerstudio/generated/rusefi_atlas.ini | 23 +++++++++++++----- .../generated/rusefi_f429-discovery.ini | 23 +++++++++++++----- .../generated/rusefi_frankenso_na6.ini | 23 +++++++++++++----- .../generated/rusefi_hellen-nb1.ini | 23 +++++++++++++----- .../generated/rusefi_hellen121nissan.ini | 23 +++++++++++++----- .../generated/rusefi_hellen121vag.ini | 23 +++++++++++++----- .../generated/rusefi_hellen128mercedes.ini | 23 +++++++++++++----- .../generated/rusefi_hellen154hyundai.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_hellen_cypress.ini | 23 +++++++++++++----- .../tunerstudio/generated/rusefi_kinetis.ini | 23 +++++++++++++----- .../tunerstudio/generated/rusefi_mre_f4.ini | 23 +++++++++++++----- .../tunerstudio/generated/rusefi_mre_f7.ini | 23 +++++++++++++----- .../generated/rusefi_prometheus_405.ini | 23 +++++++++++++----- .../generated/rusefi_prometheus_469.ini | 23 +++++++++++++----- .../generated/rusefi_proteus_f4.ini | 23 +++++++++++++----- .../generated/rusefi_proteus_f7.ini | 23 +++++++++++++----- .../generated/rusefi_subaru_eg33_f7.ini | 23 +++++++++++++----- .../com/rusefi/config/generated/Fields.java | 22 ++++++++++------- 53 files changed, 528 insertions(+), 228 deletions(-) diff --git a/firmware/config/boards/hellen/cypress/config/controllers/algo/engine_configuration_generated_structures.h b/firmware/config/boards/hellen/cypress/config/controllers/algo/engine_configuration_generated_structures.h index 440dcdcdd7..616b08a824 100644 --- a/firmware/config/boards/hellen/cypress/config/controllers/algo/engine_configuration_generated_structures.h +++ b/firmware/config/boards/hellen/cypress/config/controllers/algo/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Mon Dec 20 13:18:45 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Mon Dec 20 18:58:29 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3982,16 +3982,26 @@ struct engine_configuration_s { */ scaled_channel hpfpCompensationRpmBins[HPFP_COMPENSATION_SIZE]; /** - * need 4 byte alignment - units + Nm * offset 4594 */ - uint8_t alignmentFill_at_4594[2]; + uint8_t torqueValues[TORQUE_CURVE_SIZE]; + /** + RPM + * offset 4602 + */ + uint16_t torqueRpmBins[TORQUE_CURVE_SIZE]; + /** + * need 4 byte alignment + units + * offset 4618 + */ + uint8_t alignmentFill_at_4618[2]; /** units - * offset 4596 + * offset 4620 */ - int mainUnusedEnd[429]; + int mainUnusedEnd[423]; /** total size 6312*/ }; @@ -4379,4 +4389,4 @@ struct persistent_config_s { }; // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Mon Dec 20 13:18:45 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Mon Dec 20 18:58:29 UTC 2021 diff --git a/firmware/config/boards/hellen/cypress/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/hellen/cypress/config/controllers/algo/rusefi_generated.h index a7d69c4e30..af35843c54 100644 --- a/firmware/config/boards/hellen/cypress/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/hellen/cypress/config/controllers/algo/rusefi_generated.h @@ -86,7 +86,7 @@ #define alignmentFill_at_1847_offset 1847 #define alignmentFill_at_1873_offset 1873 #define alignmentFill_at_4007_offset 4007 -#define alignmentFill_at_4594_offset 4594 +#define alignmentFill_at_4618_offset 4618 #define alignmentFill_at_62_offset 62 #define alternatorControl_dFactor_offset 1492 #define alternatorControl_iFactor_offset 1488 @@ -1540,7 +1540,7 @@ #define MAIN_HELP_URL "http://www.rusefi.com/" #define mainRelayPin_offset 714 #define mainRelayPinMode_offset 756 -#define mainUnusedEnd_offset 4596 +#define mainUnusedEnd_offset 4620 #define malfunctionIndicatorPin_offset 668 #define malfunctionIndicatorPinMode_offset 669 #define manIdlePosition_offset 616 @@ -1822,7 +1822,7 @@ #define show_test_presets true #define showHumanReadableWarning_offset 896 #define showSdCardWarning_offset 164 -#define SIGNATURE_HASH 167042642 +#define SIGNATURE_HASH 3399437954 #define silentTriggerError_offset 1260 #define slowAdcAlpha_offset 1712 #define sparkDwellRpmBins_offset 54 @@ -2009,6 +2009,9 @@ #define TOOTH_PACKET_COUNT 1000 #define TOOTH_PACKET_SIZE 2 #define TOP_DEAD_CENTER_MESSAGE "r" +#define TORQUE_CURVE_SIZE 8 +#define torqueRpmBins_offset 4602 +#define torqueValues_offset 4594 #define TOTAL_CONFIG_SIZE 24400 #define tps1_1AdcChannel_offset 520 #define tps1_2AdcChannel_offset 689 @@ -2339,7 +2342,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2021.12.20.hellen_cypress.167042642" +#define TS_SIGNATURE "rusEFI 2021.12.20.hellen_cypress.3399437954" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' diff --git a/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h b/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h index 6a8841f89f..b9f8f6b38f 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Mon Dec 20 13:18:43 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Mon Dec 20 18:58:26 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3976,16 +3976,26 @@ struct engine_configuration_s { */ scaled_channel hpfpCompensationRpmBins[HPFP_COMPENSATION_SIZE]; /** - * need 4 byte alignment - units + Nm * offset 4566 */ - uint8_t alignmentFill_at_4566[2]; + uint8_t torqueValues[TORQUE_CURVE_SIZE]; + /** + RPM + * offset 4574 + */ + uint16_t torqueRpmBins[TORQUE_CURVE_SIZE]; + /** + * need 4 byte alignment + units + * offset 4590 + */ + uint8_t alignmentFill_at_4590[2]; /** units - * offset 4568 + * offset 4592 */ - int mainUnusedEnd[429]; + int mainUnusedEnd[423]; /** total size 6284*/ }; @@ -4373,4 +4383,4 @@ struct persistent_config_s { }; // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Mon Dec 20 13:18:43 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Mon Dec 20 18:58:26 UTC 2021 diff --git a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h index 6091b195cf..f933ecd38a 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -85,7 +85,7 @@ #define alignEngineSnifferAtTDC_offset 748 #define alignmentFill_at_1867_offset 1867 #define alignmentFill_at_3979_offset 3979 -#define alignmentFill_at_4566_offset 4566 +#define alignmentFill_at_4590_offset 4590 #define alignmentFill_at_62_offset 62 #define alternatorControl_dFactor_offset 1492 #define alternatorControl_iFactor_offset 1488 @@ -1525,7 +1525,7 @@ #define MAIN_HELP_URL "http://www.rusefi.com/" #define mainRelayPin_offset 714 #define mainRelayPinMode_offset 756 -#define mainUnusedEnd_offset 4568 +#define mainUnusedEnd_offset 4592 #define malfunctionIndicatorPin_offset 668 #define malfunctionIndicatorPinMode_offset 669 #define manIdlePosition_offset 616 @@ -1807,7 +1807,7 @@ #define show_test_presets true #define showHumanReadableWarning_offset 896 #define showSdCardWarning_offset 164 -#define SIGNATURE_HASH 4132508334 +#define SIGNATURE_HASH 893026942 #define silentTriggerError_offset 1260 #define slowAdcAlpha_offset 1712 #define sparkDwellRpmBins_offset 54 @@ -1994,6 +1994,9 @@ #define TOOTH_PACKET_COUNT 1000 #define TOOTH_PACKET_SIZE 2 #define TOP_DEAD_CENTER_MESSAGE "r" +#define TORQUE_CURVE_SIZE 8 +#define torqueRpmBins_offset 4574 +#define torqueValues_offset 4566 #define TOTAL_CONFIG_SIZE 24372 #define tps1_1AdcChannel_offset 520 #define tps1_2AdcChannel_offset 689 @@ -2324,7 +2327,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator true #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2021.12.20.kin.4132508334" +#define TS_SIGNATURE "rusEFI 2021.12.20.kin.893026942" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' diff --git a/firmware/config/boards/subaru_eg33/config/controllers/algo/engine_configuration_generated_structures.h b/firmware/config/boards/subaru_eg33/config/controllers/algo/engine_configuration_generated_structures.h index 054126f6e8..a1de1a4506 100644 --- a/firmware/config/boards/subaru_eg33/config/controllers/algo/engine_configuration_generated_structures.h +++ b/firmware/config/boards/subaru_eg33/config/controllers/algo/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_config.sh integration/rusefi_config.txt Mon Dec 20 13:18:47 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_config.sh integration/rusefi_config.txt Mon Dec 20 18:58:31 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3982,16 +3982,26 @@ struct engine_configuration_s { */ scaled_channel hpfpCompensationRpmBins[HPFP_COMPENSATION_SIZE]; /** - * need 4 byte alignment - units + Nm * offset 4594 */ - uint8_t alignmentFill_at_4594[2]; + uint8_t torqueValues[TORQUE_CURVE_SIZE]; + /** + RPM + * offset 4602 + */ + uint16_t torqueRpmBins[TORQUE_CURVE_SIZE]; + /** + * need 4 byte alignment + units + * offset 4618 + */ + uint8_t alignmentFill_at_4618[2]; /** units - * offset 4596 + * offset 4620 */ - int mainUnusedEnd[429]; + int mainUnusedEnd[423]; /** total size 6312*/ }; @@ -4379,4 +4389,4 @@ struct persistent_config_s { }; // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_config.sh integration/rusefi_config.txt Mon Dec 20 13:18:47 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_config.sh integration/rusefi_config.txt Mon Dec 20 18:58:31 UTC 2021 diff --git a/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h index b930b2a626..41f9615a0e 100644 --- a/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h @@ -94,7 +94,7 @@ #define alignmentFill_at_1847_offset 1847 #define alignmentFill_at_1873_offset 1873 #define alignmentFill_at_4007_offset 4007 -#define alignmentFill_at_4594_offset 4594 +#define alignmentFill_at_4618_offset 4618 #define alignmentFill_at_62_offset 62 #define alternatorControl_dFactor_offset 1492 #define alternatorControl_iFactor_offset 1488 @@ -1552,7 +1552,7 @@ #define MAIN_HELP_URL "http://www.rusefi.com/" #define mainRelayPin_offset 714 #define mainRelayPinMode_offset 756 -#define mainUnusedEnd_offset 4596 +#define mainUnusedEnd_offset 4620 #define malfunctionIndicatorPin_offset 668 #define malfunctionIndicatorPinMode_offset 669 #define manIdlePosition_offset 616 @@ -1835,7 +1835,7 @@ #define show_test_presets false #define showHumanReadableWarning_offset 896 #define showSdCardWarning_offset 164 -#define SIGNATURE_HASH 4038799294 +#define SIGNATURE_HASH 869318510 #define silentTriggerError_offset 1260 #define slowAdcAlpha_offset 1712 #define sparkDwellRpmBins_offset 54 @@ -2022,6 +2022,9 @@ #define TOOTH_PACKET_COUNT 1000 #define TOOTH_PACKET_SIZE 2 #define TOP_DEAD_CENTER_MESSAGE "r" +#define TORQUE_CURVE_SIZE 8 +#define torqueRpmBins_offset 4602 +#define torqueValues_offset 4594 #define TOTAL_CONFIG_SIZE 24400 #define tps1_1AdcChannel_offset 520 #define tps1_2AdcChannel_offset 689 @@ -2352,7 +2355,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port false -#define TS_SIGNATURE "rusEFI 2021.12.20.subaru_eg33_f7.4038799294" +#define TS_SIGNATURE "rusEFI 2021.12.20.subaru_eg33_f7.869318510" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' diff --git a/firmware/controllers/generated/engine_configuration_generated_structures.h b/firmware/controllers/generated/engine_configuration_generated_structures.h index 798b3d5410..2a2813ba67 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Dec 20 13:18:51 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Dec 20 18:58:34 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3982,16 +3982,26 @@ struct engine_configuration_s { */ scaled_channel hpfpCompensationRpmBins[HPFP_COMPENSATION_SIZE]; /** - * need 4 byte alignment - units + Nm * offset 4594 */ - uint8_t alignmentFill_at_4594[2]; + uint8_t torqueValues[TORQUE_CURVE_SIZE]; + /** + RPM + * offset 4602 + */ + uint16_t torqueRpmBins[TORQUE_CURVE_SIZE]; + /** + * need 4 byte alignment + units + * offset 4618 + */ + uint8_t alignmentFill_at_4618[2]; /** units - * offset 4596 + * offset 4620 */ - int mainUnusedEnd[429]; + int mainUnusedEnd[423]; /** total size 6312*/ }; @@ -4379,4 +4389,4 @@ struct persistent_config_s { }; // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Dec 20 13:18:51 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Dec 20 18:58:34 UTC 2021 diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h index f4f173a6fc..f436b1082f 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -86,7 +86,7 @@ #define alignmentFill_at_1847_offset 1847 #define alignmentFill_at_1873_offset 1873 #define alignmentFill_at_4007_offset 4007 -#define alignmentFill_at_4594_offset 4594 +#define alignmentFill_at_4618_offset 4618 #define alignmentFill_at_62_offset 62 #define alternatorControl_dFactor_offset 1492 #define alternatorControl_iFactor_offset 1488 @@ -1540,7 +1540,7 @@ #define MAIN_HELP_URL "http://www.rusefi.com/" #define mainRelayPin_offset 714 #define mainRelayPinMode_offset 756 -#define mainUnusedEnd_offset 4596 +#define mainUnusedEnd_offset 4620 #define malfunctionIndicatorPin_offset 668 #define malfunctionIndicatorPinMode_offset 669 #define manIdlePosition_offset 616 @@ -1822,7 +1822,7 @@ #define show_test_presets true #define showHumanReadableWarning_offset 896 #define showSdCardWarning_offset 164 -#define SIGNATURE_HASH 855718382 +#define SIGNATURE_HASH 4033521982 #define silentTriggerError_offset 1260 #define slowAdcAlpha_offset 1712 #define sparkDwellRpmBins_offset 54 @@ -2009,6 +2009,9 @@ #define TOOTH_PACKET_COUNT 1000 #define TOOTH_PACKET_SIZE 2 #define TOP_DEAD_CENTER_MESSAGE "r" +#define TORQUE_CURVE_SIZE 8 +#define torqueRpmBins_offset 4602 +#define torqueValues_offset 4594 #define TOTAL_CONFIG_SIZE 24400 #define tps1_1AdcChannel_offset 520 #define tps1_2AdcChannel_offset 689 @@ -2339,7 +2342,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2021.12.20.all.855718382" +#define TS_SIGNATURE "rusEFI 2021.12.20.all.4033521982" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' diff --git a/firmware/controllers/generated/signature_all.h b/firmware/controllers/generated/signature_all.h index d1b17f8cba..f55e759de5 100644 --- a/firmware/controllers/generated/signature_all.h +++ b/firmware/controllers/generated/signature_all.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 855718382 -#define TS_SIGNATURE "rusEFI 2021.12.20.all.855718382" +#define SIGNATURE_HASH 4033521982 +#define TS_SIGNATURE "rusEFI 2021.12.20.all.4033521982" diff --git a/firmware/controllers/generated/signature_atlas.h b/firmware/controllers/generated/signature_atlas.h index 70f831d6f7..879fe88e5f 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 ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 801885385 -#define TS_SIGNATURE "rusEFI 2021.12.20.atlas.801885385" +#define SIGNATURE_HASH 3969932313 +#define TS_SIGNATURE "rusEFI 2021.12.20.atlas.3969932313" diff --git a/firmware/controllers/generated/signature_f429-discovery.h b/firmware/controllers/generated/signature_f429-discovery.h index dd54612913..f1dd218392 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 ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 855718382 -#define TS_SIGNATURE "rusEFI 2021.12.20.f429-discovery.855718382" +#define SIGNATURE_HASH 4033521982 +#define TS_SIGNATURE "rusEFI 2021.12.20.f429-discovery.4033521982" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index d078b75761..bb6356f105 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 ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 1228106759 -#define TS_SIGNATURE "rusEFI 2021.12.20.frankenso_na6.1228106759" +#define SIGNATURE_HASH 2321087703 +#define TS_SIGNATURE "rusEFI 2021.12.20.frankenso_na6.2321087703" diff --git a/firmware/controllers/generated/signature_hellen-nb1.h b/firmware/controllers/generated/signature_hellen-nb1.h index c67d70cb4f..94fc3beac8 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 ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 2530412903 -#define TS_SIGNATURE "rusEFI 2021.12.20.hellen-nb1.2530412903" +#define SIGNATURE_HASH 1438161335 +#define TS_SIGNATURE "rusEFI 2021.12.20.hellen-nb1.1438161335" diff --git a/firmware/controllers/generated/signature_hellen121nissan.h b/firmware/controllers/generated/signature_hellen121nissan.h index 72d2e12a09..344a5c0861 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 ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 2290441039 -#define TS_SIGNATURE "rusEFI 2021.12.20.hellen121nissan.2290441039" +#define SIGNATURE_HASH 1273940895 +#define TS_SIGNATURE "rusEFI 2021.12.20.hellen121nissan.1273940895" diff --git a/firmware/controllers/generated/signature_hellen121vag.h b/firmware/controllers/generated/signature_hellen121vag.h index 5fc07b6236..ed9614290e 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 ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 1822563812 -#define TS_SIGNATURE "rusEFI 2021.12.20.hellen121vag.1822563812" +#define SIGNATURE_HASH 2949221684 +#define TS_SIGNATURE "rusEFI 2021.12.20.hellen121vag.2949221684" diff --git a/firmware/controllers/generated/signature_hellen128.h b/firmware/controllers/generated/signature_hellen128.h index a9f9c39707..cc1dc377ef 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 ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 2848412233 -#define TS_SIGNATURE "rusEFI 2021.12.20.hellen128.2848412233" +#define SIGNATURE_HASH 1789706905 +#define TS_SIGNATURE "rusEFI 2021.12.20.hellen128.1789706905" diff --git a/firmware/controllers/generated/signature_hellen154hyundai.h b/firmware/controllers/generated/signature_hellen154hyundai.h index 754e4c57be..cd566e6f30 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 ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 4280100162 -#define TS_SIGNATURE "rusEFI 2021.12.20.hellen154hyundai.4280100162" +#define SIGNATURE_HASH 1014412690 +#define TS_SIGNATURE "rusEFI 2021.12.20.hellen154hyundai.1014412690" diff --git a/firmware/controllers/generated/signature_hellen72.h b/firmware/controllers/generated/signature_hellen72.h index 4d954adfda..96289c4e17 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 ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 3351035486 -#define TS_SIGNATURE "rusEFI 2021.12.20.hellen72.3351035486" +#define SIGNATURE_HASH 81211022 +#define TS_SIGNATURE "rusEFI 2021.12.20.hellen72.81211022" diff --git a/firmware/controllers/generated/signature_hellen81.h b/firmware/controllers/generated/signature_hellen81.h index a38f6b7c53..6c288ff151 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 ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 1940988845 -#define TS_SIGNATURE "rusEFI 2021.12.20.hellen81.1940988845" +#define SIGNATURE_HASH 2967122813 +#define TS_SIGNATURE "rusEFI 2021.12.20.hellen81.2967122813" diff --git a/firmware/controllers/generated/signature_hellen88bmw.h b/firmware/controllers/generated/signature_hellen88bmw.h index df9d37ae9c..39878ec162 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 ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 2462165169 -#define TS_SIGNATURE "rusEFI 2021.12.20.hellen88bmw.2462165169" +#define SIGNATURE_HASH 1370110049 +#define TS_SIGNATURE "rusEFI 2021.12.20.hellen88bmw.1370110049" diff --git a/firmware/controllers/generated/signature_hellenNA6.h b/firmware/controllers/generated/signature_hellenNA6.h index 17531168c4..15984506a9 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 ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 1161592646 -#define TS_SIGNATURE "rusEFI 2021.12.20.hellenNA6.1161592646" +#define SIGNATURE_HASH 2253909910 +#define TS_SIGNATURE "rusEFI 2021.12.20.hellenNA6.2253909910" diff --git a/firmware/controllers/generated/signature_hellen_cypress.h b/firmware/controllers/generated/signature_hellen_cypress.h index c14ec03120..f4e30e8289 100644 --- a/firmware/controllers/generated/signature_hellen_cypress.h +++ b/firmware/controllers/generated/signature_hellen_cypress.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt // -#define SIGNATURE_HASH 167042642 -#define TS_SIGNATURE "rusEFI 2021.12.20.hellen_cypress.167042642" +#define SIGNATURE_HASH 3399437954 +#define TS_SIGNATURE "rusEFI 2021.12.20.hellen_cypress.3399437954" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index 5a0467a0e1..6aa5609636 100644 --- a/firmware/controllers/generated/signature_kin.h +++ b/firmware/controllers/generated/signature_kin.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt // -#define SIGNATURE_HASH 4132508334 -#define TS_SIGNATURE "rusEFI 2021.12.20.kin.4132508334" +#define SIGNATURE_HASH 893026942 +#define TS_SIGNATURE "rusEFI 2021.12.20.kin.893026942" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index 7a4ba5c808..3e595dee26 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 ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 2149991258 -#define TS_SIGNATURE "rusEFI 2021.12.20.mre_f4.2149991258" +#define SIGNATURE_HASH 1129173898 +#define TS_SIGNATURE "rusEFI 2021.12.20.mre_f4.1129173898" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index 382a24949f..6e84742966 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 ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 2149991258 -#define TS_SIGNATURE "rusEFI 2021.12.20.mre_f7.2149991258" +#define SIGNATURE_HASH 1129173898 +#define TS_SIGNATURE "rusEFI 2021.12.20.mre_f7.1129173898" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index 06af24462b..f335bac66e 100644 --- a/firmware/controllers/generated/signature_prometheus_405.h +++ b/firmware/controllers/generated/signature_prometheus_405.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 1676402696 -#define TS_SIGNATURE "rusEFI 2021.12.20.prometheus_405.1676402696" +#define SIGNATURE_HASH 2692772056 +#define TS_SIGNATURE "rusEFI 2021.12.20.prometheus_405.2692772056" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index 67baa3f445..eb0e37df77 100644 --- a/firmware/controllers/generated/signature_prometheus_469.h +++ b/firmware/controllers/generated/signature_prometheus_469.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 1676402696 -#define TS_SIGNATURE "rusEFI 2021.12.20.prometheus_469.1676402696" +#define SIGNATURE_HASH 2692772056 +#define TS_SIGNATURE "rusEFI 2021.12.20.prometheus_469.2692772056" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index 9045ce4137..fc410017f7 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 ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 2402337345 -#define TS_SIGNATURE "rusEFI 2021.12.20.proteus_f4.2402337345" +#define SIGNATURE_HASH 1281053329 +#define TS_SIGNATURE "rusEFI 2021.12.20.proteus_f4.1281053329" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index 6743db0115..316aeaf8a7 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 ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 2402337345 -#define TS_SIGNATURE "rusEFI 2021.12.20.proteus_f7.2402337345" +#define SIGNATURE_HASH 1281053329 +#define TS_SIGNATURE "rusEFI 2021.12.20.proteus_f7.1281053329" diff --git a/firmware/controllers/generated/signature_subaru_eg33_f7.h b/firmware/controllers/generated/signature_subaru_eg33_f7.h index 6d4b733e8d..708ff24e40 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 ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 4038799294 -#define TS_SIGNATURE "rusEFI 2021.12.20.subaru_eg33_f7.4038799294" +#define SIGNATURE_HASH 869318510 +#define TS_SIGNATURE "rusEFI 2021.12.20.subaru_eg33_f7.869318510" diff --git a/firmware/tunerstudio/generated/rusefi.ini b/firmware/tunerstudio/generated/rusefi.ini index 8ddb78cb22..510365bcb8 100644 --- a/firmware/tunerstudio/generated/rusefi.ini +++ b/firmware/tunerstudio/generated/rusefi.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.12.20.all.855718382" + signature = "rusEFI 2021.12.20.all.4033521982" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.12.20.all.855718382" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.12.20.all.4033521982" ; 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 @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Dec 20 13:18:41 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Dec 20 18:58:24 UTC 2021 pageSize = 24400 page = 1 @@ -1240,8 +1240,10 @@ hpfpTargetRpmBins = array, U08, 4454, [10], "RPM", 50.0, 0, 0, 12500, 0 hpfpCompensation = array, S08, 4464, [10x10], "%", 1, 0, -100, 100, 0 hpfpCompensationLoadBins = array, U16, 4564, [10], "cc/lobe", 0.001, 0, 0, 65, 3 hpfpCompensationRpmBins = array, U08, 4584, [10], "RPM", 50.0, 0, 0, 12500, 0 -alignmentFill_at_4594 = array, U08, 4594, [2], "units", 1, 0, -20, 100, 0 -mainUnusedEnd = array, S32, 4596, [429], "units", 1, 0, -20, 100, 0 +torqueValues = array, U08, 4594, [8], "Nm", 1, 0, 0, 255, 0 +torqueRpmBins = array, U16, 4602, [8], "RPM", 1, 0, 0, 65000, 0 +alignmentFill_at_4618 = array, U08, 4618, [2], "units", 1, 0, -20, 100, 0 +mainUnusedEnd = array, S32, 4620, [423], "units", 1, 0, -20, 100, 0 warning_message = string, ASCII, 6312, 120 afterstartCoolantBins = array, F32, 6432, [8], "C", 1, 0, -100, 250, 0 afterstartHoldTime = array, F32, 6464, [8], "Seconds", 1, 0, 0, 100, 1 @@ -1766,7 +1768,7 @@ scriptTable4RpmBins = array, F32, 24368, [8], "RPM", 1, 0, 0, 25500, 2 hpfpPumpVolume = "Size of the pump chamber in cc. Typical Bosch HDP5 has a 9.0mm diameter, typical BMW N* stroke is 4.4mm." hpfpActivationAngle = "How long to keep the valve activated (in order to allow the pump to build pressure and keep the valve open on its own)" hpfpTargetDecay = "The fastest rate the target pressure can be reduced by. This is because HPFP have no way to bleed off pressure other than injecting fuel." - alignmentFill_at_4594 = "need 4 byte alignment" + alignmentFill_at_4618 = "need 4 byte alignment" cltCrankingCorrBins = "CLT-based cranking position multiplier for simple manual idle controller" cltCrankingCorr = "CLT-based cranking position multiplier for simple manual idle controller" idleAdvanceBins = "Optional timing advance table for Idle (see useSeparateAdvanceForIdle)" @@ -2438,6 +2440,14 @@ etbStatus_resetCounter = scalar, S32, 636, "", 1, 0 yAxis = 0, 8, 10 xBins = knockNoiseRpmBins, RPMValue yBins = knockNoise + gauge = RPMGauge + + curve = torqueCurve, "Engine Torque" + columnLabel = "RPM", "Nm" + xAxis = 0, 8000, 9 + yAxis = 0, 8, 10 + xBins = torqueRpmBins, RPMValue + yBins = torqueValues gauge = RPMGauge curve = swKnockThresholdCurve, "Engine knock threshold RPM based" @@ -5782,6 +5792,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "turbo speed multiplier", turboSpeedSensorMultiplier field = "Artificial Misfire", artificialTestMisfire panel = allTriggerDebug + panel = torqueCurve help = helpGeneral, "rusEFI General Help" webHelp = "http://www.rusefi.com/" diff --git a/firmware/tunerstudio/generated/rusefi_atlas.ini b/firmware/tunerstudio/generated/rusefi_atlas.ini index efe6722c05..37238b054b 100644 --- a/firmware/tunerstudio/generated/rusefi_atlas.ini +++ b/firmware/tunerstudio/generated/rusefi_atlas.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.12.20.atlas.801885385" + signature = "rusEFI 2021.12.20.atlas.3969932313" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.12.20.atlas.801885385" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.12.20.atlas.3969932313" ; 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 @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Dec 20 13:18:38 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Dec 20 18:58:22 UTC 2021 pageSize = 24400 page = 1 @@ -1240,8 +1240,10 @@ hpfpTargetRpmBins = array, U08, 4454, [10], "RPM", 50.0, 0, 0, 12500, 0 hpfpCompensation = array, S08, 4464, [10x10], "%", 1, 0, -100, 100, 0 hpfpCompensationLoadBins = array, U16, 4564, [10], "cc/lobe", 0.001, 0, 0, 65, 3 hpfpCompensationRpmBins = array, U08, 4584, [10], "RPM", 50.0, 0, 0, 12500, 0 -alignmentFill_at_4594 = array, U08, 4594, [2], "units", 1, 0, -20, 100, 0 -mainUnusedEnd = array, S32, 4596, [429], "units", 1, 0, -20, 100, 0 +torqueValues = array, U08, 4594, [8], "Nm", 1, 0, 0, 255, 0 +torqueRpmBins = array, U16, 4602, [8], "RPM", 1, 0, 0, 65000, 0 +alignmentFill_at_4618 = array, U08, 4618, [2], "units", 1, 0, -20, 100, 0 +mainUnusedEnd = array, S32, 4620, [423], "units", 1, 0, -20, 100, 0 warning_message = string, ASCII, 6312, 120 afterstartCoolantBins = array, F32, 6432, [8], "C", 1, 0, -100, 250, 0 afterstartHoldTime = array, F32, 6464, [8], "Seconds", 1, 0, 0, 100, 1 @@ -1766,7 +1768,7 @@ scriptTable4RpmBins = array, F32, 24368, [8], "RPM", 1, 0, 0, 25500, 2 hpfpPumpVolume = "Size of the pump chamber in cc. Typical Bosch HDP5 has a 9.0mm diameter, typical BMW N* stroke is 4.4mm." hpfpActivationAngle = "How long to keep the valve activated (in order to allow the pump to build pressure and keep the valve open on its own)" hpfpTargetDecay = "The fastest rate the target pressure can be reduced by. This is because HPFP have no way to bleed off pressure other than injecting fuel." - alignmentFill_at_4594 = "need 4 byte alignment" + alignmentFill_at_4618 = "need 4 byte alignment" cltCrankingCorrBins = "CLT-based cranking position multiplier for simple manual idle controller" cltCrankingCorr = "CLT-based cranking position multiplier for simple manual idle controller" idleAdvanceBins = "Optional timing advance table for Idle (see useSeparateAdvanceForIdle)" @@ -2438,6 +2440,14 @@ etbStatus_resetCounter = scalar, S32, 636, "", 1, 0 yAxis = 0, 8, 10 xBins = knockNoiseRpmBins, RPMValue yBins = knockNoise + gauge = RPMGauge + + curve = torqueCurve, "Engine Torque" + columnLabel = "RPM", "Nm" + xAxis = 0, 8000, 9 + yAxis = 0, 8, 10 + xBins = torqueRpmBins, RPMValue + yBins = torqueValues gauge = RPMGauge curve = swKnockThresholdCurve, "Engine knock threshold RPM based" @@ -5773,6 +5783,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "turbo speed multiplier", turboSpeedSensorMultiplier field = "Artificial Misfire", artificialTestMisfire panel = allTriggerDebug + panel = torqueCurve help = helpGeneral, "rusEFI General Help" webHelp = "http://www.rusefi.com/" diff --git a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini index 7c1d46e843..b861e11a7d 100644 --- a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini +++ b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.12.20.f429-discovery.855718382" + signature = "rusEFI 2021.12.20.f429-discovery.4033521982" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.12.20.f429-discovery.855718382" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.12.20.f429-discovery.4033521982" ; 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 @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Dec 20 13:17:56 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Dec 20 18:57:40 UTC 2021 pageSize = 24400 page = 1 @@ -1240,8 +1240,10 @@ hpfpTargetRpmBins = array, U08, 4454, [10], "RPM", 50.0, 0, 0, 12500, 0 hpfpCompensation = array, S08, 4464, [10x10], "%", 1, 0, -100, 100, 0 hpfpCompensationLoadBins = array, U16, 4564, [10], "cc/lobe", 0.001, 0, 0, 65, 3 hpfpCompensationRpmBins = array, U08, 4584, [10], "RPM", 50.0, 0, 0, 12500, 0 -alignmentFill_at_4594 = array, U08, 4594, [2], "units", 1, 0, -20, 100, 0 -mainUnusedEnd = array, S32, 4596, [429], "units", 1, 0, -20, 100, 0 +torqueValues = array, U08, 4594, [8], "Nm", 1, 0, 0, 255, 0 +torqueRpmBins = array, U16, 4602, [8], "RPM", 1, 0, 0, 65000, 0 +alignmentFill_at_4618 = array, U08, 4618, [2], "units", 1, 0, -20, 100, 0 +mainUnusedEnd = array, S32, 4620, [423], "units", 1, 0, -20, 100, 0 warning_message = string, ASCII, 6312, 120 afterstartCoolantBins = array, F32, 6432, [8], "C", 1, 0, -100, 250, 0 afterstartHoldTime = array, F32, 6464, [8], "Seconds", 1, 0, 0, 100, 1 @@ -1766,7 +1768,7 @@ scriptTable4RpmBins = array, F32, 24368, [8], "RPM", 1, 0, 0, 25500, 2 hpfpPumpVolume = "Size of the pump chamber in cc. Typical Bosch HDP5 has a 9.0mm diameter, typical BMW N* stroke is 4.4mm." hpfpActivationAngle = "How long to keep the valve activated (in order to allow the pump to build pressure and keep the valve open on its own)" hpfpTargetDecay = "The fastest rate the target pressure can be reduced by. This is because HPFP have no way to bleed off pressure other than injecting fuel." - alignmentFill_at_4594 = "need 4 byte alignment" + alignmentFill_at_4618 = "need 4 byte alignment" cltCrankingCorrBins = "CLT-based cranking position multiplier for simple manual idle controller" cltCrankingCorr = "CLT-based cranking position multiplier for simple manual idle controller" idleAdvanceBins = "Optional timing advance table for Idle (see useSeparateAdvanceForIdle)" @@ -2438,6 +2440,14 @@ etbStatus_resetCounter = scalar, S32, 636, "", 1, 0 yAxis = 0, 8, 10 xBins = knockNoiseRpmBins, RPMValue yBins = knockNoise + gauge = RPMGauge + + curve = torqueCurve, "Engine Torque" + columnLabel = "RPM", "Nm" + xAxis = 0, 8000, 9 + yAxis = 0, 8, 10 + xBins = torqueRpmBins, RPMValue + yBins = torqueValues gauge = RPMGauge curve = swKnockThresholdCurve, "Engine knock threshold RPM based" @@ -5782,6 +5792,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "turbo speed multiplier", turboSpeedSensorMultiplier field = "Artificial Misfire", artificialTestMisfire panel = allTriggerDebug + panel = torqueCurve help = helpGeneral, "rusEFI General Help" webHelp = "http://www.rusefi.com/" diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index a31619324d..bc384aa6cf 100644 --- a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini +++ b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.12.20.frankenso_na6.1228106759" + signature = "rusEFI 2021.12.20.frankenso_na6.2321087703" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.12.20.frankenso_na6.1228106759" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.12.20.frankenso_na6.2321087703" ; 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 @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Dec 20 13:18:26 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Dec 20 18:58:10 UTC 2021 pageSize = 24400 page = 1 @@ -1240,8 +1240,10 @@ hpfpTargetRpmBins = array, U08, 4454, [10], "RPM", 50.0, 0, 0, 12500, 0 hpfpCompensation = array, S08, 4464, [10x10], "%", 1, 0, -100, 100, 0 hpfpCompensationLoadBins = array, U16, 4564, [10], "cc/lobe", 0.001, 0, 0, 65, 3 hpfpCompensationRpmBins = array, U08, 4584, [10], "RPM", 50.0, 0, 0, 12500, 0 -alignmentFill_at_4594 = array, U08, 4594, [2], "units", 1, 0, -20, 100, 0 -mainUnusedEnd = array, S32, 4596, [429], "units", 1, 0, -20, 100, 0 +torqueValues = array, U08, 4594, [8], "Nm", 1, 0, 0, 255, 0 +torqueRpmBins = array, U16, 4602, [8], "RPM", 1, 0, 0, 65000, 0 +alignmentFill_at_4618 = array, U08, 4618, [2], "units", 1, 0, -20, 100, 0 +mainUnusedEnd = array, S32, 4620, [423], "units", 1, 0, -20, 100, 0 warning_message = string, ASCII, 6312, 120 afterstartCoolantBins = array, F32, 6432, [8], "C", 1, 0, -100, 250, 0 afterstartHoldTime = array, F32, 6464, [8], "Seconds", 1, 0, 0, 100, 1 @@ -1766,7 +1768,7 @@ scriptTable4RpmBins = array, F32, 24368, [8], "RPM", 1, 0, 0, 25500, 2 hpfpPumpVolume = "Size of the pump chamber in cc. Typical Bosch HDP5 has a 9.0mm diameter, typical BMW N* stroke is 4.4mm." hpfpActivationAngle = "How long to keep the valve activated (in order to allow the pump to build pressure and keep the valve open on its own)" hpfpTargetDecay = "The fastest rate the target pressure can be reduced by. This is because HPFP have no way to bleed off pressure other than injecting fuel." - alignmentFill_at_4594 = "need 4 byte alignment" + alignmentFill_at_4618 = "need 4 byte alignment" cltCrankingCorrBins = "CLT-based cranking position multiplier for simple manual idle controller" cltCrankingCorr = "CLT-based cranking position multiplier for simple manual idle controller" idleAdvanceBins = "Optional timing advance table for Idle (see useSeparateAdvanceForIdle)" @@ -2438,6 +2440,14 @@ etbStatus_resetCounter = scalar, S32, 636, "", 1, 0 yAxis = 0, 8, 10 xBins = knockNoiseRpmBins, RPMValue yBins = knockNoise + gauge = RPMGauge + + curve = torqueCurve, "Engine Torque" + columnLabel = "RPM", "Nm" + xAxis = 0, 8000, 9 + yAxis = 0, 8, 10 + xBins = torqueRpmBins, RPMValue + yBins = torqueValues gauge = RPMGauge curve = swKnockThresholdCurve, "Engine knock threshold RPM based" @@ -5782,6 +5792,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "turbo speed multiplier", turboSpeedSensorMultiplier field = "Artificial Misfire", artificialTestMisfire panel = allTriggerDebug + panel = torqueCurve help = helpGeneral, "rusEFI General Help" webHelp = "http://www.rusefi.com/" diff --git a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini index 985295a676..ca28ddf419 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.12.20.hellen-nb1.2530412903" + signature = "rusEFI 2021.12.20.hellen-nb1.1438161335" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.12.20.hellen-nb1.2530412903" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.12.20.hellen-nb1.1438161335" ; 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 @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Dec 20 13:18:16 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Dec 20 18:58:00 UTC 2021 pageSize = 24400 page = 1 @@ -1240,8 +1240,10 @@ hpfpTargetRpmBins = array, U08, 4454, [10], "RPM", 50.0, 0, 0, 12500, 0 hpfpCompensation = array, S08, 4464, [10x10], "%", 1, 0, -100, 100, 0 hpfpCompensationLoadBins = array, U16, 4564, [10], "cc/lobe", 0.001, 0, 0, 65, 3 hpfpCompensationRpmBins = array, U08, 4584, [10], "RPM", 50.0, 0, 0, 12500, 0 -alignmentFill_at_4594 = array, U08, 4594, [2], "units", 1, 0, -20, 100, 0 -mainUnusedEnd = array, S32, 4596, [429], "units", 1, 0, -20, 100, 0 +torqueValues = array, U08, 4594, [8], "Nm", 1, 0, 0, 255, 0 +torqueRpmBins = array, U16, 4602, [8], "RPM", 1, 0, 0, 65000, 0 +alignmentFill_at_4618 = array, U08, 4618, [2], "units", 1, 0, -20, 100, 0 +mainUnusedEnd = array, S32, 4620, [423], "units", 1, 0, -20, 100, 0 warning_message = string, ASCII, 6312, 120 afterstartCoolantBins = array, F32, 6432, [8], "C", 1, 0, -100, 250, 0 afterstartHoldTime = array, F32, 6464, [8], "Seconds", 1, 0, 0, 100, 1 @@ -1766,7 +1768,7 @@ scriptTable4RpmBins = array, F32, 24368, [8], "RPM", 1, 0, 0, 25500, 2 hpfpPumpVolume = "Size of the pump chamber in cc. Typical Bosch HDP5 has a 9.0mm diameter, typical BMW N* stroke is 4.4mm." hpfpActivationAngle = "How long to keep the valve activated (in order to allow the pump to build pressure and keep the valve open on its own)" hpfpTargetDecay = "The fastest rate the target pressure can be reduced by. This is because HPFP have no way to bleed off pressure other than injecting fuel." - alignmentFill_at_4594 = "need 4 byte alignment" + alignmentFill_at_4618 = "need 4 byte alignment" cltCrankingCorrBins = "CLT-based cranking position multiplier for simple manual idle controller" cltCrankingCorr = "CLT-based cranking position multiplier for simple manual idle controller" idleAdvanceBins = "Optional timing advance table for Idle (see useSeparateAdvanceForIdle)" @@ -2438,6 +2440,14 @@ etbStatus_resetCounter = scalar, S32, 636, "", 1, 0 yAxis = 0, 8, 10 xBins = knockNoiseRpmBins, RPMValue yBins = knockNoise + gauge = RPMGauge + + curve = torqueCurve, "Engine Torque" + columnLabel = "RPM", "Nm" + xAxis = 0, 8000, 9 + yAxis = 0, 8, 10 + xBins = torqueRpmBins, RPMValue + yBins = torqueValues gauge = RPMGauge curve = swKnockThresholdCurve, "Engine knock threshold RPM based" @@ -5746,6 +5756,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "turbo speed multiplier", turboSpeedSensorMultiplier field = "Artificial Misfire", artificialTestMisfire panel = allTriggerDebug + panel = torqueCurve help = helpGeneral, "rusEFI General Help" webHelp = "https://rusefi.com/s/hellenNB1" diff --git a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini index 8c582fab9b..72b1f30f22 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.12.20.hellen121nissan.2290441039" + signature = "rusEFI 2021.12.20.hellen121nissan.1273940895" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.12.20.hellen121nissan.2290441039" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.12.20.hellen121nissan.1273940895" ; 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 @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Dec 20 13:18:03 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Dec 20 18:57:48 UTC 2021 pageSize = 24400 page = 1 @@ -1240,8 +1240,10 @@ hpfpTargetRpmBins = array, U08, 4454, [10], "RPM", 50.0, 0, 0, 12500, 0 hpfpCompensation = array, S08, 4464, [10x10], "%", 1, 0, -100, 100, 0 hpfpCompensationLoadBins = array, U16, 4564, [10], "cc/lobe", 0.001, 0, 0, 65, 3 hpfpCompensationRpmBins = array, U08, 4584, [10], "RPM", 50.0, 0, 0, 12500, 0 -alignmentFill_at_4594 = array, U08, 4594, [2], "units", 1, 0, -20, 100, 0 -mainUnusedEnd = array, S32, 4596, [429], "units", 1, 0, -20, 100, 0 +torqueValues = array, U08, 4594, [8], "Nm", 1, 0, 0, 255, 0 +torqueRpmBins = array, U16, 4602, [8], "RPM", 1, 0, 0, 65000, 0 +alignmentFill_at_4618 = array, U08, 4618, [2], "units", 1, 0, -20, 100, 0 +mainUnusedEnd = array, S32, 4620, [423], "units", 1, 0, -20, 100, 0 warning_message = string, ASCII, 6312, 120 afterstartCoolantBins = array, F32, 6432, [8], "C", 1, 0, -100, 250, 0 afterstartHoldTime = array, F32, 6464, [8], "Seconds", 1, 0, 0, 100, 1 @@ -1766,7 +1768,7 @@ scriptTable4RpmBins = array, F32, 24368, [8], "RPM", 1, 0, 0, 25500, 2 hpfpPumpVolume = "Size of the pump chamber in cc. Typical Bosch HDP5 has a 9.0mm diameter, typical BMW N* stroke is 4.4mm." hpfpActivationAngle = "How long to keep the valve activated (in order to allow the pump to build pressure and keep the valve open on its own)" hpfpTargetDecay = "The fastest rate the target pressure can be reduced by. This is because HPFP have no way to bleed off pressure other than injecting fuel." - alignmentFill_at_4594 = "need 4 byte alignment" + alignmentFill_at_4618 = "need 4 byte alignment" cltCrankingCorrBins = "CLT-based cranking position multiplier for simple manual idle controller" cltCrankingCorr = "CLT-based cranking position multiplier for simple manual idle controller" idleAdvanceBins = "Optional timing advance table for Idle (see useSeparateAdvanceForIdle)" @@ -2438,6 +2440,14 @@ etbStatus_resetCounter = scalar, S32, 636, "", 1, 0 yAxis = 0, 8, 10 xBins = knockNoiseRpmBins, RPMValue yBins = knockNoise + gauge = RPMGauge + + curve = torqueCurve, "Engine Torque" + columnLabel = "RPM", "Nm" + xAxis = 0, 8000, 9 + yAxis = 0, 8, 10 + xBins = torqueRpmBins, RPMValue + yBins = torqueValues gauge = RPMGauge curve = swKnockThresholdCurve, "Engine knock threshold RPM based" @@ -5747,6 +5757,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "turbo speed multiplier", turboSpeedSensorMultiplier field = "Artificial Misfire", artificialTestMisfire panel = allTriggerDebug + panel = torqueCurve help = helpGeneral, "rusEFI General Help" webHelp = "https://rusefi.com/s/hellen121nissan" diff --git a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini index 75bbe21e0c..374b76e5b2 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.12.20.hellen121vag.1822563812" + signature = "rusEFI 2021.12.20.hellen121vag.2949221684" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.12.20.hellen121vag.1822563812" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.12.20.hellen121vag.2949221684" ; 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 @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Dec 20 13:18:00 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Dec 20 18:57:45 UTC 2021 pageSize = 24400 page = 1 @@ -1240,8 +1240,10 @@ hpfpTargetRpmBins = array, U08, 4454, [10], "RPM", 50.0, 0, 0, 12500, 0 hpfpCompensation = array, S08, 4464, [10x10], "%", 1, 0, -100, 100, 0 hpfpCompensationLoadBins = array, U16, 4564, [10], "cc/lobe", 0.001, 0, 0, 65, 3 hpfpCompensationRpmBins = array, U08, 4584, [10], "RPM", 50.0, 0, 0, 12500, 0 -alignmentFill_at_4594 = array, U08, 4594, [2], "units", 1, 0, -20, 100, 0 -mainUnusedEnd = array, S32, 4596, [429], "units", 1, 0, -20, 100, 0 +torqueValues = array, U08, 4594, [8], "Nm", 1, 0, 0, 255, 0 +torqueRpmBins = array, U16, 4602, [8], "RPM", 1, 0, 0, 65000, 0 +alignmentFill_at_4618 = array, U08, 4618, [2], "units", 1, 0, -20, 100, 0 +mainUnusedEnd = array, S32, 4620, [423], "units", 1, 0, -20, 100, 0 warning_message = string, ASCII, 6312, 120 afterstartCoolantBins = array, F32, 6432, [8], "C", 1, 0, -100, 250, 0 afterstartHoldTime = array, F32, 6464, [8], "Seconds", 1, 0, 0, 100, 1 @@ -1766,7 +1768,7 @@ scriptTable4RpmBins = array, F32, 24368, [8], "RPM", 1, 0, 0, 25500, 2 hpfpPumpVolume = "Size of the pump chamber in cc. Typical Bosch HDP5 has a 9.0mm diameter, typical BMW N* stroke is 4.4mm." hpfpActivationAngle = "How long to keep the valve activated (in order to allow the pump to build pressure and keep the valve open on its own)" hpfpTargetDecay = "The fastest rate the target pressure can be reduced by. This is because HPFP have no way to bleed off pressure other than injecting fuel." - alignmentFill_at_4594 = "need 4 byte alignment" + alignmentFill_at_4618 = "need 4 byte alignment" cltCrankingCorrBins = "CLT-based cranking position multiplier for simple manual idle controller" cltCrankingCorr = "CLT-based cranking position multiplier for simple manual idle controller" idleAdvanceBins = "Optional timing advance table for Idle (see useSeparateAdvanceForIdle)" @@ -2438,6 +2440,14 @@ etbStatus_resetCounter = scalar, S32, 636, "", 1, 0 yAxis = 0, 8, 10 xBins = knockNoiseRpmBins, RPMValue yBins = knockNoise + gauge = RPMGauge + + curve = torqueCurve, "Engine Torque" + columnLabel = "RPM", "Nm" + xAxis = 0, 8000, 9 + yAxis = 0, 8, 10 + xBins = torqueRpmBins, RPMValue + yBins = torqueValues gauge = RPMGauge curve = swKnockThresholdCurve, "Engine knock threshold RPM based" @@ -5749,6 +5759,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "turbo speed multiplier", turboSpeedSensorMultiplier field = "Artificial Misfire", artificialTestMisfire panel = allTriggerDebug + panel = torqueCurve help = helpGeneral, "rusEFI General Help" webHelp = "https://rusefi.com/s/hellen121vag" diff --git a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini index 34220530e3..321b511187 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.12.20.hellen128.2848412233" + signature = "rusEFI 2021.12.20.hellen128.1789706905" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.12.20.hellen128.2848412233" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.12.20.hellen128.1789706905" ; 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 @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Dec 20 13:17:58 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Dec 20 18:57:43 UTC 2021 pageSize = 24400 page = 1 @@ -1240,8 +1240,10 @@ hpfpTargetRpmBins = array, U08, 4454, [10], "RPM", 50.0, 0, 0, 12500, 0 hpfpCompensation = array, S08, 4464, [10x10], "%", 1, 0, -100, 100, 0 hpfpCompensationLoadBins = array, U16, 4564, [10], "cc/lobe", 0.001, 0, 0, 65, 3 hpfpCompensationRpmBins = array, U08, 4584, [10], "RPM", 50.0, 0, 0, 12500, 0 -alignmentFill_at_4594 = array, U08, 4594, [2], "units", 1, 0, -20, 100, 0 -mainUnusedEnd = array, S32, 4596, [429], "units", 1, 0, -20, 100, 0 +torqueValues = array, U08, 4594, [8], "Nm", 1, 0, 0, 255, 0 +torqueRpmBins = array, U16, 4602, [8], "RPM", 1, 0, 0, 65000, 0 +alignmentFill_at_4618 = array, U08, 4618, [2], "units", 1, 0, -20, 100, 0 +mainUnusedEnd = array, S32, 4620, [423], "units", 1, 0, -20, 100, 0 warning_message = string, ASCII, 6312, 120 afterstartCoolantBins = array, F32, 6432, [8], "C", 1, 0, -100, 250, 0 afterstartHoldTime = array, F32, 6464, [8], "Seconds", 1, 0, 0, 100, 1 @@ -1766,7 +1768,7 @@ scriptTable4RpmBins = array, F32, 24368, [8], "RPM", 1, 0, 0, 25500, 2 hpfpPumpVolume = "Size of the pump chamber in cc. Typical Bosch HDP5 has a 9.0mm diameter, typical BMW N* stroke is 4.4mm." hpfpActivationAngle = "How long to keep the valve activated (in order to allow the pump to build pressure and keep the valve open on its own)" hpfpTargetDecay = "The fastest rate the target pressure can be reduced by. This is because HPFP have no way to bleed off pressure other than injecting fuel." - alignmentFill_at_4594 = "need 4 byte alignment" + alignmentFill_at_4618 = "need 4 byte alignment" cltCrankingCorrBins = "CLT-based cranking position multiplier for simple manual idle controller" cltCrankingCorr = "CLT-based cranking position multiplier for simple manual idle controller" idleAdvanceBins = "Optional timing advance table for Idle (see useSeparateAdvanceForIdle)" @@ -2438,6 +2440,14 @@ etbStatus_resetCounter = scalar, S32, 636, "", 1, 0 yAxis = 0, 8, 10 xBins = knockNoiseRpmBins, RPMValue yBins = knockNoise + gauge = RPMGauge + + curve = torqueCurve, "Engine Torque" + columnLabel = "RPM", "Nm" + xAxis = 0, 8000, 9 + yAxis = 0, 8, 10 + xBins = torqueRpmBins, RPMValue + yBins = torqueValues gauge = RPMGauge curve = swKnockThresholdCurve, "Engine knock threshold RPM based" @@ -5747,6 +5757,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "turbo speed multiplier", turboSpeedSensorMultiplier field = "Artificial Misfire", artificialTestMisfire panel = allTriggerDebug + panel = torqueCurve help = helpGeneral, "rusEFI General Help" webHelp = "https://rusefi.com/s/hellen128merc" diff --git a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini index f2c2b5e0a9..8fbaf09390 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.12.20.hellen154hyundai.4280100162" + signature = "rusEFI 2021.12.20.hellen154hyundai.1014412690" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.12.20.hellen154hyundai.4280100162" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.12.20.hellen154hyundai.1014412690" ; 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 @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Dec 20 13:18:05 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Dec 20 18:57:50 UTC 2021 pageSize = 24400 page = 1 @@ -1240,8 +1240,10 @@ hpfpTargetRpmBins = array, U08, 4454, [10], "RPM", 50.0, 0, 0, 12500, 0 hpfpCompensation = array, S08, 4464, [10x10], "%", 1, 0, -100, 100, 0 hpfpCompensationLoadBins = array, U16, 4564, [10], "cc/lobe", 0.001, 0, 0, 65, 3 hpfpCompensationRpmBins = array, U08, 4584, [10], "RPM", 50.0, 0, 0, 12500, 0 -alignmentFill_at_4594 = array, U08, 4594, [2], "units", 1, 0, -20, 100, 0 -mainUnusedEnd = array, S32, 4596, [429], "units", 1, 0, -20, 100, 0 +torqueValues = array, U08, 4594, [8], "Nm", 1, 0, 0, 255, 0 +torqueRpmBins = array, U16, 4602, [8], "RPM", 1, 0, 0, 65000, 0 +alignmentFill_at_4618 = array, U08, 4618, [2], "units", 1, 0, -20, 100, 0 +mainUnusedEnd = array, S32, 4620, [423], "units", 1, 0, -20, 100, 0 warning_message = string, ASCII, 6312, 120 afterstartCoolantBins = array, F32, 6432, [8], "C", 1, 0, -100, 250, 0 afterstartHoldTime = array, F32, 6464, [8], "Seconds", 1, 0, 0, 100, 1 @@ -1766,7 +1768,7 @@ scriptTable4RpmBins = array, F32, 24368, [8], "RPM", 1, 0, 0, 25500, 2 hpfpPumpVolume = "Size of the pump chamber in cc. Typical Bosch HDP5 has a 9.0mm diameter, typical BMW N* stroke is 4.4mm." hpfpActivationAngle = "How long to keep the valve activated (in order to allow the pump to build pressure and keep the valve open on its own)" hpfpTargetDecay = "The fastest rate the target pressure can be reduced by. This is because HPFP have no way to bleed off pressure other than injecting fuel." - alignmentFill_at_4594 = "need 4 byte alignment" + alignmentFill_at_4618 = "need 4 byte alignment" cltCrankingCorrBins = "CLT-based cranking position multiplier for simple manual idle controller" cltCrankingCorr = "CLT-based cranking position multiplier for simple manual idle controller" idleAdvanceBins = "Optional timing advance table for Idle (see useSeparateAdvanceForIdle)" @@ -2438,6 +2440,14 @@ etbStatus_resetCounter = scalar, S32, 636, "", 1, 0 yAxis = 0, 8, 10 xBins = knockNoiseRpmBins, RPMValue yBins = knockNoise + gauge = RPMGauge + + curve = torqueCurve, "Engine Torque" + columnLabel = "RPM", "Nm" + xAxis = 0, 8000, 9 + yAxis = 0, 8, 10 + xBins = torqueRpmBins, RPMValue + yBins = torqueValues gauge = RPMGauge curve = swKnockThresholdCurve, "Engine knock threshold RPM based" @@ -5746,6 +5756,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "turbo speed multiplier", turboSpeedSensorMultiplier field = "Artificial Misfire", artificialTestMisfire panel = allTriggerDebug + panel = torqueCurve help = helpGeneral, "rusEFI General Help" webHelp = "https://rusefi.com/s/hellen154hyuindai" diff --git a/firmware/tunerstudio/generated/rusefi_hellen72.ini b/firmware/tunerstudio/generated/rusefi_hellen72.ini index 0cba561a97..eba4ccfd3f 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen72.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen72.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.12.20.hellen72.3351035486" + signature = "rusEFI 2021.12.20.hellen72.81211022" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.12.20.hellen72.3351035486" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.12.20.hellen72.81211022" ; 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 @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Dec 20 13:18:11 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Dec 20 18:57:55 UTC 2021 pageSize = 24400 page = 1 @@ -1240,8 +1240,10 @@ hpfpTargetRpmBins = array, U08, 4454, [10], "RPM", 50.0, 0, 0, 12500, 0 hpfpCompensation = array, S08, 4464, [10x10], "%", 1, 0, -100, 100, 0 hpfpCompensationLoadBins = array, U16, 4564, [10], "cc/lobe", 0.001, 0, 0, 65, 3 hpfpCompensationRpmBins = array, U08, 4584, [10], "RPM", 50.0, 0, 0, 12500, 0 -alignmentFill_at_4594 = array, U08, 4594, [2], "units", 1, 0, -20, 100, 0 -mainUnusedEnd = array, S32, 4596, [429], "units", 1, 0, -20, 100, 0 +torqueValues = array, U08, 4594, [8], "Nm", 1, 0, 0, 255, 0 +torqueRpmBins = array, U16, 4602, [8], "RPM", 1, 0, 0, 65000, 0 +alignmentFill_at_4618 = array, U08, 4618, [2], "units", 1, 0, -20, 100, 0 +mainUnusedEnd = array, S32, 4620, [423], "units", 1, 0, -20, 100, 0 warning_message = string, ASCII, 6312, 120 afterstartCoolantBins = array, F32, 6432, [8], "C", 1, 0, -100, 250, 0 afterstartHoldTime = array, F32, 6464, [8], "Seconds", 1, 0, 0, 100, 1 @@ -1766,7 +1768,7 @@ scriptTable4RpmBins = array, F32, 24368, [8], "RPM", 1, 0, 0, 25500, 2 hpfpPumpVolume = "Size of the pump chamber in cc. Typical Bosch HDP5 has a 9.0mm diameter, typical BMW N* stroke is 4.4mm." hpfpActivationAngle = "How long to keep the valve activated (in order to allow the pump to build pressure and keep the valve open on its own)" hpfpTargetDecay = "The fastest rate the target pressure can be reduced by. This is because HPFP have no way to bleed off pressure other than injecting fuel." - alignmentFill_at_4594 = "need 4 byte alignment" + alignmentFill_at_4618 = "need 4 byte alignment" cltCrankingCorrBins = "CLT-based cranking position multiplier for simple manual idle controller" cltCrankingCorr = "CLT-based cranking position multiplier for simple manual idle controller" idleAdvanceBins = "Optional timing advance table for Idle (see useSeparateAdvanceForIdle)" @@ -2438,6 +2440,14 @@ etbStatus_resetCounter = scalar, S32, 636, "", 1, 0 yAxis = 0, 8, 10 xBins = knockNoiseRpmBins, RPMValue yBins = knockNoise + gauge = RPMGauge + + curve = torqueCurve, "Engine Torque" + columnLabel = "RPM", "Nm" + xAxis = 0, 8000, 9 + yAxis = 0, 8, 10 + xBins = torqueRpmBins, RPMValue + yBins = torqueValues gauge = RPMGauge curve = swKnockThresholdCurve, "Engine knock threshold RPM based" @@ -5746,6 +5756,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "turbo speed multiplier", turboSpeedSensorMultiplier field = "Artificial Misfire", artificialTestMisfire panel = allTriggerDebug + panel = torqueCurve help = helpGeneral, "rusEFI General Help" webHelp = "https://rusefi.com/s/hellen72" diff --git a/firmware/tunerstudio/generated/rusefi_hellen81.ini b/firmware/tunerstudio/generated/rusefi_hellen81.ini index 5466e5fa7b..4cd75e7b22 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen81.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen81.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.12.20.hellen81.1940988845" + signature = "rusEFI 2021.12.20.hellen81.2967122813" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.12.20.hellen81.1940988845" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.12.20.hellen81.2967122813" ; 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 @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Dec 20 13:18:13 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Dec 20 18:57:57 UTC 2021 pageSize = 24400 page = 1 @@ -1240,8 +1240,10 @@ hpfpTargetRpmBins = array, U08, 4454, [10], "RPM", 50.0, 0, 0, 12500, 0 hpfpCompensation = array, S08, 4464, [10x10], "%", 1, 0, -100, 100, 0 hpfpCompensationLoadBins = array, U16, 4564, [10], "cc/lobe", 0.001, 0, 0, 65, 3 hpfpCompensationRpmBins = array, U08, 4584, [10], "RPM", 50.0, 0, 0, 12500, 0 -alignmentFill_at_4594 = array, U08, 4594, [2], "units", 1, 0, -20, 100, 0 -mainUnusedEnd = array, S32, 4596, [429], "units", 1, 0, -20, 100, 0 +torqueValues = array, U08, 4594, [8], "Nm", 1, 0, 0, 255, 0 +torqueRpmBins = array, U16, 4602, [8], "RPM", 1, 0, 0, 65000, 0 +alignmentFill_at_4618 = array, U08, 4618, [2], "units", 1, 0, -20, 100, 0 +mainUnusedEnd = array, S32, 4620, [423], "units", 1, 0, -20, 100, 0 warning_message = string, ASCII, 6312, 120 afterstartCoolantBins = array, F32, 6432, [8], "C", 1, 0, -100, 250, 0 afterstartHoldTime = array, F32, 6464, [8], "Seconds", 1, 0, 0, 100, 1 @@ -1766,7 +1768,7 @@ scriptTable4RpmBins = array, F32, 24368, [8], "RPM", 1, 0, 0, 25500, 2 hpfpPumpVolume = "Size of the pump chamber in cc. Typical Bosch HDP5 has a 9.0mm diameter, typical BMW N* stroke is 4.4mm." hpfpActivationAngle = "How long to keep the valve activated (in order to allow the pump to build pressure and keep the valve open on its own)" hpfpTargetDecay = "The fastest rate the target pressure can be reduced by. This is because HPFP have no way to bleed off pressure other than injecting fuel." - alignmentFill_at_4594 = "need 4 byte alignment" + alignmentFill_at_4618 = "need 4 byte alignment" cltCrankingCorrBins = "CLT-based cranking position multiplier for simple manual idle controller" cltCrankingCorr = "CLT-based cranking position multiplier for simple manual idle controller" idleAdvanceBins = "Optional timing advance table for Idle (see useSeparateAdvanceForIdle)" @@ -2438,6 +2440,14 @@ etbStatus_resetCounter = scalar, S32, 636, "", 1, 0 yAxis = 0, 8, 10 xBins = knockNoiseRpmBins, RPMValue yBins = knockNoise + gauge = RPMGauge + + curve = torqueCurve, "Engine Torque" + columnLabel = "RPM", "Nm" + xAxis = 0, 8000, 9 + yAxis = 0, 8, 10 + xBins = torqueRpmBins, RPMValue + yBins = torqueValues gauge = RPMGauge curve = swKnockThresholdCurve, "Engine knock threshold RPM based" @@ -5743,6 +5753,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "turbo speed multiplier", turboSpeedSensorMultiplier field = "Artificial Misfire", artificialTestMisfire panel = allTriggerDebug + panel = torqueCurve help = helpGeneral, "rusEFI General Help" webHelp = "https://rusefi.com/s/hellen81" diff --git a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini index 106d0b8378..4a0be36291 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.12.20.hellen88bmw.2462165169" + signature = "rusEFI 2021.12.20.hellen88bmw.1370110049" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.12.20.hellen88bmw.2462165169" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.12.20.hellen88bmw.1370110049" ; 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 @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Dec 20 13:18:08 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Dec 20 18:57:53 UTC 2021 pageSize = 24400 page = 1 @@ -1240,8 +1240,10 @@ hpfpTargetRpmBins = array, U08, 4454, [10], "RPM", 50.0, 0, 0, 12500, 0 hpfpCompensation = array, S08, 4464, [10x10], "%", 1, 0, -100, 100, 0 hpfpCompensationLoadBins = array, U16, 4564, [10], "cc/lobe", 0.001, 0, 0, 65, 3 hpfpCompensationRpmBins = array, U08, 4584, [10], "RPM", 50.0, 0, 0, 12500, 0 -alignmentFill_at_4594 = array, U08, 4594, [2], "units", 1, 0, -20, 100, 0 -mainUnusedEnd = array, S32, 4596, [429], "units", 1, 0, -20, 100, 0 +torqueValues = array, U08, 4594, [8], "Nm", 1, 0, 0, 255, 0 +torqueRpmBins = array, U16, 4602, [8], "RPM", 1, 0, 0, 65000, 0 +alignmentFill_at_4618 = array, U08, 4618, [2], "units", 1, 0, -20, 100, 0 +mainUnusedEnd = array, S32, 4620, [423], "units", 1, 0, -20, 100, 0 warning_message = string, ASCII, 6312, 120 afterstartCoolantBins = array, F32, 6432, [8], "C", 1, 0, -100, 250, 0 afterstartHoldTime = array, F32, 6464, [8], "Seconds", 1, 0, 0, 100, 1 @@ -1766,7 +1768,7 @@ scriptTable4RpmBins = array, F32, 24368, [8], "RPM", 1, 0, 0, 25500, 2 hpfpPumpVolume = "Size of the pump chamber in cc. Typical Bosch HDP5 has a 9.0mm diameter, typical BMW N* stroke is 4.4mm." hpfpActivationAngle = "How long to keep the valve activated (in order to allow the pump to build pressure and keep the valve open on its own)" hpfpTargetDecay = "The fastest rate the target pressure can be reduced by. This is because HPFP have no way to bleed off pressure other than injecting fuel." - alignmentFill_at_4594 = "need 4 byte alignment" + alignmentFill_at_4618 = "need 4 byte alignment" cltCrankingCorrBins = "CLT-based cranking position multiplier for simple manual idle controller" cltCrankingCorr = "CLT-based cranking position multiplier for simple manual idle controller" idleAdvanceBins = "Optional timing advance table for Idle (see useSeparateAdvanceForIdle)" @@ -2438,6 +2440,14 @@ etbStatus_resetCounter = scalar, S32, 636, "", 1, 0 yAxis = 0, 8, 10 xBins = knockNoiseRpmBins, RPMValue yBins = knockNoise + gauge = RPMGauge + + curve = torqueCurve, "Engine Torque" + columnLabel = "RPM", "Nm" + xAxis = 0, 8000, 9 + yAxis = 0, 8, 10 + xBins = torqueRpmBins, RPMValue + yBins = torqueValues gauge = RPMGauge curve = swKnockThresholdCurve, "Engine knock threshold RPM based" @@ -5744,6 +5754,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "turbo speed multiplier", turboSpeedSensorMultiplier field = "Artificial Misfire", artificialTestMisfire panel = allTriggerDebug + panel = torqueCurve help = helpGeneral, "rusEFI General Help" webHelp = "https://rusefi.com/s/hellen121nissan" diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini index a9d00a9522..ed6456c969 100644 --- a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini +++ b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.12.20.hellenNA6.1161592646" + signature = "rusEFI 2021.12.20.hellenNA6.2253909910" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.12.20.hellenNA6.1161592646" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.12.20.hellenNA6.2253909910" ; 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 @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Dec 20 13:18:18 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Dec 20 18:58:02 UTC 2021 pageSize = 24400 page = 1 @@ -1240,8 +1240,10 @@ hpfpTargetRpmBins = array, U08, 4454, [10], "RPM", 50.0, 0, 0, 12500, 0 hpfpCompensation = array, S08, 4464, [10x10], "%", 1, 0, -100, 100, 0 hpfpCompensationLoadBins = array, U16, 4564, [10], "cc/lobe", 0.001, 0, 0, 65, 3 hpfpCompensationRpmBins = array, U08, 4584, [10], "RPM", 50.0, 0, 0, 12500, 0 -alignmentFill_at_4594 = array, U08, 4594, [2], "units", 1, 0, -20, 100, 0 -mainUnusedEnd = array, S32, 4596, [429], "units", 1, 0, -20, 100, 0 +torqueValues = array, U08, 4594, [8], "Nm", 1, 0, 0, 255, 0 +torqueRpmBins = array, U16, 4602, [8], "RPM", 1, 0, 0, 65000, 0 +alignmentFill_at_4618 = array, U08, 4618, [2], "units", 1, 0, -20, 100, 0 +mainUnusedEnd = array, S32, 4620, [423], "units", 1, 0, -20, 100, 0 warning_message = string, ASCII, 6312, 120 afterstartCoolantBins = array, F32, 6432, [8], "C", 1, 0, -100, 250, 0 afterstartHoldTime = array, F32, 6464, [8], "Seconds", 1, 0, 0, 100, 1 @@ -1766,7 +1768,7 @@ scriptTable4RpmBins = array, F32, 24368, [8], "RPM", 1, 0, 0, 25500, 2 hpfpPumpVolume = "Size of the pump chamber in cc. Typical Bosch HDP5 has a 9.0mm diameter, typical BMW N* stroke is 4.4mm." hpfpActivationAngle = "How long to keep the valve activated (in order to allow the pump to build pressure and keep the valve open on its own)" hpfpTargetDecay = "The fastest rate the target pressure can be reduced by. This is because HPFP have no way to bleed off pressure other than injecting fuel." - alignmentFill_at_4594 = "need 4 byte alignment" + alignmentFill_at_4618 = "need 4 byte alignment" cltCrankingCorrBins = "CLT-based cranking position multiplier for simple manual idle controller" cltCrankingCorr = "CLT-based cranking position multiplier for simple manual idle controller" idleAdvanceBins = "Optional timing advance table for Idle (see useSeparateAdvanceForIdle)" @@ -2438,6 +2440,14 @@ etbStatus_resetCounter = scalar, S32, 636, "", 1, 0 yAxis = 0, 8, 10 xBins = knockNoiseRpmBins, RPMValue yBins = knockNoise + gauge = RPMGauge + + curve = torqueCurve, "Engine Torque" + columnLabel = "RPM", "Nm" + xAxis = 0, 8000, 9 + yAxis = 0, 8, 10 + xBins = torqueRpmBins, RPMValue + yBins = torqueValues gauge = RPMGauge curve = swKnockThresholdCurve, "Engine knock threshold RPM based" @@ -5747,6 +5757,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "turbo speed multiplier", turboSpeedSensorMultiplier field = "Artificial Misfire", artificialTestMisfire panel = allTriggerDebug + panel = torqueCurve help = helpGeneral, "rusEFI General Help" webHelp = "https://rusefi.com/s/hellenNA6" diff --git a/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini b/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini index 1f7ddfbab3..c8f09200ad 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.12.20.hellen_cypress.167042642" + signature = "rusEFI 2021.12.20.hellen_cypress.3399437954" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.12.20.hellen_cypress.167042642" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.12.20.hellen_cypress.3399437954" ; 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 @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Mon Dec 20 13:18:45 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Mon Dec 20 18:58:29 UTC 2021 pageSize = 24400 page = 1 @@ -1240,8 +1240,10 @@ hpfpTargetRpmBins = array, U08, 4454, [10], "RPM", 50.0, 0, 0, 12500, 0 hpfpCompensation = array, S08, 4464, [10x10], "%", 1, 0, -100, 100, 0 hpfpCompensationLoadBins = array, U16, 4564, [10], "cc/lobe", 0.001, 0, 0, 65, 3 hpfpCompensationRpmBins = array, U08, 4584, [10], "RPM", 50.0, 0, 0, 12500, 0 -alignmentFill_at_4594 = array, U08, 4594, [2], "units", 1, 0, -20, 100, 0 -mainUnusedEnd = array, S32, 4596, [429], "units", 1, 0, -20, 100, 0 +torqueValues = array, U08, 4594, [8], "Nm", 1, 0, 0, 255, 0 +torqueRpmBins = array, U16, 4602, [8], "RPM", 1, 0, 0, 65000, 0 +alignmentFill_at_4618 = array, U08, 4618, [2], "units", 1, 0, -20, 100, 0 +mainUnusedEnd = array, S32, 4620, [423], "units", 1, 0, -20, 100, 0 warning_message = string, ASCII, 6312, 120 afterstartCoolantBins = array, F32, 6432, [8], "C", 1, 0, -100, 250, 0 afterstartHoldTime = array, F32, 6464, [8], "Seconds", 1, 0, 0, 100, 1 @@ -1766,7 +1768,7 @@ scriptTable4RpmBins = array, F32, 24368, [8], "RPM", 1, 0, 0, 25500, 2 hpfpPumpVolume = "Size of the pump chamber in cc. Typical Bosch HDP5 has a 9.0mm diameter, typical BMW N* stroke is 4.4mm." hpfpActivationAngle = "How long to keep the valve activated (in order to allow the pump to build pressure and keep the valve open on its own)" hpfpTargetDecay = "The fastest rate the target pressure can be reduced by. This is because HPFP have no way to bleed off pressure other than injecting fuel." - alignmentFill_at_4594 = "need 4 byte alignment" + alignmentFill_at_4618 = "need 4 byte alignment" cltCrankingCorrBins = "CLT-based cranking position multiplier for simple manual idle controller" cltCrankingCorr = "CLT-based cranking position multiplier for simple manual idle controller" idleAdvanceBins = "Optional timing advance table for Idle (see useSeparateAdvanceForIdle)" @@ -2438,6 +2440,14 @@ etbStatus_resetCounter = scalar, S32, 636, "", 1, 0 yAxis = 0, 8, 10 xBins = knockNoiseRpmBins, RPMValue yBins = knockNoise + gauge = RPMGauge + + curve = torqueCurve, "Engine Torque" + columnLabel = "RPM", "Nm" + xAxis = 0, 8000, 9 + yAxis = 0, 8, 10 + xBins = torqueRpmBins, RPMValue + yBins = torqueValues gauge = RPMGauge curve = swKnockThresholdCurve, "Engine knock threshold RPM based" @@ -5782,6 +5792,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "turbo speed multiplier", turboSpeedSensorMultiplier field = "Artificial Misfire", artificialTestMisfire panel = allTriggerDebug + panel = torqueCurve help = helpGeneral, "rusEFI General Help" webHelp = "http://www.rusefi.com/" diff --git a/firmware/tunerstudio/generated/rusefi_kinetis.ini b/firmware/tunerstudio/generated/rusefi_kinetis.ini index 92ea079e74..e8e9503b79 100644 --- a/firmware/tunerstudio/generated/rusefi_kinetis.ini +++ b/firmware/tunerstudio/generated/rusefi_kinetis.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.12.20.kin.4132508334" + signature = "rusEFI 2021.12.20.kin.893026942" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.12.20.kin.4132508334" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.12.20.kin.893026942" ; 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 @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Mon Dec 20 13:18:43 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Mon Dec 20 18:58:26 UTC 2021 pageSize = 24372 page = 1 @@ -1218,8 +1218,10 @@ hpfpTargetRpmBins = array, U08, 4426, [10], "RPM", 50.0, 0, 0, 12500, 0 hpfpCompensation = array, S08, 4436, [10x10], "%", 1, 0, -100, 100, 0 hpfpCompensationLoadBins = array, U16, 4536, [10], "cc/lobe", 0.001, 0, 0, 65, 3 hpfpCompensationRpmBins = array, U08, 4556, [10], "RPM", 50.0, 0, 0, 12500, 0 -alignmentFill_at_4566 = array, U08, 4566, [2], "units", 1, 0, -20, 100, 0 -mainUnusedEnd = array, S32, 4568, [429], "units", 1, 0, -20, 100, 0 +torqueValues = array, U08, 4566, [8], "Nm", 1, 0, 0, 255, 0 +torqueRpmBins = array, U16, 4574, [8], "RPM", 1, 0, 0, 65000, 0 +alignmentFill_at_4590 = array, U08, 4590, [2], "units", 1, 0, -20, 100, 0 +mainUnusedEnd = array, S32, 4592, [423], "units", 1, 0, -20, 100, 0 warning_message = string, ASCII, 6284, 120 afterstartCoolantBins = array, F32, 6404, [8], "C", 1, 0, -100, 250, 0 afterstartHoldTime = array, F32, 6436, [8], "Seconds", 1, 0, 0, 100, 1 @@ -1732,7 +1734,7 @@ scriptTable4RpmBins = array, F32, 24340, [8], "RPM", 1, 0, 0, 25500, 2 hpfpPumpVolume = "Size of the pump chamber in cc. Typical Bosch HDP5 has a 9.0mm diameter, typical BMW N* stroke is 4.4mm." hpfpActivationAngle = "How long to keep the valve activated (in order to allow the pump to build pressure and keep the valve open on its own)" hpfpTargetDecay = "The fastest rate the target pressure can be reduced by. This is because HPFP have no way to bleed off pressure other than injecting fuel." - alignmentFill_at_4566 = "need 4 byte alignment" + alignmentFill_at_4590 = "need 4 byte alignment" cltCrankingCorrBins = "CLT-based cranking position multiplier for simple manual idle controller" cltCrankingCorr = "CLT-based cranking position multiplier for simple manual idle controller" idleAdvanceBins = "Optional timing advance table for Idle (see useSeparateAdvanceForIdle)" @@ -2404,6 +2406,14 @@ etbStatus_resetCounter = scalar, S32, 636, "", 1, 0 yAxis = 0, 8, 10 xBins = knockNoiseRpmBins, RPMValue yBins = knockNoise + gauge = RPMGauge + + curve = torqueCurve, "Engine Torque" + columnLabel = "RPM", "Nm" + xAxis = 0, 8000, 9 + yAxis = 0, 8, 10 + xBins = torqueRpmBins, RPMValue + yBins = torqueValues gauge = RPMGauge curve = swKnockThresholdCurve, "Engine knock threshold RPM based" @@ -5749,6 +5759,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "turbo speed multiplier", turboSpeedSensorMultiplier field = "Artificial Misfire", artificialTestMisfire panel = allTriggerDebug + panel = torqueCurve help = helpGeneral, "rusEFI General Help" webHelp = "http://www.rusefi.com/" diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index df635fcd47..58214154c5 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f4.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.12.20.mre_f4.2149991258" + signature = "rusEFI 2021.12.20.mre_f4.1129173898" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.12.20.mre_f4.2149991258" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.12.20.mre_f4.1129173898" ; 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 @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Dec 20 13:18:23 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Dec 20 18:58:07 UTC 2021 pageSize = 24400 page = 1 @@ -1240,8 +1240,10 @@ hpfpTargetRpmBins = array, U08, 4454, [10], "RPM", 50.0, 0, 0, 12500, 0 hpfpCompensation = array, S08, 4464, [10x10], "%", 1, 0, -100, 100, 0 hpfpCompensationLoadBins = array, U16, 4564, [10], "cc/lobe", 0.001, 0, 0, 65, 3 hpfpCompensationRpmBins = array, U08, 4584, [10], "RPM", 50.0, 0, 0, 12500, 0 -alignmentFill_at_4594 = array, U08, 4594, [2], "units", 1, 0, -20, 100, 0 -mainUnusedEnd = array, S32, 4596, [429], "units", 1, 0, -20, 100, 0 +torqueValues = array, U08, 4594, [8], "Nm", 1, 0, 0, 255, 0 +torqueRpmBins = array, U16, 4602, [8], "RPM", 1, 0, 0, 65000, 0 +alignmentFill_at_4618 = array, U08, 4618, [2], "units", 1, 0, -20, 100, 0 +mainUnusedEnd = array, S32, 4620, [423], "units", 1, 0, -20, 100, 0 warning_message = string, ASCII, 6312, 120 afterstartCoolantBins = array, F32, 6432, [8], "C", 1, 0, -100, 250, 0 afterstartHoldTime = array, F32, 6464, [8], "Seconds", 1, 0, 0, 100, 1 @@ -1766,7 +1768,7 @@ scriptTable4RpmBins = array, F32, 24368, [8], "RPM", 1, 0, 0, 25500, 2 hpfpPumpVolume = "Size of the pump chamber in cc. Typical Bosch HDP5 has a 9.0mm diameter, typical BMW N* stroke is 4.4mm." hpfpActivationAngle = "How long to keep the valve activated (in order to allow the pump to build pressure and keep the valve open on its own)" hpfpTargetDecay = "The fastest rate the target pressure can be reduced by. This is because HPFP have no way to bleed off pressure other than injecting fuel." - alignmentFill_at_4594 = "need 4 byte alignment" + alignmentFill_at_4618 = "need 4 byte alignment" cltCrankingCorrBins = "CLT-based cranking position multiplier for simple manual idle controller" cltCrankingCorr = "CLT-based cranking position multiplier for simple manual idle controller" idleAdvanceBins = "Optional timing advance table for Idle (see useSeparateAdvanceForIdle)" @@ -2438,6 +2440,14 @@ etbStatus_resetCounter = scalar, S32, 636, "", 1, 0 yAxis = 0, 8, 10 xBins = knockNoiseRpmBins, RPMValue yBins = knockNoise + gauge = RPMGauge + + curve = torqueCurve, "Engine Torque" + columnLabel = "RPM", "Nm" + xAxis = 0, 8000, 9 + yAxis = 0, 8, 10 + xBins = torqueRpmBins, RPMValue + yBins = torqueValues gauge = RPMGauge curve = swKnockThresholdCurve, "Engine knock threshold RPM based" @@ -5752,6 +5762,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "turbo speed multiplier", turboSpeedSensorMultiplier field = "Artificial Misfire", artificialTestMisfire panel = allTriggerDebug + panel = torqueCurve help = helpGeneral, "rusEFI General Help" webHelp = "https://rusefi.com/s/microrusefi" diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index ce81a32d48..c14d2122c1 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f7.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.12.20.mre_f7.2149991258" + signature = "rusEFI 2021.12.20.mre_f7.1129173898" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.12.20.mre_f7.2149991258" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.12.20.mre_f7.1129173898" ; 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 @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Dec 20 13:18:21 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Dec 20 18:58:05 UTC 2021 pageSize = 24400 page = 1 @@ -1240,8 +1240,10 @@ hpfpTargetRpmBins = array, U08, 4454, [10], "RPM", 50.0, 0, 0, 12500, 0 hpfpCompensation = array, S08, 4464, [10x10], "%", 1, 0, -100, 100, 0 hpfpCompensationLoadBins = array, U16, 4564, [10], "cc/lobe", 0.001, 0, 0, 65, 3 hpfpCompensationRpmBins = array, U08, 4584, [10], "RPM", 50.0, 0, 0, 12500, 0 -alignmentFill_at_4594 = array, U08, 4594, [2], "units", 1, 0, -20, 100, 0 -mainUnusedEnd = array, S32, 4596, [429], "units", 1, 0, -20, 100, 0 +torqueValues = array, U08, 4594, [8], "Nm", 1, 0, 0, 255, 0 +torqueRpmBins = array, U16, 4602, [8], "RPM", 1, 0, 0, 65000, 0 +alignmentFill_at_4618 = array, U08, 4618, [2], "units", 1, 0, -20, 100, 0 +mainUnusedEnd = array, S32, 4620, [423], "units", 1, 0, -20, 100, 0 warning_message = string, ASCII, 6312, 120 afterstartCoolantBins = array, F32, 6432, [8], "C", 1, 0, -100, 250, 0 afterstartHoldTime = array, F32, 6464, [8], "Seconds", 1, 0, 0, 100, 1 @@ -1766,7 +1768,7 @@ scriptTable4RpmBins = array, F32, 24368, [8], "RPM", 1, 0, 0, 25500, 2 hpfpPumpVolume = "Size of the pump chamber in cc. Typical Bosch HDP5 has a 9.0mm diameter, typical BMW N* stroke is 4.4mm." hpfpActivationAngle = "How long to keep the valve activated (in order to allow the pump to build pressure and keep the valve open on its own)" hpfpTargetDecay = "The fastest rate the target pressure can be reduced by. This is because HPFP have no way to bleed off pressure other than injecting fuel." - alignmentFill_at_4594 = "need 4 byte alignment" + alignmentFill_at_4618 = "need 4 byte alignment" cltCrankingCorrBins = "CLT-based cranking position multiplier for simple manual idle controller" cltCrankingCorr = "CLT-based cranking position multiplier for simple manual idle controller" idleAdvanceBins = "Optional timing advance table for Idle (see useSeparateAdvanceForIdle)" @@ -2438,6 +2440,14 @@ etbStatus_resetCounter = scalar, S32, 636, "", 1, 0 yAxis = 0, 8, 10 xBins = knockNoiseRpmBins, RPMValue yBins = knockNoise + gauge = RPMGauge + + curve = torqueCurve, "Engine Torque" + columnLabel = "RPM", "Nm" + xAxis = 0, 8000, 9 + yAxis = 0, 8, 10 + xBins = torqueRpmBins, RPMValue + yBins = torqueValues gauge = RPMGauge curve = swKnockThresholdCurve, "Engine knock threshold RPM based" @@ -5752,6 +5762,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "turbo speed multiplier", turboSpeedSensorMultiplier field = "Artificial Misfire", artificialTestMisfire panel = allTriggerDebug + panel = torqueCurve help = helpGeneral, "rusEFI General Help" webHelp = "https://rusefi.com/s/microrusefi" diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index 641860f352..397a35fa67 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.12.20.prometheus_405.1676402696" + signature = "rusEFI 2021.12.20.prometheus_405.2692772056" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.12.20.prometheus_405.1676402696" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.12.20.prometheus_405.2692772056" ; 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 @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Dec 20 13:18:31 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Dec 20 18:58:14 UTC 2021 pageSize = 24400 page = 1 @@ -1240,8 +1240,10 @@ hpfpTargetRpmBins = array, U08, 4454, [10], "RPM", 50.0, 0, 0, 12500, 0 hpfpCompensation = array, S08, 4464, [10x10], "%", 1, 0, -100, 100, 0 hpfpCompensationLoadBins = array, U16, 4564, [10], "cc/lobe", 0.001, 0, 0, 65, 3 hpfpCompensationRpmBins = array, U08, 4584, [10], "RPM", 50.0, 0, 0, 12500, 0 -alignmentFill_at_4594 = array, U08, 4594, [2], "units", 1, 0, -20, 100, 0 -mainUnusedEnd = array, S32, 4596, [429], "units", 1, 0, -20, 100, 0 +torqueValues = array, U08, 4594, [8], "Nm", 1, 0, 0, 255, 0 +torqueRpmBins = array, U16, 4602, [8], "RPM", 1, 0, 0, 65000, 0 +alignmentFill_at_4618 = array, U08, 4618, [2], "units", 1, 0, -20, 100, 0 +mainUnusedEnd = array, S32, 4620, [423], "units", 1, 0, -20, 100, 0 warning_message = string, ASCII, 6312, 120 afterstartCoolantBins = array, F32, 6432, [8], "C", 1, 0, -100, 250, 0 afterstartHoldTime = array, F32, 6464, [8], "Seconds", 1, 0, 0, 100, 1 @@ -1766,7 +1768,7 @@ scriptTable4RpmBins = array, F32, 24368, [8], "RPM", 1, 0, 0, 25500, 2 hpfpPumpVolume = "Size of the pump chamber in cc. Typical Bosch HDP5 has a 9.0mm diameter, typical BMW N* stroke is 4.4mm." hpfpActivationAngle = "How long to keep the valve activated (in order to allow the pump to build pressure and keep the valve open on its own)" hpfpTargetDecay = "The fastest rate the target pressure can be reduced by. This is because HPFP have no way to bleed off pressure other than injecting fuel." - alignmentFill_at_4594 = "need 4 byte alignment" + alignmentFill_at_4618 = "need 4 byte alignment" cltCrankingCorrBins = "CLT-based cranking position multiplier for simple manual idle controller" cltCrankingCorr = "CLT-based cranking position multiplier for simple manual idle controller" idleAdvanceBins = "Optional timing advance table for Idle (see useSeparateAdvanceForIdle)" @@ -2438,6 +2440,14 @@ etbStatus_resetCounter = scalar, S32, 636, "", 1, 0 yAxis = 0, 8, 10 xBins = knockNoiseRpmBins, RPMValue yBins = knockNoise + gauge = RPMGauge + + curve = torqueCurve, "Engine Torque" + columnLabel = "RPM", "Nm" + xAxis = 0, 8000, 9 + yAxis = 0, 8, 10 + xBins = torqueRpmBins, RPMValue + yBins = torqueValues gauge = RPMGauge curve = swKnockThresholdCurve, "Engine knock threshold RPM based" @@ -5777,6 +5787,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "turbo speed multiplier", turboSpeedSensorMultiplier field = "Artificial Misfire", artificialTestMisfire panel = allTriggerDebug + panel = torqueCurve help = helpGeneral, "rusEFI General Help" webHelp = "http://www.rusefi.com/" diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index faf647d456..2713e72153 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.12.20.prometheus_469.1676402696" + signature = "rusEFI 2021.12.20.prometheus_469.2692772056" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.12.20.prometheus_469.1676402696" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.12.20.prometheus_469.2692772056" ; 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 @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Dec 20 13:18:28 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Dec 20 18:58:12 UTC 2021 pageSize = 24400 page = 1 @@ -1240,8 +1240,10 @@ hpfpTargetRpmBins = array, U08, 4454, [10], "RPM", 50.0, 0, 0, 12500, 0 hpfpCompensation = array, S08, 4464, [10x10], "%", 1, 0, -100, 100, 0 hpfpCompensationLoadBins = array, U16, 4564, [10], "cc/lobe", 0.001, 0, 0, 65, 3 hpfpCompensationRpmBins = array, U08, 4584, [10], "RPM", 50.0, 0, 0, 12500, 0 -alignmentFill_at_4594 = array, U08, 4594, [2], "units", 1, 0, -20, 100, 0 -mainUnusedEnd = array, S32, 4596, [429], "units", 1, 0, -20, 100, 0 +torqueValues = array, U08, 4594, [8], "Nm", 1, 0, 0, 255, 0 +torqueRpmBins = array, U16, 4602, [8], "RPM", 1, 0, 0, 65000, 0 +alignmentFill_at_4618 = array, U08, 4618, [2], "units", 1, 0, -20, 100, 0 +mainUnusedEnd = array, S32, 4620, [423], "units", 1, 0, -20, 100, 0 warning_message = string, ASCII, 6312, 120 afterstartCoolantBins = array, F32, 6432, [8], "C", 1, 0, -100, 250, 0 afterstartHoldTime = array, F32, 6464, [8], "Seconds", 1, 0, 0, 100, 1 @@ -1766,7 +1768,7 @@ scriptTable4RpmBins = array, F32, 24368, [8], "RPM", 1, 0, 0, 25500, 2 hpfpPumpVolume = "Size of the pump chamber in cc. Typical Bosch HDP5 has a 9.0mm diameter, typical BMW N* stroke is 4.4mm." hpfpActivationAngle = "How long to keep the valve activated (in order to allow the pump to build pressure and keep the valve open on its own)" hpfpTargetDecay = "The fastest rate the target pressure can be reduced by. This is because HPFP have no way to bleed off pressure other than injecting fuel." - alignmentFill_at_4594 = "need 4 byte alignment" + alignmentFill_at_4618 = "need 4 byte alignment" cltCrankingCorrBins = "CLT-based cranking position multiplier for simple manual idle controller" cltCrankingCorr = "CLT-based cranking position multiplier for simple manual idle controller" idleAdvanceBins = "Optional timing advance table for Idle (see useSeparateAdvanceForIdle)" @@ -2438,6 +2440,14 @@ etbStatus_resetCounter = scalar, S32, 636, "", 1, 0 yAxis = 0, 8, 10 xBins = knockNoiseRpmBins, RPMValue yBins = knockNoise + gauge = RPMGauge + + curve = torqueCurve, "Engine Torque" + columnLabel = "RPM", "Nm" + xAxis = 0, 8000, 9 + yAxis = 0, 8, 10 + xBins = torqueRpmBins, RPMValue + yBins = torqueValues gauge = RPMGauge curve = swKnockThresholdCurve, "Engine knock threshold RPM based" @@ -5777,6 +5787,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "turbo speed multiplier", turboSpeedSensorMultiplier field = "Artificial Misfire", artificialTestMisfire panel = allTriggerDebug + panel = torqueCurve help = helpGeneral, "rusEFI General Help" webHelp = "http://www.rusefi.com/" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index ee922d195e..55c94b6858 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.12.20.proteus_f4.2402337345" + signature = "rusEFI 2021.12.20.proteus_f4.1281053329" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.12.20.proteus_f4.2402337345" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.12.20.proteus_f4.1281053329" ; 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 @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Dec 20 13:18:36 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Dec 20 18:58:19 UTC 2021 pageSize = 24400 page = 1 @@ -1240,8 +1240,10 @@ hpfpTargetRpmBins = array, U08, 4454, [10], "RPM", 50.0, 0, 0, 12500, 0 hpfpCompensation = array, S08, 4464, [10x10], "%", 1, 0, -100, 100, 0 hpfpCompensationLoadBins = array, U16, 4564, [10], "cc/lobe", 0.001, 0, 0, 65, 3 hpfpCompensationRpmBins = array, U08, 4584, [10], "RPM", 50.0, 0, 0, 12500, 0 -alignmentFill_at_4594 = array, U08, 4594, [2], "units", 1, 0, -20, 100, 0 -mainUnusedEnd = array, S32, 4596, [429], "units", 1, 0, -20, 100, 0 +torqueValues = array, U08, 4594, [8], "Nm", 1, 0, 0, 255, 0 +torqueRpmBins = array, U16, 4602, [8], "RPM", 1, 0, 0, 65000, 0 +alignmentFill_at_4618 = array, U08, 4618, [2], "units", 1, 0, -20, 100, 0 +mainUnusedEnd = array, S32, 4620, [423], "units", 1, 0, -20, 100, 0 warning_message = string, ASCII, 6312, 120 afterstartCoolantBins = array, F32, 6432, [8], "C", 1, 0, -100, 250, 0 afterstartHoldTime = array, F32, 6464, [8], "Seconds", 1, 0, 0, 100, 1 @@ -1766,7 +1768,7 @@ scriptTable4RpmBins = array, F32, 24368, [8], "RPM", 1, 0, 0, 25500, 2 hpfpPumpVolume = "Size of the pump chamber in cc. Typical Bosch HDP5 has a 9.0mm diameter, typical BMW N* stroke is 4.4mm." hpfpActivationAngle = "How long to keep the valve activated (in order to allow the pump to build pressure and keep the valve open on its own)" hpfpTargetDecay = "The fastest rate the target pressure can be reduced by. This is because HPFP have no way to bleed off pressure other than injecting fuel." - alignmentFill_at_4594 = "need 4 byte alignment" + alignmentFill_at_4618 = "need 4 byte alignment" cltCrankingCorrBins = "CLT-based cranking position multiplier for simple manual idle controller" cltCrankingCorr = "CLT-based cranking position multiplier for simple manual idle controller" idleAdvanceBins = "Optional timing advance table for Idle (see useSeparateAdvanceForIdle)" @@ -2438,6 +2440,14 @@ etbStatus_resetCounter = scalar, S32, 636, "", 1, 0 yAxis = 0, 8, 10 xBins = knockNoiseRpmBins, RPMValue yBins = knockNoise + gauge = RPMGauge + + curve = torqueCurve, "Engine Torque" + columnLabel = "RPM", "Nm" + xAxis = 0, 8000, 9 + yAxis = 0, 8, 10 + xBins = torqueRpmBins, RPMValue + yBins = torqueValues gauge = RPMGauge curve = swKnockThresholdCurve, "Engine knock threshold RPM based" @@ -5745,6 +5755,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "turbo speed multiplier", turboSpeedSensorMultiplier field = "Artificial Misfire", artificialTestMisfire panel = allTriggerDebug + panel = torqueCurve help = helpGeneral, "rusEFI General Help" webHelp = "https://github.com/rusefi/rusefi/wiki/Proteus-Manual" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index 71e5e323a6..7c007537d4 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.12.20.proteus_f7.2402337345" + signature = "rusEFI 2021.12.20.proteus_f7.1281053329" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.12.20.proteus_f7.2402337345" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.12.20.proteus_f7.1281053329" ; 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 @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Dec 20 13:18:33 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Dec 20 18:58:17 UTC 2021 pageSize = 24400 page = 1 @@ -1240,8 +1240,10 @@ hpfpTargetRpmBins = array, U08, 4454, [10], "RPM", 50.0, 0, 0, 12500, 0 hpfpCompensation = array, S08, 4464, [10x10], "%", 1, 0, -100, 100, 0 hpfpCompensationLoadBins = array, U16, 4564, [10], "cc/lobe", 0.001, 0, 0, 65, 3 hpfpCompensationRpmBins = array, U08, 4584, [10], "RPM", 50.0, 0, 0, 12500, 0 -alignmentFill_at_4594 = array, U08, 4594, [2], "units", 1, 0, -20, 100, 0 -mainUnusedEnd = array, S32, 4596, [429], "units", 1, 0, -20, 100, 0 +torqueValues = array, U08, 4594, [8], "Nm", 1, 0, 0, 255, 0 +torqueRpmBins = array, U16, 4602, [8], "RPM", 1, 0, 0, 65000, 0 +alignmentFill_at_4618 = array, U08, 4618, [2], "units", 1, 0, -20, 100, 0 +mainUnusedEnd = array, S32, 4620, [423], "units", 1, 0, -20, 100, 0 warning_message = string, ASCII, 6312, 120 afterstartCoolantBins = array, F32, 6432, [8], "C", 1, 0, -100, 250, 0 afterstartHoldTime = array, F32, 6464, [8], "Seconds", 1, 0, 0, 100, 1 @@ -1766,7 +1768,7 @@ scriptTable4RpmBins = array, F32, 24368, [8], "RPM", 1, 0, 0, 25500, 2 hpfpPumpVolume = "Size of the pump chamber in cc. Typical Bosch HDP5 has a 9.0mm diameter, typical BMW N* stroke is 4.4mm." hpfpActivationAngle = "How long to keep the valve activated (in order to allow the pump to build pressure and keep the valve open on its own)" hpfpTargetDecay = "The fastest rate the target pressure can be reduced by. This is because HPFP have no way to bleed off pressure other than injecting fuel." - alignmentFill_at_4594 = "need 4 byte alignment" + alignmentFill_at_4618 = "need 4 byte alignment" cltCrankingCorrBins = "CLT-based cranking position multiplier for simple manual idle controller" cltCrankingCorr = "CLT-based cranking position multiplier for simple manual idle controller" idleAdvanceBins = "Optional timing advance table for Idle (see useSeparateAdvanceForIdle)" @@ -2438,6 +2440,14 @@ etbStatus_resetCounter = scalar, S32, 636, "", 1, 0 yAxis = 0, 8, 10 xBins = knockNoiseRpmBins, RPMValue yBins = knockNoise + gauge = RPMGauge + + curve = torqueCurve, "Engine Torque" + columnLabel = "RPM", "Nm" + xAxis = 0, 8000, 9 + yAxis = 0, 8, 10 + xBins = torqueRpmBins, RPMValue + yBins = torqueValues gauge = RPMGauge curve = swKnockThresholdCurve, "Engine knock threshold RPM based" @@ -5745,6 +5755,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "turbo speed multiplier", turboSpeedSensorMultiplier field = "Artificial Misfire", artificialTestMisfire panel = allTriggerDebug + panel = torqueCurve help = helpGeneral, "rusEFI General Help" webHelp = "https://github.com/rusefi/rusefi/wiki/Proteus-Manual" diff --git a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini index 3cc301e96d..4f767cfc16 100644 --- a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.12.20.subaru_eg33_f7.4038799294" + signature = "rusEFI 2021.12.20.subaru_eg33_f7.869318510" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.12.20.subaru_eg33_f7.4038799294" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.12.20.subaru_eg33_f7.869318510" ; 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 @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_config.sh integration/rusefi_config.txt Mon Dec 20 13:18:47 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_config.sh integration/rusefi_config.txt Mon Dec 20 18:58:31 UTC 2021 pageSize = 24400 page = 1 @@ -1240,8 +1240,10 @@ hpfpTargetRpmBins = array, U08, 4454, [10], "RPM", 50.0, 0, 0, 12500, 0 hpfpCompensation = array, S08, 4464, [10x10], "%", 1, 0, -100, 100, 0 hpfpCompensationLoadBins = array, U16, 4564, [10], "cc/lobe", 0.001, 0, 0, 65, 3 hpfpCompensationRpmBins = array, U08, 4584, [10], "RPM", 50.0, 0, 0, 12500, 0 -alignmentFill_at_4594 = array, U08, 4594, [2], "units", 1, 0, -20, 100, 0 -mainUnusedEnd = array, S32, 4596, [429], "units", 1, 0, -20, 100, 0 +torqueValues = array, U08, 4594, [8], "Nm", 1, 0, 0, 255, 0 +torqueRpmBins = array, U16, 4602, [8], "RPM", 1, 0, 0, 65000, 0 +alignmentFill_at_4618 = array, U08, 4618, [2], "units", 1, 0, -20, 100, 0 +mainUnusedEnd = array, S32, 4620, [423], "units", 1, 0, -20, 100, 0 warning_message = string, ASCII, 6312, 120 afterstartCoolantBins = array, F32, 6432, [8], "C", 1, 0, -100, 250, 0 afterstartHoldTime = array, F32, 6464, [8], "Seconds", 1, 0, 0, 100, 1 @@ -1766,7 +1768,7 @@ scriptTable4RpmBins = array, F32, 24368, [8], "RPM", 1, 0, 0, 25500, 2 hpfpPumpVolume = "Size of the pump chamber in cc. Typical Bosch HDP5 has a 9.0mm diameter, typical BMW N* stroke is 4.4mm." hpfpActivationAngle = "How long to keep the valve activated (in order to allow the pump to build pressure and keep the valve open on its own)" hpfpTargetDecay = "The fastest rate the target pressure can be reduced by. This is because HPFP have no way to bleed off pressure other than injecting fuel." - alignmentFill_at_4594 = "need 4 byte alignment" + alignmentFill_at_4618 = "need 4 byte alignment" cltCrankingCorrBins = "CLT-based cranking position multiplier for simple manual idle controller" cltCrankingCorr = "CLT-based cranking position multiplier for simple manual idle controller" idleAdvanceBins = "Optional timing advance table for Idle (see useSeparateAdvanceForIdle)" @@ -2438,6 +2440,14 @@ etbStatus_resetCounter = scalar, S32, 636, "", 1, 0 yAxis = 0, 8, 10 xBins = knockNoiseRpmBins, RPMValue yBins = knockNoise + gauge = RPMGauge + + curve = torqueCurve, "Engine Torque" + columnLabel = "RPM", "Nm" + xAxis = 0, 8000, 9 + yAxis = 0, 8, 10 + xBins = torqueRpmBins, RPMValue + yBins = torqueValues gauge = RPMGauge curve = swKnockThresholdCurve, "Engine knock threshold RPM based" @@ -5768,6 +5778,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "turbo speed multiplier", turboSpeedSensorMultiplier field = "Artificial Misfire", artificialTestMisfire panel = allTriggerDebug + panel = torqueCurve help = helpGeneral, "rusEFI General Help" webHelp = "http://www.rusefi.com/" 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 bbe426626e..556c4c9ae2 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Dec 20 13:18:51 UTC 2021 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Dec 20 18:58:34 UTC 2021 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -82,7 +82,7 @@ public class Fields { public static final int alignmentFill_at_1847_offset = 1847; public static final int alignmentFill_at_1873_offset = 1873; public static final int alignmentFill_at_4007_offset = 4007; - public static final int alignmentFill_at_4594_offset = 4594; + public static final int alignmentFill_at_4618_offset = 4618; public static final int alignmentFill_at_62_offset = 62; public static final int alternatorControl_dFactor_offset = 1492; public static final int alternatorControl_iFactor_offset = 1488; @@ -1484,7 +1484,7 @@ public class Fields { public static final String MAIN_HELP_URL = "http://www.rusefi.com/"; public static final int mainRelayPin_offset = 714; public static final int mainRelayPinMode_offset = 756; - public static final int mainUnusedEnd_offset = 4596; + public static final int mainUnusedEnd_offset = 4620; public static final int malfunctionIndicatorPin_offset = 668; public static final int malfunctionIndicatorPinMode_offset = 669; public static final int manIdlePosition_offset = 616; @@ -1750,7 +1750,6 @@ public class Fields { public static final int servoOutputPins8_offset = 2739; public static final int showHumanReadableWarning_offset = 896; public static final int showSdCardWarning_offset = 164; - public static final int SIGNATURE_HASH = 855718382; public static final int silentTriggerError_offset = 1260; public static final int slowAdcAlpha_offset = 1712; public static final int sparkDwellRpmBins_offset = 54; @@ -1927,6 +1926,9 @@ public class Fields { public static final int TOOTH_PACKET_COUNT = 1000; public static final int TOOTH_PACKET_SIZE = 2; public static final String TOP_DEAD_CENTER_MESSAGE = "r"; + public static final int TORQUE_CURVE_SIZE = 8; + public static final int torqueRpmBins_offset = 4602; + public static final int torqueValues_offset = 4594; public static final int TOTAL_CONFIG_SIZE = 24400; public static final int tps1_1AdcChannel_offset = 520; public static final int tps1_2AdcChannel_offset = 689; @@ -2212,7 +2214,7 @@ public class Fields { public static final int TS_RESPONSE_UNDERRUN = 0x80; public static final int TS_RESPONSE_UNRECOGNIZED_COMMAND = 0x83; public static final char TS_SET_LOGGER_SWITCH = 'l'; - public static final String TS_SIGNATURE = "rusEFI 2021.12.20.all.855718382"; + public static final String TS_SIGNATURE = "rusEFI 2021.12.20.all.4033521982"; public static final char TS_SINGLE_WRITE_COMMAND = 'W'; public static final char TS_TEST_COMMAND = 't'; public static final int tunerStudioSerialSpeed_offset = 732; @@ -3573,8 +3575,10 @@ public class Fields { public static final Field HPFPCOMPENSATION = Field.create("HPFPCOMPENSATION", 4464, FieldType.INT8); public static final Field HPFPCOMPENSATIONLOADBINS = Field.create("HPFPCOMPENSATIONLOADBINS", 4564, FieldType.INT16); public static final Field HPFPCOMPENSATIONRPMBINS = Field.create("HPFPCOMPENSATIONRPMBINS", 4584, FieldType.INT8); - public static final Field ALIGNMENTFILL_AT_4594 = Field.create("ALIGNMENTFILL_AT_4594", 4594, FieldType.INT8); - public static final Field MAINUNUSEDEND = Field.create("MAINUNUSEDEND", 4596, FieldType.INT); + public static final Field TORQUEVALUES = Field.create("TORQUEVALUES", 4594, FieldType.INT8); + public static final Field TORQUERPMBINS = Field.create("TORQUERPMBINS", 4602, FieldType.INT16); + public static final Field ALIGNMENTFILL_AT_4618 = Field.create("ALIGNMENTFILL_AT_4618", 4618, FieldType.INT8); + public static final Field MAINUNUSEDEND = Field.create("MAINUNUSEDEND", 4620, FieldType.INT); public static final Field WARNING_MESSAGE = Field.create("WARNING_MESSAGE", 6312, 120, FieldType.STRING); public static final Field AFTERSTARTCOOLANTBINS = Field.create("AFTERSTARTCOOLANTBINS", 6432, FieldType.FLOAT); public static final Field AFTERSTARTHOLDTIME = Field.create("AFTERSTARTHOLDTIME", 6464, FieldType.FLOAT); @@ -4800,7 +4804,9 @@ public class Fields { HPFPCOMPENSATION, HPFPCOMPENSATIONLOADBINS, HPFPCOMPENSATIONRPMBINS, - ALIGNMENTFILL_AT_4594, + TORQUEVALUES, + TORQUERPMBINS, + ALIGNMENTFILL_AT_4618, MAINUNUSEDEND, WARNING_MESSAGE, AFTERSTARTCOOLANTBINS,