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 1ead9e0a3e..ac67d0ffd1 100644 --- a/firmware/config/boards/hellen/cypress/config/controllers/algo/engine_configuration_generated_structures.h +++ b/firmware/config/boards/hellen/cypress/config/controllers/algo/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Mon May 31 12:20:29 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Mon May 31 22:02:32 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -1396,8 +1396,8 @@ struct engine_configuration_s { */ pin_input_mode_e throttlePedalUpPinMode; /** - * Additional idle PID offset while A/C is active - Percent + * Additional idle % while A/C is active + % * offset 711 */ uint8_t acIdleExtraOffset; @@ -3100,10 +3100,11 @@ struct engine_configuration_s { */ fsio_pwm_freq_t auxPidFrequency[CAMS_PER_BANK]; /** - units + * Additional idle % when fan #1 is active + % * offset 2252 */ - uint8_t unused1301; + uint8_t fan1ExtraIdle; /** * need 4 byte alignment units @@ -3141,10 +3142,16 @@ struct engine_configuration_s { */ uint8_t vvtModePadding[CAMS_PER_BANK_padding]; /** - units + * Additional idle % when fan #2 is active + % * offset 2330 */ - uint8_t unusedOldBiquad[22]; + uint8_t fan2ExtraIdle; + /** + units + * offset 2331 + */ + uint8_t unusedOldBiquad[21]; /** * CLT-based timing correction C @@ -4205,4 +4212,4 @@ struct persistent_config_s { }; // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Mon May 31 12:20:29 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Mon May 31 22:02:32 UTC 2021 diff --git a/firmware/config/boards/hellen/cypress/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/hellen/cypress/config/controllers/algo/rusefi_generated.h index d385738089..cf17c9aa3d 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 @@ -491,6 +491,8 @@ #define externalKnockSenseAdc_offset 3103 #define extraInjectionOffset_offset 432 #define failedMapFallback_offset 541 +#define fan1ExtraIdle_offset 2252 +#define fan2ExtraIdle_offset 2330 #define fanOffTemperature_offset 472 #define fanOnTemperature_offset 468 #define fanPin_offset 663 @@ -1277,7 +1279,7 @@ #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD hellen_cypress #define SIGNATURE_DATE 2021.05.31 -#define SIGNATURE_HASH 2886136611 +#define SIGNATURE_HASH 3976841991 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1630,7 +1632,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2021.05.31.hellen_cypress.2886136611" +#define TS_SIGNATURE "rusEFI 2021.05.31.hellen_cypress.3976841991" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' // 0x74 @@ -1689,7 +1691,6 @@ #define unused1128_offset 2116 #define unused1129_offset 2116 #define unused1130_offset 2116 -#define unused1301_offset 2252 #define unused1366_offset 2652 #define unused1476b19_offset 1476 #define unused1476b20_offset 1476 @@ -1759,7 +1760,7 @@ #define unusedBit_492_8_offset 2116 #define unusedBit_492_9_offset 2116 #define unusedHereWeHave_offset 1464 -#define unusedOldBiquad_offset 2330 +#define unusedOldBiquad_offset 2331 #define unusedOldIgnitionOffset_offset 445 #define unusedSpiPadding4_offset 2593 #define unusedSpiPadding5_offset 2715 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 5bab47ebf1..0ed66cfd3a 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Mon May 31 12:20:27 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Mon May 31 22:02:30 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -1396,8 +1396,8 @@ struct engine_configuration_s { */ pin_input_mode_e throttlePedalUpPinMode; /** - * Additional idle PID offset while A/C is active - Percent + * Additional idle % while A/C is active + % * offset 711 */ uint8_t acIdleExtraOffset; @@ -3094,10 +3094,11 @@ struct engine_configuration_s { */ fsio_pwm_freq_t auxPidFrequency[CAMS_PER_BANK]; /** - units + * Additional idle % when fan #1 is active + % * offset 2246 */ - uint8_t unused1301; + uint8_t fan1ExtraIdle; /** * need 4 byte alignment units @@ -3135,10 +3136,16 @@ struct engine_configuration_s { */ uint8_t vvtModePadding[CAMS_PER_BANK_padding]; /** - units + * Additional idle % when fan #2 is active + % * offset 2322 */ - uint8_t unusedOldBiquad[22]; + uint8_t fan2ExtraIdle; + /** + units + * offset 2323 + */ + uint8_t unusedOldBiquad[21]; /** * CLT-based timing correction C @@ -4199,4 +4206,4 @@ struct persistent_config_s { }; // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Mon May 31 12:20:27 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Mon May 31 22:02:30 UTC 2021 diff --git a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h index 709cc8ebd4..d95ee202ce 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -475,6 +475,8 @@ #define externalKnockSenseAdc_offset 3075 #define extraInjectionOffset_offset 432 #define failedMapFallback_offset 541 +#define fan1ExtraIdle_offset 2246 +#define fan2ExtraIdle_offset 2322 #define fanOffTemperature_offset 472 #define fanOnTemperature_offset 468 #define fanPin_offset 663 @@ -1261,7 +1263,7 @@ #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD kin #define SIGNATURE_DATE 2021.05.31 -#define SIGNATURE_HASH 1403207647 +#define SIGNATURE_HASH 313264123 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1614,7 +1616,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator true #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2021.05.31.kin.1403207647" +#define TS_SIGNATURE "rusEFI 2021.05.31.kin.313264123" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' // 0x74 @@ -1673,7 +1675,6 @@ #define unused1128_offset 2116 #define unused1129_offset 2116 #define unused1130_offset 2116 -#define unused1301_offset 2246 #define unused1366_offset 2624 #define unused1476b19_offset 1476 #define unused1476b20_offset 1476 @@ -1743,7 +1744,7 @@ #define unusedBit_492_8_offset 2116 #define unusedBit_492_9_offset 2116 #define unusedHereWeHave_offset 1464 -#define unusedOldBiquad_offset 2322 +#define unusedOldBiquad_offset 2323 #define unusedOldIgnitionOffset_offset 445 #define unusedSpiPadding4_offset 2585 #define unusedSpiPadding5_offset 2687 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 87fc79b424..1814790927 100644 --- a/firmware/config/boards/subaru_eg33/config/controllers/algo/engine_configuration_generated_structures.h +++ b/firmware/config/boards/subaru_eg33/config/controllers/algo/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_config.sh integration/rusefi_config.txt Mon May 31 12:20:31 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_config.sh integration/rusefi_config.txt Mon May 31 22:02:34 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -1396,8 +1396,8 @@ struct engine_configuration_s { */ pin_input_mode_e throttlePedalUpPinMode; /** - * Additional idle PID offset while A/C is active - Percent + * Additional idle % while A/C is active + % * offset 711 */ uint8_t acIdleExtraOffset; @@ -3100,10 +3100,11 @@ struct engine_configuration_s { */ fsio_pwm_freq_t auxPidFrequency[CAMS_PER_BANK]; /** - units + * Additional idle % when fan #1 is active + % * offset 2252 */ - uint8_t unused1301; + uint8_t fan1ExtraIdle; /** * need 4 byte alignment units @@ -3141,10 +3142,16 @@ struct engine_configuration_s { */ uint8_t vvtModePadding[CAMS_PER_BANK_padding]; /** - units + * Additional idle % when fan #2 is active + % * offset 2330 */ - uint8_t unusedOldBiquad[22]; + uint8_t fan2ExtraIdle; + /** + units + * offset 2331 + */ + uint8_t unusedOldBiquad[21]; /** * CLT-based timing correction C @@ -4205,4 +4212,4 @@ struct persistent_config_s { }; // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_config.sh integration/rusefi_config.txt Mon May 31 12:20:31 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_config.sh integration/rusefi_config.txt Mon May 31 22:02:34 UTC 2021 diff --git a/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h index fe6526dc8d..4b4b2a40fa 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 @@ -491,6 +491,8 @@ #define externalKnockSenseAdc_offset 3103 #define extraInjectionOffset_offset 432 #define failedMapFallback_offset 541 +#define fan1ExtraIdle_offset 2252 +#define fan2ExtraIdle_offset 2330 #define fanOffTemperature_offset 472 #define fanOnTemperature_offset 468 #define fanPin_offset 663 @@ -1277,7 +1279,7 @@ #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD subaru_eg33_f7 #define SIGNATURE_DATE 2021.05.31 -#define SIGNATURE_HASH 1126573797 +#define SIGNATURE_HASH 36249281 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1630,7 +1632,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port false -#define TS_SIGNATURE "rusEFI 2021.05.31.subaru_eg33_f7.1126573797" +#define TS_SIGNATURE "rusEFI 2021.05.31.subaru_eg33_f7.36249281" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' // 0x74 @@ -1689,7 +1691,6 @@ #define unused1128_offset 2116 #define unused1129_offset 2116 #define unused1130_offset 2116 -#define unused1301_offset 2252 #define unused1366_offset 2652 #define unused1476b19_offset 1476 #define unused1476b20_offset 1476 @@ -1759,7 +1760,7 @@ #define unusedBit_492_8_offset 2116 #define unusedBit_492_9_offset 2116 #define unusedHereWeHave_offset 1464 -#define unusedOldBiquad_offset 2330 +#define unusedOldBiquad_offset 2331 #define unusedOldIgnitionOffset_offset 445 #define unusedSpiPadding4_offset 2593 #define unusedSpiPadding5_offset 2715 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures.h b/firmware/controllers/generated/engine_configuration_generated_structures.h index 67c44ea27a..d91727c252 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon May 31 12:20:03 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon May 31 22:02:06 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -1396,8 +1396,8 @@ struct engine_configuration_s { */ pin_input_mode_e throttlePedalUpPinMode; /** - * Additional idle PID offset while A/C is active - Percent + * Additional idle % while A/C is active + % * offset 711 */ uint8_t acIdleExtraOffset; @@ -3100,10 +3100,11 @@ struct engine_configuration_s { */ fsio_pwm_freq_t auxPidFrequency[CAMS_PER_BANK]; /** - units + * Additional idle % when fan #1 is active + % * offset 2252 */ - uint8_t unused1301; + uint8_t fan1ExtraIdle; /** * need 4 byte alignment units @@ -3141,10 +3142,16 @@ struct engine_configuration_s { */ uint8_t vvtModePadding[CAMS_PER_BANK_padding]; /** - units + * Additional idle % when fan #2 is active + % * offset 2330 */ - uint8_t unusedOldBiquad[22]; + uint8_t fan2ExtraIdle; + /** + units + * offset 2331 + */ + uint8_t unusedOldBiquad[21]; /** * CLT-based timing correction C @@ -4205,4 +4212,4 @@ struct persistent_config_s { }; // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon May 31 12:20:03 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon May 31 22:02:06 UTC 2021 diff --git a/firmware/controllers/generated/fsio_enums_generated.def b/firmware/controllers/generated/fsio_enums_generated.def index 8fb4117216..05f05a924e 100644 --- a/firmware/controllers/generated/fsio_enums_generated.def +++ b/firmware/controllers/generated/fsio_enums_generated.def @@ -1,4 +1,4 @@ -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon May 31 12:20:03 UTC 2021 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon May 31 22:02:06 UTC 2021 // by class com.rusefi.output.FileFsioSettingsConsumer FSIO_SETTING_FANONTEMPERATURE = 1000, diff --git a/firmware/controllers/generated/fsio_getters.def b/firmware/controllers/generated/fsio_getters.def index c53835fd63..aa5bcab0be 100644 --- a/firmware/controllers/generated/fsio_getters.def +++ b/firmware/controllers/generated/fsio_getters.def @@ -1,4 +1,4 @@ -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon May 31 12:20:03 UTC 2021 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon May 31 22:02:06 UTC 2021 // by class com.rusefi.output.FileFsioSettingsConsumer case FSIO_SETTING_FANONTEMPERATURE: diff --git a/firmware/controllers/generated/fsio_names.def b/firmware/controllers/generated/fsio_names.def index 32b7a28a1a..4e929b4f8e 100644 --- a/firmware/controllers/generated/fsio_names.def +++ b/firmware/controllers/generated/fsio_names.def @@ -1,4 +1,4 @@ -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon May 31 12:20:03 UTC 2021 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon May 31 22:02:06 UTC 2021 // by class com.rusefi.output.FileFsioSettingsConsumer static LENameOrdinalPair lefanOnTemperature(FSIO_SETTING_FANONTEMPERATURE, "cfg_fanOnTemperature"); diff --git a/firmware/controllers/generated/fsio_strings.def b/firmware/controllers/generated/fsio_strings.def index 9ff8661762..466f7d3443 100644 --- a/firmware/controllers/generated/fsio_strings.def +++ b/firmware/controllers/generated/fsio_strings.def @@ -1,4 +1,4 @@ -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon May 31 12:20:03 UTC 2021 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon May 31 22:02:06 UTC 2021 // by class com.rusefi.output.FileFsioSettingsConsumer case FSIO_SETTING_FANONTEMPERATURE: diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h index be38467457..b01daae13a 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -489,6 +489,8 @@ #define externalKnockSenseAdc_offset 3103 #define extraInjectionOffset_offset 432 #define failedMapFallback_offset 541 +#define fan1ExtraIdle_offset 2252 +#define fan2ExtraIdle_offset 2330 #define fanOffTemperature_offset 472 #define fanOnTemperature_offset 468 #define fanPin_offset 663 @@ -1274,7 +1276,7 @@ #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD all #define SIGNATURE_DATE 2021.05.31 -#define SIGNATURE_HASH 4000983283 +#define SIGNATURE_HASH 2943684823 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1627,7 +1629,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2021.05.31.all.4000983283" +#define TS_SIGNATURE "rusEFI 2021.05.31.all.2943684823" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' // 0x74 @@ -1686,7 +1688,6 @@ #define unused1128_offset 2116 #define unused1129_offset 2116 #define unused1130_offset 2116 -#define unused1301_offset 2252 #define unused1366_offset 2652 #define unused1476b19_offset 1476 #define unused1476b20_offset 1476 @@ -1756,7 +1757,7 @@ #define unusedBit_492_8_offset 2116 #define unusedBit_492_9_offset 2116 #define unusedHereWeHave_offset 1464 -#define unusedOldBiquad_offset 2330 +#define unusedOldBiquad_offset 2331 #define unusedOldIgnitionOffset_offset 445 #define unusedSpiPadding4_offset 2593 #define unusedSpiPadding5_offset 2715 diff --git a/firmware/controllers/generated/signature_all.h b/firmware/controllers/generated/signature_all.h index e010fd6103..2e1d7a3711 100644 --- a/firmware/controllers/generated/signature_all.h +++ b/firmware/controllers/generated/signature_all.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD all #define SIGNATURE_DATE 2021.05.31 -#define SIGNATURE_HASH 4000983283 -#define TS_SIGNATURE "rusEFI 2021.05.31.all.4000983283" +#define SIGNATURE_HASH 2943684823 +#define TS_SIGNATURE "rusEFI 2021.05.31.all.2943684823" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index 0d7bfe0356..b846fe9222 100644 --- a/firmware/controllers/generated/signature_frankenso_na6.h +++ b/firmware/controllers/generated/signature_frankenso_na6.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD frankenso_na6 #define SIGNATURE_DATE 2021.05.31 -#define SIGNATURE_HASH 3593774794 -#define TS_SIGNATURE "rusEFI 2021.05.31.frankenso_na6.3593774794" +#define SIGNATURE_HASH 2537266926 +#define TS_SIGNATURE "rusEFI 2021.05.31.frankenso_na6.2537266926" diff --git a/firmware/controllers/generated/signature_hellen121nissan.h b/firmware/controllers/generated/signature_hellen121nissan.h index 4a9a08861f..ca14b4d28c 100644 --- a/firmware/controllers/generated/signature_hellen121nissan.h +++ b/firmware/controllers/generated/signature_hellen121nissan.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD hellen121nissan #define SIGNATURE_DATE 2021.05.31 -#define SIGNATURE_HASH 639541440 -#define TS_SIGNATURE "rusEFI 2021.05.31.hellen121nissan.639541440" +#define SIGNATURE_HASH 1729206500 +#define TS_SIGNATURE "rusEFI 2021.05.31.hellen121nissan.1729206500" diff --git a/firmware/controllers/generated/signature_hellen121vag.h b/firmware/controllers/generated/signature_hellen121vag.h index c81af81fb8..e1c4b44ba9 100644 --- a/firmware/controllers/generated/signature_hellen121vag.h +++ b/firmware/controllers/generated/signature_hellen121vag.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD hellen121vag #define SIGNATURE_DATE 2021.05.31 -#define SIGNATURE_HASH 2036052780 -#define TS_SIGNATURE "rusEFI 2021.05.31.hellen121vag.2036052780" +#define SIGNATURE_HASH 945064712 +#define TS_SIGNATURE "rusEFI 2021.05.31.hellen121vag.945064712" diff --git a/firmware/controllers/generated/signature_hellen128.h b/firmware/controllers/generated/signature_hellen128.h index f0c5d57e2a..747307028d 100644 --- a/firmware/controllers/generated/signature_hellen128.h +++ b/firmware/controllers/generated/signature_hellen128.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD hellen128 #define SIGNATURE_DATE 2021.05.31 -#define SIGNATURE_HASH 428096535 -#define TS_SIGNATURE "rusEFI 2021.05.31.hellen128.428096535" +#define SIGNATURE_HASH 1485505587 +#define TS_SIGNATURE "rusEFI 2021.05.31.hellen128.1485505587" diff --git a/firmware/controllers/generated/signature_hellen72.h b/firmware/controllers/generated/signature_hellen72.h index 1570569f01..9ebc21dcb1 100644 --- a/firmware/controllers/generated/signature_hellen72.h +++ b/firmware/controllers/generated/signature_hellen72.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD hellen72 #define SIGNATURE_DATE 2021.05.31 -#define SIGNATURE_HASH 1082972024 -#define TS_SIGNATURE "rusEFI 2021.05.31.hellen72.1082972024" +#define SIGNATURE_HASH 25423708 +#define TS_SIGNATURE "rusEFI 2021.05.31.hellen72.25423708" diff --git a/firmware/controllers/generated/signature_hellenNA6.h b/firmware/controllers/generated/signature_hellenNA6.h index c161e19671..9d0c203ce0 100644 --- a/firmware/controllers/generated/signature_hellenNA6.h +++ b/firmware/controllers/generated/signature_hellenNA6.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD hellenNA6 #define SIGNATURE_DATE 2021.05.31 -#define SIGNATURE_HASH 3349091455 -#define TS_SIGNATURE "rusEFI 2021.05.31.hellenNA6.3349091455" +#define SIGNATURE_HASH 2257595483 +#define TS_SIGNATURE "rusEFI 2021.05.31.hellenNA6.2257595483" diff --git a/firmware/controllers/generated/signature_hellen_cypress.h b/firmware/controllers/generated/signature_hellen_cypress.h index ac602d6db7..147847f563 100644 --- a/firmware/controllers/generated/signature_hellen_cypress.h +++ b/firmware/controllers/generated/signature_hellen_cypress.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD hellen_cypress #define SIGNATURE_DATE 2021.05.31 -#define SIGNATURE_HASH 2886136611 -#define TS_SIGNATURE "rusEFI 2021.05.31.hellen_cypress.2886136611" +#define SIGNATURE_HASH 3976841991 +#define TS_SIGNATURE "rusEFI 2021.05.31.hellen_cypress.3976841991" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index 64689aa57f..23f170637d 100644 --- a/firmware/controllers/generated/signature_kin.h +++ b/firmware/controllers/generated/signature_kin.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD kin #define SIGNATURE_DATE 2021.05.31 -#define SIGNATURE_HASH 1403207647 -#define TS_SIGNATURE "rusEFI 2021.05.31.kin.1403207647" +#define SIGNATURE_HASH 313264123 +#define TS_SIGNATURE "rusEFI 2021.05.31.kin.313264123" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index 1895a4112d..aee4c8b6e4 100644 --- a/firmware/controllers/generated/signature_mre_f4.h +++ b/firmware/controllers/generated/signature_mre_f4.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD mre_f4 #define SIGNATURE_DATE 2021.05.31 -#define SIGNATURE_HASH 1822994921 -#define TS_SIGNATURE "rusEFI 2021.05.31.mre_f4.1822994921" +#define SIGNATURE_HASH 765954509 +#define TS_SIGNATURE "rusEFI 2021.05.31.mre_f4.765954509" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index 87b111983f..125e27054f 100644 --- a/firmware/controllers/generated/signature_mre_f7.h +++ b/firmware/controllers/generated/signature_mre_f7.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD mre_f7 #define SIGNATURE_DATE 2021.05.31 -#define SIGNATURE_HASH 1822994921 -#define TS_SIGNATURE "rusEFI 2021.05.31.mre_f7.1822994921" +#define SIGNATURE_HASH 765954509 +#define TS_SIGNATURE "rusEFI 2021.05.31.mre_f7.765954509" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index 7b3cd44f4c..9e9a8efb2c 100644 --- a/firmware/controllers/generated/signature_prometheus_405.h +++ b/firmware/controllers/generated/signature_prometheus_405.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD prometheus_405 #define SIGNATURE_DATE 2021.05.31 -#define SIGNATURE_HASH 4243335877 -#define TS_SIGNATURE "rusEFI 2021.05.31.prometheus_405.4243335877" +#define SIGNATURE_HASH 3185775329 +#define TS_SIGNATURE "rusEFI 2021.05.31.prometheus_405.3185775329" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index b4a9facdda..39ab2d7616 100644 --- a/firmware/controllers/generated/signature_prometheus_469.h +++ b/firmware/controllers/generated/signature_prometheus_469.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD prometheus_469 #define SIGNATURE_DATE 2021.05.31 -#define SIGNATURE_HASH 4243335877 -#define TS_SIGNATURE "rusEFI 2021.05.31.prometheus_469.4243335877" +#define SIGNATURE_HASH 3185775329 +#define TS_SIGNATURE "rusEFI 2021.05.31.prometheus_469.3185775329" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index 862c302caf..98552af85b 100644 --- a/firmware/controllers/generated/signature_proteus_f4.h +++ b/firmware/controllers/generated/signature_proteus_f4.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD proteus_f4 #define SIGNATURE_DATE 2021.05.31 -#define SIGNATURE_HASH 2278331880 -#define TS_SIGNATURE "rusEFI 2021.05.31.proteus_f4.2278331880" +#define SIGNATURE_HASH 3334712780 +#define TS_SIGNATURE "rusEFI 2021.05.31.proteus_f4.3334712780" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index 0bab01cfec..e13f276b71 100644 --- a/firmware/controllers/generated/signature_proteus_f7.h +++ b/firmware/controllers/generated/signature_proteus_f7.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD proteus_f7 #define SIGNATURE_DATE 2021.05.31 -#define SIGNATURE_HASH 2278331880 -#define TS_SIGNATURE "rusEFI 2021.05.31.proteus_f7.2278331880" +#define SIGNATURE_HASH 3334712780 +#define TS_SIGNATURE "rusEFI 2021.05.31.proteus_f7.3334712780" diff --git a/firmware/controllers/generated/signature_subaru_eg33_f7.h b/firmware/controllers/generated/signature_subaru_eg33_f7.h index e836dc5cdd..b0dda23302 100644 --- a/firmware/controllers/generated/signature_subaru_eg33_f7.h +++ b/firmware/controllers/generated/signature_subaru_eg33_f7.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD subaru_eg33_f7 #define SIGNATURE_DATE 2021.05.31 -#define SIGNATURE_HASH 1126573797 -#define TS_SIGNATURE "rusEFI 2021.05.31.subaru_eg33_f7.1126573797" +#define SIGNATURE_HASH 36249281 +#define TS_SIGNATURE "rusEFI 2021.05.31.subaru_eg33_f7.36249281" diff --git a/firmware/tunerstudio/generated/cache.zip b/firmware/tunerstudio/generated/cache.zip index 7a55899e5f..1a4564e4b1 100644 Binary files a/firmware/tunerstudio/generated/cache.zip and b/firmware/tunerstudio/generated/cache.zip differ diff --git a/firmware/tunerstudio/generated/rusefi.ini b/firmware/tunerstudio/generated/rusefi.ini index 3d5867c965..b98b238ae5 100644 --- a/firmware/tunerstudio/generated/rusefi.ini +++ b/firmware/tunerstudio/generated/rusefi.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.05.31.all.4000983283" + signature = "rusEFI 2021.05.31.all.2943684823" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.05.31.all.4000983283" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.05.31.all.2943684823" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon May 31 12:20:03 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon May 31 22:02:06 UTC 2021 pageSize = 20000 page = 1 @@ -342,7 +342,7 @@ sdCardCsPin = bits, U08, 707, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA canTxPin = bits, U08, 708, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15", "PI0","PI1","PI2","PI3","PI4","PI5","PI6","PI7","PI8","PI9","PI10","PI11","PI12","PI13","PI14","PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" canRxPin = bits, U08, 709, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15", "PI0","PI1","PI2","PI3","PI4","PI5","PI6","PI7","PI8","PI9","PI10","PI11","PI12","PI13","PI14","PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" throttlePedalUpPinMode = bits, U08, 710, [0:1], "DEFAULT", "PULLUP", "PULLDOWN", "INVALID" -acIdleExtraOffset = scalar, U08, 711, "Percent", 1.0, 0, 0, 255, 0 +acIdleExtraOffset = scalar, U08, 711, "%", 1.0, 0, 0, 100, 0 can2SleepPeriodMs = scalar, S32, 712, "ms", 1.0, 0, 0, 1000.0, 2 wastegatePositionMin = scalar, U16, 716, "mv", 1.0, 0, 0, 5000, 0 wastegatePositionMax = scalar, U16, 718, "mv", 1.0, 0, 0, 5000, 0 @@ -914,7 +914,7 @@ tChargeMaxRpmMinTps = scalar, F32, 2240, "mult", 1.0, 0, 0, 3, 4 tChargeMaxRpmMaxTps = scalar, F32, 2244, "mult", 1.0, 0, 0, 3, 4 auxPidFrequency1 = scalar, U16, 2248, "Hz", 1, 0.0, 0, 3000, 0 auxPidFrequency2 = scalar, U16, 2250, "Hz", 1, 0.0, 0, 3000, 0 -unused1301 = scalar, U08, 2252, "units", 1.0, 0, -20, 100, 0 +fan1ExtraIdle = scalar, U08, 2252, "%", 1.0, 0, 0, 100, 0 alignmentFill_at_2253 = array, U08, 2253, [3], "units", 1.0, 0, -20, 100, 0 alternatorPwmFrequency = scalar, S32, 2256, "Hz", 1.0, 0, 0, 3000.0, 0 unused2260 = scalar, S32, 2260, "units", 1.0, 0, -20, 100, 0 @@ -923,7 +923,8 @@ narrowToWideOxygen = array, F32, 2296, [8], "ratio", 1.0, 0, -40.0, 40.0, 2 vvtMode1 = bits, U08, 2328, [0:3], "Inactive", "Single Tooth Second Half", "2GZ", "Miata NB2", "Single Tooth First Half", "Bosch Quick Start", "4/1", "ST 170", "Ford Barra 3+1", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" vvtMode2 = bits, U08, 2329, [0:3], "Inactive", "Single Tooth Second Half", "2GZ", "Miata NB2", "Single Tooth First Half", "Bosch Quick Start", "4/1", "ST 170", "Ford Barra 3+1", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" -unusedOldBiquad = array, U08, 2330, [22], "units", 1.0, 0, -20, 100, 0 +fan2ExtraIdle = scalar, U08, 2330, "%", 1.0, 0, 0, 100, 0 +unusedOldBiquad = array, U08, 2331, [21], "units", 1.0, 0, -20, 100, 0 cltTimingBins = array, F32, 2352, [8], "C", 1.0, 0, -100.0, 250.0, 1 cltTimingExtra = array, F32, 2384, [8], "degree", 1.0, 0, -400.0, 400.0, 0 tle8888mode = bits, U08, 2416, [0:1], "Auto", "SemiAuto", "Manual", "Hall" @@ -1361,7 +1362,7 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1.0, 0, 0.0, 25500.0, 2 triggerSimulatorFrequency = "Same RPM is used for two ways of producing simulated RPM. See also triggerSimulatorPins (with wires)\nSee also directSelfStimulation (no wires, bypassing input hardware)\nrpm X\nTODO: rename to triggerSimulatorRpm" malfunctionIndicatorPin = "Check engine light, also malfunction indicator light. Always blinks once on boot." idle_antiwindupFreq = "0.1 is a good default value" - acIdleExtraOffset = "Additional idle PID offset while A/C is active" + acIdleExtraOffset = "Additional idle % while A/C is active" can2SleepPeriodMs = "CANbus thread period, ms" wastegatePositionMin = "Voltage when the wastegate is closed.\nYou probably don't have one of these!" wastegatePositionMax = "Voltage when the wastegate is fully open.\nYou probably don't have one of these!\n1 volt = 1000 units" @@ -1472,6 +1473,8 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1.0, 0, 0.0, 25500.0, 2 injectorPressureType = "Select which fuel pressure sensor measures the pressure of the fuel at your injectors." boostCutPressure = "MAP value above which fuel is cut in case of overboost.\nSet to 0 to disable overboost cut." crankingIACposition = "This is the IAC position during cranking, some engines start better if given more air during cranking to improve cylinder filling." + fan1ExtraIdle = "Additional idle % when fan #1 is active" + fan2ExtraIdle = "Additional idle % when fan #2 is active" injectorCompensationMode = "None = I have a MAP-referenced fuel pressure regulator\nFixed rail pressure = I have an atmosphere-referenced fuel pressure regulator (returnless, typically)\nSensed rail pressure = I have a fuel pressure sensor" fuelReferencePressure = "This is the pressure at which your injector flow is known.\nFor example if your injectors flow 400cc/min at 3.5 bar, enter 350kpa here." postCrankingFactor = "Fuel multiplier (enrichment) immediately after engine start" @@ -4091,13 +4094,19 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "use Cic Pid", useCicPidForIdle field = "Use IAC PID Multiplier Table", useIacPidMultTable + dialog = idleOpenLoop, "Open Loop Idle" + slider = "Open loop base position", manIdlePosition, horizontal + field = "A/C adder", acIdleExtraOffset + field = "Fan #1 adder", fan1ExtraIdle + ;field = "Fan #2 adder", fan2ExtraIdle + field = "Extra idle air if throttle pressed", iacByTpsTaper + dialog = idleGating, "Idle Detection Thresholds" field = "TPS threshold", idlePidDeactivationTpsThreshold field = "RPM upper limit", idlePidRpmUpperLimit field = "RPM deadzone", idlePidRpmDeadZone dialog = idleExtra, "Extra Idle Features" - field = "Extra idle air if throttle pressed", iacByTpsTaper field = "Use idle ignition table", useSeparateAdvanceForIdle field = "Use idle VE table", useSeparateVeForIdle field = "Use coasting idle table", useIacTableForCoasting, {idleMode == 0} @@ -4108,10 +4117,9 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Idle control mode", idleMode field = "! Solenoid idle control is disabled at zero RPM" - slider = "Open loop idle position", manIdlePosition, horizontal - field = "" panel = idleGating + panel = idleOpenLoop panel = idlePidSettings, { idleMode == 0} panel = idleExtra diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index 578fbfb913..eca6fa6d83 100644 --- a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini +++ b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.05.31.frankenso_na6.3593774794" + signature = "rusEFI 2021.05.31.frankenso_na6.2537266926" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.05.31.frankenso_na6.3593774794" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.05.31.frankenso_na6.2537266926" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon May 31 12:20:19 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon May 31 22:02:22 UTC 2021 pageSize = 20000 page = 1 @@ -342,7 +342,7 @@ sdCardCsPin = bits, U08, 707, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA canTxPin = bits, U08, 708, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15", "PI0","PI1","PI2","PI3","PI4","PI5","PI6","PI7","PI8","PI9","PI10","PI11","PI12","PI13","PI14","PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" canRxPin = bits, U08, 709, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15", "PI0","PI1","PI2","PI3","PI4","PI5","PI6","PI7","PI8","PI9","PI10","PI11","PI12","PI13","PI14","PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" throttlePedalUpPinMode = bits, U08, 710, [0:1], "DEFAULT", "PULLUP", "PULLDOWN", "INVALID" -acIdleExtraOffset = scalar, U08, 711, "Percent", 1.0, 0, 0, 255, 0 +acIdleExtraOffset = scalar, U08, 711, "%", 1.0, 0, 0, 100, 0 can2SleepPeriodMs = scalar, S32, 712, "ms", 1.0, 0, 0, 1000.0, 2 wastegatePositionMin = scalar, U16, 716, "mv", 1.0, 0, 0, 5000, 0 wastegatePositionMax = scalar, U16, 718, "mv", 1.0, 0, 0, 5000, 0 @@ -914,7 +914,7 @@ tChargeMaxRpmMinTps = scalar, F32, 2240, "mult", 1.0, 0, 0, 3, 4 tChargeMaxRpmMaxTps = scalar, F32, 2244, "mult", 1.0, 0, 0, 3, 4 auxPidFrequency1 = scalar, U16, 2248, "Hz", 1, 0.0, 0, 3000, 0 auxPidFrequency2 = scalar, U16, 2250, "Hz", 1, 0.0, 0, 3000, 0 -unused1301 = scalar, U08, 2252, "units", 1.0, 0, -20, 100, 0 +fan1ExtraIdle = scalar, U08, 2252, "%", 1.0, 0, 0, 100, 0 alignmentFill_at_2253 = array, U08, 2253, [3], "units", 1.0, 0, -20, 100, 0 alternatorPwmFrequency = scalar, S32, 2256, "Hz", 1.0, 0, 0, 3000.0, 0 unused2260 = scalar, S32, 2260, "units", 1.0, 0, -20, 100, 0 @@ -923,7 +923,8 @@ narrowToWideOxygen = array, F32, 2296, [8], "ratio", 1.0, 0, -40.0, 40.0, 2 vvtMode1 = bits, U08, 2328, [0:3], "Inactive", "Single Tooth Second Half", "2GZ", "Miata NB2", "Single Tooth First Half", "Bosch Quick Start", "4/1", "ST 170", "Ford Barra 3+1", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" vvtMode2 = bits, U08, 2329, [0:3], "Inactive", "Single Tooth Second Half", "2GZ", "Miata NB2", "Single Tooth First Half", "Bosch Quick Start", "4/1", "ST 170", "Ford Barra 3+1", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" -unusedOldBiquad = array, U08, 2330, [22], "units", 1.0, 0, -20, 100, 0 +fan2ExtraIdle = scalar, U08, 2330, "%", 1.0, 0, 0, 100, 0 +unusedOldBiquad = array, U08, 2331, [21], "units", 1.0, 0, -20, 100, 0 cltTimingBins = array, F32, 2352, [8], "C", 1.0, 0, -100.0, 250.0, 1 cltTimingExtra = array, F32, 2384, [8], "degree", 1.0, 0, -400.0, 400.0, 0 tle8888mode = bits, U08, 2416, [0:1], "Auto", "SemiAuto", "Manual", "Hall" @@ -1361,7 +1362,7 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1.0, 0, 0.0, 25500.0, 2 triggerSimulatorFrequency = "Same RPM is used for two ways of producing simulated RPM. See also triggerSimulatorPins (with wires)\nSee also directSelfStimulation (no wires, bypassing input hardware)\nrpm X\nTODO: rename to triggerSimulatorRpm" malfunctionIndicatorPin = "Check engine light, also malfunction indicator light. Always blinks once on boot." idle_antiwindupFreq = "0.1 is a good default value" - acIdleExtraOffset = "Additional idle PID offset while A/C is active" + acIdleExtraOffset = "Additional idle % while A/C is active" can2SleepPeriodMs = "CANbus thread period, ms" wastegatePositionMin = "Voltage when the wastegate is closed.\nYou probably don't have one of these!" wastegatePositionMax = "Voltage when the wastegate is fully open.\nYou probably don't have one of these!\n1 volt = 1000 units" @@ -1472,6 +1473,8 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1.0, 0, 0.0, 25500.0, 2 injectorPressureType = "Select which fuel pressure sensor measures the pressure of the fuel at your injectors." boostCutPressure = "MAP value above which fuel is cut in case of overboost.\nSet to 0 to disable overboost cut." crankingIACposition = "This is the IAC position during cranking, some engines start better if given more air during cranking to improve cylinder filling." + fan1ExtraIdle = "Additional idle % when fan #1 is active" + fan2ExtraIdle = "Additional idle % when fan #2 is active" injectorCompensationMode = "None = I have a MAP-referenced fuel pressure regulator\nFixed rail pressure = I have an atmosphere-referenced fuel pressure regulator (returnless, typically)\nSensed rail pressure = I have a fuel pressure sensor" fuelReferencePressure = "This is the pressure at which your injector flow is known.\nFor example if your injectors flow 400cc/min at 3.5 bar, enter 350kpa here." postCrankingFactor = "Fuel multiplier (enrichment) immediately after engine start" @@ -4091,13 +4094,19 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "use Cic Pid", useCicPidForIdle field = "Use IAC PID Multiplier Table", useIacPidMultTable + dialog = idleOpenLoop, "Open Loop Idle" + slider = "Open loop base position", manIdlePosition, horizontal + field = "A/C adder", acIdleExtraOffset + field = "Fan #1 adder", fan1ExtraIdle + ;field = "Fan #2 adder", fan2ExtraIdle + field = "Extra idle air if throttle pressed", iacByTpsTaper + dialog = idleGating, "Idle Detection Thresholds" field = "TPS threshold", idlePidDeactivationTpsThreshold field = "RPM upper limit", idlePidRpmUpperLimit field = "RPM deadzone", idlePidRpmDeadZone dialog = idleExtra, "Extra Idle Features" - field = "Extra idle air if throttle pressed", iacByTpsTaper field = "Use idle ignition table", useSeparateAdvanceForIdle field = "Use idle VE table", useSeparateVeForIdle field = "Use coasting idle table", useIacTableForCoasting, {idleMode == 0} @@ -4108,10 +4117,9 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Idle control mode", idleMode field = "! Solenoid idle control is disabled at zero RPM" - slider = "Open loop idle position", manIdlePosition, horizontal - field = "" panel = idleGating + panel = idleOpenLoop panel = idlePidSettings, { idleMode == 0} panel = idleExtra diff --git a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini index 73cb465d76..62792d6264 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.05.31.hellen121nissan.639541440" + signature = "rusEFI 2021.05.31.hellen121nissan.1729206500" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.05.31.hellen121nissan.639541440" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.05.31.hellen121nissan.1729206500" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon May 31 12:20:11 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon May 31 22:02:13 UTC 2021 pageSize = 20000 page = 1 @@ -342,7 +342,7 @@ sdCardCsPin = bits, U08, 707, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA canTxPin = bits, U08, 708, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15", "PI0","PI1","PI2","PI3","PI4","PI5","PI6","PI7","PI8","PI9","PI10","PI11","PI12","PI13","PI14","PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" canRxPin = bits, U08, 709, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15", "PI0","PI1","PI2","PI3","PI4","PI5","PI6","PI7","PI8","PI9","PI10","PI11","PI12","PI13","PI14","PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" throttlePedalUpPinMode = bits, U08, 710, [0:1], "DEFAULT", "PULLUP", "PULLDOWN", "INVALID" -acIdleExtraOffset = scalar, U08, 711, "Percent", 1.0, 0, 0, 255, 0 +acIdleExtraOffset = scalar, U08, 711, "%", 1.0, 0, 0, 100, 0 can2SleepPeriodMs = scalar, S32, 712, "ms", 1.0, 0, 0, 1000.0, 2 wastegatePositionMin = scalar, U16, 716, "mv", 1.0, 0, 0, 5000, 0 wastegatePositionMax = scalar, U16, 718, "mv", 1.0, 0, 0, 5000, 0 @@ -914,7 +914,7 @@ tChargeMaxRpmMinTps = scalar, F32, 2240, "mult", 1.0, 0, 0, 3, 4 tChargeMaxRpmMaxTps = scalar, F32, 2244, "mult", 1.0, 0, 0, 3, 4 auxPidFrequency1 = scalar, U16, 2248, "Hz", 1, 0.0, 0, 3000, 0 auxPidFrequency2 = scalar, U16, 2250, "Hz", 1, 0.0, 0, 3000, 0 -unused1301 = scalar, U08, 2252, "units", 1.0, 0, -20, 100, 0 +fan1ExtraIdle = scalar, U08, 2252, "%", 1.0, 0, 0, 100, 0 alignmentFill_at_2253 = array, U08, 2253, [3], "units", 1.0, 0, -20, 100, 0 alternatorPwmFrequency = scalar, S32, 2256, "Hz", 1.0, 0, 0, 3000.0, 0 unused2260 = scalar, S32, 2260, "units", 1.0, 0, -20, 100, 0 @@ -923,7 +923,8 @@ narrowToWideOxygen = array, F32, 2296, [8], "ratio", 1.0, 0, -40.0, 40.0, 2 vvtMode1 = bits, U08, 2328, [0:3], "Inactive", "Single Tooth Second Half", "2GZ", "Miata NB2", "Single Tooth First Half", "Bosch Quick Start", "4/1", "ST 170", "Ford Barra 3+1", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" vvtMode2 = bits, U08, 2329, [0:3], "Inactive", "Single Tooth Second Half", "2GZ", "Miata NB2", "Single Tooth First Half", "Bosch Quick Start", "4/1", "ST 170", "Ford Barra 3+1", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" -unusedOldBiquad = array, U08, 2330, [22], "units", 1.0, 0, -20, 100, 0 +fan2ExtraIdle = scalar, U08, 2330, "%", 1.0, 0, 0, 100, 0 +unusedOldBiquad = array, U08, 2331, [21], "units", 1.0, 0, -20, 100, 0 cltTimingBins = array, F32, 2352, [8], "C", 1.0, 0, -100.0, 250.0, 1 cltTimingExtra = array, F32, 2384, [8], "degree", 1.0, 0, -400.0, 400.0, 0 tle8888mode = bits, U08, 2416, [0:1], "Auto", "SemiAuto", "Manual", "Hall" @@ -1361,7 +1362,7 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1.0, 0, 0.0, 25500.0, 2 triggerSimulatorFrequency = "Same RPM is used for two ways of producing simulated RPM. See also triggerSimulatorPins (with wires)\nSee also directSelfStimulation (no wires, bypassing input hardware)\nrpm X\nTODO: rename to triggerSimulatorRpm" malfunctionIndicatorPin = "Check engine light, also malfunction indicator light. Always blinks once on boot." idle_antiwindupFreq = "0.1 is a good default value" - acIdleExtraOffset = "Additional idle PID offset while A/C is active" + acIdleExtraOffset = "Additional idle % while A/C is active" can2SleepPeriodMs = "CANbus thread period, ms" wastegatePositionMin = "Voltage when the wastegate is closed.\nYou probably don't have one of these!" wastegatePositionMax = "Voltage when the wastegate is fully open.\nYou probably don't have one of these!\n1 volt = 1000 units" @@ -1472,6 +1473,8 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1.0, 0, 0.0, 25500.0, 2 injectorPressureType = "Select which fuel pressure sensor measures the pressure of the fuel at your injectors." boostCutPressure = "MAP value above which fuel is cut in case of overboost.\nSet to 0 to disable overboost cut." crankingIACposition = "This is the IAC position during cranking, some engines start better if given more air during cranking to improve cylinder filling." + fan1ExtraIdle = "Additional idle % when fan #1 is active" + fan2ExtraIdle = "Additional idle % when fan #2 is active" injectorCompensationMode = "None = I have a MAP-referenced fuel pressure regulator\nFixed rail pressure = I have an atmosphere-referenced fuel pressure regulator (returnless, typically)\nSensed rail pressure = I have a fuel pressure sensor" fuelReferencePressure = "This is the pressure at which your injector flow is known.\nFor example if your injectors flow 400cc/min at 3.5 bar, enter 350kpa here." postCrankingFactor = "Fuel multiplier (enrichment) immediately after engine start" @@ -4075,13 +4078,19 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "use Cic Pid", useCicPidForIdle field = "Use IAC PID Multiplier Table", useIacPidMultTable + dialog = idleOpenLoop, "Open Loop Idle" + slider = "Open loop base position", manIdlePosition, horizontal + field = "A/C adder", acIdleExtraOffset + field = "Fan #1 adder", fan1ExtraIdle + ;field = "Fan #2 adder", fan2ExtraIdle + field = "Extra idle air if throttle pressed", iacByTpsTaper + dialog = idleGating, "Idle Detection Thresholds" field = "TPS threshold", idlePidDeactivationTpsThreshold field = "RPM upper limit", idlePidRpmUpperLimit field = "RPM deadzone", idlePidRpmDeadZone dialog = idleExtra, "Extra Idle Features" - field = "Extra idle air if throttle pressed", iacByTpsTaper field = "Use idle ignition table", useSeparateAdvanceForIdle field = "Use idle VE table", useSeparateVeForIdle field = "Use coasting idle table", useIacTableForCoasting, {idleMode == 0} @@ -4092,10 +4101,9 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Idle control mode", idleMode field = "! Solenoid idle control is disabled at zero RPM" - slider = "Open loop idle position", manIdlePosition, horizontal - field = "" panel = idleGating + panel = idleOpenLoop panel = idlePidSettings, { idleMode == 0} panel = idleExtra diff --git a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini index ac9fb4fb16..1fb4462401 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.05.31.hellen121vag.2036052780" + signature = "rusEFI 2021.05.31.hellen121vag.945064712" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.05.31.hellen121vag.2036052780" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.05.31.hellen121vag.945064712" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon May 31 12:20:09 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon May 31 22:02:11 UTC 2021 pageSize = 20000 page = 1 @@ -342,7 +342,7 @@ sdCardCsPin = bits, U08, 707, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA canTxPin = bits, U08, 708, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15", "PI0","PI1","PI2","PI3","PI4","PI5","PI6","PI7","PI8","PI9","PI10","PI11","PI12","PI13","PI14","PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" canRxPin = bits, U08, 709, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15", "PI0","PI1","PI2","PI3","PI4","PI5","PI6","PI7","PI8","PI9","PI10","PI11","PI12","PI13","PI14","PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" throttlePedalUpPinMode = bits, U08, 710, [0:1], "DEFAULT", "PULLUP", "PULLDOWN", "INVALID" -acIdleExtraOffset = scalar, U08, 711, "Percent", 1.0, 0, 0, 255, 0 +acIdleExtraOffset = scalar, U08, 711, "%", 1.0, 0, 0, 100, 0 can2SleepPeriodMs = scalar, S32, 712, "ms", 1.0, 0, 0, 1000.0, 2 wastegatePositionMin = scalar, U16, 716, "mv", 1.0, 0, 0, 5000, 0 wastegatePositionMax = scalar, U16, 718, "mv", 1.0, 0, 0, 5000, 0 @@ -914,7 +914,7 @@ tChargeMaxRpmMinTps = scalar, F32, 2240, "mult", 1.0, 0, 0, 3, 4 tChargeMaxRpmMaxTps = scalar, F32, 2244, "mult", 1.0, 0, 0, 3, 4 auxPidFrequency1 = scalar, U16, 2248, "Hz", 1, 0.0, 0, 3000, 0 auxPidFrequency2 = scalar, U16, 2250, "Hz", 1, 0.0, 0, 3000, 0 -unused1301 = scalar, U08, 2252, "units", 1.0, 0, -20, 100, 0 +fan1ExtraIdle = scalar, U08, 2252, "%", 1.0, 0, 0, 100, 0 alignmentFill_at_2253 = array, U08, 2253, [3], "units", 1.0, 0, -20, 100, 0 alternatorPwmFrequency = scalar, S32, 2256, "Hz", 1.0, 0, 0, 3000.0, 0 unused2260 = scalar, S32, 2260, "units", 1.0, 0, -20, 100, 0 @@ -923,7 +923,8 @@ narrowToWideOxygen = array, F32, 2296, [8], "ratio", 1.0, 0, -40.0, 40.0, 2 vvtMode1 = bits, U08, 2328, [0:3], "Inactive", "Single Tooth Second Half", "2GZ", "Miata NB2", "Single Tooth First Half", "Bosch Quick Start", "4/1", "ST 170", "Ford Barra 3+1", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" vvtMode2 = bits, U08, 2329, [0:3], "Inactive", "Single Tooth Second Half", "2GZ", "Miata NB2", "Single Tooth First Half", "Bosch Quick Start", "4/1", "ST 170", "Ford Barra 3+1", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" -unusedOldBiquad = array, U08, 2330, [22], "units", 1.0, 0, -20, 100, 0 +fan2ExtraIdle = scalar, U08, 2330, "%", 1.0, 0, 0, 100, 0 +unusedOldBiquad = array, U08, 2331, [21], "units", 1.0, 0, -20, 100, 0 cltTimingBins = array, F32, 2352, [8], "C", 1.0, 0, -100.0, 250.0, 1 cltTimingExtra = array, F32, 2384, [8], "degree", 1.0, 0, -400.0, 400.0, 0 tle8888mode = bits, U08, 2416, [0:1], "Auto", "SemiAuto", "Manual", "Hall" @@ -1361,7 +1362,7 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1.0, 0, 0.0, 25500.0, 2 triggerSimulatorFrequency = "Same RPM is used for two ways of producing simulated RPM. See also triggerSimulatorPins (with wires)\nSee also directSelfStimulation (no wires, bypassing input hardware)\nrpm X\nTODO: rename to triggerSimulatorRpm" malfunctionIndicatorPin = "Check engine light, also malfunction indicator light. Always blinks once on boot." idle_antiwindupFreq = "0.1 is a good default value" - acIdleExtraOffset = "Additional idle PID offset while A/C is active" + acIdleExtraOffset = "Additional idle % while A/C is active" can2SleepPeriodMs = "CANbus thread period, ms" wastegatePositionMin = "Voltage when the wastegate is closed.\nYou probably don't have one of these!" wastegatePositionMax = "Voltage when the wastegate is fully open.\nYou probably don't have one of these!\n1 volt = 1000 units" @@ -1472,6 +1473,8 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1.0, 0, 0.0, 25500.0, 2 injectorPressureType = "Select which fuel pressure sensor measures the pressure of the fuel at your injectors." boostCutPressure = "MAP value above which fuel is cut in case of overboost.\nSet to 0 to disable overboost cut." crankingIACposition = "This is the IAC position during cranking, some engines start better if given more air during cranking to improve cylinder filling." + fan1ExtraIdle = "Additional idle % when fan #1 is active" + fan2ExtraIdle = "Additional idle % when fan #2 is active" injectorCompensationMode = "None = I have a MAP-referenced fuel pressure regulator\nFixed rail pressure = I have an atmosphere-referenced fuel pressure regulator (returnless, typically)\nSensed rail pressure = I have a fuel pressure sensor" fuelReferencePressure = "This is the pressure at which your injector flow is known.\nFor example if your injectors flow 400cc/min at 3.5 bar, enter 350kpa here." postCrankingFactor = "Fuel multiplier (enrichment) immediately after engine start" @@ -4075,13 +4078,19 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "use Cic Pid", useCicPidForIdle field = "Use IAC PID Multiplier Table", useIacPidMultTable + dialog = idleOpenLoop, "Open Loop Idle" + slider = "Open loop base position", manIdlePosition, horizontal + field = "A/C adder", acIdleExtraOffset + field = "Fan #1 adder", fan1ExtraIdle + ;field = "Fan #2 adder", fan2ExtraIdle + field = "Extra idle air if throttle pressed", iacByTpsTaper + dialog = idleGating, "Idle Detection Thresholds" field = "TPS threshold", idlePidDeactivationTpsThreshold field = "RPM upper limit", idlePidRpmUpperLimit field = "RPM deadzone", idlePidRpmDeadZone dialog = idleExtra, "Extra Idle Features" - field = "Extra idle air if throttle pressed", iacByTpsTaper field = "Use idle ignition table", useSeparateAdvanceForIdle field = "Use idle VE table", useSeparateVeForIdle field = "Use coasting idle table", useIacTableForCoasting, {idleMode == 0} @@ -4092,10 +4101,9 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Idle control mode", idleMode field = "! Solenoid idle control is disabled at zero RPM" - slider = "Open loop idle position", manIdlePosition, horizontal - field = "" panel = idleGating + panel = idleOpenLoop panel = idlePidSettings, { idleMode == 0} panel = idleExtra diff --git a/firmware/tunerstudio/generated/rusefi_hellen128.ini b/firmware/tunerstudio/generated/rusefi_hellen128.ini index ee78bc4f6d..78e2e19876 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen128.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen128.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.05.31.hellen128.428096535" + signature = "rusEFI 2021.05.31.hellen128.1485505587" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.05.31.hellen128.428096535" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.05.31.hellen128.1485505587" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon May 31 12:20:05 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon May 31 22:02:09 UTC 2021 pageSize = 20000 page = 1 @@ -342,7 +342,7 @@ sdCardCsPin = bits, U08, 707, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA canTxPin = bits, U08, 708, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15", "PI0","PI1","PI2","PI3","PI4","PI5","PI6","PI7","PI8","PI9","PI10","PI11","PI12","PI13","PI14","PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" canRxPin = bits, U08, 709, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15", "PI0","PI1","PI2","PI3","PI4","PI5","PI6","PI7","PI8","PI9","PI10","PI11","PI12","PI13","PI14","PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" throttlePedalUpPinMode = bits, U08, 710, [0:1], "DEFAULT", "PULLUP", "PULLDOWN", "INVALID" -acIdleExtraOffset = scalar, U08, 711, "Percent", 1.0, 0, 0, 255, 0 +acIdleExtraOffset = scalar, U08, 711, "%", 1.0, 0, 0, 100, 0 can2SleepPeriodMs = scalar, S32, 712, "ms", 1.0, 0, 0, 1000.0, 2 wastegatePositionMin = scalar, U16, 716, "mv", 1.0, 0, 0, 5000, 0 wastegatePositionMax = scalar, U16, 718, "mv", 1.0, 0, 0, 5000, 0 @@ -914,7 +914,7 @@ tChargeMaxRpmMinTps = scalar, F32, 2240, "mult", 1.0, 0, 0, 3, 4 tChargeMaxRpmMaxTps = scalar, F32, 2244, "mult", 1.0, 0, 0, 3, 4 auxPidFrequency1 = scalar, U16, 2248, "Hz", 1, 0.0, 0, 3000, 0 auxPidFrequency2 = scalar, U16, 2250, "Hz", 1, 0.0, 0, 3000, 0 -unused1301 = scalar, U08, 2252, "units", 1.0, 0, -20, 100, 0 +fan1ExtraIdle = scalar, U08, 2252, "%", 1.0, 0, 0, 100, 0 alignmentFill_at_2253 = array, U08, 2253, [3], "units", 1.0, 0, -20, 100, 0 alternatorPwmFrequency = scalar, S32, 2256, "Hz", 1.0, 0, 0, 3000.0, 0 unused2260 = scalar, S32, 2260, "units", 1.0, 0, -20, 100, 0 @@ -923,7 +923,8 @@ narrowToWideOxygen = array, F32, 2296, [8], "ratio", 1.0, 0, -40.0, 40.0, 2 vvtMode1 = bits, U08, 2328, [0:3], "Inactive", "Single Tooth Second Half", "2GZ", "Miata NB2", "Single Tooth First Half", "Bosch Quick Start", "4/1", "ST 170", "Ford Barra 3+1", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" vvtMode2 = bits, U08, 2329, [0:3], "Inactive", "Single Tooth Second Half", "2GZ", "Miata NB2", "Single Tooth First Half", "Bosch Quick Start", "4/1", "ST 170", "Ford Barra 3+1", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" -unusedOldBiquad = array, U08, 2330, [22], "units", 1.0, 0, -20, 100, 0 +fan2ExtraIdle = scalar, U08, 2330, "%", 1.0, 0, 0, 100, 0 +unusedOldBiquad = array, U08, 2331, [21], "units", 1.0, 0, -20, 100, 0 cltTimingBins = array, F32, 2352, [8], "C", 1.0, 0, -100.0, 250.0, 1 cltTimingExtra = array, F32, 2384, [8], "degree", 1.0, 0, -400.0, 400.0, 0 tle8888mode = bits, U08, 2416, [0:1], "Auto", "SemiAuto", "Manual", "Hall" @@ -1361,7 +1362,7 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1.0, 0, 0.0, 25500.0, 2 triggerSimulatorFrequency = "Same RPM is used for two ways of producing simulated RPM. See also triggerSimulatorPins (with wires)\nSee also directSelfStimulation (no wires, bypassing input hardware)\nrpm X\nTODO: rename to triggerSimulatorRpm" malfunctionIndicatorPin = "Check engine light, also malfunction indicator light. Always blinks once on boot." idle_antiwindupFreq = "0.1 is a good default value" - acIdleExtraOffset = "Additional idle PID offset while A/C is active" + acIdleExtraOffset = "Additional idle % while A/C is active" can2SleepPeriodMs = "CANbus thread period, ms" wastegatePositionMin = "Voltage when the wastegate is closed.\nYou probably don't have one of these!" wastegatePositionMax = "Voltage when the wastegate is fully open.\nYou probably don't have one of these!\n1 volt = 1000 units" @@ -1472,6 +1473,8 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1.0, 0, 0.0, 25500.0, 2 injectorPressureType = "Select which fuel pressure sensor measures the pressure of the fuel at your injectors." boostCutPressure = "MAP value above which fuel is cut in case of overboost.\nSet to 0 to disable overboost cut." crankingIACposition = "This is the IAC position during cranking, some engines start better if given more air during cranking to improve cylinder filling." + fan1ExtraIdle = "Additional idle % when fan #1 is active" + fan2ExtraIdle = "Additional idle % when fan #2 is active" injectorCompensationMode = "None = I have a MAP-referenced fuel pressure regulator\nFixed rail pressure = I have an atmosphere-referenced fuel pressure regulator (returnless, typically)\nSensed rail pressure = I have a fuel pressure sensor" fuelReferencePressure = "This is the pressure at which your injector flow is known.\nFor example if your injectors flow 400cc/min at 3.5 bar, enter 350kpa here." postCrankingFactor = "Fuel multiplier (enrichment) immediately after engine start" @@ -4075,13 +4078,19 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "use Cic Pid", useCicPidForIdle field = "Use IAC PID Multiplier Table", useIacPidMultTable + dialog = idleOpenLoop, "Open Loop Idle" + slider = "Open loop base position", manIdlePosition, horizontal + field = "A/C adder", acIdleExtraOffset + field = "Fan #1 adder", fan1ExtraIdle + ;field = "Fan #2 adder", fan2ExtraIdle + field = "Extra idle air if throttle pressed", iacByTpsTaper + dialog = idleGating, "Idle Detection Thresholds" field = "TPS threshold", idlePidDeactivationTpsThreshold field = "RPM upper limit", idlePidRpmUpperLimit field = "RPM deadzone", idlePidRpmDeadZone dialog = idleExtra, "Extra Idle Features" - field = "Extra idle air if throttle pressed", iacByTpsTaper field = "Use idle ignition table", useSeparateAdvanceForIdle field = "Use idle VE table", useSeparateVeForIdle field = "Use coasting idle table", useIacTableForCoasting, {idleMode == 0} @@ -4092,10 +4101,9 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Idle control mode", idleMode field = "! Solenoid idle control is disabled at zero RPM" - slider = "Open loop idle position", manIdlePosition, horizontal - field = "" panel = idleGating + panel = idleOpenLoop panel = idlePidSettings, { idleMode == 0} panel = idleExtra diff --git a/firmware/tunerstudio/generated/rusefi_hellen72.ini b/firmware/tunerstudio/generated/rusefi_hellen72.ini index 02ba03b2fb..5756000e9c 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen72.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen72.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.05.31.hellen72.1082972024" + signature = "rusEFI 2021.05.31.hellen72.25423708" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.05.31.hellen72.1082972024" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.05.31.hellen72.25423708" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon May 31 12:20:12 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon May 31 22:02:15 UTC 2021 pageSize = 20000 page = 1 @@ -342,7 +342,7 @@ sdCardCsPin = bits, U08, 707, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA canTxPin = bits, U08, 708, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15", "PI0","PI1","PI2","PI3","PI4","PI5","PI6","PI7","PI8","PI9","PI10","PI11","PI12","PI13","PI14","PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" canRxPin = bits, U08, 709, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15", "PI0","PI1","PI2","PI3","PI4","PI5","PI6","PI7","PI8","PI9","PI10","PI11","PI12","PI13","PI14","PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" throttlePedalUpPinMode = bits, U08, 710, [0:1], "DEFAULT", "PULLUP", "PULLDOWN", "INVALID" -acIdleExtraOffset = scalar, U08, 711, "Percent", 1.0, 0, 0, 255, 0 +acIdleExtraOffset = scalar, U08, 711, "%", 1.0, 0, 0, 100, 0 can2SleepPeriodMs = scalar, S32, 712, "ms", 1.0, 0, 0, 1000.0, 2 wastegatePositionMin = scalar, U16, 716, "mv", 1.0, 0, 0, 5000, 0 wastegatePositionMax = scalar, U16, 718, "mv", 1.0, 0, 0, 5000, 0 @@ -914,7 +914,7 @@ tChargeMaxRpmMinTps = scalar, F32, 2240, "mult", 1.0, 0, 0, 3, 4 tChargeMaxRpmMaxTps = scalar, F32, 2244, "mult", 1.0, 0, 0, 3, 4 auxPidFrequency1 = scalar, U16, 2248, "Hz", 1, 0.0, 0, 3000, 0 auxPidFrequency2 = scalar, U16, 2250, "Hz", 1, 0.0, 0, 3000, 0 -unused1301 = scalar, U08, 2252, "units", 1.0, 0, -20, 100, 0 +fan1ExtraIdle = scalar, U08, 2252, "%", 1.0, 0, 0, 100, 0 alignmentFill_at_2253 = array, U08, 2253, [3], "units", 1.0, 0, -20, 100, 0 alternatorPwmFrequency = scalar, S32, 2256, "Hz", 1.0, 0, 0, 3000.0, 0 unused2260 = scalar, S32, 2260, "units", 1.0, 0, -20, 100, 0 @@ -923,7 +923,8 @@ narrowToWideOxygen = array, F32, 2296, [8], "ratio", 1.0, 0, -40.0, 40.0, 2 vvtMode1 = bits, U08, 2328, [0:3], "Inactive", "Single Tooth Second Half", "2GZ", "Miata NB2", "Single Tooth First Half", "Bosch Quick Start", "4/1", "ST 170", "Ford Barra 3+1", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" vvtMode2 = bits, U08, 2329, [0:3], "Inactive", "Single Tooth Second Half", "2GZ", "Miata NB2", "Single Tooth First Half", "Bosch Quick Start", "4/1", "ST 170", "Ford Barra 3+1", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" -unusedOldBiquad = array, U08, 2330, [22], "units", 1.0, 0, -20, 100, 0 +fan2ExtraIdle = scalar, U08, 2330, "%", 1.0, 0, 0, 100, 0 +unusedOldBiquad = array, U08, 2331, [21], "units", 1.0, 0, -20, 100, 0 cltTimingBins = array, F32, 2352, [8], "C", 1.0, 0, -100.0, 250.0, 1 cltTimingExtra = array, F32, 2384, [8], "degree", 1.0, 0, -400.0, 400.0, 0 tle8888mode = bits, U08, 2416, [0:1], "Auto", "SemiAuto", "Manual", "Hall" @@ -1361,7 +1362,7 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1.0, 0, 0.0, 25500.0, 2 triggerSimulatorFrequency = "Same RPM is used for two ways of producing simulated RPM. See also triggerSimulatorPins (with wires)\nSee also directSelfStimulation (no wires, bypassing input hardware)\nrpm X\nTODO: rename to triggerSimulatorRpm" malfunctionIndicatorPin = "Check engine light, also malfunction indicator light. Always blinks once on boot." idle_antiwindupFreq = "0.1 is a good default value" - acIdleExtraOffset = "Additional idle PID offset while A/C is active" + acIdleExtraOffset = "Additional idle % while A/C is active" can2SleepPeriodMs = "CANbus thread period, ms" wastegatePositionMin = "Voltage when the wastegate is closed.\nYou probably don't have one of these!" wastegatePositionMax = "Voltage when the wastegate is fully open.\nYou probably don't have one of these!\n1 volt = 1000 units" @@ -1472,6 +1473,8 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1.0, 0, 0.0, 25500.0, 2 injectorPressureType = "Select which fuel pressure sensor measures the pressure of the fuel at your injectors." boostCutPressure = "MAP value above which fuel is cut in case of overboost.\nSet to 0 to disable overboost cut." crankingIACposition = "This is the IAC position during cranking, some engines start better if given more air during cranking to improve cylinder filling." + fan1ExtraIdle = "Additional idle % when fan #1 is active" + fan2ExtraIdle = "Additional idle % when fan #2 is active" injectorCompensationMode = "None = I have a MAP-referenced fuel pressure regulator\nFixed rail pressure = I have an atmosphere-referenced fuel pressure regulator (returnless, typically)\nSensed rail pressure = I have a fuel pressure sensor" fuelReferencePressure = "This is the pressure at which your injector flow is known.\nFor example if your injectors flow 400cc/min at 3.5 bar, enter 350kpa here." postCrankingFactor = "Fuel multiplier (enrichment) immediately after engine start" @@ -4075,13 +4078,19 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "use Cic Pid", useCicPidForIdle field = "Use IAC PID Multiplier Table", useIacPidMultTable + dialog = idleOpenLoop, "Open Loop Idle" + slider = "Open loop base position", manIdlePosition, horizontal + field = "A/C adder", acIdleExtraOffset + field = "Fan #1 adder", fan1ExtraIdle + ;field = "Fan #2 adder", fan2ExtraIdle + field = "Extra idle air if throttle pressed", iacByTpsTaper + dialog = idleGating, "Idle Detection Thresholds" field = "TPS threshold", idlePidDeactivationTpsThreshold field = "RPM upper limit", idlePidRpmUpperLimit field = "RPM deadzone", idlePidRpmDeadZone dialog = idleExtra, "Extra Idle Features" - field = "Extra idle air if throttle pressed", iacByTpsTaper field = "Use idle ignition table", useSeparateAdvanceForIdle field = "Use idle VE table", useSeparateVeForIdle field = "Use coasting idle table", useIacTableForCoasting, {idleMode == 0} @@ -4092,10 +4101,9 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Idle control mode", idleMode field = "! Solenoid idle control is disabled at zero RPM" - slider = "Open loop idle position", manIdlePosition, horizontal - field = "" panel = idleGating + panel = idleOpenLoop panel = idlePidSettings, { idleMode == 0} panel = idleExtra diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini index 80a3823d98..6365b0731d 100644 --- a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini +++ b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.05.31.hellenNA6.3349091455" + signature = "rusEFI 2021.05.31.hellenNA6.2257595483" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.05.31.hellenNA6.3349091455" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.05.31.hellenNA6.2257595483" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon May 31 12:20:14 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon May 31 22:02:17 UTC 2021 pageSize = 20000 page = 1 @@ -342,7 +342,7 @@ sdCardCsPin = bits, U08, 707, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA canTxPin = bits, U08, 708, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15", "PI0","PI1","PI2","PI3","PI4","PI5","PI6","PI7","PI8","PI9","PI10","PI11","PI12","PI13","PI14","PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" canRxPin = bits, U08, 709, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15", "PI0","PI1","PI2","PI3","PI4","PI5","PI6","PI7","PI8","PI9","PI10","PI11","PI12","PI13","PI14","PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" throttlePedalUpPinMode = bits, U08, 710, [0:1], "DEFAULT", "PULLUP", "PULLDOWN", "INVALID" -acIdleExtraOffset = scalar, U08, 711, "Percent", 1.0, 0, 0, 255, 0 +acIdleExtraOffset = scalar, U08, 711, "%", 1.0, 0, 0, 100, 0 can2SleepPeriodMs = scalar, S32, 712, "ms", 1.0, 0, 0, 1000.0, 2 wastegatePositionMin = scalar, U16, 716, "mv", 1.0, 0, 0, 5000, 0 wastegatePositionMax = scalar, U16, 718, "mv", 1.0, 0, 0, 5000, 0 @@ -914,7 +914,7 @@ tChargeMaxRpmMinTps = scalar, F32, 2240, "mult", 1.0, 0, 0, 3, 4 tChargeMaxRpmMaxTps = scalar, F32, 2244, "mult", 1.0, 0, 0, 3, 4 auxPidFrequency1 = scalar, U16, 2248, "Hz", 1, 0.0, 0, 3000, 0 auxPidFrequency2 = scalar, U16, 2250, "Hz", 1, 0.0, 0, 3000, 0 -unused1301 = scalar, U08, 2252, "units", 1.0, 0, -20, 100, 0 +fan1ExtraIdle = scalar, U08, 2252, "%", 1.0, 0, 0, 100, 0 alignmentFill_at_2253 = array, U08, 2253, [3], "units", 1.0, 0, -20, 100, 0 alternatorPwmFrequency = scalar, S32, 2256, "Hz", 1.0, 0, 0, 3000.0, 0 unused2260 = scalar, S32, 2260, "units", 1.0, 0, -20, 100, 0 @@ -923,7 +923,8 @@ narrowToWideOxygen = array, F32, 2296, [8], "ratio", 1.0, 0, -40.0, 40.0, 2 vvtMode1 = bits, U08, 2328, [0:3], "Inactive", "Single Tooth Second Half", "2GZ", "Miata NB2", "Single Tooth First Half", "Bosch Quick Start", "4/1", "ST 170", "Ford Barra 3+1", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" vvtMode2 = bits, U08, 2329, [0:3], "Inactive", "Single Tooth Second Half", "2GZ", "Miata NB2", "Single Tooth First Half", "Bosch Quick Start", "4/1", "ST 170", "Ford Barra 3+1", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" -unusedOldBiquad = array, U08, 2330, [22], "units", 1.0, 0, -20, 100, 0 +fan2ExtraIdle = scalar, U08, 2330, "%", 1.0, 0, 0, 100, 0 +unusedOldBiquad = array, U08, 2331, [21], "units", 1.0, 0, -20, 100, 0 cltTimingBins = array, F32, 2352, [8], "C", 1.0, 0, -100.0, 250.0, 1 cltTimingExtra = array, F32, 2384, [8], "degree", 1.0, 0, -400.0, 400.0, 0 tle8888mode = bits, U08, 2416, [0:1], "Auto", "SemiAuto", "Manual", "Hall" @@ -1361,7 +1362,7 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1.0, 0, 0.0, 25500.0, 2 triggerSimulatorFrequency = "Same RPM is used for two ways of producing simulated RPM. See also triggerSimulatorPins (with wires)\nSee also directSelfStimulation (no wires, bypassing input hardware)\nrpm X\nTODO: rename to triggerSimulatorRpm" malfunctionIndicatorPin = "Check engine light, also malfunction indicator light. Always blinks once on boot." idle_antiwindupFreq = "0.1 is a good default value" - acIdleExtraOffset = "Additional idle PID offset while A/C is active" + acIdleExtraOffset = "Additional idle % while A/C is active" can2SleepPeriodMs = "CANbus thread period, ms" wastegatePositionMin = "Voltage when the wastegate is closed.\nYou probably don't have one of these!" wastegatePositionMax = "Voltage when the wastegate is fully open.\nYou probably don't have one of these!\n1 volt = 1000 units" @@ -1472,6 +1473,8 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1.0, 0, 0.0, 25500.0, 2 injectorPressureType = "Select which fuel pressure sensor measures the pressure of the fuel at your injectors." boostCutPressure = "MAP value above which fuel is cut in case of overboost.\nSet to 0 to disable overboost cut." crankingIACposition = "This is the IAC position during cranking, some engines start better if given more air during cranking to improve cylinder filling." + fan1ExtraIdle = "Additional idle % when fan #1 is active" + fan2ExtraIdle = "Additional idle % when fan #2 is active" injectorCompensationMode = "None = I have a MAP-referenced fuel pressure regulator\nFixed rail pressure = I have an atmosphere-referenced fuel pressure regulator (returnless, typically)\nSensed rail pressure = I have a fuel pressure sensor" fuelReferencePressure = "This is the pressure at which your injector flow is known.\nFor example if your injectors flow 400cc/min at 3.5 bar, enter 350kpa here." postCrankingFactor = "Fuel multiplier (enrichment) immediately after engine start" @@ -4075,13 +4078,19 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "use Cic Pid", useCicPidForIdle field = "Use IAC PID Multiplier Table", useIacPidMultTable + dialog = idleOpenLoop, "Open Loop Idle" + slider = "Open loop base position", manIdlePosition, horizontal + field = "A/C adder", acIdleExtraOffset + field = "Fan #1 adder", fan1ExtraIdle + ;field = "Fan #2 adder", fan2ExtraIdle + field = "Extra idle air if throttle pressed", iacByTpsTaper + dialog = idleGating, "Idle Detection Thresholds" field = "TPS threshold", idlePidDeactivationTpsThreshold field = "RPM upper limit", idlePidRpmUpperLimit field = "RPM deadzone", idlePidRpmDeadZone dialog = idleExtra, "Extra Idle Features" - field = "Extra idle air if throttle pressed", iacByTpsTaper field = "Use idle ignition table", useSeparateAdvanceForIdle field = "Use idle VE table", useSeparateVeForIdle field = "Use coasting idle table", useIacTableForCoasting, {idleMode == 0} @@ -4092,10 +4101,9 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Idle control mode", idleMode field = "! Solenoid idle control is disabled at zero RPM" - slider = "Open loop idle position", manIdlePosition, horizontal - field = "" panel = idleGating + panel = idleOpenLoop panel = idlePidSettings, { idleMode == 0} panel = idleExtra diff --git a/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini b/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini index a7fff4209f..e12e932dc5 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.05.31.hellen_cypress.2886136611" + signature = "rusEFI 2021.05.31.hellen_cypress.3976841991" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.05.31.hellen_cypress.2886136611" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.05.31.hellen_cypress.3976841991" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Mon May 31 12:20:29 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Mon May 31 22:02:32 UTC 2021 pageSize = 20000 page = 1 @@ -342,7 +342,7 @@ sdCardCsPin = bits, U08, 707, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA canTxPin = bits, U08, 708, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15", "PI0","PI1","PI2","PI3","PI4","PI5","PI6","PI7","PI8","PI9","PI10","PI11","PI12","PI13","PI14","PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" canRxPin = bits, U08, 709, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15", "PI0","PI1","PI2","PI3","PI4","PI5","PI6","PI7","PI8","PI9","PI10","PI11","PI12","PI13","PI14","PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" throttlePedalUpPinMode = bits, U08, 710, [0:1], "DEFAULT", "PULLUP", "PULLDOWN", "INVALID" -acIdleExtraOffset = scalar, U08, 711, "Percent", 1.0, 0, 0, 255, 0 +acIdleExtraOffset = scalar, U08, 711, "%", 1.0, 0, 0, 100, 0 can2SleepPeriodMs = scalar, S32, 712, "ms", 1.0, 0, 0, 1000.0, 2 wastegatePositionMin = scalar, U16, 716, "mv", 1.0, 0, 0, 5000, 0 wastegatePositionMax = scalar, U16, 718, "mv", 1.0, 0, 0, 5000, 0 @@ -914,7 +914,7 @@ tChargeMaxRpmMinTps = scalar, F32, 2240, "mult", 1.0, 0, 0, 3, 4 tChargeMaxRpmMaxTps = scalar, F32, 2244, "mult", 1.0, 0, 0, 3, 4 auxPidFrequency1 = scalar, U16, 2248, "Hz", 1, 0.0, 0, 3000, 0 auxPidFrequency2 = scalar, U16, 2250, "Hz", 1, 0.0, 0, 3000, 0 -unused1301 = scalar, U08, 2252, "units", 1.0, 0, -20, 100, 0 +fan1ExtraIdle = scalar, U08, 2252, "%", 1.0, 0, 0, 100, 0 alignmentFill_at_2253 = array, U08, 2253, [3], "units", 1.0, 0, -20, 100, 0 alternatorPwmFrequency = scalar, S32, 2256, "Hz", 1.0, 0, 0, 3000.0, 0 unused2260 = scalar, S32, 2260, "units", 1.0, 0, -20, 100, 0 @@ -923,7 +923,8 @@ narrowToWideOxygen = array, F32, 2296, [8], "ratio", 1.0, 0, -40.0, 40.0, 2 vvtMode1 = bits, U08, 2328, [0:3], "Inactive", "Single Tooth Second Half", "2GZ", "Miata NB2", "Single Tooth First Half", "Bosch Quick Start", "4/1", "ST 170", "Ford Barra 3+1", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" vvtMode2 = bits, U08, 2329, [0:3], "Inactive", "Single Tooth Second Half", "2GZ", "Miata NB2", "Single Tooth First Half", "Bosch Quick Start", "4/1", "ST 170", "Ford Barra 3+1", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" -unusedOldBiquad = array, U08, 2330, [22], "units", 1.0, 0, -20, 100, 0 +fan2ExtraIdle = scalar, U08, 2330, "%", 1.0, 0, 0, 100, 0 +unusedOldBiquad = array, U08, 2331, [21], "units", 1.0, 0, -20, 100, 0 cltTimingBins = array, F32, 2352, [8], "C", 1.0, 0, -100.0, 250.0, 1 cltTimingExtra = array, F32, 2384, [8], "degree", 1.0, 0, -400.0, 400.0, 0 tle8888mode = bits, U08, 2416, [0:1], "Auto", "SemiAuto", "Manual", "Hall" @@ -1361,7 +1362,7 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1.0, 0, 0.0, 25500.0, 2 triggerSimulatorFrequency = "Same RPM is used for two ways of producing simulated RPM. See also triggerSimulatorPins (with wires)\nSee also directSelfStimulation (no wires, bypassing input hardware)\nrpm X\nTODO: rename to triggerSimulatorRpm" malfunctionIndicatorPin = "Check engine light, also malfunction indicator light. Always blinks once on boot." idle_antiwindupFreq = "0.1 is a good default value" - acIdleExtraOffset = "Additional idle PID offset while A/C is active" + acIdleExtraOffset = "Additional idle % while A/C is active" can2SleepPeriodMs = "CANbus thread period, ms" wastegatePositionMin = "Voltage when the wastegate is closed.\nYou probably don't have one of these!" wastegatePositionMax = "Voltage when the wastegate is fully open.\nYou probably don't have one of these!\n1 volt = 1000 units" @@ -1472,6 +1473,8 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1.0, 0, 0.0, 25500.0, 2 injectorPressureType = "Select which fuel pressure sensor measures the pressure of the fuel at your injectors." boostCutPressure = "MAP value above which fuel is cut in case of overboost.\nSet to 0 to disable overboost cut." crankingIACposition = "This is the IAC position during cranking, some engines start better if given more air during cranking to improve cylinder filling." + fan1ExtraIdle = "Additional idle % when fan #1 is active" + fan2ExtraIdle = "Additional idle % when fan #2 is active" injectorCompensationMode = "None = I have a MAP-referenced fuel pressure regulator\nFixed rail pressure = I have an atmosphere-referenced fuel pressure regulator (returnless, typically)\nSensed rail pressure = I have a fuel pressure sensor" fuelReferencePressure = "This is the pressure at which your injector flow is known.\nFor example if your injectors flow 400cc/min at 3.5 bar, enter 350kpa here." postCrankingFactor = "Fuel multiplier (enrichment) immediately after engine start" @@ -4091,13 +4094,19 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "use Cic Pid", useCicPidForIdle field = "Use IAC PID Multiplier Table", useIacPidMultTable + dialog = idleOpenLoop, "Open Loop Idle" + slider = "Open loop base position", manIdlePosition, horizontal + field = "A/C adder", acIdleExtraOffset + field = "Fan #1 adder", fan1ExtraIdle + ;field = "Fan #2 adder", fan2ExtraIdle + field = "Extra idle air if throttle pressed", iacByTpsTaper + dialog = idleGating, "Idle Detection Thresholds" field = "TPS threshold", idlePidDeactivationTpsThreshold field = "RPM upper limit", idlePidRpmUpperLimit field = "RPM deadzone", idlePidRpmDeadZone dialog = idleExtra, "Extra Idle Features" - field = "Extra idle air if throttle pressed", iacByTpsTaper field = "Use idle ignition table", useSeparateAdvanceForIdle field = "Use idle VE table", useSeparateVeForIdle field = "Use coasting idle table", useIacTableForCoasting, {idleMode == 0} @@ -4108,10 +4117,9 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Idle control mode", idleMode field = "! Solenoid idle control is disabled at zero RPM" - slider = "Open loop idle position", manIdlePosition, horizontal - field = "" panel = idleGating + panel = idleOpenLoop panel = idlePidSettings, { idleMode == 0} panel = idleExtra diff --git a/firmware/tunerstudio/generated/rusefi_kinetis.ini b/firmware/tunerstudio/generated/rusefi_kinetis.ini index 8cccc38eae..52007dad2a 100644 --- a/firmware/tunerstudio/generated/rusefi_kinetis.ini +++ b/firmware/tunerstudio/generated/rusefi_kinetis.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.05.31.kin.1403207647" + signature = "rusEFI 2021.05.31.kin.313264123" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.05.31.kin.1403207647" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.05.31.kin.313264123" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Mon May 31 12:20:27 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Mon May 31 22:02:30 UTC 2021 pageSize = 19972 page = 1 @@ -339,7 +339,7 @@ sdCardCsPin = bits, U08, 707, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA canTxPin = bits, U08, 708, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PA16", "PA17", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PB16", "PB17", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PC16", "PC17", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PD16", "PD17", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PE16", "PE17", "TLE6240_1", "TLE6240_2", "TLE6240_3", "TLE6240_4", "TLE6240_5", "TLE6240_6", "TLE6240_7", "TLE6240_8", "TLE6240_9", "TLE6240_10", "TLE6240_11", "TLE6240_12", "TLE6240_13", "TLE6240_14", "TLE6240_15", "TLE6240_16", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" canRxPin = bits, U08, 709, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PA16", "PA17", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PB16", "PB17", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PC16", "PC17", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PD16", "PD17", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PE16", "PE17", "TLE6240_1", "TLE6240_2", "TLE6240_3", "TLE6240_4", "TLE6240_5", "TLE6240_6", "TLE6240_7", "TLE6240_8", "TLE6240_9", "TLE6240_10", "TLE6240_11", "TLE6240_12", "TLE6240_13", "TLE6240_14", "TLE6240_15", "TLE6240_16", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" throttlePedalUpPinMode = bits, U08, 710, [0:1], "DEFAULT", "PULLUP", "PULLDOWN", "INVALID" -acIdleExtraOffset = scalar, U08, 711, "Percent", 1.0, 0, 0, 255, 0 +acIdleExtraOffset = scalar, U08, 711, "%", 1.0, 0, 0, 100, 0 can2SleepPeriodMs = scalar, S32, 712, "ms", 1.0, 0, 0, 1000.0, 2 wastegatePositionMin = scalar, U16, 716, "mv", 1.0, 0, 0, 5000, 0 wastegatePositionMax = scalar, U16, 718, "mv", 1.0, 0, 0, 5000, 0 @@ -906,7 +906,7 @@ tChargeMinRpmMaxTps = scalar, F32, 2232, "mult", 1.0, 0, 0, 3, 4 tChargeMaxRpmMinTps = scalar, F32, 2236, "mult", 1.0, 0, 0, 3, 4 tChargeMaxRpmMaxTps = scalar, F32, 2240, "mult", 1.0, 0, 0, 3, 4 auxPidFrequency1 = scalar, U16, 2244, "Hz", 1, 0.0, 0, 3000, 0 -unused1301 = scalar, U08, 2246, "units", 1.0, 0, -20, 100, 0 +fan1ExtraIdle = scalar, U08, 2246, "%", 1.0, 0, 0, 100, 0 alignmentFill_at_2247 = scalar, U08, 2247, "units", 1.0, 0, -20, 100, 0 alternatorPwmFrequency = scalar, S32, 2248, "Hz", 1.0, 0, 0, 3000.0, 0 unused2260 = scalar, S32, 2252, "units", 1.0, 0, -20, 100, 0 @@ -914,7 +914,8 @@ narrowToWideOxygenBins = array, F32, 2256, [8], "V", 1.0, 0, -10.0, 10.0, 3 narrowToWideOxygen = array, F32, 2288, [8], "ratio", 1.0, 0, -40.0, 40.0, 2 vvtMode1 = bits, U08, 2320, [0:3], "Inactive", "Single Tooth Second Half", "2GZ", "Miata NB2", "Single Tooth First Half", "Bosch Quick Start", "4/1", "ST 170", "Ford Barra 3+1", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" vvtModePadding = scalar, U08, 2321, -unusedOldBiquad = array, U08, 2322, [22], "units", 1.0, 0, -20, 100, 0 +fan2ExtraIdle = scalar, U08, 2322, "%", 1.0, 0, 0, 100, 0 +unusedOldBiquad = array, U08, 2323, [21], "units", 1.0, 0, -20, 100, 0 cltTimingBins = array, F32, 2344, [8], "C", 1.0, 0, -100.0, 250.0, 1 cltTimingExtra = array, F32, 2376, [8], "degree", 1.0, 0, -400.0, 400.0, 0 tle8888mode = bits, U08, 2408, [0:1], "Auto", "SemiAuto", "Manual", "Hall" @@ -1342,7 +1343,7 @@ fsioTable4RpmBins = array, F32, 19940, [8], "RPM", 1.0, 0, 0.0, 25500.0, 2 triggerSimulatorFrequency = "Same RPM is used for two ways of producing simulated RPM. See also triggerSimulatorPins (with wires)\nSee also directSelfStimulation (no wires, bypassing input hardware)\nrpm X\nTODO: rename to triggerSimulatorRpm" malfunctionIndicatorPin = "Check engine light, also malfunction indicator light. Always blinks once on boot." idle_antiwindupFreq = "0.1 is a good default value" - acIdleExtraOffset = "Additional idle PID offset while A/C is active" + acIdleExtraOffset = "Additional idle % while A/C is active" can2SleepPeriodMs = "CANbus thread period, ms" wastegatePositionMin = "Voltage when the wastegate is closed.\nYou probably don't have one of these!" wastegatePositionMax = "Voltage when the wastegate is fully open.\nYou probably don't have one of these!\n1 volt = 1000 units" @@ -1453,6 +1454,8 @@ fsioTable4RpmBins = array, F32, 19940, [8], "RPM", 1.0, 0, 0.0, 25500.0, 2 injectorPressureType = "Select which fuel pressure sensor measures the pressure of the fuel at your injectors." boostCutPressure = "MAP value above which fuel is cut in case of overboost.\nSet to 0 to disable overboost cut." crankingIACposition = "This is the IAC position during cranking, some engines start better if given more air during cranking to improve cylinder filling." + fan1ExtraIdle = "Additional idle % when fan #1 is active" + fan2ExtraIdle = "Additional idle % when fan #2 is active" injectorCompensationMode = "None = I have a MAP-referenced fuel pressure regulator\nFixed rail pressure = I have an atmosphere-referenced fuel pressure regulator (returnless, typically)\nSensed rail pressure = I have a fuel pressure sensor" fuelReferencePressure = "This is the pressure at which your injector flow is known.\nFor example if your injectors flow 400cc/min at 3.5 bar, enter 350kpa here." postCrankingFactor = "Fuel multiplier (enrichment) immediately after engine start" @@ -4073,13 +4076,19 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "use Cic Pid", useCicPidForIdle field = "Use IAC PID Multiplier Table", useIacPidMultTable + dialog = idleOpenLoop, "Open Loop Idle" + slider = "Open loop base position", manIdlePosition, horizontal + field = "A/C adder", acIdleExtraOffset + field = "Fan #1 adder", fan1ExtraIdle + ;field = "Fan #2 adder", fan2ExtraIdle + field = "Extra idle air if throttle pressed", iacByTpsTaper + dialog = idleGating, "Idle Detection Thresholds" field = "TPS threshold", idlePidDeactivationTpsThreshold field = "RPM upper limit", idlePidRpmUpperLimit field = "RPM deadzone", idlePidRpmDeadZone dialog = idleExtra, "Extra Idle Features" - field = "Extra idle air if throttle pressed", iacByTpsTaper field = "Use idle ignition table", useSeparateAdvanceForIdle field = "Use idle VE table", useSeparateVeForIdle field = "Use coasting idle table", useIacTableForCoasting, {idleMode == 0} @@ -4090,10 +4099,9 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Idle control mode", idleMode field = "! Solenoid idle control is disabled at zero RPM" - slider = "Open loop idle position", manIdlePosition, horizontal - field = "" panel = idleGating + panel = idleOpenLoop panel = idlePidSettings, { idleMode == 0} panel = idleExtra diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index 5f77d3c330..a2bf727725 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f4.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.05.31.mre_f4.1822994921" + signature = "rusEFI 2021.05.31.mre_f4.765954509" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.05.31.mre_f4.1822994921" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.05.31.mre_f4.765954509" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon May 31 12:20:17 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon May 31 22:02:20 UTC 2021 pageSize = 20000 page = 1 @@ -342,7 +342,7 @@ sdCardCsPin = bits, U08, 707, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA canTxPin = bits, U08, 708, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15", "PI0","PI1","PI2","PI3","PI4","PI5","PI6","PI7","PI8","PI9","PI10","PI11","PI12","PI13","PI14","PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" canRxPin = bits, U08, 709, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15", "PI0","PI1","PI2","PI3","PI4","PI5","PI6","PI7","PI8","PI9","PI10","PI11","PI12","PI13","PI14","PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" throttlePedalUpPinMode = bits, U08, 710, [0:1], "DEFAULT", "PULLUP", "PULLDOWN", "INVALID" -acIdleExtraOffset = scalar, U08, 711, "Percent", 1.0, 0, 0, 255, 0 +acIdleExtraOffset = scalar, U08, 711, "%", 1.0, 0, 0, 100, 0 can2SleepPeriodMs = scalar, S32, 712, "ms", 1.0, 0, 0, 1000.0, 2 wastegatePositionMin = scalar, U16, 716, "mv", 1.0, 0, 0, 5000, 0 wastegatePositionMax = scalar, U16, 718, "mv", 1.0, 0, 0, 5000, 0 @@ -914,7 +914,7 @@ tChargeMaxRpmMinTps = scalar, F32, 2240, "mult", 1.0, 0, 0, 3, 4 tChargeMaxRpmMaxTps = scalar, F32, 2244, "mult", 1.0, 0, 0, 3, 4 auxPidFrequency1 = scalar, U16, 2248, "Hz", 1, 0.0, 0, 3000, 0 auxPidFrequency2 = scalar, U16, 2250, "Hz", 1, 0.0, 0, 3000, 0 -unused1301 = scalar, U08, 2252, "units", 1.0, 0, -20, 100, 0 +fan1ExtraIdle = scalar, U08, 2252, "%", 1.0, 0, 0, 100, 0 alignmentFill_at_2253 = array, U08, 2253, [3], "units", 1.0, 0, -20, 100, 0 alternatorPwmFrequency = scalar, S32, 2256, "Hz", 1.0, 0, 0, 3000.0, 0 unused2260 = scalar, S32, 2260, "units", 1.0, 0, -20, 100, 0 @@ -923,7 +923,8 @@ narrowToWideOxygen = array, F32, 2296, [8], "ratio", 1.0, 0, -40.0, 40.0, 2 vvtMode1 = bits, U08, 2328, [0:3], "Inactive", "Single Tooth Second Half", "2GZ", "Miata NB2", "Single Tooth First Half", "Bosch Quick Start", "4/1", "ST 170", "Ford Barra 3+1", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" vvtMode2 = bits, U08, 2329, [0:3], "Inactive", "Single Tooth Second Half", "2GZ", "Miata NB2", "Single Tooth First Half", "Bosch Quick Start", "4/1", "ST 170", "Ford Barra 3+1", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" -unusedOldBiquad = array, U08, 2330, [22], "units", 1.0, 0, -20, 100, 0 +fan2ExtraIdle = scalar, U08, 2330, "%", 1.0, 0, 0, 100, 0 +unusedOldBiquad = array, U08, 2331, [21], "units", 1.0, 0, -20, 100, 0 cltTimingBins = array, F32, 2352, [8], "C", 1.0, 0, -100.0, 250.0, 1 cltTimingExtra = array, F32, 2384, [8], "degree", 1.0, 0, -400.0, 400.0, 0 tle8888mode = bits, U08, 2416, [0:1], "Auto", "SemiAuto", "Manual", "Hall" @@ -1361,7 +1362,7 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1.0, 0, 0.0, 25500.0, 2 triggerSimulatorFrequency = "Same RPM is used for two ways of producing simulated RPM. See also triggerSimulatorPins (with wires)\nSee also directSelfStimulation (no wires, bypassing input hardware)\nrpm X\nTODO: rename to triggerSimulatorRpm" malfunctionIndicatorPin = "Check engine light, also malfunction indicator light. Always blinks once on boot." idle_antiwindupFreq = "0.1 is a good default value" - acIdleExtraOffset = "Additional idle PID offset while A/C is active" + acIdleExtraOffset = "Additional idle % while A/C is active" can2SleepPeriodMs = "CANbus thread period, ms" wastegatePositionMin = "Voltage when the wastegate is closed.\nYou probably don't have one of these!" wastegatePositionMax = "Voltage when the wastegate is fully open.\nYou probably don't have one of these!\n1 volt = 1000 units" @@ -1472,6 +1473,8 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1.0, 0, 0.0, 25500.0, 2 injectorPressureType = "Select which fuel pressure sensor measures the pressure of the fuel at your injectors." boostCutPressure = "MAP value above which fuel is cut in case of overboost.\nSet to 0 to disable overboost cut." crankingIACposition = "This is the IAC position during cranking, some engines start better if given more air during cranking to improve cylinder filling." + fan1ExtraIdle = "Additional idle % when fan #1 is active" + fan2ExtraIdle = "Additional idle % when fan #2 is active" injectorCompensationMode = "None = I have a MAP-referenced fuel pressure regulator\nFixed rail pressure = I have an atmosphere-referenced fuel pressure regulator (returnless, typically)\nSensed rail pressure = I have a fuel pressure sensor" fuelReferencePressure = "This is the pressure at which your injector flow is known.\nFor example if your injectors flow 400cc/min at 3.5 bar, enter 350kpa here." postCrankingFactor = "Fuel multiplier (enrichment) immediately after engine start" @@ -4075,13 +4078,19 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "use Cic Pid", useCicPidForIdle field = "Use IAC PID Multiplier Table", useIacPidMultTable + dialog = idleOpenLoop, "Open Loop Idle" + slider = "Open loop base position", manIdlePosition, horizontal + field = "A/C adder", acIdleExtraOffset + field = "Fan #1 adder", fan1ExtraIdle + ;field = "Fan #2 adder", fan2ExtraIdle + field = "Extra idle air if throttle pressed", iacByTpsTaper + dialog = idleGating, "Idle Detection Thresholds" field = "TPS threshold", idlePidDeactivationTpsThreshold field = "RPM upper limit", idlePidRpmUpperLimit field = "RPM deadzone", idlePidRpmDeadZone dialog = idleExtra, "Extra Idle Features" - field = "Extra idle air if throttle pressed", iacByTpsTaper field = "Use idle ignition table", useSeparateAdvanceForIdle field = "Use idle VE table", useSeparateVeForIdle field = "Use coasting idle table", useIacTableForCoasting, {idleMode == 0} @@ -4092,10 +4101,9 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Idle control mode", idleMode field = "! Solenoid idle control is disabled at zero RPM" - slider = "Open loop idle position", manIdlePosition, horizontal - field = "" panel = idleGating + panel = idleOpenLoop panel = idlePidSettings, { idleMode == 0} panel = idleExtra diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index f1bc0f6cb3..88fbbdbd83 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f7.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.05.31.mre_f7.1822994921" + signature = "rusEFI 2021.05.31.mre_f7.765954509" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.05.31.mre_f7.1822994921" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.05.31.mre_f7.765954509" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon May 31 12:20:16 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon May 31 22:02:19 UTC 2021 pageSize = 20000 page = 1 @@ -342,7 +342,7 @@ sdCardCsPin = bits, U08, 707, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA canTxPin = bits, U08, 708, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15", "PI0","PI1","PI2","PI3","PI4","PI5","PI6","PI7","PI8","PI9","PI10","PI11","PI12","PI13","PI14","PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" canRxPin = bits, U08, 709, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15", "PI0","PI1","PI2","PI3","PI4","PI5","PI6","PI7","PI8","PI9","PI10","PI11","PI12","PI13","PI14","PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" throttlePedalUpPinMode = bits, U08, 710, [0:1], "DEFAULT", "PULLUP", "PULLDOWN", "INVALID" -acIdleExtraOffset = scalar, U08, 711, "Percent", 1.0, 0, 0, 255, 0 +acIdleExtraOffset = scalar, U08, 711, "%", 1.0, 0, 0, 100, 0 can2SleepPeriodMs = scalar, S32, 712, "ms", 1.0, 0, 0, 1000.0, 2 wastegatePositionMin = scalar, U16, 716, "mv", 1.0, 0, 0, 5000, 0 wastegatePositionMax = scalar, U16, 718, "mv", 1.0, 0, 0, 5000, 0 @@ -914,7 +914,7 @@ tChargeMaxRpmMinTps = scalar, F32, 2240, "mult", 1.0, 0, 0, 3, 4 tChargeMaxRpmMaxTps = scalar, F32, 2244, "mult", 1.0, 0, 0, 3, 4 auxPidFrequency1 = scalar, U16, 2248, "Hz", 1, 0.0, 0, 3000, 0 auxPidFrequency2 = scalar, U16, 2250, "Hz", 1, 0.0, 0, 3000, 0 -unused1301 = scalar, U08, 2252, "units", 1.0, 0, -20, 100, 0 +fan1ExtraIdle = scalar, U08, 2252, "%", 1.0, 0, 0, 100, 0 alignmentFill_at_2253 = array, U08, 2253, [3], "units", 1.0, 0, -20, 100, 0 alternatorPwmFrequency = scalar, S32, 2256, "Hz", 1.0, 0, 0, 3000.0, 0 unused2260 = scalar, S32, 2260, "units", 1.0, 0, -20, 100, 0 @@ -923,7 +923,8 @@ narrowToWideOxygen = array, F32, 2296, [8], "ratio", 1.0, 0, -40.0, 40.0, 2 vvtMode1 = bits, U08, 2328, [0:3], "Inactive", "Single Tooth Second Half", "2GZ", "Miata NB2", "Single Tooth First Half", "Bosch Quick Start", "4/1", "ST 170", "Ford Barra 3+1", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" vvtMode2 = bits, U08, 2329, [0:3], "Inactive", "Single Tooth Second Half", "2GZ", "Miata NB2", "Single Tooth First Half", "Bosch Quick Start", "4/1", "ST 170", "Ford Barra 3+1", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" -unusedOldBiquad = array, U08, 2330, [22], "units", 1.0, 0, -20, 100, 0 +fan2ExtraIdle = scalar, U08, 2330, "%", 1.0, 0, 0, 100, 0 +unusedOldBiquad = array, U08, 2331, [21], "units", 1.0, 0, -20, 100, 0 cltTimingBins = array, F32, 2352, [8], "C", 1.0, 0, -100.0, 250.0, 1 cltTimingExtra = array, F32, 2384, [8], "degree", 1.0, 0, -400.0, 400.0, 0 tle8888mode = bits, U08, 2416, [0:1], "Auto", "SemiAuto", "Manual", "Hall" @@ -1361,7 +1362,7 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1.0, 0, 0.0, 25500.0, 2 triggerSimulatorFrequency = "Same RPM is used for two ways of producing simulated RPM. See also triggerSimulatorPins (with wires)\nSee also directSelfStimulation (no wires, bypassing input hardware)\nrpm X\nTODO: rename to triggerSimulatorRpm" malfunctionIndicatorPin = "Check engine light, also malfunction indicator light. Always blinks once on boot." idle_antiwindupFreq = "0.1 is a good default value" - acIdleExtraOffset = "Additional idle PID offset while A/C is active" + acIdleExtraOffset = "Additional idle % while A/C is active" can2SleepPeriodMs = "CANbus thread period, ms" wastegatePositionMin = "Voltage when the wastegate is closed.\nYou probably don't have one of these!" wastegatePositionMax = "Voltage when the wastegate is fully open.\nYou probably don't have one of these!\n1 volt = 1000 units" @@ -1472,6 +1473,8 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1.0, 0, 0.0, 25500.0, 2 injectorPressureType = "Select which fuel pressure sensor measures the pressure of the fuel at your injectors." boostCutPressure = "MAP value above which fuel is cut in case of overboost.\nSet to 0 to disable overboost cut." crankingIACposition = "This is the IAC position during cranking, some engines start better if given more air during cranking to improve cylinder filling." + fan1ExtraIdle = "Additional idle % when fan #1 is active" + fan2ExtraIdle = "Additional idle % when fan #2 is active" injectorCompensationMode = "None = I have a MAP-referenced fuel pressure regulator\nFixed rail pressure = I have an atmosphere-referenced fuel pressure regulator (returnless, typically)\nSensed rail pressure = I have a fuel pressure sensor" fuelReferencePressure = "This is the pressure at which your injector flow is known.\nFor example if your injectors flow 400cc/min at 3.5 bar, enter 350kpa here." postCrankingFactor = "Fuel multiplier (enrichment) immediately after engine start" @@ -4075,13 +4078,19 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "use Cic Pid", useCicPidForIdle field = "Use IAC PID Multiplier Table", useIacPidMultTable + dialog = idleOpenLoop, "Open Loop Idle" + slider = "Open loop base position", manIdlePosition, horizontal + field = "A/C adder", acIdleExtraOffset + field = "Fan #1 adder", fan1ExtraIdle + ;field = "Fan #2 adder", fan2ExtraIdle + field = "Extra idle air if throttle pressed", iacByTpsTaper + dialog = idleGating, "Idle Detection Thresholds" field = "TPS threshold", idlePidDeactivationTpsThreshold field = "RPM upper limit", idlePidRpmUpperLimit field = "RPM deadzone", idlePidRpmDeadZone dialog = idleExtra, "Extra Idle Features" - field = "Extra idle air if throttle pressed", iacByTpsTaper field = "Use idle ignition table", useSeparateAdvanceForIdle field = "Use idle VE table", useSeparateVeForIdle field = "Use coasting idle table", useIacTableForCoasting, {idleMode == 0} @@ -4092,10 +4101,9 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Idle control mode", idleMode field = "! Solenoid idle control is disabled at zero RPM" - slider = "Open loop idle position", manIdlePosition, horizontal - field = "" panel = idleGating + panel = idleOpenLoop panel = idlePidSettings, { idleMode == 0} panel = idleExtra diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index 8af5b270b4..8129154b09 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.05.31.prometheus_405.4243335877" + signature = "rusEFI 2021.05.31.prometheus_405.3185775329" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.05.31.prometheus_405.4243335877" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.05.31.prometheus_405.3185775329" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon May 31 12:20:22 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon May 31 22:02:25 UTC 2021 pageSize = 20000 page = 1 @@ -342,7 +342,7 @@ sdCardCsPin = bits, U08, 707, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA canTxPin = bits, U08, 708, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15", "PI0","PI1","PI2","PI3","PI4","PI5","PI6","PI7","PI8","PI9","PI10","PI11","PI12","PI13","PI14","PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" canRxPin = bits, U08, 709, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15", "PI0","PI1","PI2","PI3","PI4","PI5","PI6","PI7","PI8","PI9","PI10","PI11","PI12","PI13","PI14","PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" throttlePedalUpPinMode = bits, U08, 710, [0:1], "DEFAULT", "PULLUP", "PULLDOWN", "INVALID" -acIdleExtraOffset = scalar, U08, 711, "Percent", 1.0, 0, 0, 255, 0 +acIdleExtraOffset = scalar, U08, 711, "%", 1.0, 0, 0, 100, 0 can2SleepPeriodMs = scalar, S32, 712, "ms", 1.0, 0, 0, 1000.0, 2 wastegatePositionMin = scalar, U16, 716, "mv", 1.0, 0, 0, 5000, 0 wastegatePositionMax = scalar, U16, 718, "mv", 1.0, 0, 0, 5000, 0 @@ -914,7 +914,7 @@ tChargeMaxRpmMinTps = scalar, F32, 2240, "mult", 1.0, 0, 0, 3, 4 tChargeMaxRpmMaxTps = scalar, F32, 2244, "mult", 1.0, 0, 0, 3, 4 auxPidFrequency1 = scalar, U16, 2248, "Hz", 1, 0.0, 0, 3000, 0 auxPidFrequency2 = scalar, U16, 2250, "Hz", 1, 0.0, 0, 3000, 0 -unused1301 = scalar, U08, 2252, "units", 1.0, 0, -20, 100, 0 +fan1ExtraIdle = scalar, U08, 2252, "%", 1.0, 0, 0, 100, 0 alignmentFill_at_2253 = array, U08, 2253, [3], "units", 1.0, 0, -20, 100, 0 alternatorPwmFrequency = scalar, S32, 2256, "Hz", 1.0, 0, 0, 3000.0, 0 unused2260 = scalar, S32, 2260, "units", 1.0, 0, -20, 100, 0 @@ -923,7 +923,8 @@ narrowToWideOxygen = array, F32, 2296, [8], "ratio", 1.0, 0, -40.0, 40.0, 2 vvtMode1 = bits, U08, 2328, [0:3], "Inactive", "Single Tooth Second Half", "2GZ", "Miata NB2", "Single Tooth First Half", "Bosch Quick Start", "4/1", "ST 170", "Ford Barra 3+1", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" vvtMode2 = bits, U08, 2329, [0:3], "Inactive", "Single Tooth Second Half", "2GZ", "Miata NB2", "Single Tooth First Half", "Bosch Quick Start", "4/1", "ST 170", "Ford Barra 3+1", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" -unusedOldBiquad = array, U08, 2330, [22], "units", 1.0, 0, -20, 100, 0 +fan2ExtraIdle = scalar, U08, 2330, "%", 1.0, 0, 0, 100, 0 +unusedOldBiquad = array, U08, 2331, [21], "units", 1.0, 0, -20, 100, 0 cltTimingBins = array, F32, 2352, [8], "C", 1.0, 0, -100.0, 250.0, 1 cltTimingExtra = array, F32, 2384, [8], "degree", 1.0, 0, -400.0, 400.0, 0 tle8888mode = bits, U08, 2416, [0:1], "Auto", "SemiAuto", "Manual", "Hall" @@ -1361,7 +1362,7 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1.0, 0, 0.0, 25500.0, 2 triggerSimulatorFrequency = "Same RPM is used for two ways of producing simulated RPM. See also triggerSimulatorPins (with wires)\nSee also directSelfStimulation (no wires, bypassing input hardware)\nrpm X\nTODO: rename to triggerSimulatorRpm" malfunctionIndicatorPin = "Check engine light, also malfunction indicator light. Always blinks once on boot." idle_antiwindupFreq = "0.1 is a good default value" - acIdleExtraOffset = "Additional idle PID offset while A/C is active" + acIdleExtraOffset = "Additional idle % while A/C is active" can2SleepPeriodMs = "CANbus thread period, ms" wastegatePositionMin = "Voltage when the wastegate is closed.\nYou probably don't have one of these!" wastegatePositionMax = "Voltage when the wastegate is fully open.\nYou probably don't have one of these!\n1 volt = 1000 units" @@ -1472,6 +1473,8 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1.0, 0, 0.0, 25500.0, 2 injectorPressureType = "Select which fuel pressure sensor measures the pressure of the fuel at your injectors." boostCutPressure = "MAP value above which fuel is cut in case of overboost.\nSet to 0 to disable overboost cut." crankingIACposition = "This is the IAC position during cranking, some engines start better if given more air during cranking to improve cylinder filling." + fan1ExtraIdle = "Additional idle % when fan #1 is active" + fan2ExtraIdle = "Additional idle % when fan #2 is active" injectorCompensationMode = "None = I have a MAP-referenced fuel pressure regulator\nFixed rail pressure = I have an atmosphere-referenced fuel pressure regulator (returnless, typically)\nSensed rail pressure = I have a fuel pressure sensor" fuelReferencePressure = "This is the pressure at which your injector flow is known.\nFor example if your injectors flow 400cc/min at 3.5 bar, enter 350kpa here." postCrankingFactor = "Fuel multiplier (enrichment) immediately after engine start" @@ -4086,13 +4089,19 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "use Cic Pid", useCicPidForIdle field = "Use IAC PID Multiplier Table", useIacPidMultTable + dialog = idleOpenLoop, "Open Loop Idle" + slider = "Open loop base position", manIdlePosition, horizontal + field = "A/C adder", acIdleExtraOffset + field = "Fan #1 adder", fan1ExtraIdle + ;field = "Fan #2 adder", fan2ExtraIdle + field = "Extra idle air if throttle pressed", iacByTpsTaper + dialog = idleGating, "Idle Detection Thresholds" field = "TPS threshold", idlePidDeactivationTpsThreshold field = "RPM upper limit", idlePidRpmUpperLimit field = "RPM deadzone", idlePidRpmDeadZone dialog = idleExtra, "Extra Idle Features" - field = "Extra idle air if throttle pressed", iacByTpsTaper field = "Use idle ignition table", useSeparateAdvanceForIdle field = "Use idle VE table", useSeparateVeForIdle field = "Use coasting idle table", useIacTableForCoasting, {idleMode == 0} @@ -4103,10 +4112,9 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Idle control mode", idleMode field = "! Solenoid idle control is disabled at zero RPM" - slider = "Open loop idle position", manIdlePosition, horizontal - field = "" panel = idleGating + panel = idleOpenLoop panel = idlePidSettings, { idleMode == 0} panel = idleExtra diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index 71ab973640..3fd06f0add 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.05.31.prometheus_469.4243335877" + signature = "rusEFI 2021.05.31.prometheus_469.3185775329" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.05.31.prometheus_469.4243335877" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.05.31.prometheus_469.3185775329" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon May 31 12:20:21 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon May 31 22:02:24 UTC 2021 pageSize = 20000 page = 1 @@ -342,7 +342,7 @@ sdCardCsPin = bits, U08, 707, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA canTxPin = bits, U08, 708, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15", "PI0","PI1","PI2","PI3","PI4","PI5","PI6","PI7","PI8","PI9","PI10","PI11","PI12","PI13","PI14","PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" canRxPin = bits, U08, 709, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15", "PI0","PI1","PI2","PI3","PI4","PI5","PI6","PI7","PI8","PI9","PI10","PI11","PI12","PI13","PI14","PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" throttlePedalUpPinMode = bits, U08, 710, [0:1], "DEFAULT", "PULLUP", "PULLDOWN", "INVALID" -acIdleExtraOffset = scalar, U08, 711, "Percent", 1.0, 0, 0, 255, 0 +acIdleExtraOffset = scalar, U08, 711, "%", 1.0, 0, 0, 100, 0 can2SleepPeriodMs = scalar, S32, 712, "ms", 1.0, 0, 0, 1000.0, 2 wastegatePositionMin = scalar, U16, 716, "mv", 1.0, 0, 0, 5000, 0 wastegatePositionMax = scalar, U16, 718, "mv", 1.0, 0, 0, 5000, 0 @@ -914,7 +914,7 @@ tChargeMaxRpmMinTps = scalar, F32, 2240, "mult", 1.0, 0, 0, 3, 4 tChargeMaxRpmMaxTps = scalar, F32, 2244, "mult", 1.0, 0, 0, 3, 4 auxPidFrequency1 = scalar, U16, 2248, "Hz", 1, 0.0, 0, 3000, 0 auxPidFrequency2 = scalar, U16, 2250, "Hz", 1, 0.0, 0, 3000, 0 -unused1301 = scalar, U08, 2252, "units", 1.0, 0, -20, 100, 0 +fan1ExtraIdle = scalar, U08, 2252, "%", 1.0, 0, 0, 100, 0 alignmentFill_at_2253 = array, U08, 2253, [3], "units", 1.0, 0, -20, 100, 0 alternatorPwmFrequency = scalar, S32, 2256, "Hz", 1.0, 0, 0, 3000.0, 0 unused2260 = scalar, S32, 2260, "units", 1.0, 0, -20, 100, 0 @@ -923,7 +923,8 @@ narrowToWideOxygen = array, F32, 2296, [8], "ratio", 1.0, 0, -40.0, 40.0, 2 vvtMode1 = bits, U08, 2328, [0:3], "Inactive", "Single Tooth Second Half", "2GZ", "Miata NB2", "Single Tooth First Half", "Bosch Quick Start", "4/1", "ST 170", "Ford Barra 3+1", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" vvtMode2 = bits, U08, 2329, [0:3], "Inactive", "Single Tooth Second Half", "2GZ", "Miata NB2", "Single Tooth First Half", "Bosch Quick Start", "4/1", "ST 170", "Ford Barra 3+1", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" -unusedOldBiquad = array, U08, 2330, [22], "units", 1.0, 0, -20, 100, 0 +fan2ExtraIdle = scalar, U08, 2330, "%", 1.0, 0, 0, 100, 0 +unusedOldBiquad = array, U08, 2331, [21], "units", 1.0, 0, -20, 100, 0 cltTimingBins = array, F32, 2352, [8], "C", 1.0, 0, -100.0, 250.0, 1 cltTimingExtra = array, F32, 2384, [8], "degree", 1.0, 0, -400.0, 400.0, 0 tle8888mode = bits, U08, 2416, [0:1], "Auto", "SemiAuto", "Manual", "Hall" @@ -1361,7 +1362,7 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1.0, 0, 0.0, 25500.0, 2 triggerSimulatorFrequency = "Same RPM is used for two ways of producing simulated RPM. See also triggerSimulatorPins (with wires)\nSee also directSelfStimulation (no wires, bypassing input hardware)\nrpm X\nTODO: rename to triggerSimulatorRpm" malfunctionIndicatorPin = "Check engine light, also malfunction indicator light. Always blinks once on boot." idle_antiwindupFreq = "0.1 is a good default value" - acIdleExtraOffset = "Additional idle PID offset while A/C is active" + acIdleExtraOffset = "Additional idle % while A/C is active" can2SleepPeriodMs = "CANbus thread period, ms" wastegatePositionMin = "Voltage when the wastegate is closed.\nYou probably don't have one of these!" wastegatePositionMax = "Voltage when the wastegate is fully open.\nYou probably don't have one of these!\n1 volt = 1000 units" @@ -1472,6 +1473,8 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1.0, 0, 0.0, 25500.0, 2 injectorPressureType = "Select which fuel pressure sensor measures the pressure of the fuel at your injectors." boostCutPressure = "MAP value above which fuel is cut in case of overboost.\nSet to 0 to disable overboost cut." crankingIACposition = "This is the IAC position during cranking, some engines start better if given more air during cranking to improve cylinder filling." + fan1ExtraIdle = "Additional idle % when fan #1 is active" + fan2ExtraIdle = "Additional idle % when fan #2 is active" injectorCompensationMode = "None = I have a MAP-referenced fuel pressure regulator\nFixed rail pressure = I have an atmosphere-referenced fuel pressure regulator (returnless, typically)\nSensed rail pressure = I have a fuel pressure sensor" fuelReferencePressure = "This is the pressure at which your injector flow is known.\nFor example if your injectors flow 400cc/min at 3.5 bar, enter 350kpa here." postCrankingFactor = "Fuel multiplier (enrichment) immediately after engine start" @@ -4086,13 +4089,19 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "use Cic Pid", useCicPidForIdle field = "Use IAC PID Multiplier Table", useIacPidMultTable + dialog = idleOpenLoop, "Open Loop Idle" + slider = "Open loop base position", manIdlePosition, horizontal + field = "A/C adder", acIdleExtraOffset + field = "Fan #1 adder", fan1ExtraIdle + ;field = "Fan #2 adder", fan2ExtraIdle + field = "Extra idle air if throttle pressed", iacByTpsTaper + dialog = idleGating, "Idle Detection Thresholds" field = "TPS threshold", idlePidDeactivationTpsThreshold field = "RPM upper limit", idlePidRpmUpperLimit field = "RPM deadzone", idlePidRpmDeadZone dialog = idleExtra, "Extra Idle Features" - field = "Extra idle air if throttle pressed", iacByTpsTaper field = "Use idle ignition table", useSeparateAdvanceForIdle field = "Use idle VE table", useSeparateVeForIdle field = "Use coasting idle table", useIacTableForCoasting, {idleMode == 0} @@ -4103,10 +4112,9 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Idle control mode", idleMode field = "! Solenoid idle control is disabled at zero RPM" - slider = "Open loop idle position", manIdlePosition, horizontal - field = "" panel = idleGating + panel = idleOpenLoop panel = idlePidSettings, { idleMode == 0} panel = idleExtra diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index 1b0e408a9e..4a32759d51 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.05.31.proteus_f4.2278331880" + signature = "rusEFI 2021.05.31.proteus_f4.3334712780" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.05.31.proteus_f4.2278331880" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.05.31.proteus_f4.3334712780" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon May 31 12:20:26 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon May 31 22:02:29 UTC 2021 pageSize = 20000 page = 1 @@ -342,7 +342,7 @@ sdCardCsPin = bits, U08, 707, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA canTxPin = bits, U08, 708, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15", "PI0","PI1","PI2","PI3","PI4","PI5","PI6","PI7","PI8","PI9","PI10","PI11","PI12","PI13","PI14","PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" canRxPin = bits, U08, 709, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15", "PI0","PI1","PI2","PI3","PI4","PI5","PI6","PI7","PI8","PI9","PI10","PI11","PI12","PI13","PI14","PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" throttlePedalUpPinMode = bits, U08, 710, [0:1], "DEFAULT", "PULLUP", "PULLDOWN", "INVALID" -acIdleExtraOffset = scalar, U08, 711, "Percent", 1.0, 0, 0, 255, 0 +acIdleExtraOffset = scalar, U08, 711, "%", 1.0, 0, 0, 100, 0 can2SleepPeriodMs = scalar, S32, 712, "ms", 1.0, 0, 0, 1000.0, 2 wastegatePositionMin = scalar, U16, 716, "mv", 1.0, 0, 0, 5000, 0 wastegatePositionMax = scalar, U16, 718, "mv", 1.0, 0, 0, 5000, 0 @@ -914,7 +914,7 @@ tChargeMaxRpmMinTps = scalar, F32, 2240, "mult", 1.0, 0, 0, 3, 4 tChargeMaxRpmMaxTps = scalar, F32, 2244, "mult", 1.0, 0, 0, 3, 4 auxPidFrequency1 = scalar, U16, 2248, "Hz", 1, 0.0, 0, 3000, 0 auxPidFrequency2 = scalar, U16, 2250, "Hz", 1, 0.0, 0, 3000, 0 -unused1301 = scalar, U08, 2252, "units", 1.0, 0, -20, 100, 0 +fan1ExtraIdle = scalar, U08, 2252, "%", 1.0, 0, 0, 100, 0 alignmentFill_at_2253 = array, U08, 2253, [3], "units", 1.0, 0, -20, 100, 0 alternatorPwmFrequency = scalar, S32, 2256, "Hz", 1.0, 0, 0, 3000.0, 0 unused2260 = scalar, S32, 2260, "units", 1.0, 0, -20, 100, 0 @@ -923,7 +923,8 @@ narrowToWideOxygen = array, F32, 2296, [8], "ratio", 1.0, 0, -40.0, 40.0, 2 vvtMode1 = bits, U08, 2328, [0:3], "Inactive", "Single Tooth Second Half", "2GZ", "Miata NB2", "Single Tooth First Half", "Bosch Quick Start", "4/1", "ST 170", "Ford Barra 3+1", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" vvtMode2 = bits, U08, 2329, [0:3], "Inactive", "Single Tooth Second Half", "2GZ", "Miata NB2", "Single Tooth First Half", "Bosch Quick Start", "4/1", "ST 170", "Ford Barra 3+1", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" -unusedOldBiquad = array, U08, 2330, [22], "units", 1.0, 0, -20, 100, 0 +fan2ExtraIdle = scalar, U08, 2330, "%", 1.0, 0, 0, 100, 0 +unusedOldBiquad = array, U08, 2331, [21], "units", 1.0, 0, -20, 100, 0 cltTimingBins = array, F32, 2352, [8], "C", 1.0, 0, -100.0, 250.0, 1 cltTimingExtra = array, F32, 2384, [8], "degree", 1.0, 0, -400.0, 400.0, 0 tle8888mode = bits, U08, 2416, [0:1], "Auto", "SemiAuto", "Manual", "Hall" @@ -1361,7 +1362,7 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1.0, 0, 0.0, 25500.0, 2 triggerSimulatorFrequency = "Same RPM is used for two ways of producing simulated RPM. See also triggerSimulatorPins (with wires)\nSee also directSelfStimulation (no wires, bypassing input hardware)\nrpm X\nTODO: rename to triggerSimulatorRpm" malfunctionIndicatorPin = "Check engine light, also malfunction indicator light. Always blinks once on boot." idle_antiwindupFreq = "0.1 is a good default value" - acIdleExtraOffset = "Additional idle PID offset while A/C is active" + acIdleExtraOffset = "Additional idle % while A/C is active" can2SleepPeriodMs = "CANbus thread period, ms" wastegatePositionMin = "Voltage when the wastegate is closed.\nYou probably don't have one of these!" wastegatePositionMax = "Voltage when the wastegate is fully open.\nYou probably don't have one of these!\n1 volt = 1000 units" @@ -1472,6 +1473,8 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1.0, 0, 0.0, 25500.0, 2 injectorPressureType = "Select which fuel pressure sensor measures the pressure of the fuel at your injectors." boostCutPressure = "MAP value above which fuel is cut in case of overboost.\nSet to 0 to disable overboost cut." crankingIACposition = "This is the IAC position during cranking, some engines start better if given more air during cranking to improve cylinder filling." + fan1ExtraIdle = "Additional idle % when fan #1 is active" + fan2ExtraIdle = "Additional idle % when fan #2 is active" injectorCompensationMode = "None = I have a MAP-referenced fuel pressure regulator\nFixed rail pressure = I have an atmosphere-referenced fuel pressure regulator (returnless, typically)\nSensed rail pressure = I have a fuel pressure sensor" fuelReferencePressure = "This is the pressure at which your injector flow is known.\nFor example if your injectors flow 400cc/min at 3.5 bar, enter 350kpa here." postCrankingFactor = "Fuel multiplier (enrichment) immediately after engine start" @@ -4068,13 +4071,19 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "use Cic Pid", useCicPidForIdle field = "Use IAC PID Multiplier Table", useIacPidMultTable + dialog = idleOpenLoop, "Open Loop Idle" + slider = "Open loop base position", manIdlePosition, horizontal + field = "A/C adder", acIdleExtraOffset + field = "Fan #1 adder", fan1ExtraIdle + ;field = "Fan #2 adder", fan2ExtraIdle + field = "Extra idle air if throttle pressed", iacByTpsTaper + dialog = idleGating, "Idle Detection Thresholds" field = "TPS threshold", idlePidDeactivationTpsThreshold field = "RPM upper limit", idlePidRpmUpperLimit field = "RPM deadzone", idlePidRpmDeadZone dialog = idleExtra, "Extra Idle Features" - field = "Extra idle air if throttle pressed", iacByTpsTaper field = "Use idle ignition table", useSeparateAdvanceForIdle field = "Use idle VE table", useSeparateVeForIdle field = "Use coasting idle table", useIacTableForCoasting, {idleMode == 0} @@ -4085,10 +4094,9 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Idle control mode", idleMode field = "! Solenoid idle control is disabled at zero RPM" - slider = "Open loop idle position", manIdlePosition, horizontal - field = "" panel = idleGating + panel = idleOpenLoop panel = idlePidSettings, { idleMode == 0} panel = idleExtra diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index fa7d107ff0..932827eade 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.05.31.proteus_f7.2278331880" + signature = "rusEFI 2021.05.31.proteus_f7.3334712780" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.05.31.proteus_f7.2278331880" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.05.31.proteus_f7.3334712780" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon May 31 12:20:24 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon May 31 22:02:27 UTC 2021 pageSize = 20000 page = 1 @@ -342,7 +342,7 @@ sdCardCsPin = bits, U08, 707, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA canTxPin = bits, U08, 708, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15", "PI0","PI1","PI2","PI3","PI4","PI5","PI6","PI7","PI8","PI9","PI10","PI11","PI12","PI13","PI14","PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" canRxPin = bits, U08, 709, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15", "PI0","PI1","PI2","PI3","PI4","PI5","PI6","PI7","PI8","PI9","PI10","PI11","PI12","PI13","PI14","PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" throttlePedalUpPinMode = bits, U08, 710, [0:1], "DEFAULT", "PULLUP", "PULLDOWN", "INVALID" -acIdleExtraOffset = scalar, U08, 711, "Percent", 1.0, 0, 0, 255, 0 +acIdleExtraOffset = scalar, U08, 711, "%", 1.0, 0, 0, 100, 0 can2SleepPeriodMs = scalar, S32, 712, "ms", 1.0, 0, 0, 1000.0, 2 wastegatePositionMin = scalar, U16, 716, "mv", 1.0, 0, 0, 5000, 0 wastegatePositionMax = scalar, U16, 718, "mv", 1.0, 0, 0, 5000, 0 @@ -914,7 +914,7 @@ tChargeMaxRpmMinTps = scalar, F32, 2240, "mult", 1.0, 0, 0, 3, 4 tChargeMaxRpmMaxTps = scalar, F32, 2244, "mult", 1.0, 0, 0, 3, 4 auxPidFrequency1 = scalar, U16, 2248, "Hz", 1, 0.0, 0, 3000, 0 auxPidFrequency2 = scalar, U16, 2250, "Hz", 1, 0.0, 0, 3000, 0 -unused1301 = scalar, U08, 2252, "units", 1.0, 0, -20, 100, 0 +fan1ExtraIdle = scalar, U08, 2252, "%", 1.0, 0, 0, 100, 0 alignmentFill_at_2253 = array, U08, 2253, [3], "units", 1.0, 0, -20, 100, 0 alternatorPwmFrequency = scalar, S32, 2256, "Hz", 1.0, 0, 0, 3000.0, 0 unused2260 = scalar, S32, 2260, "units", 1.0, 0, -20, 100, 0 @@ -923,7 +923,8 @@ narrowToWideOxygen = array, F32, 2296, [8], "ratio", 1.0, 0, -40.0, 40.0, 2 vvtMode1 = bits, U08, 2328, [0:3], "Inactive", "Single Tooth Second Half", "2GZ", "Miata NB2", "Single Tooth First Half", "Bosch Quick Start", "4/1", "ST 170", "Ford Barra 3+1", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" vvtMode2 = bits, U08, 2329, [0:3], "Inactive", "Single Tooth Second Half", "2GZ", "Miata NB2", "Single Tooth First Half", "Bosch Quick Start", "4/1", "ST 170", "Ford Barra 3+1", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" -unusedOldBiquad = array, U08, 2330, [22], "units", 1.0, 0, -20, 100, 0 +fan2ExtraIdle = scalar, U08, 2330, "%", 1.0, 0, 0, 100, 0 +unusedOldBiquad = array, U08, 2331, [21], "units", 1.0, 0, -20, 100, 0 cltTimingBins = array, F32, 2352, [8], "C", 1.0, 0, -100.0, 250.0, 1 cltTimingExtra = array, F32, 2384, [8], "degree", 1.0, 0, -400.0, 400.0, 0 tle8888mode = bits, U08, 2416, [0:1], "Auto", "SemiAuto", "Manual", "Hall" @@ -1361,7 +1362,7 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1.0, 0, 0.0, 25500.0, 2 triggerSimulatorFrequency = "Same RPM is used for two ways of producing simulated RPM. See also triggerSimulatorPins (with wires)\nSee also directSelfStimulation (no wires, bypassing input hardware)\nrpm X\nTODO: rename to triggerSimulatorRpm" malfunctionIndicatorPin = "Check engine light, also malfunction indicator light. Always blinks once on boot." idle_antiwindupFreq = "0.1 is a good default value" - acIdleExtraOffset = "Additional idle PID offset while A/C is active" + acIdleExtraOffset = "Additional idle % while A/C is active" can2SleepPeriodMs = "CANbus thread period, ms" wastegatePositionMin = "Voltage when the wastegate is closed.\nYou probably don't have one of these!" wastegatePositionMax = "Voltage when the wastegate is fully open.\nYou probably don't have one of these!\n1 volt = 1000 units" @@ -1472,6 +1473,8 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1.0, 0, 0.0, 25500.0, 2 injectorPressureType = "Select which fuel pressure sensor measures the pressure of the fuel at your injectors." boostCutPressure = "MAP value above which fuel is cut in case of overboost.\nSet to 0 to disable overboost cut." crankingIACposition = "This is the IAC position during cranking, some engines start better if given more air during cranking to improve cylinder filling." + fan1ExtraIdle = "Additional idle % when fan #1 is active" + fan2ExtraIdle = "Additional idle % when fan #2 is active" injectorCompensationMode = "None = I have a MAP-referenced fuel pressure regulator\nFixed rail pressure = I have an atmosphere-referenced fuel pressure regulator (returnless, typically)\nSensed rail pressure = I have a fuel pressure sensor" fuelReferencePressure = "This is the pressure at which your injector flow is known.\nFor example if your injectors flow 400cc/min at 3.5 bar, enter 350kpa here." postCrankingFactor = "Fuel multiplier (enrichment) immediately after engine start" @@ -4068,13 +4071,19 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "use Cic Pid", useCicPidForIdle field = "Use IAC PID Multiplier Table", useIacPidMultTable + dialog = idleOpenLoop, "Open Loop Idle" + slider = "Open loop base position", manIdlePosition, horizontal + field = "A/C adder", acIdleExtraOffset + field = "Fan #1 adder", fan1ExtraIdle + ;field = "Fan #2 adder", fan2ExtraIdle + field = "Extra idle air if throttle pressed", iacByTpsTaper + dialog = idleGating, "Idle Detection Thresholds" field = "TPS threshold", idlePidDeactivationTpsThreshold field = "RPM upper limit", idlePidRpmUpperLimit field = "RPM deadzone", idlePidRpmDeadZone dialog = idleExtra, "Extra Idle Features" - field = "Extra idle air if throttle pressed", iacByTpsTaper field = "Use idle ignition table", useSeparateAdvanceForIdle field = "Use idle VE table", useSeparateVeForIdle field = "Use coasting idle table", useIacTableForCoasting, {idleMode == 0} @@ -4085,10 +4094,9 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Idle control mode", idleMode field = "! Solenoid idle control is disabled at zero RPM" - slider = "Open loop idle position", manIdlePosition, horizontal - field = "" panel = idleGating + panel = idleOpenLoop panel = idlePidSettings, { idleMode == 0} panel = idleExtra diff --git a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini index 830fde2a21..80141eaf11 100644 --- a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.05.31.subaru_eg33_f7.1126573797" + signature = "rusEFI 2021.05.31.subaru_eg33_f7.36249281" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.05.31.subaru_eg33_f7.1126573797" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.05.31.subaru_eg33_f7.36249281" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_config.sh integration/rusefi_config.txt Mon May 31 12:20:31 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_config.sh integration/rusefi_config.txt Mon May 31 22:02:34 UTC 2021 pageSize = 20000 page = 1 @@ -342,7 +342,7 @@ sdCardCsPin = bits, U08, 707, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA canTxPin = bits, U08, 708, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15", "PI0","PI1","PI2","PI3","PI4","PI5","PI6","PI7","PI8","PI9","PI10","PI11","PI12","PI13","PI14","PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" canRxPin = bits, U08, 709, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15", "PI0","PI1","PI2","PI3","PI4","PI5","PI6","PI7","PI8","PI9","PI10","PI11","PI12","PI13","PI14","PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" throttlePedalUpPinMode = bits, U08, 710, [0:1], "DEFAULT", "PULLUP", "PULLDOWN", "INVALID" -acIdleExtraOffset = scalar, U08, 711, "Percent", 1.0, 0, 0, 255, 0 +acIdleExtraOffset = scalar, U08, 711, "%", 1.0, 0, 0, 100, 0 can2SleepPeriodMs = scalar, S32, 712, "ms", 1.0, 0, 0, 1000.0, 2 wastegatePositionMin = scalar, U16, 716, "mv", 1.0, 0, 0, 5000, 0 wastegatePositionMax = scalar, U16, 718, "mv", 1.0, 0, 0, 5000, 0 @@ -914,7 +914,7 @@ tChargeMaxRpmMinTps = scalar, F32, 2240, "mult", 1.0, 0, 0, 3, 4 tChargeMaxRpmMaxTps = scalar, F32, 2244, "mult", 1.0, 0, 0, 3, 4 auxPidFrequency1 = scalar, U16, 2248, "Hz", 1, 0.0, 0, 3000, 0 auxPidFrequency2 = scalar, U16, 2250, "Hz", 1, 0.0, 0, 3000, 0 -unused1301 = scalar, U08, 2252, "units", 1.0, 0, -20, 100, 0 +fan1ExtraIdle = scalar, U08, 2252, "%", 1.0, 0, 0, 100, 0 alignmentFill_at_2253 = array, U08, 2253, [3], "units", 1.0, 0, -20, 100, 0 alternatorPwmFrequency = scalar, S32, 2256, "Hz", 1.0, 0, 0, 3000.0, 0 unused2260 = scalar, S32, 2260, "units", 1.0, 0, -20, 100, 0 @@ -923,7 +923,8 @@ narrowToWideOxygen = array, F32, 2296, [8], "ratio", 1.0, 0, -40.0, 40.0, 2 vvtMode1 = bits, U08, 2328, [0:3], "Inactive", "Single Tooth Second Half", "2GZ", "Miata NB2", "Single Tooth First Half", "Bosch Quick Start", "4/1", "ST 170", "Ford Barra 3+1", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" vvtMode2 = bits, U08, 2329, [0:3], "Inactive", "Single Tooth Second Half", "2GZ", "Miata NB2", "Single Tooth First Half", "Bosch Quick Start", "4/1", "ST 170", "Ford Barra 3+1", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" -unusedOldBiquad = array, U08, 2330, [22], "units", 1.0, 0, -20, 100, 0 +fan2ExtraIdle = scalar, U08, 2330, "%", 1.0, 0, 0, 100, 0 +unusedOldBiquad = array, U08, 2331, [21], "units", 1.0, 0, -20, 100, 0 cltTimingBins = array, F32, 2352, [8], "C", 1.0, 0, -100.0, 250.0, 1 cltTimingExtra = array, F32, 2384, [8], "degree", 1.0, 0, -400.0, 400.0, 0 tle8888mode = bits, U08, 2416, [0:1], "Auto", "SemiAuto", "Manual", "Hall" @@ -1361,7 +1362,7 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1.0, 0, 0.0, 25500.0, 2 triggerSimulatorFrequency = "Same RPM is used for two ways of producing simulated RPM. See also triggerSimulatorPins (with wires)\nSee also directSelfStimulation (no wires, bypassing input hardware)\nrpm X\nTODO: rename to triggerSimulatorRpm" malfunctionIndicatorPin = "Check engine light, also malfunction indicator light. Always blinks once on boot." idle_antiwindupFreq = "0.1 is a good default value" - acIdleExtraOffset = "Additional idle PID offset while A/C is active" + acIdleExtraOffset = "Additional idle % while A/C is active" can2SleepPeriodMs = "CANbus thread period, ms" wastegatePositionMin = "Voltage when the wastegate is closed.\nYou probably don't have one of these!" wastegatePositionMax = "Voltage when the wastegate is fully open.\nYou probably don't have one of these!\n1 volt = 1000 units" @@ -1472,6 +1473,8 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1.0, 0, 0.0, 25500.0, 2 injectorPressureType = "Select which fuel pressure sensor measures the pressure of the fuel at your injectors." boostCutPressure = "MAP value above which fuel is cut in case of overboost.\nSet to 0 to disable overboost cut." crankingIACposition = "This is the IAC position during cranking, some engines start better if given more air during cranking to improve cylinder filling." + fan1ExtraIdle = "Additional idle % when fan #1 is active" + fan2ExtraIdle = "Additional idle % when fan #2 is active" injectorCompensationMode = "None = I have a MAP-referenced fuel pressure regulator\nFixed rail pressure = I have an atmosphere-referenced fuel pressure regulator (returnless, typically)\nSensed rail pressure = I have a fuel pressure sensor" fuelReferencePressure = "This is the pressure at which your injector flow is known.\nFor example if your injectors flow 400cc/min at 3.5 bar, enter 350kpa here." postCrankingFactor = "Fuel multiplier (enrichment) immediately after engine start" @@ -4085,13 +4088,19 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "use Cic Pid", useCicPidForIdle field = "Use IAC PID Multiplier Table", useIacPidMultTable + dialog = idleOpenLoop, "Open Loop Idle" + slider = "Open loop base position", manIdlePosition, horizontal + field = "A/C adder", acIdleExtraOffset + field = "Fan #1 adder", fan1ExtraIdle + ;field = "Fan #2 adder", fan2ExtraIdle + field = "Extra idle air if throttle pressed", iacByTpsTaper + dialog = idleGating, "Idle Detection Thresholds" field = "TPS threshold", idlePidDeactivationTpsThreshold field = "RPM upper limit", idlePidRpmUpperLimit field = "RPM deadzone", idlePidRpmDeadZone dialog = idleExtra, "Extra Idle Features" - field = "Extra idle air if throttle pressed", iacByTpsTaper field = "Use idle ignition table", useSeparateAdvanceForIdle field = "Use idle VE table", useSeparateVeForIdle field = "Use coasting idle table", useIacTableForCoasting, {idleMode == 0} @@ -4102,10 +4111,9 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Idle control mode", idleMode field = "! Solenoid idle control is disabled at zero RPM" - slider = "Open loop idle position", manIdlePosition, horizontal - field = "" panel = idleGating + panel = idleOpenLoop panel = idlePidSettings, { idleMode == 0} panel = idleExtra 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 b042496ae1..d7d25cf9a0 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon May 31 12:20:03 UTC 2021 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon May 31 22:02:06 UTC 2021 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -470,6 +470,8 @@ public class Fields { public static final int externalKnockSenseAdc_offset = 3103; public static final int extraInjectionOffset_offset = 432; public static final int failedMapFallback_offset = 541; + public static final int fan1ExtraIdle_offset = 2252; + public static final int fan2ExtraIdle_offset = 2330; public static final int fanOffTemperature_offset = 472; public static final int fanOnTemperature_offset = 468; public static final int fanPin_offset = 663; @@ -1529,7 +1531,7 @@ public class Fields { public static final char TS_SD_R_COMMAND = 'r'; public static final char TS_SD_W_COMMAND = 'w'; public static final char TS_SET_LOGGER_SWITCH = 'l'; - public static final String TS_SIGNATURE = "rusEFI 2021.05.31.all.4000983283"; + public static final String TS_SIGNATURE = "rusEFI 2021.05.31.all.2943684823"; public static final char TS_SINGLE_WRITE_COMMAND = 'W'; public static final int TT_TT_1_16 = 50; public static final int TT_TT_2JZ_1_12 = 29; @@ -1585,7 +1587,6 @@ public class Fields { public static final int unused1128_offset = 2116; public static final int unused1129_offset = 2116; public static final int unused1130_offset = 2116; - public static final int unused1301_offset = 2252; public static final int unused1366_offset = 2652; public static final int unused1476b19_offset = 1476; public static final int unused1476b20_offset = 1476; @@ -1655,7 +1656,7 @@ public class Fields { public static final int unusedBit_492_8_offset = 2116; public static final int unusedBit_492_9_offset = 2116; public static final int unusedHereWeHave_offset = 1464; - public static final int unusedOldBiquad_offset = 2330; + public static final int unusedOldBiquad_offset = 2331; public static final int unusedOldIgnitionOffset_offset = 445; public static final int unusedSpiPadding4_offset = 2593; public static final int unusedSpiPadding5_offset = 2715; @@ -2559,12 +2560,13 @@ public class Fields { public static final Field TCHARGEMAXRPMMAXTPS = Field.create("TCHARGEMAXRPMMAXTPS", 2244, FieldType.FLOAT); public static final Field AUXPIDFREQUENCY1 = Field.create("AUXPIDFREQUENCY1", 2248, FieldType.INT16); public static final Field AUXPIDFREQUENCY2 = Field.create("AUXPIDFREQUENCY2", 2250, FieldType.INT16); - public static final Field UNUSED1301 = Field.create("UNUSED1301", 2252, FieldType.INT8); + public static final Field FAN1EXTRAIDLE = Field.create("FAN1EXTRAIDLE", 2252, FieldType.INT8); public static final Field ALTERNATORPWMFREQUENCY = Field.create("ALTERNATORPWMFREQUENCY", 2256, FieldType.INT); public static final Field UNUSED2260 = Field.create("UNUSED2260", 2260, FieldType.INT); public static final String[] vvt_mode_e = {"Inactive", "Single Tooth Second Half", "2GZ", "Miata NB2", "Single Tooth First Half", "Bosch Quick Start", "4/1", "ST 170", "Ford Barra 3+1"}; public static final Field VVTMODE1 = Field.create("VVTMODE1", 2328, FieldType.INT8, vvt_mode_e); public static final Field VVTMODE2 = Field.create("VVTMODE2", 2329, FieldType.INT8, vvt_mode_e); + public static final Field FAN2EXTRAIDLE = Field.create("FAN2EXTRAIDLE", 2330, FieldType.INT8); public static final Field TLE8888MODE = Field.create("TLE8888MODE", 2416, FieldType.INT8); public static final Field LIS302DLCSPINMODE = Field.create("LIS302DLCSPINMODE", 2417, FieldType.INT8, pin_output_mode_e); public static final Field INJECTORCOMPENSATIONMODE = Field.create("INJECTORCOMPENSATIONMODE", 2418, FieldType.INT8); @@ -3653,11 +3655,12 @@ public class Fields { TCHARGEMAXRPMMAXTPS, AUXPIDFREQUENCY1, AUXPIDFREQUENCY2, - UNUSED1301, + FAN1EXTRAIDLE, ALTERNATORPWMFREQUENCY, UNUSED2260, VVTMODE1, VVTMODE2, + FAN2EXTRAIDLE, TLE8888MODE, LIS302DLCSPINMODE, INJECTORCOMPENSATIONMODE, diff --git a/java_console/rusefi.xml b/java_console/rusefi.xml index bc14110783..b7b0833768 100644 --- a/java_console/rusefi.xml +++ b/java_console/rusefi.xml @@ -1,6 +1,6 @@ - +