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 d4a1990fc0..df87630855 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 Wed Jan 27 02:58:25 UTC 2021 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Thu Jan 28 01:32:41 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -1022,9 +1022,10 @@ struct engine_configuration_s { */ spi_device_e hip9011SpiDevice; /** + * This value is only used for speed density fueling calculations. * offset 541 */ - uint8_t unused541; + uint8_t failedMapFallback; /** * offset 542 */ @@ -2807,7 +2808,7 @@ struct engine_configuration_s { pin_output_mode_e hpfpValvePinMode; /** * MAP value above which fuel is cut in case of overboost. - * 0 to disable overboost cut. + * Set to 0 to disable overboost cut. * offset 2132 */ float boostCutPressure; @@ -3788,4 +3789,4 @@ struct persistent_config_s { typedef struct persistent_config_s 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 Wed Jan 27 02:58:25 UTC 2021 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Thu Jan 28 01:32:41 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 05876d1ea0..8534f6ad26 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 @@ -489,6 +489,7 @@ #define etbWastegatePid_pFactor_offset 2516 #define externalKnockSenseAdc_offset 3103 #define extraInjectionOffset_offset 432 +#define failedMapFallback_offset 541 #define fanOffTemperature_offset 472 #define fanOnTemperature_offset 468 #define fanPin_offset 663 @@ -1250,8 +1251,8 @@ #define showHumanReadableWarning_offset 976 #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD hellen_cypress -#define SIGNATURE_DATE 2021.01.27 -#define SIGNATURE_HASH 2373230330 +#define SIGNATURE_DATE 2021.01.28 +#define SIGNATURE_HASH 3636677184 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1584,7 +1585,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2021.01.27.hellen_cypress.2373230330" +#define TS_SIGNATURE "rusEFI 2021.01.28.hellen_cypress.3636677184" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' // 0x74 @@ -1655,7 +1656,6 @@ #define unused3942_offset 3992 #define unused3988_offset 3988 #define unused4028_offset 4028 -#define unused541_offset 541 #define unused542_offset 542 #define unused6312_offset 6312 #define unused744b25_offset 744 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 78ae138365..53df383b7b 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 Wed Jan 27 02:58:23 UTC 2021 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Thu Jan 28 01:32:39 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -1022,9 +1022,10 @@ struct engine_configuration_s { */ spi_device_e hip9011SpiDevice; /** + * This value is only used for speed density fueling calculations. * offset 541 */ - uint8_t unused541; + uint8_t failedMapFallback; /** * offset 542 */ @@ -2807,7 +2808,7 @@ struct engine_configuration_s { pin_output_mode_e hpfpValvePinMode; /** * MAP value above which fuel is cut in case of overboost. - * 0 to disable overboost cut. + * Set to 0 to disable overboost cut. * offset 2132 */ float boostCutPressure; @@ -3788,4 +3789,4 @@ struct persistent_config_s { typedef struct persistent_config_s persistent_config_s; // end -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Wed Jan 27 02:58:23 UTC 2021 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Thu Jan 28 01:32:39 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 b78f6d36d4..562baa7927 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -489,6 +489,7 @@ #define etbWastegatePid_pFactor_offset 2516 #define externalKnockSenseAdc_offset 3103 #define extraInjectionOffset_offset 432 +#define failedMapFallback_offset 541 #define fanOffTemperature_offset 472 #define fanOnTemperature_offset 468 #define fanPin_offset 663 @@ -1250,8 +1251,8 @@ #define showHumanReadableWarning_offset 976 #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD kin -#define SIGNATURE_DATE 2021.01.27 -#define SIGNATURE_HASH 2373230330 +#define SIGNATURE_DATE 2021.01.28 +#define SIGNATURE_HASH 3636677184 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1584,7 +1585,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2021.01.27.kin.2373230330" +#define TS_SIGNATURE "rusEFI 2021.01.28.kin.3636677184" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' // 0x74 @@ -1655,7 +1656,6 @@ #define unused3942_offset 3992 #define unused3988_offset 3988 #define unused4028_offset 4028 -#define unused541_offset 541 #define unused542_offset 542 #define unused6312_offset 6312 #define unused744b25_offset 744 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures.h b/firmware/controllers/generated/engine_configuration_generated_structures.h index 47d24fc900..01e62e44ca 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 Wed Jan 27 02:58:08 UTC 2021 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jan 28 01:32:24 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -1022,9 +1022,10 @@ struct engine_configuration_s { */ spi_device_e hip9011SpiDevice; /** + * This value is only used for speed density fueling calculations. * offset 541 */ - uint8_t unused541; + uint8_t failedMapFallback; /** * offset 542 */ @@ -2807,7 +2808,7 @@ struct engine_configuration_s { pin_output_mode_e hpfpValvePinMode; /** * MAP value above which fuel is cut in case of overboost. - * 0 to disable overboost cut. + * Set to 0 to disable overboost cut. * offset 2132 */ float boostCutPressure; @@ -3788,4 +3789,4 @@ struct persistent_config_s { typedef struct persistent_config_s persistent_config_s; // end -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jan 27 02:58:08 UTC 2021 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jan 28 01:32:24 UTC 2021 diff --git a/firmware/controllers/generated/fsio_enums_generated.def b/firmware/controllers/generated/fsio_enums_generated.def index b62e4c68be..d89c809421 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 Wed Jan 27 02:58:08 UTC 2021 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jan 28 01:32:24 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 026af92943..6bdb418035 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 Wed Jan 27 02:58:08 UTC 2021 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jan 28 01:32:24 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 0d5bab07c5..fc25e8fe1d 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 Wed Jan 27 02:58:08 UTC 2021 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jan 28 01:32:24 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 7412c557d3..08d6cb771e 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 Wed Jan 27 02:58:08 UTC 2021 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jan 28 01:32:24 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 a9d8e17400..75fb9f6533 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -487,6 +487,7 @@ #define etbWastegatePid_pFactor_offset 2516 #define externalKnockSenseAdc_offset 3103 #define extraInjectionOffset_offset 432 +#define failedMapFallback_offset 541 #define fanOffTemperature_offset 472 #define fanOnTemperature_offset 468 #define fanPin_offset 663 @@ -1247,8 +1248,8 @@ #define showHumanReadableWarning_offset 976 #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD all -#define SIGNATURE_DATE 2021.01.27 -#define SIGNATURE_HASH 3473425706 +#define SIGNATURE_DATE 2021.01.28 +#define SIGNATURE_HASH 2596245904 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1581,7 +1582,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2021.01.27.all.3473425706" +#define TS_SIGNATURE "rusEFI 2021.01.28.all.2596245904" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' // 0x74 @@ -1652,7 +1653,6 @@ #define unused3942_offset 3992 #define unused3988_offset 3988 #define unused4028_offset 4028 -#define unused541_offset 541 #define unused542_offset 542 #define unused6312_offset 6312 #define unused744b25_offset 744 diff --git a/firmware/controllers/generated/signature_all.h b/firmware/controllers/generated/signature_all.h index 1a70b10ea5..2739d76954 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.01.28 -#define SIGNATURE_HASH 3350011827 -#define TS_SIGNATURE "rusEFI 2021.01.28.all.3350011827" +#define SIGNATURE_HASH 2596245904 +#define TS_SIGNATURE "rusEFI 2021.01.28.all.2596245904" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index 0ac0c35a58..6b76eddd79 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.01.28 -#define SIGNATURE_HASH 1138176544 -#define TS_SIGNATURE "rusEFI 2021.01.28.frankenso_na6.1138176544" +#define SIGNATURE_HASH 516275203 +#define TS_SIGNATURE "rusEFI 2021.01.28.frankenso_na6.516275203" diff --git a/firmware/controllers/generated/signature_hellen72.h b/firmware/controllers/generated/signature_hellen72.h index ce57760c81..0af7dee2d5 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.01.28 -#define SIGNATURE_HASH 3589883659 -#define TS_SIGNATURE "rusEFI 2021.01.28.hellen72.3589883659" +#define SIGNATURE_HASH 2297153832 +#define TS_SIGNATURE "rusEFI 2021.01.28.hellen72.2297153832" diff --git a/firmware/controllers/generated/signature_hellen_cypress.h b/firmware/controllers/generated/signature_hellen_cypress.h index f6c5f7bf60..8fece79257 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.01.28 -#define SIGNATURE_HASH 2245117027 -#define TS_SIGNATURE "rusEFI 2021.01.28.hellen_cypress.2245117027" +#define SIGNATURE_HASH 3636677184 +#define TS_SIGNATURE "rusEFI 2021.01.28.hellen_cypress.3636677184" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index 756d19d44c..eb60d91da5 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.01.28 -#define SIGNATURE_HASH 2245117027 -#define TS_SIGNATURE "rusEFI 2021.01.28.kin.2245117027" +#define SIGNATURE_HASH 3636677184 +#define TS_SIGNATURE "rusEFI 2021.01.28.kin.3636677184" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index 29febe2046..dcba5cf39f 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.01.28 -#define SIGNATURE_HASH 3916131673 -#define TS_SIGNATURE "rusEFI 2021.01.28.mre_f4.3916131673" +#define SIGNATURE_HASH 3027886970 +#define TS_SIGNATURE "rusEFI 2021.01.28.mre_f4.3027886970" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index 3ab0e5a3b9..925b7062de 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.01.28 -#define SIGNATURE_HASH 3916131673 -#define TS_SIGNATURE "rusEFI 2021.01.28.mre_f7.3916131673" +#define SIGNATURE_HASH 3027886970 +#define TS_SIGNATURE "rusEFI 2021.01.28.mre_f7.3027886970" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index ae1a588bdc..80460cf212 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.01.28 -#define SIGNATURE_HASH 3577421189 -#define TS_SIGNATURE "rusEFI 2021.01.28.prometheus_405.3577421189" +#define SIGNATURE_HASH 2284426150 +#define TS_SIGNATURE "rusEFI 2021.01.28.prometheus_405.2284426150" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index 8d7fc2947d..ca9876c4b7 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.01.28 -#define SIGNATURE_HASH 3577421189 -#define TS_SIGNATURE "rusEFI 2021.01.28.prometheus_469.3577421189" +#define SIGNATURE_HASH 2284426150 +#define TS_SIGNATURE "rusEFI 2021.01.28.prometheus_469.2284426150" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index 7fa43a4456..5b389bcc8a 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.01.28 -#define SIGNATURE_HASH 2694633372 -#define TS_SIGNATURE "rusEFI 2021.01.28.proteus_f4.2694633372" +#define SIGNATURE_HASH 4253964735 +#define TS_SIGNATURE "rusEFI 2021.01.28.proteus_f4.4253964735" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index abbb7dcfdd..c050c0aa72 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.01.28 -#define SIGNATURE_HASH 2694633372 -#define TS_SIGNATURE "rusEFI 2021.01.28.proteus_f7.2694633372" +#define SIGNATURE_HASH 4253964735 +#define TS_SIGNATURE "rusEFI 2021.01.28.proteus_f7.4253964735" diff --git a/firmware/tunerstudio/generated/cache.zip b/firmware/tunerstudio/generated/cache.zip index c38549090e..791e54a3a1 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 0159d17a5c..0e6a4dbd5f 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.01.28.all.3350011827" + signature = "rusEFI 2021.01.28.all.2596245904" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.01.28.all.3350011827" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.01.28.all.2596245904" ; 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 Thu Jan 28 00:25:02 UTC 2021 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jan 28 01:32:24 UTC 2021 pageSize = 20000 page = 1 @@ -232,7 +232,7 @@ trigger_unusedBit_4_31 = bits, U32, 528, [31:31], "false", "true" trigger_customTotalToothCount = scalar, S32, 532, "number", 1.0, 0.0, 0, 500.0, 0 trigger_customSkippedToothCount = scalar, S32, 536, "number", 1.0, 0.0, 0, 500.0, 0 hip9011SpiDevice = bits, U08, 540, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4", "INVALID", "INVALID", "INVALID" -unused541 = scalar, U08, 541, "unit", 1.0, 0, 0, 100, 0 +failedMapFallback = scalar, U08, 541, "kPa", 1.0, 0, 0, 100, 0 unused542 = scalar, U08, 542, "unit", 1.0, 0, 0, 100, 0 mafAdcChannel = bits, U08, 543, [0:5], "Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" globalFuelCorrection = scalar, F32, 544, "coef", 1.0, 0.0, 0, 1000.0, 2 @@ -1315,6 +1315,7 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1.0, 0, 0.0, 25500.0, 2 fuelLevelSensor = "This is the processor pin that your fuel level sensor in connected to. This is a non standard input so will need to be user defined." idle_derivativeFilterLoss = "0.1 is a good default value" trigger_useOnlyFirstChannel = "This option could be used if your second trigger channel is broken" + failedMapFallback = "This value is only used for speed density fueling calculations." camInputs1 = "Camshaft input could be used either just for engine phase detection if your trigger shape does not include cam sensor as 'primary' channel, or it could be used for Variable Valve timing on one of the camshafts.\nTODO #660" camInputs2 = "Camshaft input could be used either just for engine phase detection if your trigger shape does not include cam sensor as 'primary' channel, or it could be used for Variable Valve timing on one of the camshafts.\nTODO #660" camInputs3 = "Camshaft input could be used either just for engine phase detection if your trigger shape does not include cam sensor as 'primary' channel, or it could be used for Variable Valve timing on one of the camshafts.\nTODO #660" @@ -1421,7 +1422,7 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1.0, 0, 0.0, 25500.0, 2 enableVerboseCan2Tx = "CAN broadcast using custom rusEFI protocol\nenable can_broadcast/disable can_broadcast" ignOverrideMode = "Override the Y axis (load) value used for the ignition table.\nAdvanced users only: If you aren't sure you need this, you probably don't need this." 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.\n0 to disable overboost cut." + 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." 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" @@ -2741,6 +2742,7 @@ menuDialog = main menu = "&Base &Engine" subMenu = engineChars, "Base engine" + subMenu = limitsAndFallback, "Limits and fallbacks" subMenu = triggerConfiguration, "Trigger" subMenu = triggerConfiguration_IO, "Advanced Trigger" subMenu = std_separator @@ -3167,20 +3169,18 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" panel = ignitionOutputs dialog = baseEngineConfig, "Engine Configuration" -; field = "Engine Preset", engineType -; this field is useful for rusEFI online catalog +; field = "Engine preset", engineType + field = "Number of cylinders", cylindersCount + field = "Displacement", displacement + field = "Firing order", firingOrder + field = "Vehicle weight", vehicleWeight + + dialog = engineMetadata, "Engine Metadata" + field = "#These metadata are used by rusEFI Online" field = "Engine Make", engineMake -; this field is useful for rusEFI online catalog field = "Manufacturer Engine Code", engineCode -; this field is useful for rusEFI online catalog field = "Vehicle Name", vehicleName - field = "Number of Cylinders", cylindersCount - field = "Engine Displacement", displacement - field = "Firing Order", firingOrder - field = "Vehicle Weight", vehicleWeight -; this field is useful for rusEFI online catalog field = "Compression Ratio", compressionRatio -; this field is useful for rusEFI online catalog field = "Forced Induction?", isForcedInduction ; Engine->Trigger configuration @@ -4352,20 +4352,26 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = debugging, "Debug" field = "!https://rusefi.com/s/debugmode" field = "Debug mode", debugMode - field = "Warning Text", warning_message - field = "showHumanReadableWarning (affects Burn)", showHumanReadableWarning - dialog = limits, "Limits" field = "RPM hard limit", rpmHardLimit + field = "Cut fuel on RPM limit", cutFuelOnHardLimit + field = "Cut spark on RPM limit", cutSparkOnHardLimit field = "Boost cut pressure", boostCutPressure + dialog = fallbacks, "Fallbacks" + field = "Failed MAP sensor fallback", failedMapFallback + + dialog = limitsAndFallback, "Limits and fallbacks" + panel = limits + panel = fallbacks + ; Engine->Base Engine Settings dialog = engineChars, "Base Engine Settings" topicHelp = "baseHelp" panel = baseEngineConfig + panel = engineMetadata panel = generalSettings - panel = limits panel = debugging dialog = crankingFuel, "Fuel" @@ -4840,6 +4846,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Global fuel correction", globalFuelCorrection field = "Ignition Math Logic @", ignMathCalculateAtIndex field = "MAP Averaging Logic @", mapAveragingSchedulingAtIndex + field = "showHumanReadableWarning (affects Burn)", showHumanReadableWarning help = helpGeneral, "rusEFI General Help" diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index df13669726..db0239579a 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.01.28.frankenso_na6.1138176544" + signature = "rusEFI 2021.01.28.frankenso_na6.516275203" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.01.28.frankenso_na6.1138176544" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.01.28.frankenso_na6.516275203" ; 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 Thu Jan 28 00:25:09 UTC 2021 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jan 28 01:32:29 UTC 2021 pageSize = 20000 page = 1 @@ -232,7 +232,7 @@ trigger_unusedBit_4_31 = bits, U32, 528, [31:31], "false", "true" trigger_customTotalToothCount = scalar, S32, 532, "number", 1.0, 0.0, 0, 500.0, 0 trigger_customSkippedToothCount = scalar, S32, 536, "number", 1.0, 0.0, 0, 500.0, 0 hip9011SpiDevice = bits, U08, 540, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4", "INVALID", "INVALID", "INVALID" -unused541 = scalar, U08, 541, "unit", 1.0, 0, 0, 100, 0 +failedMapFallback = scalar, U08, 541, "kPa", 1.0, 0, 0, 100, 0 unused542 = scalar, U08, 542, "unit", 1.0, 0, 0, 100, 0 mafAdcChannel = bits, U08, 543, [0:5], "NONE","Analog 3O","Analog 3L","Analog 3M","Analog 3J","Analog 3I","INVALID","Analog 3H","Analog 3G","INVALID","INVALID","INVALID","Analog 3P","Analog 3Q","Analog 3N","Analog VBatt","Analog 3E", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" globalFuelCorrection = scalar, F32, 544, "coef", 1.0, 0.0, 0, 1000.0, 2 @@ -1315,6 +1315,7 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1.0, 0, 0.0, 25500.0, 2 fuelLevelSensor = "This is the processor pin that your fuel level sensor in connected to. This is a non standard input so will need to be user defined." idle_derivativeFilterLoss = "0.1 is a good default value" trigger_useOnlyFirstChannel = "This option could be used if your second trigger channel is broken" + failedMapFallback = "This value is only used for speed density fueling calculations." camInputs1 = "Camshaft input could be used either just for engine phase detection if your trigger shape does not include cam sensor as 'primary' channel, or it could be used for Variable Valve timing on one of the camshafts.\nTODO #660" camInputs2 = "Camshaft input could be used either just for engine phase detection if your trigger shape does not include cam sensor as 'primary' channel, or it could be used for Variable Valve timing on one of the camshafts.\nTODO #660" camInputs3 = "Camshaft input could be used either just for engine phase detection if your trigger shape does not include cam sensor as 'primary' channel, or it could be used for Variable Valve timing on one of the camshafts.\nTODO #660" @@ -1421,7 +1422,7 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1.0, 0, 0.0, 25500.0, 2 enableVerboseCan2Tx = "CAN broadcast using custom rusEFI protocol\nenable can_broadcast/disable can_broadcast" ignOverrideMode = "Override the Y axis (load) value used for the ignition table.\nAdvanced users only: If you aren't sure you need this, you probably don't need this." 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.\n0 to disable overboost cut." + 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." 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" @@ -2741,6 +2742,7 @@ menuDialog = main menu = "&Base &Engine" subMenu = engineChars, "Base engine" + subMenu = limitsAndFallback, "Limits and fallbacks" subMenu = triggerConfiguration, "Trigger" subMenu = triggerConfiguration_IO, "Advanced Trigger" subMenu = std_separator @@ -3167,20 +3169,18 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" panel = ignitionOutputs dialog = baseEngineConfig, "Engine Configuration" -; field = "Engine Preset", engineType -; this field is useful for rusEFI online catalog +; field = "Engine preset", engineType + field = "Number of cylinders", cylindersCount + field = "Displacement", displacement + field = "Firing order", firingOrder + field = "Vehicle weight", vehicleWeight + + dialog = engineMetadata, "Engine Metadata" + field = "#These metadata are used by rusEFI Online" field = "Engine Make", engineMake -; this field is useful for rusEFI online catalog field = "Manufacturer Engine Code", engineCode -; this field is useful for rusEFI online catalog field = "Vehicle Name", vehicleName - field = "Number of Cylinders", cylindersCount - field = "Engine Displacement", displacement - field = "Firing Order", firingOrder - field = "Vehicle Weight", vehicleWeight -; this field is useful for rusEFI online catalog field = "Compression Ratio", compressionRatio -; this field is useful for rusEFI online catalog field = "Forced Induction?", isForcedInduction ; Engine->Trigger configuration @@ -4352,20 +4352,26 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = debugging, "Debug" field = "!https://rusefi.com/s/debugmode" field = "Debug mode", debugMode - field = "Warning Text", warning_message - field = "showHumanReadableWarning (affects Burn)", showHumanReadableWarning - dialog = limits, "Limits" field = "RPM hard limit", rpmHardLimit + field = "Cut fuel on RPM limit", cutFuelOnHardLimit + field = "Cut spark on RPM limit", cutSparkOnHardLimit field = "Boost cut pressure", boostCutPressure + dialog = fallbacks, "Fallbacks" + field = "Failed MAP sensor fallback", failedMapFallback + + dialog = limitsAndFallback, "Limits and fallbacks" + panel = limits + panel = fallbacks + ; Engine->Base Engine Settings dialog = engineChars, "Base Engine Settings" topicHelp = "baseHelp" panel = baseEngineConfig + panel = engineMetadata panel = generalSettings - panel = limits panel = debugging dialog = crankingFuel, "Fuel" @@ -4831,6 +4837,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Global fuel correction", globalFuelCorrection field = "Ignition Math Logic @", ignMathCalculateAtIndex field = "MAP Averaging Logic @", mapAveragingSchedulingAtIndex + field = "showHumanReadableWarning (affects Burn)", showHumanReadableWarning help = helpGeneral, "rusEFI General Help" diff --git a/firmware/tunerstudio/generated/rusefi_hellen72.ini b/firmware/tunerstudio/generated/rusefi_hellen72.ini index 3f16fc2507..ddf715bc46 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.01.28.hellen72.3589883659" + signature = "rusEFI 2021.01.28.hellen72.2297153832" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.01.28.hellen72.3589883659" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.01.28.hellen72.2297153832" ; 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 Thu Jan 28 00:25:04 UTC 2021 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jan 28 01:32:25 UTC 2021 pageSize = 20000 page = 1 @@ -232,7 +232,7 @@ trigger_unusedBit_4_31 = bits, U32, 528, [31:31], "false", "true" trigger_customTotalToothCount = scalar, S32, 532, "number", 1.0, 0.0, 0, 500.0, 0 trigger_customSkippedToothCount = scalar, S32, 536, "number", 1.0, 0.0, 0, 500.0, 0 hip9011SpiDevice = bits, U08, 540, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4", "INVALID", "INVALID", "INVALID" -unused541 = scalar, U08, 541, "unit", 1.0, 0, 0, 100, 0 +failedMapFallback = scalar, U08, 541, "kPa", 1.0, 0, 0, 100, 0 unused542 = scalar, U08, 542, "unit", 1.0, 0, 0, 100, 0 mafAdcChannel = bits, U08, 543, [0:5], "NONE","INVALID","4N - IAT (A14)","4B - Brake/RES1 (A15)","4C - Steering/RES2 (A16)","4V - TPS (A17)","4AB - FTP/PPS (A18)","3V - CAM (A19)","4J - VTCS/AUX4 (A20)","4F - AC_PRES/AUX1 (A23)","4P - CLT (A13)","4X - MAF (A9)","4U - MAP2/Ign8 (A10)","4W - O2S (A11)","4AA - O2S2 (A12)","4H - Neutral/AUX2 (A21)","4I - Clutch/AUX3 (A22)", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" globalFuelCorrection = scalar, F32, 544, "coef", 1.0, 0.0, 0, 1000.0, 2 @@ -1315,6 +1315,7 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1.0, 0, 0.0, 25500.0, 2 fuelLevelSensor = "This is the processor pin that your fuel level sensor in connected to. This is a non standard input so will need to be user defined." idle_derivativeFilterLoss = "0.1 is a good default value" trigger_useOnlyFirstChannel = "This option could be used if your second trigger channel is broken" + failedMapFallback = "This value is only used for speed density fueling calculations." camInputs1 = "Camshaft input could be used either just for engine phase detection if your trigger shape does not include cam sensor as 'primary' channel, or it could be used for Variable Valve timing on one of the camshafts.\nTODO #660" camInputs2 = "Camshaft input could be used either just for engine phase detection if your trigger shape does not include cam sensor as 'primary' channel, or it could be used for Variable Valve timing on one of the camshafts.\nTODO #660" camInputs3 = "Camshaft input could be used either just for engine phase detection if your trigger shape does not include cam sensor as 'primary' channel, or it could be used for Variable Valve timing on one of the camshafts.\nTODO #660" @@ -1421,7 +1422,7 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1.0, 0, 0.0, 25500.0, 2 enableVerboseCan2Tx = "CAN broadcast using custom rusEFI protocol\nenable can_broadcast/disable can_broadcast" ignOverrideMode = "Override the Y axis (load) value used for the ignition table.\nAdvanced users only: If you aren't sure you need this, you probably don't need this." 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.\n0 to disable overboost cut." + 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." 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" @@ -2741,6 +2742,7 @@ menuDialog = main menu = "&Base &Engine" subMenu = engineChars, "Base engine" + subMenu = limitsAndFallback, "Limits and fallbacks" subMenu = triggerConfiguration, "Trigger" subMenu = triggerConfiguration_IO, "Advanced Trigger" subMenu = std_separator @@ -3163,20 +3165,18 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" panel = ignitionOutputs dialog = baseEngineConfig, "Engine Configuration" -; field = "Engine Preset", engineType -; this field is useful for rusEFI online catalog +; field = "Engine preset", engineType + field = "Number of cylinders", cylindersCount + field = "Displacement", displacement + field = "Firing order", firingOrder + field = "Vehicle weight", vehicleWeight + + dialog = engineMetadata, "Engine Metadata" + field = "#These metadata are used by rusEFI Online" field = "Engine Make", engineMake -; this field is useful for rusEFI online catalog field = "Manufacturer Engine Code", engineCode -; this field is useful for rusEFI online catalog field = "Vehicle Name", vehicleName - field = "Number of Cylinders", cylindersCount - field = "Engine Displacement", displacement - field = "Firing Order", firingOrder - field = "Vehicle Weight", vehicleWeight -; this field is useful for rusEFI online catalog field = "Compression Ratio", compressionRatio -; this field is useful for rusEFI online catalog field = "Forced Induction?", isForcedInduction ; Engine->Trigger configuration @@ -4327,20 +4327,26 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = debugging, "Debug" field = "!https://rusefi.com/s/debugmode" field = "Debug mode", debugMode - field = "Warning Text", warning_message - field = "showHumanReadableWarning (affects Burn)", showHumanReadableWarning - dialog = limits, "Limits" field = "RPM hard limit", rpmHardLimit + field = "Cut fuel on RPM limit", cutFuelOnHardLimit + field = "Cut spark on RPM limit", cutSparkOnHardLimit field = "Boost cut pressure", boostCutPressure + dialog = fallbacks, "Fallbacks" + field = "Failed MAP sensor fallback", failedMapFallback + + dialog = limitsAndFallback, "Limits and fallbacks" + panel = limits + panel = fallbacks + ; Engine->Base Engine Settings dialog = engineChars, "Base Engine Settings" topicHelp = "baseHelp" panel = baseEngineConfig + panel = engineMetadata panel = generalSettings - panel = limits panel = debugging dialog = crankingFuel, "Fuel" @@ -4797,6 +4803,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Global fuel correction", globalFuelCorrection field = "Ignition Math Logic @", ignMathCalculateAtIndex field = "MAP Averaging Logic @", mapAveragingSchedulingAtIndex + field = "showHumanReadableWarning (affects Burn)", showHumanReadableWarning help = helpGeneral, "rusEFI General Help" diff --git a/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini b/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini index 402a399df9..c2a2123f45 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.01.28.hellen_cypress.2245117027" + signature = "rusEFI 2021.01.28.hellen_cypress.3636677184" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.01.28.hellen_cypress.2245117027" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.01.28.hellen_cypress.3636677184" ; 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 Thu Jan 28 00:25:24 UTC 2021 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Thu Jan 28 01:32:41 UTC 2021 pageSize = 20000 page = 1 @@ -232,7 +232,7 @@ trigger_unusedBit_4_31 = bits, U32, 528, [31:31], "false", "true" trigger_customTotalToothCount = scalar, S32, 532, "number", 1.0, 0.0, 0, 500.0, 0 trigger_customSkippedToothCount = scalar, S32, 536, "number", 1.0, 0.0, 0, 500.0, 0 hip9011SpiDevice = bits, U08, 540, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4", "INVALID", "INVALID", "INVALID" -unused541 = scalar, U08, 541, "unit", 1.0, 0, 0, 100, 0 +failedMapFallback = scalar, U08, 541, "kPa", 1.0, 0, 0, 100, 0 unused542 = scalar, U08, 542, "unit", 1.0, 0, 0, 100, 0 mafAdcChannel = bits, U08, 543, [0:5], "Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" globalFuelCorrection = scalar, F32, 544, "coef", 1.0, 0.0, 0, 1000.0, 2 @@ -1315,6 +1315,7 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1.0, 0, 0.0, 25500.0, 2 fuelLevelSensor = "This is the processor pin that your fuel level sensor in connected to. This is a non standard input so will need to be user defined." idle_derivativeFilterLoss = "0.1 is a good default value" trigger_useOnlyFirstChannel = "This option could be used if your second trigger channel is broken" + failedMapFallback = "This value is only used for speed density fueling calculations." camInputs1 = "Camshaft input could be used either just for engine phase detection if your trigger shape does not include cam sensor as 'primary' channel, or it could be used for Variable Valve timing on one of the camshafts.\nTODO #660" camInputs2 = "Camshaft input could be used either just for engine phase detection if your trigger shape does not include cam sensor as 'primary' channel, or it could be used for Variable Valve timing on one of the camshafts.\nTODO #660" camInputs3 = "Camshaft input could be used either just for engine phase detection if your trigger shape does not include cam sensor as 'primary' channel, or it could be used for Variable Valve timing on one of the camshafts.\nTODO #660" @@ -1421,7 +1422,7 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1.0, 0, 0.0, 25500.0, 2 enableVerboseCan2Tx = "CAN broadcast using custom rusEFI protocol\nenable can_broadcast/disable can_broadcast" ignOverrideMode = "Override the Y axis (load) value used for the ignition table.\nAdvanced users only: If you aren't sure you need this, you probably don't need this." 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.\n0 to disable overboost cut." + 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." 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" @@ -2741,6 +2742,7 @@ menuDialog = main menu = "&Base &Engine" subMenu = engineChars, "Base engine" + subMenu = limitsAndFallback, "Limits and fallbacks" subMenu = triggerConfiguration, "Trigger" subMenu = triggerConfiguration_IO, "Advanced Trigger" subMenu = std_separator @@ -3167,20 +3169,18 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" panel = ignitionOutputs dialog = baseEngineConfig, "Engine Configuration" -; field = "Engine Preset", engineType -; this field is useful for rusEFI online catalog +; field = "Engine preset", engineType + field = "Number of cylinders", cylindersCount + field = "Displacement", displacement + field = "Firing order", firingOrder + field = "Vehicle weight", vehicleWeight + + dialog = engineMetadata, "Engine Metadata" + field = "#These metadata are used by rusEFI Online" field = "Engine Make", engineMake -; this field is useful for rusEFI online catalog field = "Manufacturer Engine Code", engineCode -; this field is useful for rusEFI online catalog field = "Vehicle Name", vehicleName - field = "Number of Cylinders", cylindersCount - field = "Engine Displacement", displacement - field = "Firing Order", firingOrder - field = "Vehicle Weight", vehicleWeight -; this field is useful for rusEFI online catalog field = "Compression Ratio", compressionRatio -; this field is useful for rusEFI online catalog field = "Forced Induction?", isForcedInduction ; Engine->Trigger configuration @@ -4352,20 +4352,26 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = debugging, "Debug" field = "!https://rusefi.com/s/debugmode" field = "Debug mode", debugMode - field = "Warning Text", warning_message - field = "showHumanReadableWarning (affects Burn)", showHumanReadableWarning - dialog = limits, "Limits" field = "RPM hard limit", rpmHardLimit + field = "Cut fuel on RPM limit", cutFuelOnHardLimit + field = "Cut spark on RPM limit", cutSparkOnHardLimit field = "Boost cut pressure", boostCutPressure + dialog = fallbacks, "Fallbacks" + field = "Failed MAP sensor fallback", failedMapFallback + + dialog = limitsAndFallback, "Limits and fallbacks" + panel = limits + panel = fallbacks + ; Engine->Base Engine Settings dialog = engineChars, "Base Engine Settings" topicHelp = "baseHelp" panel = baseEngineConfig + panel = engineMetadata panel = generalSettings - panel = limits panel = debugging dialog = crankingFuel, "Fuel" @@ -4840,6 +4846,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Global fuel correction", globalFuelCorrection field = "Ignition Math Logic @", ignMathCalculateAtIndex field = "MAP Averaging Logic @", mapAveragingSchedulingAtIndex + field = "showHumanReadableWarning (affects Burn)", showHumanReadableWarning help = helpGeneral, "rusEFI General Help" diff --git a/firmware/tunerstudio/generated/rusefi_kinetis.ini b/firmware/tunerstudio/generated/rusefi_kinetis.ini index 7b0dee9b54..d63ccfcfcc 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.01.28.kin.2245117027" + signature = "rusEFI 2021.01.28.kin.3636677184" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.01.28.kin.2245117027" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.01.28.kin.3636677184" ; 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 Thu Jan 28 00:25:21 UTC 2021 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Thu Jan 28 01:32:39 UTC 2021 pageSize = 20000 page = 1 @@ -232,7 +232,7 @@ trigger_unusedBit_4_31 = bits, U32, 528, [31:31], "false", "true" trigger_customTotalToothCount = scalar, S32, 532, "number", 1.0, 0.0, 0, 500.0, 0 trigger_customSkippedToothCount = scalar, S32, 536, "number", 1.0, 0.0, 0, 500.0, 0 hip9011SpiDevice = bits, U08, 540, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4", "INVALID", "INVALID", "INVALID" -unused541 = scalar, U08, 541, "unit", 1.0, 0, 0, 100, 0 +failedMapFallback = scalar, U08, 541, "kPa", 1.0, 0, 0, 100, 0 unused542 = scalar, U08, 542, "unit", 1.0, 0, 0, 100, 0 mafAdcChannel = bits, U08, 543, [0:5], "Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" globalFuelCorrection = scalar, F32, 544, "coef", 1.0, 0.0, 0, 1000.0, 2 @@ -1315,6 +1315,7 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1.0, 0, 0.0, 25500.0, 2 fuelLevelSensor = "This is the processor pin that your fuel level sensor in connected to. This is a non standard input so will need to be user defined." idle_derivativeFilterLoss = "0.1 is a good default value" trigger_useOnlyFirstChannel = "This option could be used if your second trigger channel is broken" + failedMapFallback = "This value is only used for speed density fueling calculations." camInputs1 = "Camshaft input could be used either just for engine phase detection if your trigger shape does not include cam sensor as 'primary' channel, or it could be used for Variable Valve timing on one of the camshafts.\nTODO #660" camInputs2 = "Camshaft input could be used either just for engine phase detection if your trigger shape does not include cam sensor as 'primary' channel, or it could be used for Variable Valve timing on one of the camshafts.\nTODO #660" camInputs3 = "Camshaft input could be used either just for engine phase detection if your trigger shape does not include cam sensor as 'primary' channel, or it could be used for Variable Valve timing on one of the camshafts.\nTODO #660" @@ -1421,7 +1422,7 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1.0, 0, 0.0, 25500.0, 2 enableVerboseCan2Tx = "CAN broadcast using custom rusEFI protocol\nenable can_broadcast/disable can_broadcast" ignOverrideMode = "Override the Y axis (load) value used for the ignition table.\nAdvanced users only: If you aren't sure you need this, you probably don't need this." 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.\n0 to disable overboost cut." + 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." 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" @@ -2741,6 +2742,7 @@ menuDialog = main menu = "&Base &Engine" subMenu = engineChars, "Base engine" + subMenu = limitsAndFallback, "Limits and fallbacks" subMenu = triggerConfiguration, "Trigger" subMenu = triggerConfiguration_IO, "Advanced Trigger" subMenu = std_separator @@ -3167,20 +3169,18 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" panel = ignitionOutputs dialog = baseEngineConfig, "Engine Configuration" -; field = "Engine Preset", engineType -; this field is useful for rusEFI online catalog +; field = "Engine preset", engineType + field = "Number of cylinders", cylindersCount + field = "Displacement", displacement + field = "Firing order", firingOrder + field = "Vehicle weight", vehicleWeight + + dialog = engineMetadata, "Engine Metadata" + field = "#These metadata are used by rusEFI Online" field = "Engine Make", engineMake -; this field is useful for rusEFI online catalog field = "Manufacturer Engine Code", engineCode -; this field is useful for rusEFI online catalog field = "Vehicle Name", vehicleName - field = "Number of Cylinders", cylindersCount - field = "Engine Displacement", displacement - field = "Firing Order", firingOrder - field = "Vehicle Weight", vehicleWeight -; this field is useful for rusEFI online catalog field = "Compression Ratio", compressionRatio -; this field is useful for rusEFI online catalog field = "Forced Induction?", isForcedInduction ; Engine->Trigger configuration @@ -4352,20 +4352,26 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = debugging, "Debug" field = "!https://rusefi.com/s/debugmode" field = "Debug mode", debugMode - field = "Warning Text", warning_message - field = "showHumanReadableWarning (affects Burn)", showHumanReadableWarning - dialog = limits, "Limits" field = "RPM hard limit", rpmHardLimit + field = "Cut fuel on RPM limit", cutFuelOnHardLimit + field = "Cut spark on RPM limit", cutSparkOnHardLimit field = "Boost cut pressure", boostCutPressure + dialog = fallbacks, "Fallbacks" + field = "Failed MAP sensor fallback", failedMapFallback + + dialog = limitsAndFallback, "Limits and fallbacks" + panel = limits + panel = fallbacks + ; Engine->Base Engine Settings dialog = engineChars, "Base Engine Settings" topicHelp = "baseHelp" panel = baseEngineConfig + panel = engineMetadata panel = generalSettings - panel = limits panel = debugging dialog = crankingFuel, "Fuel" @@ -4840,6 +4846,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Global fuel correction", globalFuelCorrection field = "Ignition Math Logic @", ignMathCalculateAtIndex field = "MAP Averaging Logic @", mapAveragingSchedulingAtIndex + field = "showHumanReadableWarning (affects Burn)", showHumanReadableWarning help = helpGeneral, "rusEFI General Help" diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index 79f266d843..928a4e5d16 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.01.28.mre_f4.3916131673" + signature = "rusEFI 2021.01.28.mre_f4.3027886970" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.01.28.mre_f4.3916131673" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.01.28.mre_f4.3027886970" ; 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 Thu Jan 28 00:25:07 UTC 2021 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jan 28 01:32:28 UTC 2021 pageSize = 20000 page = 1 @@ -232,7 +232,7 @@ trigger_unusedBit_4_31 = bits, U32, 528, [31:31], "false", "true" trigger_customTotalToothCount = scalar, S32, 532, "number", 1.0, 0.0, 0, 500.0, 0 trigger_customSkippedToothCount = scalar, S32, 536, "number", 1.0, 0.0, 0, 500.0, 0 hip9011SpiDevice = bits, U08, 540, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4", "INVALID", "INVALID", "INVALID" -unused541 = scalar, U08, 541, "unit", 1.0, 0, 0, 100, 0 +failedMapFallback = scalar, U08, 541, "kPa", 1.0, 0, 0, 100, 0 unused542 = scalar, U08, 542, "unit", 1.0, 0, 0, 100, 0 mafAdcChannel = bits, U08, 543, [0:5], "NONE","18 - AN temp 1","23 - AN temp 2","24 - AN temp 3","22 - AN temp 4","28 - AN volt 10","INVALID","26 - AN volt 2","31 - AN volt 3","36 - AN volt 8","40 - AN volt 9","27 - AN volt 1","Battery Sense","19 - AN volt 4","20 - AN volt 5","32 - AN volt 6","30 - AN volt 7", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" globalFuelCorrection = scalar, F32, 544, "coef", 1.0, 0.0, 0, 1000.0, 2 @@ -1315,6 +1315,7 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1.0, 0, 0.0, 25500.0, 2 fuelLevelSensor = "This is the processor pin that your fuel level sensor in connected to. This is a non standard input so will need to be user defined." idle_derivativeFilterLoss = "0.1 is a good default value" trigger_useOnlyFirstChannel = "This option could be used if your second trigger channel is broken" + failedMapFallback = "This value is only used for speed density fueling calculations." camInputs1 = "Camshaft input could be used either just for engine phase detection if your trigger shape does not include cam sensor as 'primary' channel, or it could be used for Variable Valve timing on one of the camshafts.\nTODO #660" camInputs2 = "Camshaft input could be used either just for engine phase detection if your trigger shape does not include cam sensor as 'primary' channel, or it could be used for Variable Valve timing on one of the camshafts.\nTODO #660" camInputs3 = "Camshaft input could be used either just for engine phase detection if your trigger shape does not include cam sensor as 'primary' channel, or it could be used for Variable Valve timing on one of the camshafts.\nTODO #660" @@ -1421,7 +1422,7 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1.0, 0, 0.0, 25500.0, 2 enableVerboseCan2Tx = "CAN broadcast using custom rusEFI protocol\nenable can_broadcast/disable can_broadcast" ignOverrideMode = "Override the Y axis (load) value used for the ignition table.\nAdvanced users only: If you aren't sure you need this, you probably don't need this." 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.\n0 to disable overboost cut." + 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." 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" @@ -2741,6 +2742,7 @@ menuDialog = main menu = "&Base &Engine" subMenu = engineChars, "Base engine" + subMenu = limitsAndFallback, "Limits and fallbacks" subMenu = triggerConfiguration, "Trigger" subMenu = triggerConfiguration_IO, "Advanced Trigger" subMenu = std_separator @@ -3163,20 +3165,18 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" panel = ignitionOutputs dialog = baseEngineConfig, "Engine Configuration" -; field = "Engine Preset", engineType -; this field is useful for rusEFI online catalog +; field = "Engine preset", engineType + field = "Number of cylinders", cylindersCount + field = "Displacement", displacement + field = "Firing order", firingOrder + field = "Vehicle weight", vehicleWeight + + dialog = engineMetadata, "Engine Metadata" + field = "#These metadata are used by rusEFI Online" field = "Engine Make", engineMake -; this field is useful for rusEFI online catalog field = "Manufacturer Engine Code", engineCode -; this field is useful for rusEFI online catalog field = "Vehicle Name", vehicleName - field = "Number of Cylinders", cylindersCount - field = "Engine Displacement", displacement - field = "Firing Order", firingOrder - field = "Vehicle Weight", vehicleWeight -; this field is useful for rusEFI online catalog field = "Compression Ratio", compressionRatio -; this field is useful for rusEFI online catalog field = "Forced Induction?", isForcedInduction ; Engine->Trigger configuration @@ -4327,20 +4327,26 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = debugging, "Debug" field = "!https://rusefi.com/s/debugmode" field = "Debug mode", debugMode - field = "Warning Text", warning_message - field = "showHumanReadableWarning (affects Burn)", showHumanReadableWarning - dialog = limits, "Limits" field = "RPM hard limit", rpmHardLimit + field = "Cut fuel on RPM limit", cutFuelOnHardLimit + field = "Cut spark on RPM limit", cutSparkOnHardLimit field = "Boost cut pressure", boostCutPressure + dialog = fallbacks, "Fallbacks" + field = "Failed MAP sensor fallback", failedMapFallback + + dialog = limitsAndFallback, "Limits and fallbacks" + panel = limits + panel = fallbacks + ; Engine->Base Engine Settings dialog = engineChars, "Base Engine Settings" topicHelp = "baseHelp" panel = baseEngineConfig + panel = engineMetadata panel = generalSettings - panel = limits panel = debugging dialog = crankingFuel, "Fuel" @@ -4806,6 +4812,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Global fuel correction", globalFuelCorrection field = "Ignition Math Logic @", ignMathCalculateAtIndex field = "MAP Averaging Logic @", mapAveragingSchedulingAtIndex + field = "showHumanReadableWarning (affects Burn)", showHumanReadableWarning help = helpGeneral, "rusEFI General Help" diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index 5e0ae3a3d1..a65e8a6b49 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.01.28.mre_f7.3916131673" + signature = "rusEFI 2021.01.28.mre_f7.3027886970" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.01.28.mre_f7.3916131673" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.01.28.mre_f7.3027886970" ; 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 Thu Jan 28 00:25:06 UTC 2021 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jan 28 01:32:26 UTC 2021 pageSize = 20000 page = 1 @@ -232,7 +232,7 @@ trigger_unusedBit_4_31 = bits, U32, 528, [31:31], "false", "true" trigger_customTotalToothCount = scalar, S32, 532, "number", 1.0, 0.0, 0, 500.0, 0 trigger_customSkippedToothCount = scalar, S32, 536, "number", 1.0, 0.0, 0, 500.0, 0 hip9011SpiDevice = bits, U08, 540, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4", "INVALID", "INVALID", "INVALID" -unused541 = scalar, U08, 541, "unit", 1.0, 0, 0, 100, 0 +failedMapFallback = scalar, U08, 541, "kPa", 1.0, 0, 0, 100, 0 unused542 = scalar, U08, 542, "unit", 1.0, 0, 0, 100, 0 mafAdcChannel = bits, U08, 543, [0:5], "NONE","18 - AN temp 1","23 - AN temp 2","24 - AN temp 3","22 - AN temp 4","28 - AN volt 10","INVALID","26 - AN volt 2","31 - AN volt 3","36 - AN volt 8","40 - AN volt 9","27 - AN volt 1","Battery Sense","19 - AN volt 4","20 - AN volt 5","32 - AN volt 6","30 - AN volt 7", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" globalFuelCorrection = scalar, F32, 544, "coef", 1.0, 0.0, 0, 1000.0, 2 @@ -1315,6 +1315,7 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1.0, 0, 0.0, 25500.0, 2 fuelLevelSensor = "This is the processor pin that your fuel level sensor in connected to. This is a non standard input so will need to be user defined." idle_derivativeFilterLoss = "0.1 is a good default value" trigger_useOnlyFirstChannel = "This option could be used if your second trigger channel is broken" + failedMapFallback = "This value is only used for speed density fueling calculations." camInputs1 = "Camshaft input could be used either just for engine phase detection if your trigger shape does not include cam sensor as 'primary' channel, or it could be used for Variable Valve timing on one of the camshafts.\nTODO #660" camInputs2 = "Camshaft input could be used either just for engine phase detection if your trigger shape does not include cam sensor as 'primary' channel, or it could be used for Variable Valve timing on one of the camshafts.\nTODO #660" camInputs3 = "Camshaft input could be used either just for engine phase detection if your trigger shape does not include cam sensor as 'primary' channel, or it could be used for Variable Valve timing on one of the camshafts.\nTODO #660" @@ -1421,7 +1422,7 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1.0, 0, 0.0, 25500.0, 2 enableVerboseCan2Tx = "CAN broadcast using custom rusEFI protocol\nenable can_broadcast/disable can_broadcast" ignOverrideMode = "Override the Y axis (load) value used for the ignition table.\nAdvanced users only: If you aren't sure you need this, you probably don't need this." 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.\n0 to disable overboost cut." + 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." 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" @@ -2741,6 +2742,7 @@ menuDialog = main menu = "&Base &Engine" subMenu = engineChars, "Base engine" + subMenu = limitsAndFallback, "Limits and fallbacks" subMenu = triggerConfiguration, "Trigger" subMenu = triggerConfiguration_IO, "Advanced Trigger" subMenu = std_separator @@ -3163,20 +3165,18 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" panel = ignitionOutputs dialog = baseEngineConfig, "Engine Configuration" -; field = "Engine Preset", engineType -; this field is useful for rusEFI online catalog +; field = "Engine preset", engineType + field = "Number of cylinders", cylindersCount + field = "Displacement", displacement + field = "Firing order", firingOrder + field = "Vehicle weight", vehicleWeight + + dialog = engineMetadata, "Engine Metadata" + field = "#These metadata are used by rusEFI Online" field = "Engine Make", engineMake -; this field is useful for rusEFI online catalog field = "Manufacturer Engine Code", engineCode -; this field is useful for rusEFI online catalog field = "Vehicle Name", vehicleName - field = "Number of Cylinders", cylindersCount - field = "Engine Displacement", displacement - field = "Firing Order", firingOrder - field = "Vehicle Weight", vehicleWeight -; this field is useful for rusEFI online catalog field = "Compression Ratio", compressionRatio -; this field is useful for rusEFI online catalog field = "Forced Induction?", isForcedInduction ; Engine->Trigger configuration @@ -4327,20 +4327,26 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = debugging, "Debug" field = "!https://rusefi.com/s/debugmode" field = "Debug mode", debugMode - field = "Warning Text", warning_message - field = "showHumanReadableWarning (affects Burn)", showHumanReadableWarning - dialog = limits, "Limits" field = "RPM hard limit", rpmHardLimit + field = "Cut fuel on RPM limit", cutFuelOnHardLimit + field = "Cut spark on RPM limit", cutSparkOnHardLimit field = "Boost cut pressure", boostCutPressure + dialog = fallbacks, "Fallbacks" + field = "Failed MAP sensor fallback", failedMapFallback + + dialog = limitsAndFallback, "Limits and fallbacks" + panel = limits + panel = fallbacks + ; Engine->Base Engine Settings dialog = engineChars, "Base Engine Settings" topicHelp = "baseHelp" panel = baseEngineConfig + panel = engineMetadata panel = generalSettings - panel = limits panel = debugging dialog = crankingFuel, "Fuel" @@ -4806,6 +4812,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Global fuel correction", globalFuelCorrection field = "Ignition Math Logic @", ignMathCalculateAtIndex field = "MAP Averaging Logic @", mapAveragingSchedulingAtIndex + field = "showHumanReadableWarning (affects Burn)", showHumanReadableWarning help = helpGeneral, "rusEFI General Help" diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index d38d74dfa6..b4c16cc51f 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.01.28.prometheus_405.3577421189" + signature = "rusEFI 2021.01.28.prometheus_405.2284426150" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.01.28.prometheus_405.3577421189" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.01.28.prometheus_405.2284426150" ; 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 Thu Jan 28 00:25:13 UTC 2021 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jan 28 01:32:32 UTC 2021 pageSize = 20000 page = 1 @@ -232,7 +232,7 @@ trigger_unusedBit_4_31 = bits, U32, 528, [31:31], "false", "true" trigger_customTotalToothCount = scalar, S32, 532, "number", 1.0, 0.0, 0, 500.0, 0 trigger_customSkippedToothCount = scalar, S32, 536, "number", 1.0, 0.0, 0, 500.0, 0 hip9011SpiDevice = bits, U08, 540, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4", "INVALID", "INVALID", "INVALID" -unused541 = scalar, U08, 541, "unit", 1.0, 0, 0, 100, 0 +failedMapFallback = scalar, U08, 541, "kPa", 1.0, 0, 0, 100, 0 unused542 = scalar, U08, 542, "unit", 1.0, 0, 0, 100, 0 mafAdcChannel = bits, U08, 543, [0:5], "Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" globalFuelCorrection = scalar, F32, 544, "coef", 1.0, 0.0, 0, 1000.0, 2 @@ -1315,6 +1315,7 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1.0, 0, 0.0, 25500.0, 2 fuelLevelSensor = "This is the processor pin that your fuel level sensor in connected to. This is a non standard input so will need to be user defined." idle_derivativeFilterLoss = "0.1 is a good default value" trigger_useOnlyFirstChannel = "This option could be used if your second trigger channel is broken" + failedMapFallback = "This value is only used for speed density fueling calculations." camInputs1 = "Camshaft input could be used either just for engine phase detection if your trigger shape does not include cam sensor as 'primary' channel, or it could be used for Variable Valve timing on one of the camshafts.\nTODO #660" camInputs2 = "Camshaft input could be used either just for engine phase detection if your trigger shape does not include cam sensor as 'primary' channel, or it could be used for Variable Valve timing on one of the camshafts.\nTODO #660" camInputs3 = "Camshaft input could be used either just for engine phase detection if your trigger shape does not include cam sensor as 'primary' channel, or it could be used for Variable Valve timing on one of the camshafts.\nTODO #660" @@ -1421,7 +1422,7 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1.0, 0, 0.0, 25500.0, 2 enableVerboseCan2Tx = "CAN broadcast using custom rusEFI protocol\nenable can_broadcast/disable can_broadcast" ignOverrideMode = "Override the Y axis (load) value used for the ignition table.\nAdvanced users only: If you aren't sure you need this, you probably don't need this." 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.\n0 to disable overboost cut." + 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." 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" @@ -2741,6 +2742,7 @@ menuDialog = main menu = "&Base &Engine" subMenu = engineChars, "Base engine" + subMenu = limitsAndFallback, "Limits and fallbacks" subMenu = triggerConfiguration, "Trigger" subMenu = triggerConfiguration_IO, "Advanced Trigger" subMenu = std_separator @@ -3163,20 +3165,18 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" panel = ignitionOutputs dialog = baseEngineConfig, "Engine Configuration" -; field = "Engine Preset", engineType -; this field is useful for rusEFI online catalog +; field = "Engine preset", engineType + field = "Number of cylinders", cylindersCount + field = "Displacement", displacement + field = "Firing order", firingOrder + field = "Vehicle weight", vehicleWeight + + dialog = engineMetadata, "Engine Metadata" + field = "#These metadata are used by rusEFI Online" field = "Engine Make", engineMake -; this field is useful for rusEFI online catalog field = "Manufacturer Engine Code", engineCode -; this field is useful for rusEFI online catalog field = "Vehicle Name", vehicleName - field = "Number of Cylinders", cylindersCount - field = "Engine Displacement", displacement - field = "Firing Order", firingOrder - field = "Vehicle Weight", vehicleWeight -; this field is useful for rusEFI online catalog field = "Compression Ratio", compressionRatio -; this field is useful for rusEFI online catalog field = "Forced Induction?", isForcedInduction ; Engine->Trigger configuration @@ -4348,20 +4348,26 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = debugging, "Debug" field = "!https://rusefi.com/s/debugmode" field = "Debug mode", debugMode - field = "Warning Text", warning_message - field = "showHumanReadableWarning (affects Burn)", showHumanReadableWarning - dialog = limits, "Limits" field = "RPM hard limit", rpmHardLimit + field = "Cut fuel on RPM limit", cutFuelOnHardLimit + field = "Cut spark on RPM limit", cutSparkOnHardLimit field = "Boost cut pressure", boostCutPressure + dialog = fallbacks, "Fallbacks" + field = "Failed MAP sensor fallback", failedMapFallback + + dialog = limitsAndFallback, "Limits and fallbacks" + panel = limits + panel = fallbacks + ; Engine->Base Engine Settings dialog = engineChars, "Base Engine Settings" topicHelp = "baseHelp" panel = baseEngineConfig + panel = engineMetadata panel = generalSettings - panel = limits panel = debugging dialog = crankingFuel, "Fuel" @@ -4836,6 +4842,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Global fuel correction", globalFuelCorrection field = "Ignition Math Logic @", ignMathCalculateAtIndex field = "MAP Averaging Logic @", mapAveragingSchedulingAtIndex + field = "showHumanReadableWarning (affects Burn)", showHumanReadableWarning help = helpGeneral, "rusEFI General Help" diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index 5e6d3e8e3a..e323c05188 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.01.28.prometheus_469.3577421189" + signature = "rusEFI 2021.01.28.prometheus_469.2284426150" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.01.28.prometheus_469.3577421189" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.01.28.prometheus_469.2284426150" ; 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 Thu Jan 28 00:25:11 UTC 2021 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jan 28 01:32:31 UTC 2021 pageSize = 20000 page = 1 @@ -232,7 +232,7 @@ trigger_unusedBit_4_31 = bits, U32, 528, [31:31], "false", "true" trigger_customTotalToothCount = scalar, S32, 532, "number", 1.0, 0.0, 0, 500.0, 0 trigger_customSkippedToothCount = scalar, S32, 536, "number", 1.0, 0.0, 0, 500.0, 0 hip9011SpiDevice = bits, U08, 540, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4", "INVALID", "INVALID", "INVALID" -unused541 = scalar, U08, 541, "unit", 1.0, 0, 0, 100, 0 +failedMapFallback = scalar, U08, 541, "kPa", 1.0, 0, 0, 100, 0 unused542 = scalar, U08, 542, "unit", 1.0, 0, 0, 100, 0 mafAdcChannel = bits, U08, 543, [0:5], "Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" globalFuelCorrection = scalar, F32, 544, "coef", 1.0, 0.0, 0, 1000.0, 2 @@ -1315,6 +1315,7 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1.0, 0, 0.0, 25500.0, 2 fuelLevelSensor = "This is the processor pin that your fuel level sensor in connected to. This is a non standard input so will need to be user defined." idle_derivativeFilterLoss = "0.1 is a good default value" trigger_useOnlyFirstChannel = "This option could be used if your second trigger channel is broken" + failedMapFallback = "This value is only used for speed density fueling calculations." camInputs1 = "Camshaft input could be used either just for engine phase detection if your trigger shape does not include cam sensor as 'primary' channel, or it could be used for Variable Valve timing on one of the camshafts.\nTODO #660" camInputs2 = "Camshaft input could be used either just for engine phase detection if your trigger shape does not include cam sensor as 'primary' channel, or it could be used for Variable Valve timing on one of the camshafts.\nTODO #660" camInputs3 = "Camshaft input could be used either just for engine phase detection if your trigger shape does not include cam sensor as 'primary' channel, or it could be used for Variable Valve timing on one of the camshafts.\nTODO #660" @@ -1421,7 +1422,7 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1.0, 0, 0.0, 25500.0, 2 enableVerboseCan2Tx = "CAN broadcast using custom rusEFI protocol\nenable can_broadcast/disable can_broadcast" ignOverrideMode = "Override the Y axis (load) value used for the ignition table.\nAdvanced users only: If you aren't sure you need this, you probably don't need this." 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.\n0 to disable overboost cut." + 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." 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" @@ -2741,6 +2742,7 @@ menuDialog = main menu = "&Base &Engine" subMenu = engineChars, "Base engine" + subMenu = limitsAndFallback, "Limits and fallbacks" subMenu = triggerConfiguration, "Trigger" subMenu = triggerConfiguration_IO, "Advanced Trigger" subMenu = std_separator @@ -3163,20 +3165,18 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" panel = ignitionOutputs dialog = baseEngineConfig, "Engine Configuration" -; field = "Engine Preset", engineType -; this field is useful for rusEFI online catalog +; field = "Engine preset", engineType + field = "Number of cylinders", cylindersCount + field = "Displacement", displacement + field = "Firing order", firingOrder + field = "Vehicle weight", vehicleWeight + + dialog = engineMetadata, "Engine Metadata" + field = "#These metadata are used by rusEFI Online" field = "Engine Make", engineMake -; this field is useful for rusEFI online catalog field = "Manufacturer Engine Code", engineCode -; this field is useful for rusEFI online catalog field = "Vehicle Name", vehicleName - field = "Number of Cylinders", cylindersCount - field = "Engine Displacement", displacement - field = "Firing Order", firingOrder - field = "Vehicle Weight", vehicleWeight -; this field is useful for rusEFI online catalog field = "Compression Ratio", compressionRatio -; this field is useful for rusEFI online catalog field = "Forced Induction?", isForcedInduction ; Engine->Trigger configuration @@ -4348,20 +4348,26 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = debugging, "Debug" field = "!https://rusefi.com/s/debugmode" field = "Debug mode", debugMode - field = "Warning Text", warning_message - field = "showHumanReadableWarning (affects Burn)", showHumanReadableWarning - dialog = limits, "Limits" field = "RPM hard limit", rpmHardLimit + field = "Cut fuel on RPM limit", cutFuelOnHardLimit + field = "Cut spark on RPM limit", cutSparkOnHardLimit field = "Boost cut pressure", boostCutPressure + dialog = fallbacks, "Fallbacks" + field = "Failed MAP sensor fallback", failedMapFallback + + dialog = limitsAndFallback, "Limits and fallbacks" + panel = limits + panel = fallbacks + ; Engine->Base Engine Settings dialog = engineChars, "Base Engine Settings" topicHelp = "baseHelp" panel = baseEngineConfig + panel = engineMetadata panel = generalSettings - panel = limits panel = debugging dialog = crankingFuel, "Fuel" @@ -4836,6 +4842,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Global fuel correction", globalFuelCorrection field = "Ignition Math Logic @", ignMathCalculateAtIndex field = "MAP Averaging Logic @", mapAveragingSchedulingAtIndex + field = "showHumanReadableWarning (affects Burn)", showHumanReadableWarning help = helpGeneral, "rusEFI General Help" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index 71a2766681..5677178b6e 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.01.28.proteus_f4.2694633372" + signature = "rusEFI 2021.01.28.proteus_f4.4253964735" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.01.28.proteus_f4.2694633372" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.01.28.proteus_f4.4253964735" ; 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 Thu Jan 28 00:25:17 UTC 2021 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jan 28 01:32:36 UTC 2021 pageSize = 20000 page = 1 @@ -232,7 +232,7 @@ trigger_unusedBit_4_31 = bits, U32, 528, [31:31], "false", "true" trigger_customTotalToothCount = scalar, S32, 532, "number", 1.0, 0.0, 0, 500.0, 0 trigger_customSkippedToothCount = scalar, S32, 536, "number", 1.0, 0.0, 0, 500.0, 0 hip9011SpiDevice = bits, U08, 540, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4", "INVALID", "INVALID", "INVALID" -unused541 = scalar, U08, 541, "unit", 1.0, 0, 0, 100, 0 +failedMapFallback = scalar, U08, 541, "kPa", 1.0, 0, 0, 100, 0 unused542 = scalar, U08, 542, "unit", 1.0, 0, 0, 100, 0 mafAdcChannel = bits, U08, 543, [0:5], "NONE","Analog Volt 5","Analog Volt 6","Analog Volt 7","Analog Volt 8","Analog Volt 9","Analog Volt 10","Analog Volt 11","Battery Sense","Analog Temp 3","Analog Temp 4","Analog Volt 1","Analog Volt 2","Analog Volt 3","Analog Volt 4","Analog Temp 1","Analog Temp 2", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" globalFuelCorrection = scalar, F32, 544, "coef", 1.0, 0.0, 0, 1000.0, 2 @@ -1315,6 +1315,7 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1.0, 0, 0.0, 25500.0, 2 fuelLevelSensor = "This is the processor pin that your fuel level sensor in connected to. This is a non standard input so will need to be user defined." idle_derivativeFilterLoss = "0.1 is a good default value" trigger_useOnlyFirstChannel = "This option could be used if your second trigger channel is broken" + failedMapFallback = "This value is only used for speed density fueling calculations." camInputs1 = "Camshaft input could be used either just for engine phase detection if your trigger shape does not include cam sensor as 'primary' channel, or it could be used for Variable Valve timing on one of the camshafts.\nTODO #660" camInputs2 = "Camshaft input could be used either just for engine phase detection if your trigger shape does not include cam sensor as 'primary' channel, or it could be used for Variable Valve timing on one of the camshafts.\nTODO #660" camInputs3 = "Camshaft input could be used either just for engine phase detection if your trigger shape does not include cam sensor as 'primary' channel, or it could be used for Variable Valve timing on one of the camshafts.\nTODO #660" @@ -1421,7 +1422,7 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1.0, 0, 0.0, 25500.0, 2 enableVerboseCan2Tx = "CAN broadcast using custom rusEFI protocol\nenable can_broadcast/disable can_broadcast" ignOverrideMode = "Override the Y axis (load) value used for the ignition table.\nAdvanced users only: If you aren't sure you need this, you probably don't need this." 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.\n0 to disable overboost cut." + 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." 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" @@ -2741,6 +2742,7 @@ menuDialog = main menu = "&Base &Engine" subMenu = engineChars, "Base engine" + subMenu = limitsAndFallback, "Limits and fallbacks" subMenu = triggerConfiguration, "Trigger" subMenu = triggerConfiguration_IO, "Advanced Trigger" subMenu = std_separator @@ -3159,20 +3161,18 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" panel = ignitionOutputs dialog = baseEngineConfig, "Engine Configuration" -; field = "Engine Preset", engineType -; this field is useful for rusEFI online catalog +; field = "Engine preset", engineType + field = "Number of cylinders", cylindersCount + field = "Displacement", displacement + field = "Firing order", firingOrder + field = "Vehicle weight", vehicleWeight + + dialog = engineMetadata, "Engine Metadata" + field = "#These metadata are used by rusEFI Online" field = "Engine Make", engineMake -; this field is useful for rusEFI online catalog field = "Manufacturer Engine Code", engineCode -; this field is useful for rusEFI online catalog field = "Vehicle Name", vehicleName - field = "Number of Cylinders", cylindersCount - field = "Engine Displacement", displacement - field = "Firing Order", firingOrder - field = "Vehicle Weight", vehicleWeight -; this field is useful for rusEFI online catalog field = "Compression Ratio", compressionRatio -; this field is useful for rusEFI online catalog field = "Forced Induction?", isForcedInduction ; Engine->Trigger configuration @@ -4319,20 +4319,26 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = debugging, "Debug" field = "!https://rusefi.com/s/debugmode" field = "Debug mode", debugMode - field = "Warning Text", warning_message - field = "showHumanReadableWarning (affects Burn)", showHumanReadableWarning - dialog = limits, "Limits" field = "RPM hard limit", rpmHardLimit + field = "Cut fuel on RPM limit", cutFuelOnHardLimit + field = "Cut spark on RPM limit", cutSparkOnHardLimit field = "Boost cut pressure", boostCutPressure + dialog = fallbacks, "Fallbacks" + field = "Failed MAP sensor fallback", failedMapFallback + + dialog = limitsAndFallback, "Limits and fallbacks" + panel = limits + panel = fallbacks + ; Engine->Base Engine Settings dialog = engineChars, "Base Engine Settings" topicHelp = "baseHelp" panel = baseEngineConfig + panel = engineMetadata panel = generalSettings - panel = limits panel = debugging dialog = crankingFuel, "Fuel" @@ -4795,6 +4801,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Global fuel correction", globalFuelCorrection field = "Ignition Math Logic @", ignMathCalculateAtIndex field = "MAP Averaging Logic @", mapAveragingSchedulingAtIndex + field = "showHumanReadableWarning (affects Burn)", showHumanReadableWarning help = helpGeneral, "rusEFI General Help" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index 4a119dc836..ae762d174c 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.01.28.proteus_f7.2694633372" + signature = "rusEFI 2021.01.28.proteus_f7.4253964735" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.01.28.proteus_f7.2694633372" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.01.28.proteus_f7.4253964735" ; 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 Thu Jan 28 00:25:14 UTC 2021 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jan 28 01:32:33 UTC 2021 pageSize = 20000 page = 1 @@ -232,7 +232,7 @@ trigger_unusedBit_4_31 = bits, U32, 528, [31:31], "false", "true" trigger_customTotalToothCount = scalar, S32, 532, "number", 1.0, 0.0, 0, 500.0, 0 trigger_customSkippedToothCount = scalar, S32, 536, "number", 1.0, 0.0, 0, 500.0, 0 hip9011SpiDevice = bits, U08, 540, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4", "INVALID", "INVALID", "INVALID" -unused541 = scalar, U08, 541, "unit", 1.0, 0, 0, 100, 0 +failedMapFallback = scalar, U08, 541, "kPa", 1.0, 0, 0, 100, 0 unused542 = scalar, U08, 542, "unit", 1.0, 0, 0, 100, 0 mafAdcChannel = bits, U08, 543, [0:5], "NONE","Analog Volt 5","Analog Volt 6","Analog Volt 7","Analog Volt 8","Analog Volt 9","Analog Volt 10","Analog Volt 11","Battery Sense","Analog Temp 3","Analog Temp 4","Analog Volt 1","Analog Volt 2","Analog Volt 3","Analog Volt 4","Analog Temp 1","Analog Temp 2", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" globalFuelCorrection = scalar, F32, 544, "coef", 1.0, 0.0, 0, 1000.0, 2 @@ -1315,6 +1315,7 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1.0, 0, 0.0, 25500.0, 2 fuelLevelSensor = "This is the processor pin that your fuel level sensor in connected to. This is a non standard input so will need to be user defined." idle_derivativeFilterLoss = "0.1 is a good default value" trigger_useOnlyFirstChannel = "This option could be used if your second trigger channel is broken" + failedMapFallback = "This value is only used for speed density fueling calculations." camInputs1 = "Camshaft input could be used either just for engine phase detection if your trigger shape does not include cam sensor as 'primary' channel, or it could be used for Variable Valve timing on one of the camshafts.\nTODO #660" camInputs2 = "Camshaft input could be used either just for engine phase detection if your trigger shape does not include cam sensor as 'primary' channel, or it could be used for Variable Valve timing on one of the camshafts.\nTODO #660" camInputs3 = "Camshaft input could be used either just for engine phase detection if your trigger shape does not include cam sensor as 'primary' channel, or it could be used for Variable Valve timing on one of the camshafts.\nTODO #660" @@ -1421,7 +1422,7 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1.0, 0, 0.0, 25500.0, 2 enableVerboseCan2Tx = "CAN broadcast using custom rusEFI protocol\nenable can_broadcast/disable can_broadcast" ignOverrideMode = "Override the Y axis (load) value used for the ignition table.\nAdvanced users only: If you aren't sure you need this, you probably don't need this." 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.\n0 to disable overboost cut." + 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." 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" @@ -2741,6 +2742,7 @@ menuDialog = main menu = "&Base &Engine" subMenu = engineChars, "Base engine" + subMenu = limitsAndFallback, "Limits and fallbacks" subMenu = triggerConfiguration, "Trigger" subMenu = triggerConfiguration_IO, "Advanced Trigger" subMenu = std_separator @@ -3159,20 +3161,18 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" panel = ignitionOutputs dialog = baseEngineConfig, "Engine Configuration" -; field = "Engine Preset", engineType -; this field is useful for rusEFI online catalog +; field = "Engine preset", engineType + field = "Number of cylinders", cylindersCount + field = "Displacement", displacement + field = "Firing order", firingOrder + field = "Vehicle weight", vehicleWeight + + dialog = engineMetadata, "Engine Metadata" + field = "#These metadata are used by rusEFI Online" field = "Engine Make", engineMake -; this field is useful for rusEFI online catalog field = "Manufacturer Engine Code", engineCode -; this field is useful for rusEFI online catalog field = "Vehicle Name", vehicleName - field = "Number of Cylinders", cylindersCount - field = "Engine Displacement", displacement - field = "Firing Order", firingOrder - field = "Vehicle Weight", vehicleWeight -; this field is useful for rusEFI online catalog field = "Compression Ratio", compressionRatio -; this field is useful for rusEFI online catalog field = "Forced Induction?", isForcedInduction ; Engine->Trigger configuration @@ -4319,20 +4319,26 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = debugging, "Debug" field = "!https://rusefi.com/s/debugmode" field = "Debug mode", debugMode - field = "Warning Text", warning_message - field = "showHumanReadableWarning (affects Burn)", showHumanReadableWarning - dialog = limits, "Limits" field = "RPM hard limit", rpmHardLimit + field = "Cut fuel on RPM limit", cutFuelOnHardLimit + field = "Cut spark on RPM limit", cutSparkOnHardLimit field = "Boost cut pressure", boostCutPressure + dialog = fallbacks, "Fallbacks" + field = "Failed MAP sensor fallback", failedMapFallback + + dialog = limitsAndFallback, "Limits and fallbacks" + panel = limits + panel = fallbacks + ; Engine->Base Engine Settings dialog = engineChars, "Base Engine Settings" topicHelp = "baseHelp" panel = baseEngineConfig + panel = engineMetadata panel = generalSettings - panel = limits panel = debugging dialog = crankingFuel, "Fuel" @@ -4795,6 +4801,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Global fuel correction", globalFuelCorrection field = "Ignition Math Logic @", ignMathCalculateAtIndex field = "MAP Averaging Logic @", mapAveragingSchedulingAtIndex + field = "showHumanReadableWarning (affects Burn)", showHumanReadableWarning help = helpGeneral, "rusEFI General Help" 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 fb2f526ef7..8ed4b8285d 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 Wed Jan 27 02:58:08 UTC 2021 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jan 28 01:32:24 UTC 2021 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -468,6 +468,7 @@ public class Fields { public static final int etbWastegatePid_pFactor_offset = 2516; 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 fanOffTemperature_offset = 472; public static final int fanOnTemperature_offset = 468; public static final int fanPin_offset = 663; @@ -1484,7 +1485,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.01.27.all.3473425706"; + public static final String TS_SIGNATURE = "rusEFI 2021.01.28.all.2596245904"; 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; @@ -1552,7 +1553,6 @@ public class Fields { public static final int unused3942_offset = 3992; public static final int unused3988_offset = 3988; public static final int unused4028_offset = 4028; - public static final int unused541_offset = 541; public static final int unused542_offset = 542; public static final int unused6312_offset = 6312; public static final int unused744b25_offset = 744; @@ -1813,7 +1813,7 @@ public class Fields { public static final Field TRIGGER_CUSTOMTOTALTOOTHCOUNT = Field.create("TRIGGER_CUSTOMTOTALTOOTHCOUNT", 532, FieldType.INT); public static final Field TRIGGER_CUSTOMSKIPPEDTOOTHCOUNT = Field.create("TRIGGER_CUSTOMSKIPPEDTOOTHCOUNT", 536, FieldType.INT); public static final Field HIP9011SPIDEVICE = Field.create("HIP9011SPIDEVICE", 540, FieldType.INT8); - public static final Field UNUSED541 = Field.create("UNUSED541", 541, FieldType.INT8); + public static final Field FAILEDMAPFALLBACK = Field.create("FAILEDMAPFALLBACK", 541, FieldType.INT8); public static final Field UNUSED542 = Field.create("UNUSED542", 542, FieldType.INT8); public static final Field MAFADCCHANNEL = Field.create("MAFADCCHANNEL", 543, FieldType.INT8, adc_channel_e); public static final Field GLOBALFUELCORRECTION = Field.create("GLOBALFUELCORRECTION", 544, FieldType.FLOAT); @@ -2907,7 +2907,7 @@ public class Fields { TRIGGER_CUSTOMTOTALTOOTHCOUNT, TRIGGER_CUSTOMSKIPPEDTOOTHCOUNT, HIP9011SPIDEVICE, - UNUSED541, + FAILEDMAPFALLBACK, UNUSED542, MAFADCCHANNEL, GLOBALFUELCORRECTION, diff --git a/java_console/rusefi.xml b/java_console/rusefi.xml index ae38d4e8c5..e9c54fb022 100644 --- a/java_console/rusefi.xml +++ b/java_console/rusefi.xml @@ -1,6 +1,6 @@ - +