From 1ba5e052a1aeb024a92c12f97aef5a5c4c4bd989 Mon Sep 17 00:00:00 2001 From: GitHub build-firmware Action Date: Thu, 20 Jan 2022 19:14:41 +0000 Subject: [PATCH] Auto-generated configs and docs --- ...ngine_configuration_generated_structures.h | 15 ++++---- .../controllers/algo/rusefi_generated.h | 13 +++---- ...ngine_configuration_generated_structures.h | 15 ++++---- .../controllers/algo/rusefi_generated.h | 13 +++---- ...ngine_configuration_generated_structures.h | 15 ++++---- .../controllers/algo/rusefi_generated.h | 13 +++---- ...ngine_configuration_generated_structures.h | 15 ++++---- .../controllers/generated/rusefi_generated.h | 13 +++---- .../controllers/generated/signature_all.h | 4 +-- .../generated/signature_alphax-2chan.h | 4 +-- .../generated/signature_alphax-4chan.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_hellenNA8_96.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 | 34 ++++++++----------- .../generated/rusefi_alphax-2chan.ini | 34 ++++++++----------- .../generated/rusefi_alphax-4chan.ini | 34 ++++++++----------- .../tunerstudio/generated/rusefi_atlas.ini | 34 ++++++++----------- .../generated/rusefi_f429-discovery.ini | 34 ++++++++----------- .../generated/rusefi_frankenso_na6.ini | 34 ++++++++----------- .../generated/rusefi_hellen-nb1.ini | 34 ++++++++----------- .../generated/rusefi_hellen121nissan.ini | 34 ++++++++----------- .../generated/rusefi_hellen121vag.ini | 34 ++++++++----------- .../generated/rusefi_hellen128mercedes.ini | 34 ++++++++----------- .../generated/rusefi_hellen154hyundai.ini | 34 ++++++++----------- .../tunerstudio/generated/rusefi_hellen72.ini | 34 ++++++++----------- .../tunerstudio/generated/rusefi_hellen81.ini | 34 ++++++++----------- .../generated/rusefi_hellen88bmw.ini | 34 ++++++++----------- .../generated/rusefi_hellenNA6.ini | 34 ++++++++----------- .../generated/rusefi_hellenNA8_96.ini | 34 ++++++++----------- .../generated/rusefi_hellen_cypress.ini | 34 ++++++++----------- .../tunerstudio/generated/rusefi_kinetis.ini | 34 ++++++++----------- .../tunerstudio/generated/rusefi_mre_f4.ini | 34 ++++++++----------- .../tunerstudio/generated/rusefi_mre_f7.ini | 34 ++++++++----------- .../generated/rusefi_prometheus_405.ini | 34 ++++++++----------- .../generated/rusefi_prometheus_469.ini | 34 ++++++++----------- .../generated/rusefi_proteus_f4.ini | 34 ++++++++----------- .../generated/rusefi_proteus_f7.ini | 34 ++++++++----------- .../generated/rusefi_subaru_eg33_f7.ini | 34 ++++++++----------- .../com/rusefi/config/generated/Fields.java | 25 ++++++++------ 59 files changed, 478 insertions(+), 609 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 c6296ae105..065280e175 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 (unknown script) integration/rusefi_config.txt Wed Jan 19 12:38:05 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) integration/rusefi_config.txt Thu Jan 20 19:12:56 UTC 2022 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -4145,17 +4145,20 @@ struct persistent_config_s { */ float idleAdvance[IDLE_ADVANCE_CURVE_SIZE]; /** - * Optional VE table for Idle (see useSeparateVEForIdle) RPM * offset 5596 */ - scaled_channel idleVeBins[IDLE_VE_CURVE_SIZE]; + scaled_channel idleVeRpmBins[IDLE_VE_SIZE]; + /** + load + * offset 5600 + */ + scaled_channel idleVeLoadBins[IDLE_VE_SIZE]; /** - * Optional VE table for Idle (see useSeparateVEForIdle) % * offset 5604 */ - float idleVe[IDLE_VE_CURVE_SIZE]; + scaled_channel idleVeTable[IDLE_VE_SIZE][IDLE_VE_SIZE]; /** * offset 5636 */ @@ -4460,4 +4463,4 @@ struct persistent_config_s { }; // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 19 12:38:05 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) integration/rusefi_config.txt Thu Jan 20 19:12:56 UTC 2022 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 5977445e39..2d2b8fe512 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 @@ -952,7 +952,7 @@ #define firingOrder_offset 424 #define fixedModeTiming_offset 464 #define fixedTiming_offset 1824 -#define FLASH_DATA_VERSION 10007 +#define FLASH_DATA_VERSION 10008 #define flexSensorPin_offset 806 #define FSIO_METHOD_FSIO_ANALOG_INPUT "fsio_analog_input" #define FSIO_METHOD_FSIO_DIGITAL_INPUT "fsio_digital_input" @@ -1315,7 +1315,7 @@ #define idle_state_e_TPS_THRESHOLD 1 #define idle_stepperDirectionPin_offset 613 #define idle_stepperStepPin_offset 614 -#define IDLE_VE_CURVE_SIZE 8 +#define IDLE_VE_SIZE 4 #define idleAdvance_offset 5564 #define idleAdvanceBins_offset 5556 #define idleIncrementalPidCic_offset 748 @@ -1356,8 +1356,9 @@ #define idleTimingPid_periodMs_offset 3458 #define idleTimingPid_pFactor_offset 3444 #define idleTimingPidDeadZone_offset 3464 -#define idleVe_offset 5604 -#define idleVeBins_offset 5596 +#define idleVeLoadBins_offset 5600 +#define idleVeRpmBins_offset 5596 +#define idleVeTable_offset 5604 #define IGN_LOAD_COUNT 16 #define IGN_RPM_COUNT 16 #define ignition_mode_e_auto_enum "IM_ONE_COIL", "IM_INDIVIDUAL_COILS", "IM_WASTED_SPARK", "IM_TWO_COILS" @@ -1893,7 +1894,7 @@ #define show_test_presets true #define showHumanReadableWarning_offset 896 #define showSdCardWarning_offset 164 -#define SIGNATURE_HASH 1213141080 +#define SIGNATURE_HASH 1830190508 #define silentTriggerError_offset 1260 #define slowAdcAlpha_offset 1712 #define sparkDwellRpmBins_offset 54 @@ -2418,7 +2419,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2022.01.20.hellen_cypress.1213141080" +#define TS_SIGNATURE "rusEFI 2022.01.20.hellen_cypress.1830190508" #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 047c6fd385..c247a44557 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 (unknown script) integration/rusefi_config.txt Wed Jan 19 12:38:03 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) integration/rusefi_config.txt Thu Jan 20 19:12:54 UTC 2022 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -4139,17 +4139,20 @@ struct persistent_config_s { */ float idleAdvance[IDLE_ADVANCE_CURVE_SIZE]; /** - * Optional VE table for Idle (see useSeparateVEForIdle) RPM * offset 5568 */ - scaled_channel idleVeBins[IDLE_VE_CURVE_SIZE]; + scaled_channel idleVeRpmBins[IDLE_VE_SIZE]; + /** + load + * offset 5572 + */ + scaled_channel idleVeLoadBins[IDLE_VE_SIZE]; /** - * Optional VE table for Idle (see useSeparateVEForIdle) % * offset 5576 */ - float idleVe[IDLE_VE_CURVE_SIZE]; + scaled_channel idleVeTable[IDLE_VE_SIZE][IDLE_VE_SIZE]; /** * offset 5608 */ @@ -4454,4 +4457,4 @@ struct persistent_config_s { }; // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 19 12:38:03 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) integration/rusefi_config.txt Thu Jan 20 19:12:54 UTC 2022 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 cf59131261..7a8482a740 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -937,7 +937,7 @@ #define firingOrder_offset 424 #define fixedModeTiming_offset 464 #define fixedTiming_offset 1824 -#define FLASH_DATA_VERSION 10007 +#define FLASH_DATA_VERSION 10008 #define flexSensorPin_offset 806 #define FSIO_METHOD_FSIO_ANALOG_INPUT "fsio_analog_input" #define FSIO_METHOD_FSIO_DIGITAL_INPUT "fsio_digital_input" @@ -1300,7 +1300,7 @@ #define idle_state_e_TPS_THRESHOLD 1 #define idle_stepperDirectionPin_offset 613 #define idle_stepperStepPin_offset 614 -#define IDLE_VE_CURVE_SIZE 8 +#define IDLE_VE_SIZE 4 #define idleAdvance_offset 5536 #define idleAdvanceBins_offset 5528 #define idleIncrementalPidCic_offset 748 @@ -1341,8 +1341,9 @@ #define idleTimingPid_periodMs_offset 3430 #define idleTimingPid_pFactor_offset 3416 #define idleTimingPidDeadZone_offset 3436 -#define idleVe_offset 5576 -#define idleVeBins_offset 5568 +#define idleVeLoadBins_offset 5572 +#define idleVeRpmBins_offset 5568 +#define idleVeTable_offset 5576 #define IGN_LOAD_COUNT 16 #define IGN_RPM_COUNT 16 #define ignition_mode_e_auto_enum "IM_ONE_COIL", "IM_INDIVIDUAL_COILS", "IM_WASTED_SPARK", "IM_TWO_COILS" @@ -1878,7 +1879,7 @@ #define show_test_presets true #define showHumanReadableWarning_offset 896 #define showSdCardWarning_offset 164 -#define SIGNATURE_HASH 3085622436 +#define SIGNATURE_HASH 2461249872 #define silentTriggerError_offset 1260 #define slowAdcAlpha_offset 1712 #define sparkDwellRpmBins_offset 54 @@ -2403,7 +2404,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator true #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2022.01.20.kin.3085622436" +#define TS_SIGNATURE "rusEFI 2022.01.20.kin.2461249872" #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 caa5b6cf27..46ebb5ed8d 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 (unknown script) integration/rusefi_config.txt Wed Jan 19 12:38:06 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) integration/rusefi_config.txt Thu Jan 20 19:12:57 UTC 2022 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -4145,17 +4145,20 @@ struct persistent_config_s { */ float idleAdvance[IDLE_ADVANCE_CURVE_SIZE]; /** - * Optional VE table for Idle (see useSeparateVEForIdle) RPM * offset 5596 */ - scaled_channel idleVeBins[IDLE_VE_CURVE_SIZE]; + scaled_channel idleVeRpmBins[IDLE_VE_SIZE]; + /** + load + * offset 5600 + */ + scaled_channel idleVeLoadBins[IDLE_VE_SIZE]; /** - * Optional VE table for Idle (see useSeparateVEForIdle) % * offset 5604 */ - float idleVe[IDLE_VE_CURVE_SIZE]; + scaled_channel idleVeTable[IDLE_VE_SIZE][IDLE_VE_SIZE]; /** * offset 5636 */ @@ -4460,4 +4463,4 @@ struct persistent_config_s { }; // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 19 12:38:06 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) integration/rusefi_config.txt Thu Jan 20 19:12:57 UTC 2022 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 dda36c4a19..4e608a28f9 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 @@ -964,7 +964,7 @@ #define firingOrder_offset 424 #define fixedModeTiming_offset 464 #define fixedTiming_offset 1824 -#define FLASH_DATA_VERSION 10007 +#define FLASH_DATA_VERSION 10008 #define flexSensorPin_offset 806 #define FSIO_METHOD_FSIO_ANALOG_INPUT "fsio_analog_input" #define FSIO_METHOD_FSIO_DIGITAL_INPUT "fsio_digital_input" @@ -1327,7 +1327,7 @@ #define idle_state_e_TPS_THRESHOLD 1 #define idle_stepperDirectionPin_offset 613 #define idle_stepperStepPin_offset 614 -#define IDLE_VE_CURVE_SIZE 8 +#define IDLE_VE_SIZE 4 #define idleAdvance_offset 5564 #define idleAdvanceBins_offset 5556 #define idleIncrementalPidCic_offset 748 @@ -1368,8 +1368,9 @@ #define idleTimingPid_periodMs_offset 3458 #define idleTimingPid_pFactor_offset 3444 #define idleTimingPidDeadZone_offset 3464 -#define idleVe_offset 5604 -#define idleVeBins_offset 5596 +#define idleVeLoadBins_offset 5600 +#define idleVeRpmBins_offset 5596 +#define idleVeTable_offset 5604 #define IGN_LOAD_COUNT 16 #define IGN_RPM_COUNT 16 #define ignition_mode_e_auto_enum "IM_ONE_COIL", "IM_INDIVIDUAL_COILS", "IM_WASTED_SPARK", "IM_TWO_COILS" @@ -1906,7 +1907,7 @@ #define show_test_presets false #define showHumanReadableWarning_offset 896 #define showSdCardWarning_offset 164 -#define SIGNATURE_HASH 2969625012 +#define SIGNATURE_HASH 2488896576 #define silentTriggerError_offset 1260 #define slowAdcAlpha_offset 1712 #define sparkDwellRpmBins_offset 54 @@ -2431,7 +2432,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port false -#define TS_SIGNATURE "rusEFI 2022.01.20.subaru_eg33_f7.2969625012" +#define TS_SIGNATURE "rusEFI 2022.01.20.subaru_eg33_f7.2488896576" #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 7c5817439e..779d5e6253 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 (unknown script) integration/rusefi_config.txt Wed Jan 19 12:38:08 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) integration/rusefi_config.txt Thu Jan 20 19:13:00 UTC 2022 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -4145,17 +4145,20 @@ struct persistent_config_s { */ float idleAdvance[IDLE_ADVANCE_CURVE_SIZE]; /** - * Optional VE table for Idle (see useSeparateVEForIdle) RPM * offset 5596 */ - scaled_channel idleVeBins[IDLE_VE_CURVE_SIZE]; + scaled_channel idleVeRpmBins[IDLE_VE_SIZE]; + /** + load + * offset 5600 + */ + scaled_channel idleVeLoadBins[IDLE_VE_SIZE]; /** - * Optional VE table for Idle (see useSeparateVEForIdle) % * offset 5604 */ - float idleVe[IDLE_VE_CURVE_SIZE]; + scaled_channel idleVeTable[IDLE_VE_SIZE][IDLE_VE_SIZE]; /** * offset 5636 */ @@ -4460,4 +4463,4 @@ struct persistent_config_s { }; // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 19 12:38:08 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) integration/rusefi_config.txt Thu Jan 20 19:13:00 UTC 2022 diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h index 44741bcf8b..ac5b094c15 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -952,7 +952,7 @@ #define firingOrder_offset 424 #define fixedModeTiming_offset 464 #define fixedTiming_offset 1824 -#define FLASH_DATA_VERSION 10007 +#define FLASH_DATA_VERSION 10008 #define flexSensorPin_offset 806 #define FSIO_METHOD_FSIO_ANALOG_INPUT "fsio_analog_input" #define FSIO_METHOD_FSIO_DIGITAL_INPUT "fsio_digital_input" @@ -1315,7 +1315,7 @@ #define idle_state_e_TPS_THRESHOLD 1 #define idle_stepperDirectionPin_offset 613 #define idle_stepperStepPin_offset 614 -#define IDLE_VE_CURVE_SIZE 8 +#define IDLE_VE_SIZE 4 #define idleAdvance_offset 5564 #define idleAdvanceBins_offset 5556 #define idleIncrementalPidCic_offset 748 @@ -1356,8 +1356,9 @@ #define idleTimingPid_periodMs_offset 3458 #define idleTimingPid_pFactor_offset 3444 #define idleTimingPidDeadZone_offset 3464 -#define idleVe_offset 5604 -#define idleVeBins_offset 5596 +#define idleVeLoadBins_offset 5600 +#define idleVeRpmBins_offset 5596 +#define idleVeTable_offset 5604 #define IGN_LOAD_COUNT 16 #define IGN_RPM_COUNT 16 #define ignition_mode_e_auto_enum "IM_ONE_COIL", "IM_INDIVIDUAL_COILS", "IM_WASTED_SPARK", "IM_TWO_COILS" @@ -1893,7 +1894,7 @@ #define show_test_presets true #define showHumanReadableWarning_offset 896 #define showSdCardWarning_offset 164 -#define SIGNATURE_HASH 1924855780 +#define SIGNATURE_HASH 1474533904 #define silentTriggerError_offset 1260 #define slowAdcAlpha_offset 1712 #define sparkDwellRpmBins_offset 54 @@ -2418,7 +2419,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2022.01.20.all.1924855780" +#define TS_SIGNATURE "rusEFI 2022.01.20.all.1474533904" #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 2c9ed9464e..d5e7059530 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 null // -#define SIGNATURE_HASH 1924855780 -#define TS_SIGNATURE "rusEFI 2022.01.20.all.1924855780" +#define SIGNATURE_HASH 1474533904 +#define TS_SIGNATURE "rusEFI 2022.01.20.all.1474533904" diff --git a/firmware/controllers/generated/signature_alphax-2chan.h b/firmware/controllers/generated/signature_alphax-2chan.h index bc7b542ae5..7b0ebe5e4d 100644 --- a/firmware/controllers/generated/signature_alphax-2chan.h +++ b/firmware/controllers/generated/signature_alphax-2chan.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 1943903275 -#define TS_SIGNATURE "rusEFI 2022.01.20.alphax-2chan.1943903275" +#define SIGNATURE_HASH 1451553247 +#define TS_SIGNATURE "rusEFI 2022.01.20.alphax-2chan.1451553247" diff --git a/firmware/controllers/generated/signature_alphax-4chan.h b/firmware/controllers/generated/signature_alphax-4chan.h index 4d2bdefe15..22c2a2e9b5 100644 --- a/firmware/controllers/generated/signature_alphax-4chan.h +++ b/firmware/controllers/generated/signature_alphax-4chan.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3697311743 -#define TS_SIGNATURE "rusEFI 2022.01.20.alphax-4chan.3697311743" +#define SIGNATURE_HASH 4181266955 +#define TS_SIGNATURE "rusEFI 2022.01.20.alphax-4chan.4181266955" diff --git a/firmware/controllers/generated/signature_atlas.h b/firmware/controllers/generated/signature_atlas.h index 72b1b5b2c3..7254ee87f4 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 null // -#define SIGNATURE_HASH 1852834499 -#define TS_SIGNATURE "rusEFI 2022.01.20.atlas.1852834499" +#define SIGNATURE_HASH 1261006647 +#define TS_SIGNATURE "rusEFI 2022.01.20.atlas.1261006647" diff --git a/firmware/controllers/generated/signature_f429-discovery.h b/firmware/controllers/generated/signature_f429-discovery.h index df1f8c35ec..613fc20c88 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 null // -#define SIGNATURE_HASH 1924855780 -#define TS_SIGNATURE "rusEFI 2022.01.20.f429-discovery.1924855780" +#define SIGNATURE_HASH 1474533904 +#define TS_SIGNATURE "rusEFI 2022.01.20.f429-discovery.1474533904" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index 183fa44a38..d6b76c60e8 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 null // -#define SIGNATURE_HASH 143172109 -#define TS_SIGNATURE "rusEFI 2022.01.20.frankenso_na6.143172109" +#define SIGNATURE_HASH 768724985 +#define TS_SIGNATURE "rusEFI 2022.01.20.frankenso_na6.768724985" diff --git a/firmware/controllers/generated/signature_hellen-nb1.h b/firmware/controllers/generated/signature_hellen-nb1.h index a9b1cf78e2..21af0e0e8a 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 null // -#define SIGNATURE_HASH 2389903677 -#define TS_SIGNATURE "rusEFI 2022.01.20.hellen-nb1.2389903677" +#define SIGNATURE_HASH 2871682249 +#define TS_SIGNATURE "rusEFI 2022.01.20.hellen-nb1.2871682249" diff --git a/firmware/controllers/generated/signature_hellen121nissan.h b/firmware/controllers/generated/signature_hellen121nissan.h index 7a72387a6b..912f64dafa 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 null // -#define SIGNATURE_HASH 3591087255 -#define TS_SIGNATURE "rusEFI 2022.01.20.hellen121nissan.3591087255" +#define SIGNATURE_HASH 4082288995 +#define TS_SIGNATURE "rusEFI 2022.01.20.hellen121nissan.4082288995" diff --git a/firmware/controllers/generated/signature_hellen121vag.h b/firmware/controllers/generated/signature_hellen121vag.h index f6f2b1a3cc..20a7770f90 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 null // -#define SIGNATURE_HASH 756667374 -#define TS_SIGNATURE "rusEFI 2022.01.20.hellen121vag.756667374" +#define SIGNATURE_HASH 138460698 +#define TS_SIGNATURE "rusEFI 2022.01.20.hellen121vag.138460698" diff --git a/firmware/controllers/generated/signature_hellen128.h b/firmware/controllers/generated/signature_hellen128.h index 71cbb95938..da00d0fd23 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 null // -#define SIGNATURE_HASH 1615977294 -#define TS_SIGNATURE "rusEFI 2022.01.20.hellen128.1615977294" +#define SIGNATURE_HASH 1158198970 +#define TS_SIGNATURE "rusEFI 2022.01.20.hellen128.1158198970" diff --git a/firmware/controllers/generated/signature_hellen154hyundai.h b/firmware/controllers/generated/signature_hellen154hyundai.h index 8b88cecb15..0acfe2392b 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 null // -#define SIGNATURE_HASH 3198610248 -#define TS_SIGNATURE "rusEFI 2022.01.20.hellen154hyundai.3198610248" +#define SIGNATURE_HASH 2617214652 +#define TS_SIGNATURE "rusEFI 2022.01.20.hellen154hyundai.2617214652" diff --git a/firmware/controllers/generated/signature_hellen72.h b/firmware/controllers/generated/signature_hellen72.h index 9137bc3ba2..57a5d51c88 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 null // -#define SIGNATURE_HASH 2248634452 -#define TS_SIGNATURE "rusEFI 2022.01.20.hellen72.2248634452" +#define SIGNATURE_HASH 2740854176 +#define TS_SIGNATURE "rusEFI 2022.01.20.hellen72.2740854176" diff --git a/firmware/controllers/generated/signature_hellen81.h b/firmware/controllers/generated/signature_hellen81.h index 4e29ed8045..8a2339032a 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 null // -#define SIGNATURE_HASH 839576999 -#define TS_SIGNATURE "rusEFI 2022.01.20.hellen81.839576999" +#define SIGNATURE_HASH 391348307 +#define TS_SIGNATURE "rusEFI 2022.01.20.hellen81.391348307" diff --git a/firmware/controllers/generated/signature_hellen88bmw.h b/firmware/controllers/generated/signature_hellen88bmw.h index 367c734d1a..8e165ae497 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 null // -#define SIGNATURE_HASH 3548014267 -#define TS_SIGNATURE "rusEFI 2022.01.20.hellen88bmw.3548014267" +#define SIGNATURE_HASH 4129491791 +#define TS_SIGNATURE "rusEFI 2022.01.20.hellen88bmw.4129491791" diff --git a/firmware/controllers/generated/signature_hellenNA6.h b/firmware/controllers/generated/signature_hellenNA6.h index f7f084e705..dafbdb1650 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 null // -#define SIGNATURE_HASH 76001612 -#define TS_SIGNATURE "rusEFI 2022.01.20.hellenNA6.76001612" +#define SIGNATURE_HASH 568253624 +#define TS_SIGNATURE "rusEFI 2022.01.20.hellenNA6.568253624" diff --git a/firmware/controllers/generated/signature_hellenNA8_96.h b/firmware/controllers/generated/signature_hellenNA8_96.h index c0ebd3e2ad..dc98854fb8 100644 --- a/firmware/controllers/generated/signature_hellenNA8_96.h +++ b/firmware/controllers/generated/signature_hellenNA8_96.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 1500939839 -#define TS_SIGNATURE "rusEFI 2022.01.20.hellenNA8_96.1500939839" +#define SIGNATURE_HASH 2083515339 +#define TS_SIGNATURE "rusEFI 2022.01.20.hellenNA8_96.2083515339" diff --git a/firmware/controllers/generated/signature_hellen_cypress.h b/firmware/controllers/generated/signature_hellen_cypress.h index a0fc72eee7..19eb501c79 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 null // -#define SIGNATURE_HASH 1213141080 -#define TS_SIGNATURE "rusEFI 2022.01.20.hellen_cypress.1213141080" +#define SIGNATURE_HASH 1830190508 +#define TS_SIGNATURE "rusEFI 2022.01.20.hellen_cypress.1830190508" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index 45897e5c12..6d7e04e7f5 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 null // -#define SIGNATURE_HASH 3085622436 -#define TS_SIGNATURE "rusEFI 2022.01.20.kin.3085622436" +#define SIGNATURE_HASH 2461249872 +#define TS_SIGNATURE "rusEFI 2022.01.20.kin.2461249872" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index dc0e5c68bc..1ac88c997d 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 null // -#define SIGNATURE_HASH 2004987424 -#define TS_SIGNATURE "rusEFI 2022.01.20.mre_f4.2004987424" +#define SIGNATURE_HASH 1389937620 +#define TS_SIGNATURE "rusEFI 2022.01.20.mre_f4.1389937620" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index d7ab36202d..a7ad400459 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 null // -#define SIGNATURE_HASH 2004987424 -#define TS_SIGNATURE "rusEFI 2022.01.20.mre_f7.2004987424" +#define SIGNATURE_HASH 1389937620 +#define TS_SIGNATURE "rusEFI 2022.01.20.mre_f7.1389937620" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index 9a2fe71155..d6b280b57f 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 null // -#define SIGNATURE_HASH 575680002 -#define TS_SIGNATURE "rusEFI 2022.01.20.prometheus_405.575680002" +#define SIGNATURE_HASH 118047734 +#define TS_SIGNATURE "rusEFI 2022.01.20.prometheus_405.118047734" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index 4cd0166930..b2f1ff314a 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 null // -#define SIGNATURE_HASH 575680002 -#define TS_SIGNATURE "rusEFI 2022.01.20.prometheus_469.575680002" +#define SIGNATURE_HASH 118047734 +#define TS_SIGNATURE "rusEFI 2022.01.20.prometheus_469.118047734" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index c693f6a419..440e050f1f 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 null // -#define SIGNATURE_HASH 2801285655 -#define TS_SIGNATURE "rusEFI 2022.01.20.proteus_f4.2801285655" +#define SIGNATURE_HASH 2208389091 +#define TS_SIGNATURE "rusEFI 2022.01.20.proteus_f4.2208389091" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index 3c5313cf83..abeeb5477b 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 null // -#define SIGNATURE_HASH 2801285655 -#define TS_SIGNATURE "rusEFI 2022.01.20.proteus_f7.2801285655" +#define SIGNATURE_HASH 2208389091 +#define TS_SIGNATURE "rusEFI 2022.01.20.proteus_f7.2208389091" diff --git a/firmware/controllers/generated/signature_subaru_eg33_f7.h b/firmware/controllers/generated/signature_subaru_eg33_f7.h index ccd2fa578a..fd4fceaf34 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 null // -#define SIGNATURE_HASH 2969625012 -#define TS_SIGNATURE "rusEFI 2022.01.20.subaru_eg33_f7.2969625012" +#define SIGNATURE_HASH 2488896576 +#define TS_SIGNATURE "rusEFI 2022.01.20.subaru_eg33_f7.2488896576" diff --git a/firmware/tunerstudio/generated/rusefi.ini b/firmware/tunerstudio/generated/rusefi.ini index b5cc2b1d79..a93aad227f 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 2022.01.20.all.1924855780" + signature = "rusEFI 2022.01.20.all.1474533904" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.01.20.all.1924855780" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.01.20.all.1474533904" ; 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 (unknown script) integration/rusefi_config.txt Thu Jan 20 02:12:27 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) integration/rusefi_config.txt Thu Jan 20 19:12:53 UTC 2022 pageSize = 20996 page = 1 @@ -1279,8 +1279,9 @@ cltCrankingCorrBins = array, F32, 5492, [8], "C", 1, 0, -100, 250, 2 cltCrankingCorr = array, F32, 5524, [8], "%", 1, 0, 0, 500, 2 idleAdvanceBins = array, U08, 5556, [8], "RPM", 50.0, 0, 0, 18000, 0 idleAdvance = array, F32, 5564, [8], "deg", 1, 0, -20, 90, 1 -idleVeBins = array, U08, 5596, [8], "RPM", 50.0, 0, 0, 18000, 0 -idleVe = array, F32, 5604, [8], "%", 1, 0, 0, 999, 1 +idleVeRpmBins = array, U08, 5596, [4], "RPM", 10.0, 0, 0, 2500, 0 +idleVeLoadBins = array, U08, 5600, [4], "load", 1, 0, 0, 100, 0 +idleVeTable = array, U16, 5604, [4x4], "%", 0.1, 0, 0, 999, 1 luaScript = string, ASCII, 5636, 8000 cltFuelCorrBins = array, F32, 13636, [16], "C", 1, 0, -100, 250, 2 cltFuelCorr = array, F32, 13700, [16], "ratio", 1, 0, 0, 5, 2 @@ -1818,8 +1819,6 @@ fuelTrims12_table = array, S08, 20980, [4x4], "", 0.2, 0, -25, 25, 1 cltCrankingCorr = "CLT-based cranking position multiplier for simple manual idle controller" idleAdvanceBins = "Optional timing advance table for Idle (see useSeparateAdvanceForIdle)" idleAdvance = "Optional timing advance table for Idle (see useSeparateAdvanceForIdle)" - idleVeBins = "Optional VE table for Idle (see useSeparateVEForIdle)" - idleVe = "Optional VE table for Idle (see useSeparateVEForIdle)" cltIdleCorrBins = "CLT-based idle position multiplier for simple manual idle controller" cltIdleCorr = "CLT-based idle position multiplier for simple manual idle controller" mafDecoding = "Also known as MAF transfer function.\nkg/hour value.\nBy the way 2.081989116 kg/h = 1 ft3/m" @@ -2701,18 +2700,6 @@ etbStatus_resetCounter = scalar, S32, 636, "", 1, 0 yBins = idleAdvance gauge = RPMGauge - curve = idleVeCurve, "Idle VE" - columnLabel = "RPM", "%" - xAxis = 0, 2400, 13 - yAxis = 0, 250, 11 - xBins = idleVeBins, RPMValue - yBins = idleVe -#if LAMBDA - gauge = lambda1Gauge -#else - gauge = afr1Gauge -#endif - curve = crankingAdvanceCurve, "Cranking Advance Angle" columnLabel = "RPM", "degrees" xAxis = 0, 1200, 13 @@ -2850,6 +2837,13 @@ etbStatus_resetCounter = scalar, S32, 636, "", 1, 0 gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. upDownLabel = "(RICHER)", "(LEANER)" + table = idleVeTableTbl, idleVeTable, "Idle VE" + xBins = idleVeRpmBins, RPMValue + yBins = idleVeLoadBins, veTableYAxis + zBins = idleVeTable + gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. + upDownLabel = "(RICHER)", "(LEANER)" + table = fuelTrimTbl1, fuelTrimMap1, "Fuel trim cyl 1", 1 xBins = fuelTrimRpmBins, RPMValue yBins = fuelTrimLoadBins, veTableYAxis @@ -3817,7 +3811,7 @@ menuDialog = main subMenu = iacPidMultTbl, "IAC PID Multiplier", 0, {idleMode == 0 && useIacPidMultTable == 1} subMenu = iacCoastingCurve, "Coasting IAC Position for Auto-Idle", 0, {useIacTableForCoasting == 1} subMenu = std_separator - subMenu = idleVeCurve, "VE", 0, {useSeparateVeForIdle == 1} + subMenu = idleVeTableTbl, "Idle VE", 0, {useSeparateVeForIdle == 1} subMenu = idleAdvanceCurve, "Ignition advance", 0, {useSeparateAdvanceForIdle == 1} menu = "&Advanced" diff --git a/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini index 5073fc9095..b96f985dfe 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.01.20.alphax-2chan.1943903275" + signature = "rusEFI 2022.01.20.alphax-2chan.1451553247" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.01.20.alphax-2chan.1943903275" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.01.20.alphax-2chan.1451553247" ; 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 (unknown script) integration/rusefi_config.txt Thu Jan 20 02:11:49 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) integration/rusefi_config.txt Thu Jan 20 19:12:15 UTC 2022 pageSize = 20996 page = 1 @@ -1279,8 +1279,9 @@ cltCrankingCorrBins = array, F32, 5492, [8], "C", 1, 0, -100, 250, 2 cltCrankingCorr = array, F32, 5524, [8], "%", 1, 0, 0, 500, 2 idleAdvanceBins = array, U08, 5556, [8], "RPM", 50.0, 0, 0, 18000, 0 idleAdvance = array, F32, 5564, [8], "deg", 1, 0, -20, 90, 1 -idleVeBins = array, U08, 5596, [8], "RPM", 50.0, 0, 0, 18000, 0 -idleVe = array, F32, 5604, [8], "%", 1, 0, 0, 999, 1 +idleVeRpmBins = array, U08, 5596, [4], "RPM", 10.0, 0, 0, 2500, 0 +idleVeLoadBins = array, U08, 5600, [4], "load", 1, 0, 0, 100, 0 +idleVeTable = array, U16, 5604, [4x4], "%", 0.1, 0, 0, 999, 1 luaScript = string, ASCII, 5636, 8000 cltFuelCorrBins = array, F32, 13636, [16], "C", 1, 0, -100, 250, 2 cltFuelCorr = array, F32, 13700, [16], "ratio", 1, 0, 0, 5, 2 @@ -1818,8 +1819,6 @@ fuelTrims12_table = array, S08, 20980, [4x4], "", 0.2, 0, -25, 25, 1 cltCrankingCorr = "CLT-based cranking position multiplier for simple manual idle controller" idleAdvanceBins = "Optional timing advance table for Idle (see useSeparateAdvanceForIdle)" idleAdvance = "Optional timing advance table for Idle (see useSeparateAdvanceForIdle)" - idleVeBins = "Optional VE table for Idle (see useSeparateVEForIdle)" - idleVe = "Optional VE table for Idle (see useSeparateVEForIdle)" cltIdleCorrBins = "CLT-based idle position multiplier for simple manual idle controller" cltIdleCorr = "CLT-based idle position multiplier for simple manual idle controller" mafDecoding = "Also known as MAF transfer function.\nkg/hour value.\nBy the way 2.081989116 kg/h = 1 ft3/m" @@ -2701,18 +2700,6 @@ etbStatus_resetCounter = scalar, S32, 636, "", 1, 0 yBins = idleAdvance gauge = RPMGauge - curve = idleVeCurve, "Idle VE" - columnLabel = "RPM", "%" - xAxis = 0, 2400, 13 - yAxis = 0, 250, 11 - xBins = idleVeBins, RPMValue - yBins = idleVe -#if LAMBDA - gauge = lambda1Gauge -#else - gauge = afr1Gauge -#endif - curve = crankingAdvanceCurve, "Cranking Advance Angle" columnLabel = "RPM", "degrees" xAxis = 0, 1200, 13 @@ -2850,6 +2837,13 @@ etbStatus_resetCounter = scalar, S32, 636, "", 1, 0 gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. upDownLabel = "(RICHER)", "(LEANER)" + table = idleVeTableTbl, idleVeTable, "Idle VE" + xBins = idleVeRpmBins, RPMValue + yBins = idleVeLoadBins, veTableYAxis + zBins = idleVeTable + gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. + upDownLabel = "(RICHER)", "(LEANER)" + table = fuelTrimTbl1, fuelTrimMap1, "Fuel trim cyl 1", 1 xBins = fuelTrimRpmBins, RPMValue yBins = fuelTrimLoadBins, veTableYAxis @@ -3817,7 +3811,7 @@ menuDialog = main subMenu = iacPidMultTbl, "IAC PID Multiplier", 0, {idleMode == 0 && useIacPidMultTable == 1} subMenu = iacCoastingCurve, "Coasting IAC Position for Auto-Idle", 0, {useIacTableForCoasting == 1} subMenu = std_separator - subMenu = idleVeCurve, "VE", 0, {useSeparateVeForIdle == 1} + subMenu = idleVeTableTbl, "Idle VE", 0, {useSeparateVeForIdle == 1} subMenu = idleAdvanceCurve, "Ignition advance", 0, {useSeparateAdvanceForIdle == 1} menu = "&Advanced" diff --git a/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini index 349fb4d9ca..2d19f0f586 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.01.20.alphax-4chan.3697311743" + signature = "rusEFI 2022.01.20.alphax-4chan.4181266955" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.01.20.alphax-4chan.3697311743" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.01.20.alphax-4chan.4181266955" ; 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 (unknown script) integration/rusefi_config.txt Thu Jan 20 02:11:51 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) integration/rusefi_config.txt Thu Jan 20 19:12:17 UTC 2022 pageSize = 20996 page = 1 @@ -1279,8 +1279,9 @@ cltCrankingCorrBins = array, F32, 5492, [8], "C", 1, 0, -100, 250, 2 cltCrankingCorr = array, F32, 5524, [8], "%", 1, 0, 0, 500, 2 idleAdvanceBins = array, U08, 5556, [8], "RPM", 50.0, 0, 0, 18000, 0 idleAdvance = array, F32, 5564, [8], "deg", 1, 0, -20, 90, 1 -idleVeBins = array, U08, 5596, [8], "RPM", 50.0, 0, 0, 18000, 0 -idleVe = array, F32, 5604, [8], "%", 1, 0, 0, 999, 1 +idleVeRpmBins = array, U08, 5596, [4], "RPM", 10.0, 0, 0, 2500, 0 +idleVeLoadBins = array, U08, 5600, [4], "load", 1, 0, 0, 100, 0 +idleVeTable = array, U16, 5604, [4x4], "%", 0.1, 0, 0, 999, 1 luaScript = string, ASCII, 5636, 8000 cltFuelCorrBins = array, F32, 13636, [16], "C", 1, 0, -100, 250, 2 cltFuelCorr = array, F32, 13700, [16], "ratio", 1, 0, 0, 5, 2 @@ -1818,8 +1819,6 @@ fuelTrims12_table = array, S08, 20980, [4x4], "", 0.2, 0, -25, 25, 1 cltCrankingCorr = "CLT-based cranking position multiplier for simple manual idle controller" idleAdvanceBins = "Optional timing advance table for Idle (see useSeparateAdvanceForIdle)" idleAdvance = "Optional timing advance table for Idle (see useSeparateAdvanceForIdle)" - idleVeBins = "Optional VE table for Idle (see useSeparateVEForIdle)" - idleVe = "Optional VE table for Idle (see useSeparateVEForIdle)" cltIdleCorrBins = "CLT-based idle position multiplier for simple manual idle controller" cltIdleCorr = "CLT-based idle position multiplier for simple manual idle controller" mafDecoding = "Also known as MAF transfer function.\nkg/hour value.\nBy the way 2.081989116 kg/h = 1 ft3/m" @@ -2701,18 +2700,6 @@ etbStatus_resetCounter = scalar, S32, 636, "", 1, 0 yBins = idleAdvance gauge = RPMGauge - curve = idleVeCurve, "Idle VE" - columnLabel = "RPM", "%" - xAxis = 0, 2400, 13 - yAxis = 0, 250, 11 - xBins = idleVeBins, RPMValue - yBins = idleVe -#if LAMBDA - gauge = lambda1Gauge -#else - gauge = afr1Gauge -#endif - curve = crankingAdvanceCurve, "Cranking Advance Angle" columnLabel = "RPM", "degrees" xAxis = 0, 1200, 13 @@ -2850,6 +2837,13 @@ etbStatus_resetCounter = scalar, S32, 636, "", 1, 0 gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. upDownLabel = "(RICHER)", "(LEANER)" + table = idleVeTableTbl, idleVeTable, "Idle VE" + xBins = idleVeRpmBins, RPMValue + yBins = idleVeLoadBins, veTableYAxis + zBins = idleVeTable + gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. + upDownLabel = "(RICHER)", "(LEANER)" + table = fuelTrimTbl1, fuelTrimMap1, "Fuel trim cyl 1", 1 xBins = fuelTrimRpmBins, RPMValue yBins = fuelTrimLoadBins, veTableYAxis @@ -3817,7 +3811,7 @@ menuDialog = main subMenu = iacPidMultTbl, "IAC PID Multiplier", 0, {idleMode == 0 && useIacPidMultTable == 1} subMenu = iacCoastingCurve, "Coasting IAC Position for Auto-Idle", 0, {useIacTableForCoasting == 1} subMenu = std_separator - subMenu = idleVeCurve, "VE", 0, {useSeparateVeForIdle == 1} + subMenu = idleVeTableTbl, "Idle VE", 0, {useSeparateVeForIdle == 1} subMenu = idleAdvanceCurve, "Ignition advance", 0, {useSeparateAdvanceForIdle == 1} menu = "&Advanced" diff --git a/firmware/tunerstudio/generated/rusefi_atlas.ini b/firmware/tunerstudio/generated/rusefi_atlas.ini index e7480c2535..99f253b007 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 2022.01.20.atlas.1852834499" + signature = "rusEFI 2022.01.20.atlas.1261006647" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.01.20.atlas.1852834499" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.01.20.atlas.1261006647" ; 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 (unknown script) integration/rusefi_config.txt Thu Jan 20 02:12:25 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) integration/rusefi_config.txt Thu Jan 20 19:12:51 UTC 2022 pageSize = 20996 page = 1 @@ -1279,8 +1279,9 @@ cltCrankingCorrBins = array, F32, 5492, [8], "C", 1, 0, -100, 250, 2 cltCrankingCorr = array, F32, 5524, [8], "%", 1, 0, 0, 500, 2 idleAdvanceBins = array, U08, 5556, [8], "RPM", 50.0, 0, 0, 18000, 0 idleAdvance = array, F32, 5564, [8], "deg", 1, 0, -20, 90, 1 -idleVeBins = array, U08, 5596, [8], "RPM", 50.0, 0, 0, 18000, 0 -idleVe = array, F32, 5604, [8], "%", 1, 0, 0, 999, 1 +idleVeRpmBins = array, U08, 5596, [4], "RPM", 10.0, 0, 0, 2500, 0 +idleVeLoadBins = array, U08, 5600, [4], "load", 1, 0, 0, 100, 0 +idleVeTable = array, U16, 5604, [4x4], "%", 0.1, 0, 0, 999, 1 luaScript = string, ASCII, 5636, 8000 cltFuelCorrBins = array, F32, 13636, [16], "C", 1, 0, -100, 250, 2 cltFuelCorr = array, F32, 13700, [16], "ratio", 1, 0, 0, 5, 2 @@ -1818,8 +1819,6 @@ fuelTrims12_table = array, S08, 20980, [4x4], "", 0.2, 0, -25, 25, 1 cltCrankingCorr = "CLT-based cranking position multiplier for simple manual idle controller" idleAdvanceBins = "Optional timing advance table for Idle (see useSeparateAdvanceForIdle)" idleAdvance = "Optional timing advance table for Idle (see useSeparateAdvanceForIdle)" - idleVeBins = "Optional VE table for Idle (see useSeparateVEForIdle)" - idleVe = "Optional VE table for Idle (see useSeparateVEForIdle)" cltIdleCorrBins = "CLT-based idle position multiplier for simple manual idle controller" cltIdleCorr = "CLT-based idle position multiplier for simple manual idle controller" mafDecoding = "Also known as MAF transfer function.\nkg/hour value.\nBy the way 2.081989116 kg/h = 1 ft3/m" @@ -2701,18 +2700,6 @@ etbStatus_resetCounter = scalar, S32, 636, "", 1, 0 yBins = idleAdvance gauge = RPMGauge - curve = idleVeCurve, "Idle VE" - columnLabel = "RPM", "%" - xAxis = 0, 2400, 13 - yAxis = 0, 250, 11 - xBins = idleVeBins, RPMValue - yBins = idleVe -#if LAMBDA - gauge = lambda1Gauge -#else - gauge = afr1Gauge -#endif - curve = crankingAdvanceCurve, "Cranking Advance Angle" columnLabel = "RPM", "degrees" xAxis = 0, 1200, 13 @@ -2850,6 +2837,13 @@ etbStatus_resetCounter = scalar, S32, 636, "", 1, 0 gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. upDownLabel = "(RICHER)", "(LEANER)" + table = idleVeTableTbl, idleVeTable, "Idle VE" + xBins = idleVeRpmBins, RPMValue + yBins = idleVeLoadBins, veTableYAxis + zBins = idleVeTable + gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. + upDownLabel = "(RICHER)", "(LEANER)" + table = fuelTrimTbl1, fuelTrimMap1, "Fuel trim cyl 1", 1 xBins = fuelTrimRpmBins, RPMValue yBins = fuelTrimLoadBins, veTableYAxis @@ -3817,7 +3811,7 @@ menuDialog = main subMenu = iacPidMultTbl, "IAC PID Multiplier", 0, {idleMode == 0 && useIacPidMultTable == 1} subMenu = iacCoastingCurve, "Coasting IAC Position for Auto-Idle", 0, {useIacTableForCoasting == 1} subMenu = std_separator - subMenu = idleVeCurve, "VE", 0, {useSeparateVeForIdle == 1} + subMenu = idleVeTableTbl, "Idle VE", 0, {useSeparateVeForIdle == 1} subMenu = idleAdvanceCurve, "Ignition advance", 0, {useSeparateAdvanceForIdle == 1} menu = "&Advanced" diff --git a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini index 85b104d0c8..48215f6991 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 2022.01.20.f429-discovery.1924855780" + signature = "rusEFI 2022.01.20.f429-discovery.1474533904" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.01.20.f429-discovery.1924855780" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.01.20.f429-discovery.1474533904" ; 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 (unknown script) integration/rusefi_config.txt Thu Jan 20 02:11:47 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) integration/rusefi_config.txt Thu Jan 20 19:12:14 UTC 2022 pageSize = 20996 page = 1 @@ -1279,8 +1279,9 @@ cltCrankingCorrBins = array, F32, 5492, [8], "C", 1, 0, -100, 250, 2 cltCrankingCorr = array, F32, 5524, [8], "%", 1, 0, 0, 500, 2 idleAdvanceBins = array, U08, 5556, [8], "RPM", 50.0, 0, 0, 18000, 0 idleAdvance = array, F32, 5564, [8], "deg", 1, 0, -20, 90, 1 -idleVeBins = array, U08, 5596, [8], "RPM", 50.0, 0, 0, 18000, 0 -idleVe = array, F32, 5604, [8], "%", 1, 0, 0, 999, 1 +idleVeRpmBins = array, U08, 5596, [4], "RPM", 10.0, 0, 0, 2500, 0 +idleVeLoadBins = array, U08, 5600, [4], "load", 1, 0, 0, 100, 0 +idleVeTable = array, U16, 5604, [4x4], "%", 0.1, 0, 0, 999, 1 luaScript = string, ASCII, 5636, 8000 cltFuelCorrBins = array, F32, 13636, [16], "C", 1, 0, -100, 250, 2 cltFuelCorr = array, F32, 13700, [16], "ratio", 1, 0, 0, 5, 2 @@ -1818,8 +1819,6 @@ fuelTrims12_table = array, S08, 20980, [4x4], "", 0.2, 0, -25, 25, 1 cltCrankingCorr = "CLT-based cranking position multiplier for simple manual idle controller" idleAdvanceBins = "Optional timing advance table for Idle (see useSeparateAdvanceForIdle)" idleAdvance = "Optional timing advance table for Idle (see useSeparateAdvanceForIdle)" - idleVeBins = "Optional VE table for Idle (see useSeparateVEForIdle)" - idleVe = "Optional VE table for Idle (see useSeparateVEForIdle)" cltIdleCorrBins = "CLT-based idle position multiplier for simple manual idle controller" cltIdleCorr = "CLT-based idle position multiplier for simple manual idle controller" mafDecoding = "Also known as MAF transfer function.\nkg/hour value.\nBy the way 2.081989116 kg/h = 1 ft3/m" @@ -2701,18 +2700,6 @@ etbStatus_resetCounter = scalar, S32, 636, "", 1, 0 yBins = idleAdvance gauge = RPMGauge - curve = idleVeCurve, "Idle VE" - columnLabel = "RPM", "%" - xAxis = 0, 2400, 13 - yAxis = 0, 250, 11 - xBins = idleVeBins, RPMValue - yBins = idleVe -#if LAMBDA - gauge = lambda1Gauge -#else - gauge = afr1Gauge -#endif - curve = crankingAdvanceCurve, "Cranking Advance Angle" columnLabel = "RPM", "degrees" xAxis = 0, 1200, 13 @@ -2850,6 +2837,13 @@ etbStatus_resetCounter = scalar, S32, 636, "", 1, 0 gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. upDownLabel = "(RICHER)", "(LEANER)" + table = idleVeTableTbl, idleVeTable, "Idle VE" + xBins = idleVeRpmBins, RPMValue + yBins = idleVeLoadBins, veTableYAxis + zBins = idleVeTable + gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. + upDownLabel = "(RICHER)", "(LEANER)" + table = fuelTrimTbl1, fuelTrimMap1, "Fuel trim cyl 1", 1 xBins = fuelTrimRpmBins, RPMValue yBins = fuelTrimLoadBins, veTableYAxis @@ -3817,7 +3811,7 @@ menuDialog = main subMenu = iacPidMultTbl, "IAC PID Multiplier", 0, {idleMode == 0 && useIacPidMultTable == 1} subMenu = iacCoastingCurve, "Coasting IAC Position for Auto-Idle", 0, {useIacTableForCoasting == 1} subMenu = std_separator - subMenu = idleVeCurve, "VE", 0, {useSeparateVeForIdle == 1} + subMenu = idleVeTableTbl, "Idle VE", 0, {useSeparateVeForIdle == 1} subMenu = idleAdvanceCurve, "Ignition advance", 0, {useSeparateAdvanceForIdle == 1} menu = "&Advanced" diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index 45225014b0..2df5922928 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 2022.01.20.frankenso_na6.143172109" + signature = "rusEFI 2022.01.20.frankenso_na6.768724985" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.01.20.frankenso_na6.143172109" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.01.20.frankenso_na6.768724985" ; 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 (unknown script) integration/rusefi_config.txt Thu Jan 20 02:12:16 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) integration/rusefi_config.txt Thu Jan 20 19:12:42 UTC 2022 pageSize = 20996 page = 1 @@ -1279,8 +1279,9 @@ cltCrankingCorrBins = array, F32, 5492, [8], "C", 1, 0, -100, 250, 2 cltCrankingCorr = array, F32, 5524, [8], "%", 1, 0, 0, 500, 2 idleAdvanceBins = array, U08, 5556, [8], "RPM", 50.0, 0, 0, 18000, 0 idleAdvance = array, F32, 5564, [8], "deg", 1, 0, -20, 90, 1 -idleVeBins = array, U08, 5596, [8], "RPM", 50.0, 0, 0, 18000, 0 -idleVe = array, F32, 5604, [8], "%", 1, 0, 0, 999, 1 +idleVeRpmBins = array, U08, 5596, [4], "RPM", 10.0, 0, 0, 2500, 0 +idleVeLoadBins = array, U08, 5600, [4], "load", 1, 0, 0, 100, 0 +idleVeTable = array, U16, 5604, [4x4], "%", 0.1, 0, 0, 999, 1 luaScript = string, ASCII, 5636, 8000 cltFuelCorrBins = array, F32, 13636, [16], "C", 1, 0, -100, 250, 2 cltFuelCorr = array, F32, 13700, [16], "ratio", 1, 0, 0, 5, 2 @@ -1818,8 +1819,6 @@ fuelTrims12_table = array, S08, 20980, [4x4], "", 0.2, 0, -25, 25, 1 cltCrankingCorr = "CLT-based cranking position multiplier for simple manual idle controller" idleAdvanceBins = "Optional timing advance table for Idle (see useSeparateAdvanceForIdle)" idleAdvance = "Optional timing advance table for Idle (see useSeparateAdvanceForIdle)" - idleVeBins = "Optional VE table for Idle (see useSeparateVEForIdle)" - idleVe = "Optional VE table for Idle (see useSeparateVEForIdle)" cltIdleCorrBins = "CLT-based idle position multiplier for simple manual idle controller" cltIdleCorr = "CLT-based idle position multiplier for simple manual idle controller" mafDecoding = "Also known as MAF transfer function.\nkg/hour value.\nBy the way 2.081989116 kg/h = 1 ft3/m" @@ -2701,18 +2700,6 @@ etbStatus_resetCounter = scalar, S32, 636, "", 1, 0 yBins = idleAdvance gauge = RPMGauge - curve = idleVeCurve, "Idle VE" - columnLabel = "RPM", "%" - xAxis = 0, 2400, 13 - yAxis = 0, 250, 11 - xBins = idleVeBins, RPMValue - yBins = idleVe -#if LAMBDA - gauge = lambda1Gauge -#else - gauge = afr1Gauge -#endif - curve = crankingAdvanceCurve, "Cranking Advance Angle" columnLabel = "RPM", "degrees" xAxis = 0, 1200, 13 @@ -2850,6 +2837,13 @@ etbStatus_resetCounter = scalar, S32, 636, "", 1, 0 gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. upDownLabel = "(RICHER)", "(LEANER)" + table = idleVeTableTbl, idleVeTable, "Idle VE" + xBins = idleVeRpmBins, RPMValue + yBins = idleVeLoadBins, veTableYAxis + zBins = idleVeTable + gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. + upDownLabel = "(RICHER)", "(LEANER)" + table = fuelTrimTbl1, fuelTrimMap1, "Fuel trim cyl 1", 1 xBins = fuelTrimRpmBins, RPMValue yBins = fuelTrimLoadBins, veTableYAxis @@ -3817,7 +3811,7 @@ menuDialog = main subMenu = iacPidMultTbl, "IAC PID Multiplier", 0, {idleMode == 0 && useIacPidMultTable == 1} subMenu = iacCoastingCurve, "Coasting IAC Position for Auto-Idle", 0, {useIacTableForCoasting == 1} subMenu = std_separator - subMenu = idleVeCurve, "VE", 0, {useSeparateVeForIdle == 1} + subMenu = idleVeTableTbl, "Idle VE", 0, {useSeparateVeForIdle == 1} subMenu = idleAdvanceCurve, "Ignition advance", 0, {useSeparateAdvanceForIdle == 1} menu = "&Advanced" diff --git a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini index de9ba1d73a..84d5111d7e 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 2022.01.20.hellen-nb1.2389903677" + signature = "rusEFI 2022.01.20.hellen-nb1.2871682249" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.01.20.hellen-nb1.2389903677" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.01.20.hellen-nb1.2871682249" ; 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 (unknown script) integration/rusefi_config.txt Thu Jan 20 02:12:07 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) integration/rusefi_config.txt Thu Jan 20 19:12:33 UTC 2022 pageSize = 20996 page = 1 @@ -1279,8 +1279,9 @@ cltCrankingCorrBins = array, F32, 5492, [8], "C", 1, 0, -100, 250, 2 cltCrankingCorr = array, F32, 5524, [8], "%", 1, 0, 0, 500, 2 idleAdvanceBins = array, U08, 5556, [8], "RPM", 50.0, 0, 0, 18000, 0 idleAdvance = array, F32, 5564, [8], "deg", 1, 0, -20, 90, 1 -idleVeBins = array, U08, 5596, [8], "RPM", 50.0, 0, 0, 18000, 0 -idleVe = array, F32, 5604, [8], "%", 1, 0, 0, 999, 1 +idleVeRpmBins = array, U08, 5596, [4], "RPM", 10.0, 0, 0, 2500, 0 +idleVeLoadBins = array, U08, 5600, [4], "load", 1, 0, 0, 100, 0 +idleVeTable = array, U16, 5604, [4x4], "%", 0.1, 0, 0, 999, 1 luaScript = string, ASCII, 5636, 8000 cltFuelCorrBins = array, F32, 13636, [16], "C", 1, 0, -100, 250, 2 cltFuelCorr = array, F32, 13700, [16], "ratio", 1, 0, 0, 5, 2 @@ -1818,8 +1819,6 @@ fuelTrims12_table = array, S08, 20980, [4x4], "", 0.2, 0, -25, 25, 1 cltCrankingCorr = "CLT-based cranking position multiplier for simple manual idle controller" idleAdvanceBins = "Optional timing advance table for Idle (see useSeparateAdvanceForIdle)" idleAdvance = "Optional timing advance table for Idle (see useSeparateAdvanceForIdle)" - idleVeBins = "Optional VE table for Idle (see useSeparateVEForIdle)" - idleVe = "Optional VE table for Idle (see useSeparateVEForIdle)" cltIdleCorrBins = "CLT-based idle position multiplier for simple manual idle controller" cltIdleCorr = "CLT-based idle position multiplier for simple manual idle controller" mafDecoding = "Also known as MAF transfer function.\nkg/hour value.\nBy the way 2.081989116 kg/h = 1 ft3/m" @@ -2701,18 +2700,6 @@ etbStatus_resetCounter = scalar, S32, 636, "", 1, 0 yBins = idleAdvance gauge = RPMGauge - curve = idleVeCurve, "Idle VE" - columnLabel = "RPM", "%" - xAxis = 0, 2400, 13 - yAxis = 0, 250, 11 - xBins = idleVeBins, RPMValue - yBins = idleVe -#if LAMBDA - gauge = lambda1Gauge -#else - gauge = afr1Gauge -#endif - curve = crankingAdvanceCurve, "Cranking Advance Angle" columnLabel = "RPM", "degrees" xAxis = 0, 1200, 13 @@ -2850,6 +2837,13 @@ etbStatus_resetCounter = scalar, S32, 636, "", 1, 0 gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. upDownLabel = "(RICHER)", "(LEANER)" + table = idleVeTableTbl, idleVeTable, "Idle VE" + xBins = idleVeRpmBins, RPMValue + yBins = idleVeLoadBins, veTableYAxis + zBins = idleVeTable + gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. + upDownLabel = "(RICHER)", "(LEANER)" + table = fuelTrimTbl1, fuelTrimMap1, "Fuel trim cyl 1", 1 xBins = fuelTrimRpmBins, RPMValue yBins = fuelTrimLoadBins, veTableYAxis @@ -3817,7 +3811,7 @@ menuDialog = main subMenu = iacPidMultTbl, "IAC PID Multiplier", 0, {idleMode == 0 && useIacPidMultTable == 1} subMenu = iacCoastingCurve, "Coasting IAC Position for Auto-Idle", 0, {useIacTableForCoasting == 1} subMenu = std_separator - subMenu = idleVeCurve, "VE", 0, {useSeparateVeForIdle == 1} + subMenu = idleVeTableTbl, "Idle VE", 0, {useSeparateVeForIdle == 1} subMenu = idleAdvanceCurve, "Ignition advance", 0, {useSeparateAdvanceForIdle == 1} menu = "&Advanced" diff --git a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini index de12a6dff5..2a8c96137e 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 2022.01.20.hellen121nissan.3591087255" + signature = "rusEFI 2022.01.20.hellen121nissan.4082288995" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.01.20.hellen121nissan.3591087255" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.01.20.hellen121nissan.4082288995" ; 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 (unknown script) integration/rusefi_config.txt Thu Jan 20 02:11:57 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) integration/rusefi_config.txt Thu Jan 20 19:12:24 UTC 2022 pageSize = 20996 page = 1 @@ -1279,8 +1279,9 @@ cltCrankingCorrBins = array, F32, 5492, [8], "C", 1, 0, -100, 250, 2 cltCrankingCorr = array, F32, 5524, [8], "%", 1, 0, 0, 500, 2 idleAdvanceBins = array, U08, 5556, [8], "RPM", 50.0, 0, 0, 18000, 0 idleAdvance = array, F32, 5564, [8], "deg", 1, 0, -20, 90, 1 -idleVeBins = array, U08, 5596, [8], "RPM", 50.0, 0, 0, 18000, 0 -idleVe = array, F32, 5604, [8], "%", 1, 0, 0, 999, 1 +idleVeRpmBins = array, U08, 5596, [4], "RPM", 10.0, 0, 0, 2500, 0 +idleVeLoadBins = array, U08, 5600, [4], "load", 1, 0, 0, 100, 0 +idleVeTable = array, U16, 5604, [4x4], "%", 0.1, 0, 0, 999, 1 luaScript = string, ASCII, 5636, 8000 cltFuelCorrBins = array, F32, 13636, [16], "C", 1, 0, -100, 250, 2 cltFuelCorr = array, F32, 13700, [16], "ratio", 1, 0, 0, 5, 2 @@ -1818,8 +1819,6 @@ fuelTrims12_table = array, S08, 20980, [4x4], "", 0.2, 0, -25, 25, 1 cltCrankingCorr = "CLT-based cranking position multiplier for simple manual idle controller" idleAdvanceBins = "Optional timing advance table for Idle (see useSeparateAdvanceForIdle)" idleAdvance = "Optional timing advance table for Idle (see useSeparateAdvanceForIdle)" - idleVeBins = "Optional VE table for Idle (see useSeparateVEForIdle)" - idleVe = "Optional VE table for Idle (see useSeparateVEForIdle)" cltIdleCorrBins = "CLT-based idle position multiplier for simple manual idle controller" cltIdleCorr = "CLT-based idle position multiplier for simple manual idle controller" mafDecoding = "Also known as MAF transfer function.\nkg/hour value.\nBy the way 2.081989116 kg/h = 1 ft3/m" @@ -2701,18 +2700,6 @@ etbStatus_resetCounter = scalar, S32, 636, "", 1, 0 yBins = idleAdvance gauge = RPMGauge - curve = idleVeCurve, "Idle VE" - columnLabel = "RPM", "%" - xAxis = 0, 2400, 13 - yAxis = 0, 250, 11 - xBins = idleVeBins, RPMValue - yBins = idleVe -#if LAMBDA - gauge = lambda1Gauge -#else - gauge = afr1Gauge -#endif - curve = crankingAdvanceCurve, "Cranking Advance Angle" columnLabel = "RPM", "degrees" xAxis = 0, 1200, 13 @@ -2850,6 +2837,13 @@ etbStatus_resetCounter = scalar, S32, 636, "", 1, 0 gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. upDownLabel = "(RICHER)", "(LEANER)" + table = idleVeTableTbl, idleVeTable, "Idle VE" + xBins = idleVeRpmBins, RPMValue + yBins = idleVeLoadBins, veTableYAxis + zBins = idleVeTable + gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. + upDownLabel = "(RICHER)", "(LEANER)" + table = fuelTrimTbl1, fuelTrimMap1, "Fuel trim cyl 1", 1 xBins = fuelTrimRpmBins, RPMValue yBins = fuelTrimLoadBins, veTableYAxis @@ -3817,7 +3811,7 @@ menuDialog = main subMenu = iacPidMultTbl, "IAC PID Multiplier", 0, {idleMode == 0 && useIacPidMultTable == 1} subMenu = iacCoastingCurve, "Coasting IAC Position for Auto-Idle", 0, {useIacTableForCoasting == 1} subMenu = std_separator - subMenu = idleVeCurve, "VE", 0, {useSeparateVeForIdle == 1} + subMenu = idleVeTableTbl, "Idle VE", 0, {useSeparateVeForIdle == 1} subMenu = idleAdvanceCurve, "Ignition advance", 0, {useSeparateAdvanceForIdle == 1} menu = "&Advanced" diff --git a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini index abcb82a3db..bee4d9ae4a 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 2022.01.20.hellen121vag.756667374" + signature = "rusEFI 2022.01.20.hellen121vag.138460698" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.01.20.hellen121vag.756667374" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.01.20.hellen121vag.138460698" ; 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 (unknown script) integration/rusefi_config.txt Thu Jan 20 02:11:55 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) integration/rusefi_config.txt Thu Jan 20 19:12:22 UTC 2022 pageSize = 20996 page = 1 @@ -1279,8 +1279,9 @@ cltCrankingCorrBins = array, F32, 5492, [8], "C", 1, 0, -100, 250, 2 cltCrankingCorr = array, F32, 5524, [8], "%", 1, 0, 0, 500, 2 idleAdvanceBins = array, U08, 5556, [8], "RPM", 50.0, 0, 0, 18000, 0 idleAdvance = array, F32, 5564, [8], "deg", 1, 0, -20, 90, 1 -idleVeBins = array, U08, 5596, [8], "RPM", 50.0, 0, 0, 18000, 0 -idleVe = array, F32, 5604, [8], "%", 1, 0, 0, 999, 1 +idleVeRpmBins = array, U08, 5596, [4], "RPM", 10.0, 0, 0, 2500, 0 +idleVeLoadBins = array, U08, 5600, [4], "load", 1, 0, 0, 100, 0 +idleVeTable = array, U16, 5604, [4x4], "%", 0.1, 0, 0, 999, 1 luaScript = string, ASCII, 5636, 8000 cltFuelCorrBins = array, F32, 13636, [16], "C", 1, 0, -100, 250, 2 cltFuelCorr = array, F32, 13700, [16], "ratio", 1, 0, 0, 5, 2 @@ -1818,8 +1819,6 @@ fuelTrims12_table = array, S08, 20980, [4x4], "", 0.2, 0, -25, 25, 1 cltCrankingCorr = "CLT-based cranking position multiplier for simple manual idle controller" idleAdvanceBins = "Optional timing advance table for Idle (see useSeparateAdvanceForIdle)" idleAdvance = "Optional timing advance table for Idle (see useSeparateAdvanceForIdle)" - idleVeBins = "Optional VE table for Idle (see useSeparateVEForIdle)" - idleVe = "Optional VE table for Idle (see useSeparateVEForIdle)" cltIdleCorrBins = "CLT-based idle position multiplier for simple manual idle controller" cltIdleCorr = "CLT-based idle position multiplier for simple manual idle controller" mafDecoding = "Also known as MAF transfer function.\nkg/hour value.\nBy the way 2.081989116 kg/h = 1 ft3/m" @@ -2701,18 +2700,6 @@ etbStatus_resetCounter = scalar, S32, 636, "", 1, 0 yBins = idleAdvance gauge = RPMGauge - curve = idleVeCurve, "Idle VE" - columnLabel = "RPM", "%" - xAxis = 0, 2400, 13 - yAxis = 0, 250, 11 - xBins = idleVeBins, RPMValue - yBins = idleVe -#if LAMBDA - gauge = lambda1Gauge -#else - gauge = afr1Gauge -#endif - curve = crankingAdvanceCurve, "Cranking Advance Angle" columnLabel = "RPM", "degrees" xAxis = 0, 1200, 13 @@ -2850,6 +2837,13 @@ etbStatus_resetCounter = scalar, S32, 636, "", 1, 0 gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. upDownLabel = "(RICHER)", "(LEANER)" + table = idleVeTableTbl, idleVeTable, "Idle VE" + xBins = idleVeRpmBins, RPMValue + yBins = idleVeLoadBins, veTableYAxis + zBins = idleVeTable + gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. + upDownLabel = "(RICHER)", "(LEANER)" + table = fuelTrimTbl1, fuelTrimMap1, "Fuel trim cyl 1", 1 xBins = fuelTrimRpmBins, RPMValue yBins = fuelTrimLoadBins, veTableYAxis @@ -3817,7 +3811,7 @@ menuDialog = main subMenu = iacPidMultTbl, "IAC PID Multiplier", 0, {idleMode == 0 && useIacPidMultTable == 1} subMenu = iacCoastingCurve, "Coasting IAC Position for Auto-Idle", 0, {useIacTableForCoasting == 1} subMenu = std_separator - subMenu = idleVeCurve, "VE", 0, {useSeparateVeForIdle == 1} + subMenu = idleVeTableTbl, "Idle VE", 0, {useSeparateVeForIdle == 1} subMenu = idleAdvanceCurve, "Ignition advance", 0, {useSeparateAdvanceForIdle == 1} menu = "&Advanced" diff --git a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini index 62bff7b643..b5e786e3df 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 2022.01.20.hellen128.1615977294" + signature = "rusEFI 2022.01.20.hellen128.1158198970" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.01.20.hellen128.1615977294" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.01.20.hellen128.1158198970" ; 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 (unknown script) integration/rusefi_config.txt Thu Jan 20 02:11:53 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) integration/rusefi_config.txt Thu Jan 20 19:12:20 UTC 2022 pageSize = 20996 page = 1 @@ -1279,8 +1279,9 @@ cltCrankingCorrBins = array, F32, 5492, [8], "C", 1, 0, -100, 250, 2 cltCrankingCorr = array, F32, 5524, [8], "%", 1, 0, 0, 500, 2 idleAdvanceBins = array, U08, 5556, [8], "RPM", 50.0, 0, 0, 18000, 0 idleAdvance = array, F32, 5564, [8], "deg", 1, 0, -20, 90, 1 -idleVeBins = array, U08, 5596, [8], "RPM", 50.0, 0, 0, 18000, 0 -idleVe = array, F32, 5604, [8], "%", 1, 0, 0, 999, 1 +idleVeRpmBins = array, U08, 5596, [4], "RPM", 10.0, 0, 0, 2500, 0 +idleVeLoadBins = array, U08, 5600, [4], "load", 1, 0, 0, 100, 0 +idleVeTable = array, U16, 5604, [4x4], "%", 0.1, 0, 0, 999, 1 luaScript = string, ASCII, 5636, 8000 cltFuelCorrBins = array, F32, 13636, [16], "C", 1, 0, -100, 250, 2 cltFuelCorr = array, F32, 13700, [16], "ratio", 1, 0, 0, 5, 2 @@ -1818,8 +1819,6 @@ fuelTrims12_table = array, S08, 20980, [4x4], "", 0.2, 0, -25, 25, 1 cltCrankingCorr = "CLT-based cranking position multiplier for simple manual idle controller" idleAdvanceBins = "Optional timing advance table for Idle (see useSeparateAdvanceForIdle)" idleAdvance = "Optional timing advance table for Idle (see useSeparateAdvanceForIdle)" - idleVeBins = "Optional VE table for Idle (see useSeparateVEForIdle)" - idleVe = "Optional VE table for Idle (see useSeparateVEForIdle)" cltIdleCorrBins = "CLT-based idle position multiplier for simple manual idle controller" cltIdleCorr = "CLT-based idle position multiplier for simple manual idle controller" mafDecoding = "Also known as MAF transfer function.\nkg/hour value.\nBy the way 2.081989116 kg/h = 1 ft3/m" @@ -2701,18 +2700,6 @@ etbStatus_resetCounter = scalar, S32, 636, "", 1, 0 yBins = idleAdvance gauge = RPMGauge - curve = idleVeCurve, "Idle VE" - columnLabel = "RPM", "%" - xAxis = 0, 2400, 13 - yAxis = 0, 250, 11 - xBins = idleVeBins, RPMValue - yBins = idleVe -#if LAMBDA - gauge = lambda1Gauge -#else - gauge = afr1Gauge -#endif - curve = crankingAdvanceCurve, "Cranking Advance Angle" columnLabel = "RPM", "degrees" xAxis = 0, 1200, 13 @@ -2850,6 +2837,13 @@ etbStatus_resetCounter = scalar, S32, 636, "", 1, 0 gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. upDownLabel = "(RICHER)", "(LEANER)" + table = idleVeTableTbl, idleVeTable, "Idle VE" + xBins = idleVeRpmBins, RPMValue + yBins = idleVeLoadBins, veTableYAxis + zBins = idleVeTable + gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. + upDownLabel = "(RICHER)", "(LEANER)" + table = fuelTrimTbl1, fuelTrimMap1, "Fuel trim cyl 1", 1 xBins = fuelTrimRpmBins, RPMValue yBins = fuelTrimLoadBins, veTableYAxis @@ -3817,7 +3811,7 @@ menuDialog = main subMenu = iacPidMultTbl, "IAC PID Multiplier", 0, {idleMode == 0 && useIacPidMultTable == 1} subMenu = iacCoastingCurve, "Coasting IAC Position for Auto-Idle", 0, {useIacTableForCoasting == 1} subMenu = std_separator - subMenu = idleVeCurve, "VE", 0, {useSeparateVeForIdle == 1} + subMenu = idleVeTableTbl, "Idle VE", 0, {useSeparateVeForIdle == 1} subMenu = idleAdvanceCurve, "Ignition advance", 0, {useSeparateAdvanceForIdle == 1} menu = "&Advanced" diff --git a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini index 8d505e5ac4..d3a0086bd9 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 2022.01.20.hellen154hyundai.3198610248" + signature = "rusEFI 2022.01.20.hellen154hyundai.2617214652" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.01.20.hellen154hyundai.3198610248" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.01.20.hellen154hyundai.2617214652" ; 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 (unknown script) integration/rusefi_config.txt Thu Jan 20 02:11:59 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) integration/rusefi_config.txt Thu Jan 20 19:12:26 UTC 2022 pageSize = 20996 page = 1 @@ -1279,8 +1279,9 @@ cltCrankingCorrBins = array, F32, 5492, [8], "C", 1, 0, -100, 250, 2 cltCrankingCorr = array, F32, 5524, [8], "%", 1, 0, 0, 500, 2 idleAdvanceBins = array, U08, 5556, [8], "RPM", 50.0, 0, 0, 18000, 0 idleAdvance = array, F32, 5564, [8], "deg", 1, 0, -20, 90, 1 -idleVeBins = array, U08, 5596, [8], "RPM", 50.0, 0, 0, 18000, 0 -idleVe = array, F32, 5604, [8], "%", 1, 0, 0, 999, 1 +idleVeRpmBins = array, U08, 5596, [4], "RPM", 10.0, 0, 0, 2500, 0 +idleVeLoadBins = array, U08, 5600, [4], "load", 1, 0, 0, 100, 0 +idleVeTable = array, U16, 5604, [4x4], "%", 0.1, 0, 0, 999, 1 luaScript = string, ASCII, 5636, 8000 cltFuelCorrBins = array, F32, 13636, [16], "C", 1, 0, -100, 250, 2 cltFuelCorr = array, F32, 13700, [16], "ratio", 1, 0, 0, 5, 2 @@ -1818,8 +1819,6 @@ fuelTrims12_table = array, S08, 20980, [4x4], "", 0.2, 0, -25, 25, 1 cltCrankingCorr = "CLT-based cranking position multiplier for simple manual idle controller" idleAdvanceBins = "Optional timing advance table for Idle (see useSeparateAdvanceForIdle)" idleAdvance = "Optional timing advance table for Idle (see useSeparateAdvanceForIdle)" - idleVeBins = "Optional VE table for Idle (see useSeparateVEForIdle)" - idleVe = "Optional VE table for Idle (see useSeparateVEForIdle)" cltIdleCorrBins = "CLT-based idle position multiplier for simple manual idle controller" cltIdleCorr = "CLT-based idle position multiplier for simple manual idle controller" mafDecoding = "Also known as MAF transfer function.\nkg/hour value.\nBy the way 2.081989116 kg/h = 1 ft3/m" @@ -2701,18 +2700,6 @@ etbStatus_resetCounter = scalar, S32, 636, "", 1, 0 yBins = idleAdvance gauge = RPMGauge - curve = idleVeCurve, "Idle VE" - columnLabel = "RPM", "%" - xAxis = 0, 2400, 13 - yAxis = 0, 250, 11 - xBins = idleVeBins, RPMValue - yBins = idleVe -#if LAMBDA - gauge = lambda1Gauge -#else - gauge = afr1Gauge -#endif - curve = crankingAdvanceCurve, "Cranking Advance Angle" columnLabel = "RPM", "degrees" xAxis = 0, 1200, 13 @@ -2850,6 +2837,13 @@ etbStatus_resetCounter = scalar, S32, 636, "", 1, 0 gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. upDownLabel = "(RICHER)", "(LEANER)" + table = idleVeTableTbl, idleVeTable, "Idle VE" + xBins = idleVeRpmBins, RPMValue + yBins = idleVeLoadBins, veTableYAxis + zBins = idleVeTable + gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. + upDownLabel = "(RICHER)", "(LEANER)" + table = fuelTrimTbl1, fuelTrimMap1, "Fuel trim cyl 1", 1 xBins = fuelTrimRpmBins, RPMValue yBins = fuelTrimLoadBins, veTableYAxis @@ -3817,7 +3811,7 @@ menuDialog = main subMenu = iacPidMultTbl, "IAC PID Multiplier", 0, {idleMode == 0 && useIacPidMultTable == 1} subMenu = iacCoastingCurve, "Coasting IAC Position for Auto-Idle", 0, {useIacTableForCoasting == 1} subMenu = std_separator - subMenu = idleVeCurve, "VE", 0, {useSeparateVeForIdle == 1} + subMenu = idleVeTableTbl, "Idle VE", 0, {useSeparateVeForIdle == 1} subMenu = idleAdvanceCurve, "Ignition advance", 0, {useSeparateAdvanceForIdle == 1} menu = "&Advanced" diff --git a/firmware/tunerstudio/generated/rusefi_hellen72.ini b/firmware/tunerstudio/generated/rusefi_hellen72.ini index 21b0d4b7c9..f6b4be8d12 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 2022.01.20.hellen72.2248634452" + signature = "rusEFI 2022.01.20.hellen72.2740854176" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.01.20.hellen72.2248634452" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.01.20.hellen72.2740854176" ; 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 (unknown script) integration/rusefi_config.txt Thu Jan 20 02:12:03 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) integration/rusefi_config.txt Thu Jan 20 19:12:29 UTC 2022 pageSize = 20996 page = 1 @@ -1279,8 +1279,9 @@ cltCrankingCorrBins = array, F32, 5492, [8], "C", 1, 0, -100, 250, 2 cltCrankingCorr = array, F32, 5524, [8], "%", 1, 0, 0, 500, 2 idleAdvanceBins = array, U08, 5556, [8], "RPM", 50.0, 0, 0, 18000, 0 idleAdvance = array, F32, 5564, [8], "deg", 1, 0, -20, 90, 1 -idleVeBins = array, U08, 5596, [8], "RPM", 50.0, 0, 0, 18000, 0 -idleVe = array, F32, 5604, [8], "%", 1, 0, 0, 999, 1 +idleVeRpmBins = array, U08, 5596, [4], "RPM", 10.0, 0, 0, 2500, 0 +idleVeLoadBins = array, U08, 5600, [4], "load", 1, 0, 0, 100, 0 +idleVeTable = array, U16, 5604, [4x4], "%", 0.1, 0, 0, 999, 1 luaScript = string, ASCII, 5636, 8000 cltFuelCorrBins = array, F32, 13636, [16], "C", 1, 0, -100, 250, 2 cltFuelCorr = array, F32, 13700, [16], "ratio", 1, 0, 0, 5, 2 @@ -1818,8 +1819,6 @@ fuelTrims12_table = array, S08, 20980, [4x4], "", 0.2, 0, -25, 25, 1 cltCrankingCorr = "CLT-based cranking position multiplier for simple manual idle controller" idleAdvanceBins = "Optional timing advance table for Idle (see useSeparateAdvanceForIdle)" idleAdvance = "Optional timing advance table for Idle (see useSeparateAdvanceForIdle)" - idleVeBins = "Optional VE table for Idle (see useSeparateVEForIdle)" - idleVe = "Optional VE table for Idle (see useSeparateVEForIdle)" cltIdleCorrBins = "CLT-based idle position multiplier for simple manual idle controller" cltIdleCorr = "CLT-based idle position multiplier for simple manual idle controller" mafDecoding = "Also known as MAF transfer function.\nkg/hour value.\nBy the way 2.081989116 kg/h = 1 ft3/m" @@ -2701,18 +2700,6 @@ etbStatus_resetCounter = scalar, S32, 636, "", 1, 0 yBins = idleAdvance gauge = RPMGauge - curve = idleVeCurve, "Idle VE" - columnLabel = "RPM", "%" - xAxis = 0, 2400, 13 - yAxis = 0, 250, 11 - xBins = idleVeBins, RPMValue - yBins = idleVe -#if LAMBDA - gauge = lambda1Gauge -#else - gauge = afr1Gauge -#endif - curve = crankingAdvanceCurve, "Cranking Advance Angle" columnLabel = "RPM", "degrees" xAxis = 0, 1200, 13 @@ -2850,6 +2837,13 @@ etbStatus_resetCounter = scalar, S32, 636, "", 1, 0 gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. upDownLabel = "(RICHER)", "(LEANER)" + table = idleVeTableTbl, idleVeTable, "Idle VE" + xBins = idleVeRpmBins, RPMValue + yBins = idleVeLoadBins, veTableYAxis + zBins = idleVeTable + gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. + upDownLabel = "(RICHER)", "(LEANER)" + table = fuelTrimTbl1, fuelTrimMap1, "Fuel trim cyl 1", 1 xBins = fuelTrimRpmBins, RPMValue yBins = fuelTrimLoadBins, veTableYAxis @@ -3817,7 +3811,7 @@ menuDialog = main subMenu = iacPidMultTbl, "IAC PID Multiplier", 0, {idleMode == 0 && useIacPidMultTable == 1} subMenu = iacCoastingCurve, "Coasting IAC Position for Auto-Idle", 0, {useIacTableForCoasting == 1} subMenu = std_separator - subMenu = idleVeCurve, "VE", 0, {useSeparateVeForIdle == 1} + subMenu = idleVeTableTbl, "Idle VE", 0, {useSeparateVeForIdle == 1} subMenu = idleAdvanceCurve, "Ignition advance", 0, {useSeparateAdvanceForIdle == 1} menu = "&Advanced" diff --git a/firmware/tunerstudio/generated/rusefi_hellen81.ini b/firmware/tunerstudio/generated/rusefi_hellen81.ini index 1bde24b867..c0a93007d6 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 2022.01.20.hellen81.839576999" + signature = "rusEFI 2022.01.20.hellen81.391348307" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.01.20.hellen81.839576999" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.01.20.hellen81.391348307" ; 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 (unknown script) integration/rusefi_config.txt Thu Jan 20 02:12:05 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) integration/rusefi_config.txt Thu Jan 20 19:12:31 UTC 2022 pageSize = 20996 page = 1 @@ -1279,8 +1279,9 @@ cltCrankingCorrBins = array, F32, 5492, [8], "C", 1, 0, -100, 250, 2 cltCrankingCorr = array, F32, 5524, [8], "%", 1, 0, 0, 500, 2 idleAdvanceBins = array, U08, 5556, [8], "RPM", 50.0, 0, 0, 18000, 0 idleAdvance = array, F32, 5564, [8], "deg", 1, 0, -20, 90, 1 -idleVeBins = array, U08, 5596, [8], "RPM", 50.0, 0, 0, 18000, 0 -idleVe = array, F32, 5604, [8], "%", 1, 0, 0, 999, 1 +idleVeRpmBins = array, U08, 5596, [4], "RPM", 10.0, 0, 0, 2500, 0 +idleVeLoadBins = array, U08, 5600, [4], "load", 1, 0, 0, 100, 0 +idleVeTable = array, U16, 5604, [4x4], "%", 0.1, 0, 0, 999, 1 luaScript = string, ASCII, 5636, 8000 cltFuelCorrBins = array, F32, 13636, [16], "C", 1, 0, -100, 250, 2 cltFuelCorr = array, F32, 13700, [16], "ratio", 1, 0, 0, 5, 2 @@ -1818,8 +1819,6 @@ fuelTrims12_table = array, S08, 20980, [4x4], "", 0.2, 0, -25, 25, 1 cltCrankingCorr = "CLT-based cranking position multiplier for simple manual idle controller" idleAdvanceBins = "Optional timing advance table for Idle (see useSeparateAdvanceForIdle)" idleAdvance = "Optional timing advance table for Idle (see useSeparateAdvanceForIdle)" - idleVeBins = "Optional VE table for Idle (see useSeparateVEForIdle)" - idleVe = "Optional VE table for Idle (see useSeparateVEForIdle)" cltIdleCorrBins = "CLT-based idle position multiplier for simple manual idle controller" cltIdleCorr = "CLT-based idle position multiplier for simple manual idle controller" mafDecoding = "Also known as MAF transfer function.\nkg/hour value.\nBy the way 2.081989116 kg/h = 1 ft3/m" @@ -2701,18 +2700,6 @@ etbStatus_resetCounter = scalar, S32, 636, "", 1, 0 yBins = idleAdvance gauge = RPMGauge - curve = idleVeCurve, "Idle VE" - columnLabel = "RPM", "%" - xAxis = 0, 2400, 13 - yAxis = 0, 250, 11 - xBins = idleVeBins, RPMValue - yBins = idleVe -#if LAMBDA - gauge = lambda1Gauge -#else - gauge = afr1Gauge -#endif - curve = crankingAdvanceCurve, "Cranking Advance Angle" columnLabel = "RPM", "degrees" xAxis = 0, 1200, 13 @@ -2850,6 +2837,13 @@ etbStatus_resetCounter = scalar, S32, 636, "", 1, 0 gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. upDownLabel = "(RICHER)", "(LEANER)" + table = idleVeTableTbl, idleVeTable, "Idle VE" + xBins = idleVeRpmBins, RPMValue + yBins = idleVeLoadBins, veTableYAxis + zBins = idleVeTable + gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. + upDownLabel = "(RICHER)", "(LEANER)" + table = fuelTrimTbl1, fuelTrimMap1, "Fuel trim cyl 1", 1 xBins = fuelTrimRpmBins, RPMValue yBins = fuelTrimLoadBins, veTableYAxis @@ -3817,7 +3811,7 @@ menuDialog = main subMenu = iacPidMultTbl, "IAC PID Multiplier", 0, {idleMode == 0 && useIacPidMultTable == 1} subMenu = iacCoastingCurve, "Coasting IAC Position for Auto-Idle", 0, {useIacTableForCoasting == 1} subMenu = std_separator - subMenu = idleVeCurve, "VE", 0, {useSeparateVeForIdle == 1} + subMenu = idleVeTableTbl, "Idle VE", 0, {useSeparateVeForIdle == 1} subMenu = idleAdvanceCurve, "Ignition advance", 0, {useSeparateAdvanceForIdle == 1} menu = "&Advanced" diff --git a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini index 601b04b041..640f21fc23 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 2022.01.20.hellen88bmw.3548014267" + signature = "rusEFI 2022.01.20.hellen88bmw.4129491791" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.01.20.hellen88bmw.3548014267" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.01.20.hellen88bmw.4129491791" ; 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 (unknown script) integration/rusefi_config.txt Thu Jan 20 02:12:01 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) integration/rusefi_config.txt Thu Jan 20 19:12:27 UTC 2022 pageSize = 20996 page = 1 @@ -1279,8 +1279,9 @@ cltCrankingCorrBins = array, F32, 5492, [8], "C", 1, 0, -100, 250, 2 cltCrankingCorr = array, F32, 5524, [8], "%", 1, 0, 0, 500, 2 idleAdvanceBins = array, U08, 5556, [8], "RPM", 50.0, 0, 0, 18000, 0 idleAdvance = array, F32, 5564, [8], "deg", 1, 0, -20, 90, 1 -idleVeBins = array, U08, 5596, [8], "RPM", 50.0, 0, 0, 18000, 0 -idleVe = array, F32, 5604, [8], "%", 1, 0, 0, 999, 1 +idleVeRpmBins = array, U08, 5596, [4], "RPM", 10.0, 0, 0, 2500, 0 +idleVeLoadBins = array, U08, 5600, [4], "load", 1, 0, 0, 100, 0 +idleVeTable = array, U16, 5604, [4x4], "%", 0.1, 0, 0, 999, 1 luaScript = string, ASCII, 5636, 8000 cltFuelCorrBins = array, F32, 13636, [16], "C", 1, 0, -100, 250, 2 cltFuelCorr = array, F32, 13700, [16], "ratio", 1, 0, 0, 5, 2 @@ -1818,8 +1819,6 @@ fuelTrims12_table = array, S08, 20980, [4x4], "", 0.2, 0, -25, 25, 1 cltCrankingCorr = "CLT-based cranking position multiplier for simple manual idle controller" idleAdvanceBins = "Optional timing advance table for Idle (see useSeparateAdvanceForIdle)" idleAdvance = "Optional timing advance table for Idle (see useSeparateAdvanceForIdle)" - idleVeBins = "Optional VE table for Idle (see useSeparateVEForIdle)" - idleVe = "Optional VE table for Idle (see useSeparateVEForIdle)" cltIdleCorrBins = "CLT-based idle position multiplier for simple manual idle controller" cltIdleCorr = "CLT-based idle position multiplier for simple manual idle controller" mafDecoding = "Also known as MAF transfer function.\nkg/hour value.\nBy the way 2.081989116 kg/h = 1 ft3/m" @@ -2701,18 +2700,6 @@ etbStatus_resetCounter = scalar, S32, 636, "", 1, 0 yBins = idleAdvance gauge = RPMGauge - curve = idleVeCurve, "Idle VE" - columnLabel = "RPM", "%" - xAxis = 0, 2400, 13 - yAxis = 0, 250, 11 - xBins = idleVeBins, RPMValue - yBins = idleVe -#if LAMBDA - gauge = lambda1Gauge -#else - gauge = afr1Gauge -#endif - curve = crankingAdvanceCurve, "Cranking Advance Angle" columnLabel = "RPM", "degrees" xAxis = 0, 1200, 13 @@ -2850,6 +2837,13 @@ etbStatus_resetCounter = scalar, S32, 636, "", 1, 0 gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. upDownLabel = "(RICHER)", "(LEANER)" + table = idleVeTableTbl, idleVeTable, "Idle VE" + xBins = idleVeRpmBins, RPMValue + yBins = idleVeLoadBins, veTableYAxis + zBins = idleVeTable + gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. + upDownLabel = "(RICHER)", "(LEANER)" + table = fuelTrimTbl1, fuelTrimMap1, "Fuel trim cyl 1", 1 xBins = fuelTrimRpmBins, RPMValue yBins = fuelTrimLoadBins, veTableYAxis @@ -3817,7 +3811,7 @@ menuDialog = main subMenu = iacPidMultTbl, "IAC PID Multiplier", 0, {idleMode == 0 && useIacPidMultTable == 1} subMenu = iacCoastingCurve, "Coasting IAC Position for Auto-Idle", 0, {useIacTableForCoasting == 1} subMenu = std_separator - subMenu = idleVeCurve, "VE", 0, {useSeparateVeForIdle == 1} + subMenu = idleVeTableTbl, "Idle VE", 0, {useSeparateVeForIdle == 1} subMenu = idleAdvanceCurve, "Ignition advance", 0, {useSeparateAdvanceForIdle == 1} menu = "&Advanced" diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini index 70c5a023c9..09258c0a83 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 2022.01.20.hellenNA6.76001612" + signature = "rusEFI 2022.01.20.hellenNA6.568253624" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.01.20.hellenNA6.76001612" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.01.20.hellenNA6.568253624" ; 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 (unknown script) integration/rusefi_config.txt Thu Jan 20 02:12:09 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) integration/rusefi_config.txt Thu Jan 20 19:12:35 UTC 2022 pageSize = 20996 page = 1 @@ -1279,8 +1279,9 @@ cltCrankingCorrBins = array, F32, 5492, [8], "C", 1, 0, -100, 250, 2 cltCrankingCorr = array, F32, 5524, [8], "%", 1, 0, 0, 500, 2 idleAdvanceBins = array, U08, 5556, [8], "RPM", 50.0, 0, 0, 18000, 0 idleAdvance = array, F32, 5564, [8], "deg", 1, 0, -20, 90, 1 -idleVeBins = array, U08, 5596, [8], "RPM", 50.0, 0, 0, 18000, 0 -idleVe = array, F32, 5604, [8], "%", 1, 0, 0, 999, 1 +idleVeRpmBins = array, U08, 5596, [4], "RPM", 10.0, 0, 0, 2500, 0 +idleVeLoadBins = array, U08, 5600, [4], "load", 1, 0, 0, 100, 0 +idleVeTable = array, U16, 5604, [4x4], "%", 0.1, 0, 0, 999, 1 luaScript = string, ASCII, 5636, 8000 cltFuelCorrBins = array, F32, 13636, [16], "C", 1, 0, -100, 250, 2 cltFuelCorr = array, F32, 13700, [16], "ratio", 1, 0, 0, 5, 2 @@ -1818,8 +1819,6 @@ fuelTrims12_table = array, S08, 20980, [4x4], "", 0.2, 0, -25, 25, 1 cltCrankingCorr = "CLT-based cranking position multiplier for simple manual idle controller" idleAdvanceBins = "Optional timing advance table for Idle (see useSeparateAdvanceForIdle)" idleAdvance = "Optional timing advance table for Idle (see useSeparateAdvanceForIdle)" - idleVeBins = "Optional VE table for Idle (see useSeparateVEForIdle)" - idleVe = "Optional VE table for Idle (see useSeparateVEForIdle)" cltIdleCorrBins = "CLT-based idle position multiplier for simple manual idle controller" cltIdleCorr = "CLT-based idle position multiplier for simple manual idle controller" mafDecoding = "Also known as MAF transfer function.\nkg/hour value.\nBy the way 2.081989116 kg/h = 1 ft3/m" @@ -2701,18 +2700,6 @@ etbStatus_resetCounter = scalar, S32, 636, "", 1, 0 yBins = idleAdvance gauge = RPMGauge - curve = idleVeCurve, "Idle VE" - columnLabel = "RPM", "%" - xAxis = 0, 2400, 13 - yAxis = 0, 250, 11 - xBins = idleVeBins, RPMValue - yBins = idleVe -#if LAMBDA - gauge = lambda1Gauge -#else - gauge = afr1Gauge -#endif - curve = crankingAdvanceCurve, "Cranking Advance Angle" columnLabel = "RPM", "degrees" xAxis = 0, 1200, 13 @@ -2850,6 +2837,13 @@ etbStatus_resetCounter = scalar, S32, 636, "", 1, 0 gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. upDownLabel = "(RICHER)", "(LEANER)" + table = idleVeTableTbl, idleVeTable, "Idle VE" + xBins = idleVeRpmBins, RPMValue + yBins = idleVeLoadBins, veTableYAxis + zBins = idleVeTable + gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. + upDownLabel = "(RICHER)", "(LEANER)" + table = fuelTrimTbl1, fuelTrimMap1, "Fuel trim cyl 1", 1 xBins = fuelTrimRpmBins, RPMValue yBins = fuelTrimLoadBins, veTableYAxis @@ -3817,7 +3811,7 @@ menuDialog = main subMenu = iacPidMultTbl, "IAC PID Multiplier", 0, {idleMode == 0 && useIacPidMultTable == 1} subMenu = iacCoastingCurve, "Coasting IAC Position for Auto-Idle", 0, {useIacTableForCoasting == 1} subMenu = std_separator - subMenu = idleVeCurve, "VE", 0, {useSeparateVeForIdle == 1} + subMenu = idleVeTableTbl, "Idle VE", 0, {useSeparateVeForIdle == 1} subMenu = idleAdvanceCurve, "Ignition advance", 0, {useSeparateAdvanceForIdle == 1} menu = "&Advanced" diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini b/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini index 62220fc207..f279149839 100644 --- a/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini +++ b/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.01.20.hellenNA8_96.1500939839" + signature = "rusEFI 2022.01.20.hellenNA8_96.2083515339" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.01.20.hellenNA8_96.1500939839" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.01.20.hellenNA8_96.2083515339" ; 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 (unknown script) integration/rusefi_config.txt Thu Jan 20 02:12:11 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) integration/rusefi_config.txt Thu Jan 20 19:12:36 UTC 2022 pageSize = 20996 page = 1 @@ -1279,8 +1279,9 @@ cltCrankingCorrBins = array, F32, 5492, [8], "C", 1, 0, -100, 250, 2 cltCrankingCorr = array, F32, 5524, [8], "%", 1, 0, 0, 500, 2 idleAdvanceBins = array, U08, 5556, [8], "RPM", 50.0, 0, 0, 18000, 0 idleAdvance = array, F32, 5564, [8], "deg", 1, 0, -20, 90, 1 -idleVeBins = array, U08, 5596, [8], "RPM", 50.0, 0, 0, 18000, 0 -idleVe = array, F32, 5604, [8], "%", 1, 0, 0, 999, 1 +idleVeRpmBins = array, U08, 5596, [4], "RPM", 10.0, 0, 0, 2500, 0 +idleVeLoadBins = array, U08, 5600, [4], "load", 1, 0, 0, 100, 0 +idleVeTable = array, U16, 5604, [4x4], "%", 0.1, 0, 0, 999, 1 luaScript = string, ASCII, 5636, 8000 cltFuelCorrBins = array, F32, 13636, [16], "C", 1, 0, -100, 250, 2 cltFuelCorr = array, F32, 13700, [16], "ratio", 1, 0, 0, 5, 2 @@ -1818,8 +1819,6 @@ fuelTrims12_table = array, S08, 20980, [4x4], "", 0.2, 0, -25, 25, 1 cltCrankingCorr = "CLT-based cranking position multiplier for simple manual idle controller" idleAdvanceBins = "Optional timing advance table for Idle (see useSeparateAdvanceForIdle)" idleAdvance = "Optional timing advance table for Idle (see useSeparateAdvanceForIdle)" - idleVeBins = "Optional VE table for Idle (see useSeparateVEForIdle)" - idleVe = "Optional VE table for Idle (see useSeparateVEForIdle)" cltIdleCorrBins = "CLT-based idle position multiplier for simple manual idle controller" cltIdleCorr = "CLT-based idle position multiplier for simple manual idle controller" mafDecoding = "Also known as MAF transfer function.\nkg/hour value.\nBy the way 2.081989116 kg/h = 1 ft3/m" @@ -2701,18 +2700,6 @@ etbStatus_resetCounter = scalar, S32, 636, "", 1, 0 yBins = idleAdvance gauge = RPMGauge - curve = idleVeCurve, "Idle VE" - columnLabel = "RPM", "%" - xAxis = 0, 2400, 13 - yAxis = 0, 250, 11 - xBins = idleVeBins, RPMValue - yBins = idleVe -#if LAMBDA - gauge = lambda1Gauge -#else - gauge = afr1Gauge -#endif - curve = crankingAdvanceCurve, "Cranking Advance Angle" columnLabel = "RPM", "degrees" xAxis = 0, 1200, 13 @@ -2850,6 +2837,13 @@ etbStatus_resetCounter = scalar, S32, 636, "", 1, 0 gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. upDownLabel = "(RICHER)", "(LEANER)" + table = idleVeTableTbl, idleVeTable, "Idle VE" + xBins = idleVeRpmBins, RPMValue + yBins = idleVeLoadBins, veTableYAxis + zBins = idleVeTable + gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. + upDownLabel = "(RICHER)", "(LEANER)" + table = fuelTrimTbl1, fuelTrimMap1, "Fuel trim cyl 1", 1 xBins = fuelTrimRpmBins, RPMValue yBins = fuelTrimLoadBins, veTableYAxis @@ -3817,7 +3811,7 @@ menuDialog = main subMenu = iacPidMultTbl, "IAC PID Multiplier", 0, {idleMode == 0 && useIacPidMultTable == 1} subMenu = iacCoastingCurve, "Coasting IAC Position for Auto-Idle", 0, {useIacTableForCoasting == 1} subMenu = std_separator - subMenu = idleVeCurve, "VE", 0, {useSeparateVeForIdle == 1} + subMenu = idleVeTableTbl, "Idle VE", 0, {useSeparateVeForIdle == 1} subMenu = idleAdvanceCurve, "Ignition advance", 0, {useSeparateAdvanceForIdle == 1} menu = "&Advanced" diff --git a/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini b/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini index 4c888d5067..69c3448cd8 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 2022.01.20.hellen_cypress.1213141080" + signature = "rusEFI 2022.01.20.hellen_cypress.1830190508" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.01.20.hellen_cypress.1213141080" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.01.20.hellen_cypress.1830190508" ; 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 (unknown script) integration/rusefi_config.txt Thu Jan 20 02:12:31 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) integration/rusefi_config.txt Thu Jan 20 19:12:56 UTC 2022 pageSize = 20996 page = 1 @@ -1279,8 +1279,9 @@ cltCrankingCorrBins = array, F32, 5492, [8], "C", 1, 0, -100, 250, 2 cltCrankingCorr = array, F32, 5524, [8], "%", 1, 0, 0, 500, 2 idleAdvanceBins = array, U08, 5556, [8], "RPM", 50.0, 0, 0, 18000, 0 idleAdvance = array, F32, 5564, [8], "deg", 1, 0, -20, 90, 1 -idleVeBins = array, U08, 5596, [8], "RPM", 50.0, 0, 0, 18000, 0 -idleVe = array, F32, 5604, [8], "%", 1, 0, 0, 999, 1 +idleVeRpmBins = array, U08, 5596, [4], "RPM", 10.0, 0, 0, 2500, 0 +idleVeLoadBins = array, U08, 5600, [4], "load", 1, 0, 0, 100, 0 +idleVeTable = array, U16, 5604, [4x4], "%", 0.1, 0, 0, 999, 1 luaScript = string, ASCII, 5636, 8000 cltFuelCorrBins = array, F32, 13636, [16], "C", 1, 0, -100, 250, 2 cltFuelCorr = array, F32, 13700, [16], "ratio", 1, 0, 0, 5, 2 @@ -1818,8 +1819,6 @@ fuelTrims12_table = array, S08, 20980, [4x4], "", 0.2, 0, -25, 25, 1 cltCrankingCorr = "CLT-based cranking position multiplier for simple manual idle controller" idleAdvanceBins = "Optional timing advance table for Idle (see useSeparateAdvanceForIdle)" idleAdvance = "Optional timing advance table for Idle (see useSeparateAdvanceForIdle)" - idleVeBins = "Optional VE table for Idle (see useSeparateVEForIdle)" - idleVe = "Optional VE table for Idle (see useSeparateVEForIdle)" cltIdleCorrBins = "CLT-based idle position multiplier for simple manual idle controller" cltIdleCorr = "CLT-based idle position multiplier for simple manual idle controller" mafDecoding = "Also known as MAF transfer function.\nkg/hour value.\nBy the way 2.081989116 kg/h = 1 ft3/m" @@ -2701,18 +2700,6 @@ etbStatus_resetCounter = scalar, S32, 636, "", 1, 0 yBins = idleAdvance gauge = RPMGauge - curve = idleVeCurve, "Idle VE" - columnLabel = "RPM", "%" - xAxis = 0, 2400, 13 - yAxis = 0, 250, 11 - xBins = idleVeBins, RPMValue - yBins = idleVe -#if LAMBDA - gauge = lambda1Gauge -#else - gauge = afr1Gauge -#endif - curve = crankingAdvanceCurve, "Cranking Advance Angle" columnLabel = "RPM", "degrees" xAxis = 0, 1200, 13 @@ -2850,6 +2837,13 @@ etbStatus_resetCounter = scalar, S32, 636, "", 1, 0 gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. upDownLabel = "(RICHER)", "(LEANER)" + table = idleVeTableTbl, idleVeTable, "Idle VE" + xBins = idleVeRpmBins, RPMValue + yBins = idleVeLoadBins, veTableYAxis + zBins = idleVeTable + gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. + upDownLabel = "(RICHER)", "(LEANER)" + table = fuelTrimTbl1, fuelTrimMap1, "Fuel trim cyl 1", 1 xBins = fuelTrimRpmBins, RPMValue yBins = fuelTrimLoadBins, veTableYAxis @@ -3817,7 +3811,7 @@ menuDialog = main subMenu = iacPidMultTbl, "IAC PID Multiplier", 0, {idleMode == 0 && useIacPidMultTable == 1} subMenu = iacCoastingCurve, "Coasting IAC Position for Auto-Idle", 0, {useIacTableForCoasting == 1} subMenu = std_separator - subMenu = idleVeCurve, "VE", 0, {useSeparateVeForIdle == 1} + subMenu = idleVeTableTbl, "Idle VE", 0, {useSeparateVeForIdle == 1} subMenu = idleAdvanceCurve, "Ignition advance", 0, {useSeparateAdvanceForIdle == 1} menu = "&Advanced" diff --git a/firmware/tunerstudio/generated/rusefi_kinetis.ini b/firmware/tunerstudio/generated/rusefi_kinetis.ini index 2b0a738b52..1b40c263c2 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 2022.01.20.kin.3085622436" + signature = "rusEFI 2022.01.20.kin.2461249872" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.01.20.kin.3085622436" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.01.20.kin.2461249872" ; 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 (unknown script) integration/rusefi_config.txt Thu Jan 20 02:12:29 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) integration/rusefi_config.txt Thu Jan 20 19:12:54 UTC 2022 pageSize = 20968 page = 1 @@ -1257,8 +1257,9 @@ cltCrankingCorrBins = array, F32, 5464, [8], "C", 1, 0, -100, 250, 2 cltCrankingCorr = array, F32, 5496, [8], "%", 1, 0, 0, 500, 2 idleAdvanceBins = array, U08, 5528, [8], "RPM", 50.0, 0, 0, 18000, 0 idleAdvance = array, F32, 5536, [8], "deg", 1, 0, -20, 90, 1 -idleVeBins = array, U08, 5568, [8], "RPM", 50.0, 0, 0, 18000, 0 -idleVe = array, F32, 5576, [8], "%", 1, 0, 0, 999, 1 +idleVeRpmBins = array, U08, 5568, [4], "RPM", 10.0, 0, 0, 2500, 0 +idleVeLoadBins = array, U08, 5572, [4], "load", 1, 0, 0, 100, 0 +idleVeTable = array, U16, 5576, [4x4], "%", 0.1, 0, 0, 999, 1 luaScript = string, ASCII, 5608, 8000 cltFuelCorrBins = array, F32, 13608, [16], "C", 1, 0, -100, 250, 2 cltFuelCorr = array, F32, 13672, [16], "ratio", 1, 0, 0, 5, 2 @@ -1784,8 +1785,6 @@ fuelTrims12_table = array, S08, 20952, [4x4], "", 0.2, 0, -25, 25, 1 cltCrankingCorr = "CLT-based cranking position multiplier for simple manual idle controller" idleAdvanceBins = "Optional timing advance table for Idle (see useSeparateAdvanceForIdle)" idleAdvance = "Optional timing advance table for Idle (see useSeparateAdvanceForIdle)" - idleVeBins = "Optional VE table for Idle (see useSeparateVEForIdle)" - idleVe = "Optional VE table for Idle (see useSeparateVEForIdle)" cltIdleCorrBins = "CLT-based idle position multiplier for simple manual idle controller" cltIdleCorr = "CLT-based idle position multiplier for simple manual idle controller" mafDecoding = "Also known as MAF transfer function.\nkg/hour value.\nBy the way 2.081989116 kg/h = 1 ft3/m" @@ -2667,18 +2666,6 @@ etbStatus_resetCounter = scalar, S32, 636, "", 1, 0 yBins = idleAdvance gauge = RPMGauge - curve = idleVeCurve, "Idle VE" - columnLabel = "RPM", "%" - xAxis = 0, 2400, 13 - yAxis = 0, 250, 11 - xBins = idleVeBins, RPMValue - yBins = idleVe -#if LAMBDA - gauge = lambda1Gauge -#else - gauge = afr1Gauge -#endif - curve = crankingAdvanceCurve, "Cranking Advance Angle" columnLabel = "RPM", "degrees" xAxis = 0, 1200, 13 @@ -2816,6 +2803,13 @@ etbStatus_resetCounter = scalar, S32, 636, "", 1, 0 gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. upDownLabel = "(RICHER)", "(LEANER)" + table = idleVeTableTbl, idleVeTable, "Idle VE" + xBins = idleVeRpmBins, RPMValue + yBins = idleVeLoadBins, veTableYAxis + zBins = idleVeTable + gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. + upDownLabel = "(RICHER)", "(LEANER)" + table = fuelTrimTbl1, fuelTrimMap1, "Fuel trim cyl 1", 1 xBins = fuelTrimRpmBins, RPMValue yBins = fuelTrimLoadBins, veTableYAxis @@ -3783,7 +3777,7 @@ menuDialog = main subMenu = iacPidMultTbl, "IAC PID Multiplier", 0, {idleMode == 0 && useIacPidMultTable == 1} subMenu = iacCoastingCurve, "Coasting IAC Position for Auto-Idle", 0, {useIacTableForCoasting == 1} subMenu = std_separator - subMenu = idleVeCurve, "VE", 0, {useSeparateVeForIdle == 1} + subMenu = idleVeTableTbl, "Idle VE", 0, {useSeparateVeForIdle == 1} subMenu = idleAdvanceCurve, "Ignition advance", 0, {useSeparateAdvanceForIdle == 1} menu = "&Advanced" diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index d9b08096f8..01c66e03b2 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 2022.01.20.mre_f4.2004987424" + signature = "rusEFI 2022.01.20.mre_f4.1389937620" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.01.20.mre_f4.2004987424" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.01.20.mre_f4.1389937620" ; 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 (unknown script) integration/rusefi_config.txt Thu Jan 20 02:12:14 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) integration/rusefi_config.txt Thu Jan 20 19:12:40 UTC 2022 pageSize = 20996 page = 1 @@ -1279,8 +1279,9 @@ cltCrankingCorrBins = array, F32, 5492, [8], "C", 1, 0, -100, 250, 2 cltCrankingCorr = array, F32, 5524, [8], "%", 1, 0, 0, 500, 2 idleAdvanceBins = array, U08, 5556, [8], "RPM", 50.0, 0, 0, 18000, 0 idleAdvance = array, F32, 5564, [8], "deg", 1, 0, -20, 90, 1 -idleVeBins = array, U08, 5596, [8], "RPM", 50.0, 0, 0, 18000, 0 -idleVe = array, F32, 5604, [8], "%", 1, 0, 0, 999, 1 +idleVeRpmBins = array, U08, 5596, [4], "RPM", 10.0, 0, 0, 2500, 0 +idleVeLoadBins = array, U08, 5600, [4], "load", 1, 0, 0, 100, 0 +idleVeTable = array, U16, 5604, [4x4], "%", 0.1, 0, 0, 999, 1 luaScript = string, ASCII, 5636, 8000 cltFuelCorrBins = array, F32, 13636, [16], "C", 1, 0, -100, 250, 2 cltFuelCorr = array, F32, 13700, [16], "ratio", 1, 0, 0, 5, 2 @@ -1818,8 +1819,6 @@ fuelTrims12_table = array, S08, 20980, [4x4], "", 0.2, 0, -25, 25, 1 cltCrankingCorr = "CLT-based cranking position multiplier for simple manual idle controller" idleAdvanceBins = "Optional timing advance table for Idle (see useSeparateAdvanceForIdle)" idleAdvance = "Optional timing advance table for Idle (see useSeparateAdvanceForIdle)" - idleVeBins = "Optional VE table for Idle (see useSeparateVEForIdle)" - idleVe = "Optional VE table for Idle (see useSeparateVEForIdle)" cltIdleCorrBins = "CLT-based idle position multiplier for simple manual idle controller" cltIdleCorr = "CLT-based idle position multiplier for simple manual idle controller" mafDecoding = "Also known as MAF transfer function.\nkg/hour value.\nBy the way 2.081989116 kg/h = 1 ft3/m" @@ -2701,18 +2700,6 @@ etbStatus_resetCounter = scalar, S32, 636, "", 1, 0 yBins = idleAdvance gauge = RPMGauge - curve = idleVeCurve, "Idle VE" - columnLabel = "RPM", "%" - xAxis = 0, 2400, 13 - yAxis = 0, 250, 11 - xBins = idleVeBins, RPMValue - yBins = idleVe -#if LAMBDA - gauge = lambda1Gauge -#else - gauge = afr1Gauge -#endif - curve = crankingAdvanceCurve, "Cranking Advance Angle" columnLabel = "RPM", "degrees" xAxis = 0, 1200, 13 @@ -2850,6 +2837,13 @@ etbStatus_resetCounter = scalar, S32, 636, "", 1, 0 gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. upDownLabel = "(RICHER)", "(LEANER)" + table = idleVeTableTbl, idleVeTable, "Idle VE" + xBins = idleVeRpmBins, RPMValue + yBins = idleVeLoadBins, veTableYAxis + zBins = idleVeTable + gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. + upDownLabel = "(RICHER)", "(LEANER)" + table = fuelTrimTbl1, fuelTrimMap1, "Fuel trim cyl 1", 1 xBins = fuelTrimRpmBins, RPMValue yBins = fuelTrimLoadBins, veTableYAxis @@ -3817,7 +3811,7 @@ menuDialog = main subMenu = iacPidMultTbl, "IAC PID Multiplier", 0, {idleMode == 0 && useIacPidMultTable == 1} subMenu = iacCoastingCurve, "Coasting IAC Position for Auto-Idle", 0, {useIacTableForCoasting == 1} subMenu = std_separator - subMenu = idleVeCurve, "VE", 0, {useSeparateVeForIdle == 1} + subMenu = idleVeTableTbl, "Idle VE", 0, {useSeparateVeForIdle == 1} subMenu = idleAdvanceCurve, "Ignition advance", 0, {useSeparateAdvanceForIdle == 1} menu = "&Advanced" diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index 95119d541f..a1695ff453 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 2022.01.20.mre_f7.2004987424" + signature = "rusEFI 2022.01.20.mre_f7.1389937620" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.01.20.mre_f7.2004987424" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.01.20.mre_f7.1389937620" ; 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 (unknown script) integration/rusefi_config.txt Thu Jan 20 02:12:13 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) integration/rusefi_config.txt Thu Jan 20 19:12:38 UTC 2022 pageSize = 20996 page = 1 @@ -1279,8 +1279,9 @@ cltCrankingCorrBins = array, F32, 5492, [8], "C", 1, 0, -100, 250, 2 cltCrankingCorr = array, F32, 5524, [8], "%", 1, 0, 0, 500, 2 idleAdvanceBins = array, U08, 5556, [8], "RPM", 50.0, 0, 0, 18000, 0 idleAdvance = array, F32, 5564, [8], "deg", 1, 0, -20, 90, 1 -idleVeBins = array, U08, 5596, [8], "RPM", 50.0, 0, 0, 18000, 0 -idleVe = array, F32, 5604, [8], "%", 1, 0, 0, 999, 1 +idleVeRpmBins = array, U08, 5596, [4], "RPM", 10.0, 0, 0, 2500, 0 +idleVeLoadBins = array, U08, 5600, [4], "load", 1, 0, 0, 100, 0 +idleVeTable = array, U16, 5604, [4x4], "%", 0.1, 0, 0, 999, 1 luaScript = string, ASCII, 5636, 8000 cltFuelCorrBins = array, F32, 13636, [16], "C", 1, 0, -100, 250, 2 cltFuelCorr = array, F32, 13700, [16], "ratio", 1, 0, 0, 5, 2 @@ -1818,8 +1819,6 @@ fuelTrims12_table = array, S08, 20980, [4x4], "", 0.2, 0, -25, 25, 1 cltCrankingCorr = "CLT-based cranking position multiplier for simple manual idle controller" idleAdvanceBins = "Optional timing advance table for Idle (see useSeparateAdvanceForIdle)" idleAdvance = "Optional timing advance table for Idle (see useSeparateAdvanceForIdle)" - idleVeBins = "Optional VE table for Idle (see useSeparateVEForIdle)" - idleVe = "Optional VE table for Idle (see useSeparateVEForIdle)" cltIdleCorrBins = "CLT-based idle position multiplier for simple manual idle controller" cltIdleCorr = "CLT-based idle position multiplier for simple manual idle controller" mafDecoding = "Also known as MAF transfer function.\nkg/hour value.\nBy the way 2.081989116 kg/h = 1 ft3/m" @@ -2701,18 +2700,6 @@ etbStatus_resetCounter = scalar, S32, 636, "", 1, 0 yBins = idleAdvance gauge = RPMGauge - curve = idleVeCurve, "Idle VE" - columnLabel = "RPM", "%" - xAxis = 0, 2400, 13 - yAxis = 0, 250, 11 - xBins = idleVeBins, RPMValue - yBins = idleVe -#if LAMBDA - gauge = lambda1Gauge -#else - gauge = afr1Gauge -#endif - curve = crankingAdvanceCurve, "Cranking Advance Angle" columnLabel = "RPM", "degrees" xAxis = 0, 1200, 13 @@ -2850,6 +2837,13 @@ etbStatus_resetCounter = scalar, S32, 636, "", 1, 0 gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. upDownLabel = "(RICHER)", "(LEANER)" + table = idleVeTableTbl, idleVeTable, "Idle VE" + xBins = idleVeRpmBins, RPMValue + yBins = idleVeLoadBins, veTableYAxis + zBins = idleVeTable + gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. + upDownLabel = "(RICHER)", "(LEANER)" + table = fuelTrimTbl1, fuelTrimMap1, "Fuel trim cyl 1", 1 xBins = fuelTrimRpmBins, RPMValue yBins = fuelTrimLoadBins, veTableYAxis @@ -3817,7 +3811,7 @@ menuDialog = main subMenu = iacPidMultTbl, "IAC PID Multiplier", 0, {idleMode == 0 && useIacPidMultTable == 1} subMenu = iacCoastingCurve, "Coasting IAC Position for Auto-Idle", 0, {useIacTableForCoasting == 1} subMenu = std_separator - subMenu = idleVeCurve, "VE", 0, {useSeparateVeForIdle == 1} + subMenu = idleVeTableTbl, "Idle VE", 0, {useSeparateVeForIdle == 1} subMenu = idleAdvanceCurve, "Ignition advance", 0, {useSeparateAdvanceForIdle == 1} menu = "&Advanced" diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index f2ac176e5d..ab8fb39208 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 2022.01.20.prometheus_405.575680002" + signature = "rusEFI 2022.01.20.prometheus_405.118047734" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.01.20.prometheus_405.575680002" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.01.20.prometheus_405.118047734" ; 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 (unknown script) integration/rusefi_config.txt Thu Jan 20 02:12:20 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) integration/rusefi_config.txt Thu Jan 20 19:12:45 UTC 2022 pageSize = 20996 page = 1 @@ -1279,8 +1279,9 @@ cltCrankingCorrBins = array, F32, 5492, [8], "C", 1, 0, -100, 250, 2 cltCrankingCorr = array, F32, 5524, [8], "%", 1, 0, 0, 500, 2 idleAdvanceBins = array, U08, 5556, [8], "RPM", 50.0, 0, 0, 18000, 0 idleAdvance = array, F32, 5564, [8], "deg", 1, 0, -20, 90, 1 -idleVeBins = array, U08, 5596, [8], "RPM", 50.0, 0, 0, 18000, 0 -idleVe = array, F32, 5604, [8], "%", 1, 0, 0, 999, 1 +idleVeRpmBins = array, U08, 5596, [4], "RPM", 10.0, 0, 0, 2500, 0 +idleVeLoadBins = array, U08, 5600, [4], "load", 1, 0, 0, 100, 0 +idleVeTable = array, U16, 5604, [4x4], "%", 0.1, 0, 0, 999, 1 luaScript = string, ASCII, 5636, 8000 cltFuelCorrBins = array, F32, 13636, [16], "C", 1, 0, -100, 250, 2 cltFuelCorr = array, F32, 13700, [16], "ratio", 1, 0, 0, 5, 2 @@ -1818,8 +1819,6 @@ fuelTrims12_table = array, S08, 20980, [4x4], "", 0.2, 0, -25, 25, 1 cltCrankingCorr = "CLT-based cranking position multiplier for simple manual idle controller" idleAdvanceBins = "Optional timing advance table for Idle (see useSeparateAdvanceForIdle)" idleAdvance = "Optional timing advance table for Idle (see useSeparateAdvanceForIdle)" - idleVeBins = "Optional VE table for Idle (see useSeparateVEForIdle)" - idleVe = "Optional VE table for Idle (see useSeparateVEForIdle)" cltIdleCorrBins = "CLT-based idle position multiplier for simple manual idle controller" cltIdleCorr = "CLT-based idle position multiplier for simple manual idle controller" mafDecoding = "Also known as MAF transfer function.\nkg/hour value.\nBy the way 2.081989116 kg/h = 1 ft3/m" @@ -2701,18 +2700,6 @@ etbStatus_resetCounter = scalar, S32, 636, "", 1, 0 yBins = idleAdvance gauge = RPMGauge - curve = idleVeCurve, "Idle VE" - columnLabel = "RPM", "%" - xAxis = 0, 2400, 13 - yAxis = 0, 250, 11 - xBins = idleVeBins, RPMValue - yBins = idleVe -#if LAMBDA - gauge = lambda1Gauge -#else - gauge = afr1Gauge -#endif - curve = crankingAdvanceCurve, "Cranking Advance Angle" columnLabel = "RPM", "degrees" xAxis = 0, 1200, 13 @@ -2850,6 +2837,13 @@ etbStatus_resetCounter = scalar, S32, 636, "", 1, 0 gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. upDownLabel = "(RICHER)", "(LEANER)" + table = idleVeTableTbl, idleVeTable, "Idle VE" + xBins = idleVeRpmBins, RPMValue + yBins = idleVeLoadBins, veTableYAxis + zBins = idleVeTable + gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. + upDownLabel = "(RICHER)", "(LEANER)" + table = fuelTrimTbl1, fuelTrimMap1, "Fuel trim cyl 1", 1 xBins = fuelTrimRpmBins, RPMValue yBins = fuelTrimLoadBins, veTableYAxis @@ -3817,7 +3811,7 @@ menuDialog = main subMenu = iacPidMultTbl, "IAC PID Multiplier", 0, {idleMode == 0 && useIacPidMultTable == 1} subMenu = iacCoastingCurve, "Coasting IAC Position for Auto-Idle", 0, {useIacTableForCoasting == 1} subMenu = std_separator - subMenu = idleVeCurve, "VE", 0, {useSeparateVeForIdle == 1} + subMenu = idleVeTableTbl, "Idle VE", 0, {useSeparateVeForIdle == 1} subMenu = idleAdvanceCurve, "Ignition advance", 0, {useSeparateAdvanceForIdle == 1} menu = "&Advanced" diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index 3f52f7b636..baff42fab8 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 2022.01.20.prometheus_469.575680002" + signature = "rusEFI 2022.01.20.prometheus_469.118047734" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.01.20.prometheus_469.575680002" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.01.20.prometheus_469.118047734" ; 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 (unknown script) integration/rusefi_config.txt Thu Jan 20 02:12:18 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) integration/rusefi_config.txt Thu Jan 20 19:12:44 UTC 2022 pageSize = 20996 page = 1 @@ -1279,8 +1279,9 @@ cltCrankingCorrBins = array, F32, 5492, [8], "C", 1, 0, -100, 250, 2 cltCrankingCorr = array, F32, 5524, [8], "%", 1, 0, 0, 500, 2 idleAdvanceBins = array, U08, 5556, [8], "RPM", 50.0, 0, 0, 18000, 0 idleAdvance = array, F32, 5564, [8], "deg", 1, 0, -20, 90, 1 -idleVeBins = array, U08, 5596, [8], "RPM", 50.0, 0, 0, 18000, 0 -idleVe = array, F32, 5604, [8], "%", 1, 0, 0, 999, 1 +idleVeRpmBins = array, U08, 5596, [4], "RPM", 10.0, 0, 0, 2500, 0 +idleVeLoadBins = array, U08, 5600, [4], "load", 1, 0, 0, 100, 0 +idleVeTable = array, U16, 5604, [4x4], "%", 0.1, 0, 0, 999, 1 luaScript = string, ASCII, 5636, 8000 cltFuelCorrBins = array, F32, 13636, [16], "C", 1, 0, -100, 250, 2 cltFuelCorr = array, F32, 13700, [16], "ratio", 1, 0, 0, 5, 2 @@ -1818,8 +1819,6 @@ fuelTrims12_table = array, S08, 20980, [4x4], "", 0.2, 0, -25, 25, 1 cltCrankingCorr = "CLT-based cranking position multiplier for simple manual idle controller" idleAdvanceBins = "Optional timing advance table for Idle (see useSeparateAdvanceForIdle)" idleAdvance = "Optional timing advance table for Idle (see useSeparateAdvanceForIdle)" - idleVeBins = "Optional VE table for Idle (see useSeparateVEForIdle)" - idleVe = "Optional VE table for Idle (see useSeparateVEForIdle)" cltIdleCorrBins = "CLT-based idle position multiplier for simple manual idle controller" cltIdleCorr = "CLT-based idle position multiplier for simple manual idle controller" mafDecoding = "Also known as MAF transfer function.\nkg/hour value.\nBy the way 2.081989116 kg/h = 1 ft3/m" @@ -2701,18 +2700,6 @@ etbStatus_resetCounter = scalar, S32, 636, "", 1, 0 yBins = idleAdvance gauge = RPMGauge - curve = idleVeCurve, "Idle VE" - columnLabel = "RPM", "%" - xAxis = 0, 2400, 13 - yAxis = 0, 250, 11 - xBins = idleVeBins, RPMValue - yBins = idleVe -#if LAMBDA - gauge = lambda1Gauge -#else - gauge = afr1Gauge -#endif - curve = crankingAdvanceCurve, "Cranking Advance Angle" columnLabel = "RPM", "degrees" xAxis = 0, 1200, 13 @@ -2850,6 +2837,13 @@ etbStatus_resetCounter = scalar, S32, 636, "", 1, 0 gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. upDownLabel = "(RICHER)", "(LEANER)" + table = idleVeTableTbl, idleVeTable, "Idle VE" + xBins = idleVeRpmBins, RPMValue + yBins = idleVeLoadBins, veTableYAxis + zBins = idleVeTable + gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. + upDownLabel = "(RICHER)", "(LEANER)" + table = fuelTrimTbl1, fuelTrimMap1, "Fuel trim cyl 1", 1 xBins = fuelTrimRpmBins, RPMValue yBins = fuelTrimLoadBins, veTableYAxis @@ -3817,7 +3811,7 @@ menuDialog = main subMenu = iacPidMultTbl, "IAC PID Multiplier", 0, {idleMode == 0 && useIacPidMultTable == 1} subMenu = iacCoastingCurve, "Coasting IAC Position for Auto-Idle", 0, {useIacTableForCoasting == 1} subMenu = std_separator - subMenu = idleVeCurve, "VE", 0, {useSeparateVeForIdle == 1} + subMenu = idleVeTableTbl, "Idle VE", 0, {useSeparateVeForIdle == 1} subMenu = idleAdvanceCurve, "Ignition advance", 0, {useSeparateAdvanceForIdle == 1} menu = "&Advanced" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index 97ba62e608..682ff97e17 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 2022.01.20.proteus_f4.2801285655" + signature = "rusEFI 2022.01.20.proteus_f4.2208389091" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.01.20.proteus_f4.2801285655" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.01.20.proteus_f4.2208389091" ; 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 (unknown script) integration/rusefi_config.txt Thu Jan 20 02:12:24 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) integration/rusefi_config.txt Thu Jan 20 19:12:49 UTC 2022 pageSize = 20996 page = 1 @@ -1279,8 +1279,9 @@ cltCrankingCorrBins = array, F32, 5492, [8], "C", 1, 0, -100, 250, 2 cltCrankingCorr = array, F32, 5524, [8], "%", 1, 0, 0, 500, 2 idleAdvanceBins = array, U08, 5556, [8], "RPM", 50.0, 0, 0, 18000, 0 idleAdvance = array, F32, 5564, [8], "deg", 1, 0, -20, 90, 1 -idleVeBins = array, U08, 5596, [8], "RPM", 50.0, 0, 0, 18000, 0 -idleVe = array, F32, 5604, [8], "%", 1, 0, 0, 999, 1 +idleVeRpmBins = array, U08, 5596, [4], "RPM", 10.0, 0, 0, 2500, 0 +idleVeLoadBins = array, U08, 5600, [4], "load", 1, 0, 0, 100, 0 +idleVeTable = array, U16, 5604, [4x4], "%", 0.1, 0, 0, 999, 1 luaScript = string, ASCII, 5636, 8000 cltFuelCorrBins = array, F32, 13636, [16], "C", 1, 0, -100, 250, 2 cltFuelCorr = array, F32, 13700, [16], "ratio", 1, 0, 0, 5, 2 @@ -1818,8 +1819,6 @@ fuelTrims12_table = array, S08, 20980, [4x4], "", 0.2, 0, -25, 25, 1 cltCrankingCorr = "CLT-based cranking position multiplier for simple manual idle controller" idleAdvanceBins = "Optional timing advance table for Idle (see useSeparateAdvanceForIdle)" idleAdvance = "Optional timing advance table for Idle (see useSeparateAdvanceForIdle)" - idleVeBins = "Optional VE table for Idle (see useSeparateVEForIdle)" - idleVe = "Optional VE table for Idle (see useSeparateVEForIdle)" cltIdleCorrBins = "CLT-based idle position multiplier for simple manual idle controller" cltIdleCorr = "CLT-based idle position multiplier for simple manual idle controller" mafDecoding = "Also known as MAF transfer function.\nkg/hour value.\nBy the way 2.081989116 kg/h = 1 ft3/m" @@ -2701,18 +2700,6 @@ etbStatus_resetCounter = scalar, S32, 636, "", 1, 0 yBins = idleAdvance gauge = RPMGauge - curve = idleVeCurve, "Idle VE" - columnLabel = "RPM", "%" - xAxis = 0, 2400, 13 - yAxis = 0, 250, 11 - xBins = idleVeBins, RPMValue - yBins = idleVe -#if LAMBDA - gauge = lambda1Gauge -#else - gauge = afr1Gauge -#endif - curve = crankingAdvanceCurve, "Cranking Advance Angle" columnLabel = "RPM", "degrees" xAxis = 0, 1200, 13 @@ -2850,6 +2837,13 @@ etbStatus_resetCounter = scalar, S32, 636, "", 1, 0 gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. upDownLabel = "(RICHER)", "(LEANER)" + table = idleVeTableTbl, idleVeTable, "Idle VE" + xBins = idleVeRpmBins, RPMValue + yBins = idleVeLoadBins, veTableYAxis + zBins = idleVeTable + gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. + upDownLabel = "(RICHER)", "(LEANER)" + table = fuelTrimTbl1, fuelTrimMap1, "Fuel trim cyl 1", 1 xBins = fuelTrimRpmBins, RPMValue yBins = fuelTrimLoadBins, veTableYAxis @@ -3817,7 +3811,7 @@ menuDialog = main subMenu = iacPidMultTbl, "IAC PID Multiplier", 0, {idleMode == 0 && useIacPidMultTable == 1} subMenu = iacCoastingCurve, "Coasting IAC Position for Auto-Idle", 0, {useIacTableForCoasting == 1} subMenu = std_separator - subMenu = idleVeCurve, "VE", 0, {useSeparateVeForIdle == 1} + subMenu = idleVeTableTbl, "Idle VE", 0, {useSeparateVeForIdle == 1} subMenu = idleAdvanceCurve, "Ignition advance", 0, {useSeparateAdvanceForIdle == 1} menu = "&Advanced" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index dda817f8b6..ba6a309871 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 2022.01.20.proteus_f7.2801285655" + signature = "rusEFI 2022.01.20.proteus_f7.2208389091" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.01.20.proteus_f7.2801285655" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.01.20.proteus_f7.2208389091" ; 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 (unknown script) integration/rusefi_config.txt Thu Jan 20 02:12:22 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) integration/rusefi_config.txt Thu Jan 20 19:12:47 UTC 2022 pageSize = 20996 page = 1 @@ -1279,8 +1279,9 @@ cltCrankingCorrBins = array, F32, 5492, [8], "C", 1, 0, -100, 250, 2 cltCrankingCorr = array, F32, 5524, [8], "%", 1, 0, 0, 500, 2 idleAdvanceBins = array, U08, 5556, [8], "RPM", 50.0, 0, 0, 18000, 0 idleAdvance = array, F32, 5564, [8], "deg", 1, 0, -20, 90, 1 -idleVeBins = array, U08, 5596, [8], "RPM", 50.0, 0, 0, 18000, 0 -idleVe = array, F32, 5604, [8], "%", 1, 0, 0, 999, 1 +idleVeRpmBins = array, U08, 5596, [4], "RPM", 10.0, 0, 0, 2500, 0 +idleVeLoadBins = array, U08, 5600, [4], "load", 1, 0, 0, 100, 0 +idleVeTable = array, U16, 5604, [4x4], "%", 0.1, 0, 0, 999, 1 luaScript = string, ASCII, 5636, 8000 cltFuelCorrBins = array, F32, 13636, [16], "C", 1, 0, -100, 250, 2 cltFuelCorr = array, F32, 13700, [16], "ratio", 1, 0, 0, 5, 2 @@ -1818,8 +1819,6 @@ fuelTrims12_table = array, S08, 20980, [4x4], "", 0.2, 0, -25, 25, 1 cltCrankingCorr = "CLT-based cranking position multiplier for simple manual idle controller" idleAdvanceBins = "Optional timing advance table for Idle (see useSeparateAdvanceForIdle)" idleAdvance = "Optional timing advance table for Idle (see useSeparateAdvanceForIdle)" - idleVeBins = "Optional VE table for Idle (see useSeparateVEForIdle)" - idleVe = "Optional VE table for Idle (see useSeparateVEForIdle)" cltIdleCorrBins = "CLT-based idle position multiplier for simple manual idle controller" cltIdleCorr = "CLT-based idle position multiplier for simple manual idle controller" mafDecoding = "Also known as MAF transfer function.\nkg/hour value.\nBy the way 2.081989116 kg/h = 1 ft3/m" @@ -2701,18 +2700,6 @@ etbStatus_resetCounter = scalar, S32, 636, "", 1, 0 yBins = idleAdvance gauge = RPMGauge - curve = idleVeCurve, "Idle VE" - columnLabel = "RPM", "%" - xAxis = 0, 2400, 13 - yAxis = 0, 250, 11 - xBins = idleVeBins, RPMValue - yBins = idleVe -#if LAMBDA - gauge = lambda1Gauge -#else - gauge = afr1Gauge -#endif - curve = crankingAdvanceCurve, "Cranking Advance Angle" columnLabel = "RPM", "degrees" xAxis = 0, 1200, 13 @@ -2850,6 +2837,13 @@ etbStatus_resetCounter = scalar, S32, 636, "", 1, 0 gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. upDownLabel = "(RICHER)", "(LEANER)" + table = idleVeTableTbl, idleVeTable, "Idle VE" + xBins = idleVeRpmBins, RPMValue + yBins = idleVeLoadBins, veTableYAxis + zBins = idleVeTable + gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. + upDownLabel = "(RICHER)", "(LEANER)" + table = fuelTrimTbl1, fuelTrimMap1, "Fuel trim cyl 1", 1 xBins = fuelTrimRpmBins, RPMValue yBins = fuelTrimLoadBins, veTableYAxis @@ -3817,7 +3811,7 @@ menuDialog = main subMenu = iacPidMultTbl, "IAC PID Multiplier", 0, {idleMode == 0 && useIacPidMultTable == 1} subMenu = iacCoastingCurve, "Coasting IAC Position for Auto-Idle", 0, {useIacTableForCoasting == 1} subMenu = std_separator - subMenu = idleVeCurve, "VE", 0, {useSeparateVeForIdle == 1} + subMenu = idleVeTableTbl, "Idle VE", 0, {useSeparateVeForIdle == 1} subMenu = idleAdvanceCurve, "Ignition advance", 0, {useSeparateAdvanceForIdle == 1} menu = "&Advanced" diff --git a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini index 976d566992..f153993bb2 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 2022.01.20.subaru_eg33_f7.2969625012" + signature = "rusEFI 2022.01.20.subaru_eg33_f7.2488896576" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.01.20.subaru_eg33_f7.2969625012" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.01.20.subaru_eg33_f7.2488896576" ; 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 (unknown script) integration/rusefi_config.txt Thu Jan 20 02:12:32 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) integration/rusefi_config.txt Thu Jan 20 19:12:57 UTC 2022 pageSize = 20996 page = 1 @@ -1279,8 +1279,9 @@ cltCrankingCorrBins = array, F32, 5492, [8], "C", 1, 0, -100, 250, 2 cltCrankingCorr = array, F32, 5524, [8], "%", 1, 0, 0, 500, 2 idleAdvanceBins = array, U08, 5556, [8], "RPM", 50.0, 0, 0, 18000, 0 idleAdvance = array, F32, 5564, [8], "deg", 1, 0, -20, 90, 1 -idleVeBins = array, U08, 5596, [8], "RPM", 50.0, 0, 0, 18000, 0 -idleVe = array, F32, 5604, [8], "%", 1, 0, 0, 999, 1 +idleVeRpmBins = array, U08, 5596, [4], "RPM", 10.0, 0, 0, 2500, 0 +idleVeLoadBins = array, U08, 5600, [4], "load", 1, 0, 0, 100, 0 +idleVeTable = array, U16, 5604, [4x4], "%", 0.1, 0, 0, 999, 1 luaScript = string, ASCII, 5636, 8000 cltFuelCorrBins = array, F32, 13636, [16], "C", 1, 0, -100, 250, 2 cltFuelCorr = array, F32, 13700, [16], "ratio", 1, 0, 0, 5, 2 @@ -1818,8 +1819,6 @@ fuelTrims12_table = array, S08, 20980, [4x4], "", 0.2, 0, -25, 25, 1 cltCrankingCorr = "CLT-based cranking position multiplier for simple manual idle controller" idleAdvanceBins = "Optional timing advance table for Idle (see useSeparateAdvanceForIdle)" idleAdvance = "Optional timing advance table for Idle (see useSeparateAdvanceForIdle)" - idleVeBins = "Optional VE table for Idle (see useSeparateVEForIdle)" - idleVe = "Optional VE table for Idle (see useSeparateVEForIdle)" cltIdleCorrBins = "CLT-based idle position multiplier for simple manual idle controller" cltIdleCorr = "CLT-based idle position multiplier for simple manual idle controller" mafDecoding = "Also known as MAF transfer function.\nkg/hour value.\nBy the way 2.081989116 kg/h = 1 ft3/m" @@ -2701,18 +2700,6 @@ etbStatus_resetCounter = scalar, S32, 636, "", 1, 0 yBins = idleAdvance gauge = RPMGauge - curve = idleVeCurve, "Idle VE" - columnLabel = "RPM", "%" - xAxis = 0, 2400, 13 - yAxis = 0, 250, 11 - xBins = idleVeBins, RPMValue - yBins = idleVe -#if LAMBDA - gauge = lambda1Gauge -#else - gauge = afr1Gauge -#endif - curve = crankingAdvanceCurve, "Cranking Advance Angle" columnLabel = "RPM", "degrees" xAxis = 0, 1200, 13 @@ -2850,6 +2837,13 @@ etbStatus_resetCounter = scalar, S32, 636, "", 1, 0 gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. upDownLabel = "(RICHER)", "(LEANER)" + table = idleVeTableTbl, idleVeTable, "Idle VE" + xBins = idleVeRpmBins, RPMValue + yBins = idleVeLoadBins, veTableYAxis + zBins = idleVeTable + gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. + upDownLabel = "(RICHER)", "(LEANER)" + table = fuelTrimTbl1, fuelTrimMap1, "Fuel trim cyl 1", 1 xBins = fuelTrimRpmBins, RPMValue yBins = fuelTrimLoadBins, veTableYAxis @@ -3817,7 +3811,7 @@ menuDialog = main subMenu = iacPidMultTbl, "IAC PID Multiplier", 0, {idleMode == 0 && useIacPidMultTable == 1} subMenu = iacCoastingCurve, "Coasting IAC Position for Auto-Idle", 0, {useIacTableForCoasting == 1} subMenu = std_separator - subMenu = idleVeCurve, "VE", 0, {useSeparateVeForIdle == 1} + subMenu = idleVeTableTbl, "Idle VE", 0, {useSeparateVeForIdle == 1} subMenu = idleAdvanceCurve, "Ignition advance", 0, {useSeparateAdvanceForIdle == 1} menu = "&Advanced" 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 e4d4d81bd0..314bac3b09 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 (unknown script) integration/rusefi_config.txt Thu Jan 20 02:12:36 UTC 2022 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) integration/rusefi_config.txt Thu Jan 20 19:13:00 UTC 2022 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -920,7 +920,7 @@ public class Fields { public static final int firingOrder_offset = 424; public static final int fixedModeTiming_offset = 464; public static final int fixedTiming_offset = 1824; - public static final int FLASH_DATA_VERSION = 10007; + public static final int FLASH_DATA_VERSION = 10008; public static final int flexSensorPin_offset = 806; public static final String FSIO_METHOD_FSIO_ANALOG_INPUT = "fsio_analog_input"; public static final String FSIO_METHOD_FSIO_DIGITAL_INPUT = "fsio_digital_input"; @@ -1276,7 +1276,7 @@ public class Fields { public static final int idle_state_e_TPS_THRESHOLD = 1; public static final int idle_stepperDirectionPin_offset = 613; public static final int idle_stepperStepPin_offset = 614; - public static final int IDLE_VE_CURVE_SIZE = 8; + public static final int IDLE_VE_SIZE = 4; public static final int idleAdvance_offset = 5564; public static final int idleAdvanceBins_offset = 5556; public static final int idleIncrementalPidCic_offset = 748; @@ -1317,8 +1317,9 @@ public class Fields { public static final int idleTimingPid_periodMs_offset = 3458; public static final int idleTimingPid_pFactor_offset = 3444; public static final int idleTimingPidDeadZone_offset = 3464; - public static final int idleVe_offset = 5604; - public static final int idleVeBins_offset = 5596; + public static final int idleVeLoadBins_offset = 5600; + public static final int idleVeRpmBins_offset = 5596; + public static final int idleVeTable_offset = 5604; public static final int IGN_LOAD_COUNT = 16; public static final int IGN_RPM_COUNT = 16; public static final int ignition_mode_e_IM_INDIVIDUAL_COILS = 1; @@ -1821,7 +1822,7 @@ 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 = 1924855780; + public static final int SIGNATURE_HASH = 1474533904; public static final int silentTriggerError_offset = 1260; public static final int slowAdcAlpha_offset = 1712; public static final int sparkDwellRpmBins_offset = 54; @@ -2291,7 +2292,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 2022.01.20.all.1924855780"; + public static final String TS_SIGNATURE = "rusEFI 2022.01.20.all.1474533904"; public static final char TS_SINGLE_WRITE_COMMAND = 'W'; public static final char TS_TEST_COMMAND = 't'; public static final int tunerStudioSerialSpeed_offset = 732; @@ -3690,8 +3691,9 @@ public class Fields { public static final Field CLTCRANKINGCORR = Field.create("CLTCRANKINGCORR", 5524, FieldType.FLOAT); public static final Field IDLEADVANCEBINS = Field.create("IDLEADVANCEBINS", 5556, FieldType.INT8); public static final Field IDLEADVANCE = Field.create("IDLEADVANCE", 5564, FieldType.FLOAT); - public static final Field IDLEVEBINS = Field.create("IDLEVEBINS", 5596, FieldType.INT8); - public static final Field IDLEVE = Field.create("IDLEVE", 5604, FieldType.FLOAT); + public static final Field IDLEVERPMBINS = Field.create("IDLEVERPMBINS", 5596, FieldType.INT8); + public static final Field IDLEVELOADBINS = Field.create("IDLEVELOADBINS", 5600, FieldType.INT8); + public static final Field IDLEVETABLE = Field.create("IDLEVETABLE", 5604, FieldType.INT16); public static final Field LUASCRIPT = Field.create("LUASCRIPT", 5636, 8000, FieldType.STRING); public static final Field CLTFUELCORRBINS = Field.create("CLTFUELCORRBINS", 13636, FieldType.FLOAT); public static final Field CLTFUELCORR = Field.create("CLTFUELCORR", 13700, FieldType.FLOAT); @@ -4966,8 +4968,9 @@ public class Fields { CLTCRANKINGCORR, IDLEADVANCEBINS, IDLEADVANCE, - IDLEVEBINS, - IDLEVE, + IDLEVERPMBINS, + IDLEVELOADBINS, + IDLEVETABLE, LUASCRIPT, CLTFUELCORRBINS, CLTFUELCORR,