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 96c2a8d883..2043005dec 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 Tue Jan 05 12:58:50 UTC 2021 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Tue Jan 05 21:31:36 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3342,7 +3342,7 @@ struct engine_configuration_s { */ spi_device_e tle6240spiDevice; /** - * Stoichiometric ratio for your primary fuel. + * Stoichiometric ratio for your primary fuel. When Flex Fuel is enabled, this value is used when the Flex Fuel sensor indicates E0. * offset 4005 */ uint8_t stoichRatioPrimary; @@ -3356,9 +3356,14 @@ struct engine_configuration_s { */ spi_device_e mc33972spiDevice; /** + * Stoichiometric ratio for your secondary fuel. This value is used when the Flex Fuel sensor indicates E100. * offset 4009 */ - uint8_t unusedSpiPadding8[3]; + uint8_t stoichRatioSecondary; + /** + * offset 4010 + */ + uint8_t unusedSpiPadding8[2]; /** * ETB idle authority * offset 4012 @@ -3780,4 +3785,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 Tue Jan 05 12:58:50 UTC 2021 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Tue Jan 05 21:31:36 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 975df14374..d3954e445c 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 @@ -1243,7 +1243,7 @@ #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD hellen_cypress #define SIGNATURE_DATE 2021.01.05 -#define SIGNATURE_HASH 372768766 +#define SIGNATURE_HASH 2103511994 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1324,6 +1324,7 @@ #define stft_startupDelay_offset 1071 #define stftIgnoreErrorMagnitude_offset 976 #define stoichRatioPrimary_offset 4005 +#define stoichRatioSecondary_offset 4009 #define switch_input_pin_e_enum "NONE", "INVALID", "P00 (A_0)", "P01 (A_1)", "P02 (A_2)", "P03 (A_3)", "P04 (A_4)", "P05 (A_5)", "P06 (A_6)", "P07 (A_7)", "P08 (A_8)", "P09 (A_9)", "P0A (A_10)", "P0B (A_11)", "P0C (A_12)", "P0D (A_13)", "P0E (A_14)", "P0F (A_15)", "P10 (B_0)", "P11 (B_1)", "P12 (B_2)", "P13 (B_3)", "P14 (B_4)", "P15 (B_5)", "P16 (B_6)", "P17 (B_7)", "P18 (B_8)", "P19 (B_9)", "P1A (B_10)", "P1B (B_11)", "P1C (B_12)", "P1D (B_13)", "P1E (B_14)", "P1F (B_15)", "P20 (C_0)", "P21 (C_1)", "P22 (C_2)", "P23 (C_3)", "P24 (C_4)", "P25 (C_5)", "P26 (C_6)", "P27 (C_7)", "P28 (C_8)", "P29 (C_9)", "P2A (C_10)", "P2B (C_11)", "P2C (C_12)", "P2D (C_13)", "P2E (C_14)", "P2F (C_15)", "P30 (D_0)", "P31 (D_1)", "P32 (D_2)", "P33 (D_3)", "P34 (D_4)", "P35 (D_5)", "P36 (D_6)", "P37 (D_7)", "P38 (D_8)", "P39 (D_9)", "P3A (D_10)", "P3B (D_11)", "P3C (D_12)", "P3D (D_13)", "P3E (D_14)", "P3F (D_15)", "P40 (E_0)", "P41 (E_1)", "P42 (E_2)", "P43 (E_3)", "P44 (E_4)", "P45 (E_5)", "P46 (E_6)", "P47 (E_7)", "P48 (E_8)", "P49 (E_9)", "P4A (E_10)", "P4B (E_11)", "P4C (E_12)", "P4D (E_13)", "P4E (E_14)", "P4F (E_15)", "P50 (F_0)", "P51 (F_1)", "P52 (F_2)", "P53 (F_3)", "P54 (F_4)", "P55 (F_5)", "P56 (F_6)", "P57 (F_7)", "P58 (F_8)", "P59 (F_9)", "P5A (F_10)", "P5B (F_11)", "P5C (F_12)", "P5D (F_13)", "P5E (F_14)", "P5F (F_15)", "P70 (G_0)", "P71 (G_1)", "P72 (G_2)", "P73 (G_3)", "P74 (G_4)", "P75 (G_5)", "P76 (G_6)", "P77 (G_7)", "P78 (G_8)", "P79 (G_9)", "P7A (G_10)", "P7B (G_11)", "P7C (G_12)", "P7D (G_13)", "P7E (G_14)", "P7F (G_15)", "PA0 (H_0)", "PA1 (H_1)", "PA2 (H_2)", "PA3 (H_3)", "PA4 (H_4)", "PA5 (H_5)", "PA6 (H_6)", "PA7 (H_7)", "PA8 (H_8)", "PA9 (H_9)", "PAA (H_10)", "PAB (H_11)", "PAC (H_12)", "PAD (H_13)", "PAE (H_14)", "PAF (H_15)", "PB0 (I_0)", "PB1 (I_1)", "PB2 (I_2)", "PB3 (I_3)", "PB4 (I_4)", "PB5 (I_5)", "PB6 (I_6)", "PB7 (I_7)", "PB8 (I_8)", "PB9 (I_9)", "PBA (I_10)", "PBB (I_11)", "PBC (I_12)", "PBD (I_13)", "PBE (I_14)", "PBF (I_15)", "PC0 (J_0)", "PC1 (J_1)", "PC2 (J_2)", "PC3 (J_3)", "PC4 (J_4)", "PC5 (J_5)", "PC6 (J_6)", "PC7 (J_7)", "PC8 (J_8)", "PC9 (J_9)", "PCA (J_10)", "PCB (J_11)", "PCC (J_12)", "PCD (J_13)", "PCE (J_14)", "PCF (J_15)", "PF0 (K_0)", "PF1 (K_1)", "PF2 (K_2)", "PF3 (K_3)", "PF4 (K_4)", "PF5 (K_5)", "PF6 (K_6)", "PF7 (K_7)", "PF8 (K_8)", "PF9 (K_9)", "PFA (K_10)", "PFB (K_11)", "PFC (K_12)", "PFD (K_13)", "PFE (K_14)", "PFF (K_15)", "DRV8860_1", "DRV8860_2", "DRV8860_3", "DRV8860_4", "DRV8860_5", "DRV8860_6", "DRV8860_7", "DRV8860_8", "DRV8860_9", "DRV8860_10", "DRV8860_11", "DRV8860_12", "DRV8860_13", "DRV8860_14", "DRV8860_15", "DRV8860_16" #define tachOutputPin_offset 704 #define tachOutputPinMode_offset 705 @@ -1574,7 +1575,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2021.01.05.hellen_cypress.372768766" +#define TS_SIGNATURE "rusEFI 2021.01.05.hellen_cypress.2103511994" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' // 0x74 @@ -1694,7 +1695,7 @@ #define unusedOldBiquad_offset 2332 #define unusedSpiPadding4_offset 2593 #define unusedSpiPadding5_offset 2715 -#define unusedSpiPadding8_offset 4009 +#define unusedSpiPadding8_offset 4010 #define useAdvanceCorrectionsForCranking_offset 1476 #define useCicPidForIdle_offset 76 #define useConstantDwellDuringCranking_offset 1464 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 e36d02f78e..50e963034f 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 Tue Jan 05 12:58:47 UTC 2021 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Tue Jan 05 21:31:34 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3342,7 +3342,7 @@ struct engine_configuration_s { */ spi_device_e tle6240spiDevice; /** - * Stoichiometric ratio for your primary fuel. + * Stoichiometric ratio for your primary fuel. When Flex Fuel is enabled, this value is used when the Flex Fuel sensor indicates E0. * offset 4005 */ uint8_t stoichRatioPrimary; @@ -3356,9 +3356,14 @@ struct engine_configuration_s { */ spi_device_e mc33972spiDevice; /** + * Stoichiometric ratio for your secondary fuel. This value is used when the Flex Fuel sensor indicates E100. * offset 4009 */ - uint8_t unusedSpiPadding8[3]; + uint8_t stoichRatioSecondary; + /** + * offset 4010 + */ + uint8_t unusedSpiPadding8[2]; /** * ETB idle authority * offset 4012 @@ -3780,4 +3785,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 Tue Jan 05 12:58:47 UTC 2021 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Tue Jan 05 21:31:34 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 bf0204334a..4f4b14e408 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -1243,7 +1243,7 @@ #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD kin #define SIGNATURE_DATE 2021.01.05 -#define SIGNATURE_HASH 1194050820 +#define SIGNATURE_HASH 746402112 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1324,6 +1324,7 @@ #define stft_startupDelay_offset 1071 #define stftIgnoreErrorMagnitude_offset 976 #define stoichRatioPrimary_offset 4005 +#define stoichRatioSecondary_offset 4009 #define switch_input_pin_e_enum "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "N/A", "N/A", "PA10", "PA11", "PA12", "PA13", "N/A", "N/A", "N/A", "N/A", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "N/A", "N/A", "N/A", "N/A", "PB12", "PB13", "N/A", "N/A", "N/A", "N/A", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "N/A", "N/A", "N/A", "N/A", "PC14", "PC15", "PC16", "PC17", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "PD15", "PD16", "N/A", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A" #define tachOutputPin_offset 704 #define tachOutputPinMode_offset 705 @@ -1574,7 +1575,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator true #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2021.01.05.kin.1194050820" +#define TS_SIGNATURE "rusEFI 2021.01.05.kin.746402112" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' // 0x74 @@ -1694,7 +1695,7 @@ #define unusedOldBiquad_offset 2332 #define unusedSpiPadding4_offset 2593 #define unusedSpiPadding5_offset 2715 -#define unusedSpiPadding8_offset 4009 +#define unusedSpiPadding8_offset 4010 #define useAdvanceCorrectionsForCranking_offset 1476 #define useCicPidForIdle_offset 76 #define useConstantDwellDuringCranking_offset 1464 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures.h b/firmware/controllers/generated/engine_configuration_generated_structures.h index 55858b1cce..b5be774e24 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 Tue Jan 05 12:58:32 UTC 2021 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jan 05 21:31:17 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3342,7 +3342,7 @@ struct engine_configuration_s { */ spi_device_e tle6240spiDevice; /** - * Stoichiometric ratio for your primary fuel. + * Stoichiometric ratio for your primary fuel. When Flex Fuel is enabled, this value is used when the Flex Fuel sensor indicates E0. * offset 4005 */ uint8_t stoichRatioPrimary; @@ -3356,9 +3356,14 @@ struct engine_configuration_s { */ spi_device_e mc33972spiDevice; /** + * Stoichiometric ratio for your secondary fuel. This value is used when the Flex Fuel sensor indicates E100. * offset 4009 */ - uint8_t unusedSpiPadding8[3]; + uint8_t stoichRatioSecondary; + /** + * offset 4010 + */ + uint8_t unusedSpiPadding8[2]; /** * ETB idle authority * offset 4012 @@ -3780,4 +3785,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 Tue Jan 05 12:58:32 UTC 2021 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jan 05 21:31:17 UTC 2021 diff --git a/firmware/controllers/generated/fsio_enums_generated.def b/firmware/controllers/generated/fsio_enums_generated.def index c9a315caf9..0e9f51125a 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 Tue Jan 05 12:58:32 UTC 2021 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jan 05 21:31:17 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 5ab2ac3dab..22e57c43ee 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 Tue Jan 05 12:58:32 UTC 2021 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jan 05 21:31:17 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 969418841b..c23b118c68 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 Tue Jan 05 12:58:32 UTC 2021 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jan 05 21:31:17 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 74c642b8cc..19f468fd90 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 Tue Jan 05 12:58:32 UTC 2021 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jan 05 21:31:17 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 345560f5ff..5926116061 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -1243,7 +1243,7 @@ #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD all #define SIGNATURE_DATE 2021.01.05 -#define SIGNATURE_HASH 3754318141 +#define SIGNATURE_HASH 3029380473 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1324,6 +1324,7 @@ #define stft_startupDelay_offset 1071 #define stftIgnoreErrorMagnitude_offset 976 #define stoichRatioPrimary_offset 4005 +#define stoichRatioSecondary_offset 4009 #define switch_input_pin_e_enum "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" #define tachOutputPin_offset 704 #define tachOutputPinMode_offset 705 @@ -1574,7 +1575,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2021.01.05.all.3754318141" +#define TS_SIGNATURE "rusEFI 2021.01.05.all.3029380473" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' // 0x74 @@ -1694,7 +1695,7 @@ #define unusedOldBiquad_offset 2332 #define unusedSpiPadding4_offset 2593 #define unusedSpiPadding5_offset 2715 -#define unusedSpiPadding8_offset 4009 +#define unusedSpiPadding8_offset 4010 #define useAdvanceCorrectionsForCranking_offset 1476 #define useCicPidForIdle_offset 76 #define useConstantDwellDuringCranking_offset 1464 diff --git a/firmware/controllers/generated/signature_all.h b/firmware/controllers/generated/signature_all.h index 093a000bda..047d304d56 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.05 -#define SIGNATURE_HASH 3754318141 -#define TS_SIGNATURE "rusEFI 2021.01.05.all.3754318141" +#define SIGNATURE_HASH 3029380473 +#define TS_SIGNATURE "rusEFI 2021.01.05.all.3029380473" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index 7bf0d27647..4420b379de 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.05 -#define SIGNATURE_HASH 1236723910 -#define TS_SIGNATURE "rusEFI 2021.01.05.frankenso_na6.1236723910" +#define SIGNATURE_HASH 585112706 +#define TS_SIGNATURE "rusEFI 2021.01.05.frankenso_na6.585112706" diff --git a/firmware/controllers/generated/signature_hellen_cypress.h b/firmware/controllers/generated/signature_hellen_cypress.h index 7d28e817d6..0147a537fc 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.05 -#define SIGNATURE_HASH 372768766 -#define TS_SIGNATURE "rusEFI 2021.01.05.hellen_cypress.372768766" +#define SIGNATURE_HASH 2103511994 +#define TS_SIGNATURE "rusEFI 2021.01.05.hellen_cypress.2103511994" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index b845bc8ba0..6448f56753 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.05 -#define SIGNATURE_HASH 1194050820 -#define TS_SIGNATURE "rusEFI 2021.01.05.kin.1194050820" +#define SIGNATURE_HASH 746402112 +#define TS_SIGNATURE "rusEFI 2021.01.05.kin.746402112" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index 2656970d6a..961b1149e6 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.05 -#define SIGNATURE_HASH 3356919620 -#define TS_SIGNATURE "rusEFI 2021.01.05.mre_f4.3356919620" +#define SIGNATURE_HASH 2738909952 +#define TS_SIGNATURE "rusEFI 2021.01.05.mre_f4.2738909952" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index aa66f54eab..2faf017c23 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.05 -#define SIGNATURE_HASH 3356919620 -#define TS_SIGNATURE "rusEFI 2021.01.05.mre_f7.3356919620" +#define SIGNATURE_HASH 2738909952 +#define TS_SIGNATURE "rusEFI 2021.01.05.mre_f7.2738909952" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index 7103a22e82..ea837b8f1c 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.05 -#define SIGNATURE_HASH 2636013420 -#define TS_SIGNATURE "rusEFI 2021.01.05.prometheus_405.2636013420" +#define SIGNATURE_HASH 4131957544 +#define TS_SIGNATURE "rusEFI 2021.01.05.prometheus_405.4131957544" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index d391245091..58ebd47cbe 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.05 -#define SIGNATURE_HASH 2636013420 -#define TS_SIGNATURE "rusEFI 2021.01.05.prometheus_469.2636013420" +#define SIGNATURE_HASH 4131957544 +#define TS_SIGNATURE "rusEFI 2021.01.05.prometheus_469.4131957544" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index 3d1a3ab92f..4763e3e109 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.05 -#define SIGNATURE_HASH 376181731 -#define TS_SIGNATURE "rusEFI 2021.01.05.proteus_f4.376181731" +#define SIGNATURE_HASH 2101012391 +#define TS_SIGNATURE "rusEFI 2021.01.05.proteus_f4.2101012391" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index 8970fe17dd..e7d4c346f5 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.05 -#define SIGNATURE_HASH 376181731 -#define TS_SIGNATURE "rusEFI 2021.01.05.proteus_f7.376181731" +#define SIGNATURE_HASH 2101012391 +#define TS_SIGNATURE "rusEFI 2021.01.05.proteus_f7.2101012391" diff --git a/firmware/tunerstudio/generated/cache.zip b/firmware/tunerstudio/generated/cache.zip index df99d46782..5a5fa4e841 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 332b62e443..ad022e02a3 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.05.all.3754318141" + signature = "rusEFI 2021.01.05.all.3029380473" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.01.05.all.3754318141" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.01.05.all.3029380473" ; 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 Tue Jan 05 12:58:32 UTC 2021 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jan 05 21:31:17 UTC 2021 pageSize = 20000 page = 1 @@ -1099,7 +1099,8 @@ page = 1 stoichRatioPrimary = scalar, U08, 4005, ":1", 0.1,0, 5, 25.0, 1 idlerpmpid_iTermMax = scalar, S16, 4006, "", 1.0, 0, -30000, 30000.0, 0 mc33972spiDevice = bits,U32, 4008, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4", "INVALID", "INVALID", "INVALID" - unusedSpiPadding8 = array, U08, 4009, [3], "units", 1.0, 0, -20, 100, 0 + stoichRatioSecondary = scalar, U08, 4009, ":1", 0.1,0, 5, 25.0, 1 + unusedSpiPadding8 = array, U08, 4010, [2], "units", 1.0, 0, -20, 100, 0 etbIdleThrottleRange = scalar, F32, 4012, "%", 1.0, 0, 0, 15, 0 cylinderBankSelect1 = scalar, U08, 4016, "", 1.0, 1, 1, 2, 0 cylinderBankSelect2 = scalar, U08, 4017, "", 1.0, 1, 1, 2, 0 @@ -1445,7 +1446,8 @@ page = 1 idlePidFalloffDeltaRpm = "Taper out idle timing control over this range as the engine leaves idle conditions" tpsAccelFractionPeriod = "A delay in cycles between fuel-enrich. portions" tpsAccelFractionDivisor = "A fraction divisor: 1 or less = entire portion at once, or split into diminishing fractions" - stoichRatioPrimary = "Stoichiometric ratio for your primary fuel." + stoichRatioPrimary = "Stoichiometric ratio for your primary fuel. When Flex Fuel is enabled, this value is used when the Flex Fuel sensor indicates E0." + stoichRatioSecondary = "Stoichiometric ratio for your secondary fuel. This value is used when the Flex Fuel sensor indicates E100." cylinderBankSelect1 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" cylinderBankSelect2 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" cylinderBankSelect3 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" @@ -3225,7 +3227,8 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Injector reference pressure", fuelReferencePressure, { isInjectionEnabled && injectorCompensationMode != 0 } dialog = fuelParams, "Fuel characteristics", yAxis - field = "Stoichiometric ratio", stoichRatioPrimary, {isInjectionEnabled == 1} + field = "Stoichiometric ratio", stoichRatioPrimary, {isInjectionEnabled == 1} + field = "E100 stoichiometric ratio", stoichRatioSecondary, {isInjectionEnabled == 1 && flexSensorPin != 0 } dialog = injectorOutputSettings, "Injector Outputs", yAxis field = "Use only first half of pins for batch mode" diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index 63e95bb11a..798ea00cb9 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.05.frankenso_na6.1236723910" + signature = "rusEFI 2021.01.05.frankenso_na6.585112706" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.01.05.frankenso_na6.1236723910" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.01.05.frankenso_na6.585112706" ; 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 Tue Jan 05 12:58:38 UTC 2021 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jan 05 21:31:24 UTC 2021 pageSize = 20000 page = 1 @@ -1099,7 +1099,8 @@ page = 1 stoichRatioPrimary = scalar, U08, 4005, ":1", 0.1,0, 5, 25.0, 1 idlerpmpid_iTermMax = scalar, S16, 4006, "", 1.0, 0, -30000, 30000.0, 0 mc33972spiDevice = bits,U32, 4008, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4", "INVALID", "INVALID", "INVALID" - unusedSpiPadding8 = array, U08, 4009, [3], "units", 1.0, 0, -20, 100, 0 + stoichRatioSecondary = scalar, U08, 4009, ":1", 0.1,0, 5, 25.0, 1 + unusedSpiPadding8 = array, U08, 4010, [2], "units", 1.0, 0, -20, 100, 0 etbIdleThrottleRange = scalar, F32, 4012, "%", 1.0, 0, 0, 15, 0 cylinderBankSelect1 = scalar, U08, 4016, "", 1.0, 1, 1, 2, 0 cylinderBankSelect2 = scalar, U08, 4017, "", 1.0, 1, 1, 2, 0 @@ -1445,7 +1446,8 @@ page = 1 idlePidFalloffDeltaRpm = "Taper out idle timing control over this range as the engine leaves idle conditions" tpsAccelFractionPeriod = "A delay in cycles between fuel-enrich. portions" tpsAccelFractionDivisor = "A fraction divisor: 1 or less = entire portion at once, or split into diminishing fractions" - stoichRatioPrimary = "Stoichiometric ratio for your primary fuel." + stoichRatioPrimary = "Stoichiometric ratio for your primary fuel. When Flex Fuel is enabled, this value is used when the Flex Fuel sensor indicates E0." + stoichRatioSecondary = "Stoichiometric ratio for your secondary fuel. This value is used when the Flex Fuel sensor indicates E100." cylinderBankSelect1 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" cylinderBankSelect2 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" cylinderBankSelect3 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" @@ -3225,7 +3227,8 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Injector reference pressure", fuelReferencePressure, { isInjectionEnabled && injectorCompensationMode != 0 } dialog = fuelParams, "Fuel characteristics", yAxis - field = "Stoichiometric ratio", stoichRatioPrimary, {isInjectionEnabled == 1} + field = "Stoichiometric ratio", stoichRatioPrimary, {isInjectionEnabled == 1} + field = "E100 stoichiometric ratio", stoichRatioSecondary, {isInjectionEnabled == 1 && flexSensorPin != 0 } dialog = injectorOutputSettings, "Injector Outputs", yAxis field = "Use only first half of pins for batch mode" diff --git a/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini b/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini index 8a5cb22147..4ec7d67abd 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.05.hellen_cypress.372768766" + signature = "rusEFI 2021.01.05.hellen_cypress.2103511994" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.01.05.hellen_cypress.372768766" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.01.05.hellen_cypress.2103511994" ; 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 Tue Jan 05 12:58:50 UTC 2021 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Tue Jan 05 21:31:36 UTC 2021 pageSize = 20000 page = 1 @@ -1099,7 +1099,8 @@ page = 1 stoichRatioPrimary = scalar, U08, 4005, ":1", 0.1,0, 5, 25.0, 1 idlerpmpid_iTermMax = scalar, S16, 4006, "", 1.0, 0, -30000, 30000.0, 0 mc33972spiDevice = bits,U32, 4008, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4", "INVALID", "INVALID", "INVALID" - unusedSpiPadding8 = array, U08, 4009, [3], "units", 1.0, 0, -20, 100, 0 + stoichRatioSecondary = scalar, U08, 4009, ":1", 0.1,0, 5, 25.0, 1 + unusedSpiPadding8 = array, U08, 4010, [2], "units", 1.0, 0, -20, 100, 0 etbIdleThrottleRange = scalar, F32, 4012, "%", 1.0, 0, 0, 15, 0 cylinderBankSelect1 = scalar, U08, 4016, "", 1.0, 1, 1, 2, 0 cylinderBankSelect2 = scalar, U08, 4017, "", 1.0, 1, 1, 2, 0 @@ -1445,7 +1446,8 @@ page = 1 idlePidFalloffDeltaRpm = "Taper out idle timing control over this range as the engine leaves idle conditions" tpsAccelFractionPeriod = "A delay in cycles between fuel-enrich. portions" tpsAccelFractionDivisor = "A fraction divisor: 1 or less = entire portion at once, or split into diminishing fractions" - stoichRatioPrimary = "Stoichiometric ratio for your primary fuel." + stoichRatioPrimary = "Stoichiometric ratio for your primary fuel. When Flex Fuel is enabled, this value is used when the Flex Fuel sensor indicates E0." + stoichRatioSecondary = "Stoichiometric ratio for your secondary fuel. This value is used when the Flex Fuel sensor indicates E100." cylinderBankSelect1 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" cylinderBankSelect2 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" cylinderBankSelect3 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" @@ -3225,7 +3227,8 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Injector reference pressure", fuelReferencePressure, { isInjectionEnabled && injectorCompensationMode != 0 } dialog = fuelParams, "Fuel characteristics", yAxis - field = "Stoichiometric ratio", stoichRatioPrimary, {isInjectionEnabled == 1} + field = "Stoichiometric ratio", stoichRatioPrimary, {isInjectionEnabled == 1} + field = "E100 stoichiometric ratio", stoichRatioSecondary, {isInjectionEnabled == 1 && flexSensorPin != 0 } dialog = injectorOutputSettings, "Injector Outputs", yAxis field = "Use only first half of pins for batch mode" diff --git a/firmware/tunerstudio/generated/rusefi_kinetis.ini b/firmware/tunerstudio/generated/rusefi_kinetis.ini index bae1adca0b..cfdac80d3f 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.05.kin.1194050820" + signature = "rusEFI 2021.01.05.kin.746402112" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.01.05.kin.1194050820" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.01.05.kin.746402112" ; 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 Tue Jan 05 12:58:47 UTC 2021 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Tue Jan 05 21:31:34 UTC 2021 pageSize = 20000 page = 1 @@ -1099,7 +1099,8 @@ page = 1 stoichRatioPrimary = scalar, U08, 4005, ":1", 0.1,0, 5, 25.0, 1 idlerpmpid_iTermMax = scalar, S16, 4006, "", 1.0, 0, -30000, 30000.0, 0 mc33972spiDevice = bits,U32, 4008, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4", "INVALID", "INVALID", "INVALID" - unusedSpiPadding8 = array, U08, 4009, [3], "units", 1.0, 0, -20, 100, 0 + stoichRatioSecondary = scalar, U08, 4009, ":1", 0.1,0, 5, 25.0, 1 + unusedSpiPadding8 = array, U08, 4010, [2], "units", 1.0, 0, -20, 100, 0 etbIdleThrottleRange = scalar, F32, 4012, "%", 1.0, 0, 0, 15, 0 cylinderBankSelect1 = scalar, U08, 4016, "", 1.0, 1, 1, 2, 0 cylinderBankSelect2 = scalar, U08, 4017, "", 1.0, 1, 1, 2, 0 @@ -1445,7 +1446,8 @@ page = 1 idlePidFalloffDeltaRpm = "Taper out idle timing control over this range as the engine leaves idle conditions" tpsAccelFractionPeriod = "A delay in cycles between fuel-enrich. portions" tpsAccelFractionDivisor = "A fraction divisor: 1 or less = entire portion at once, or split into diminishing fractions" - stoichRatioPrimary = "Stoichiometric ratio for your primary fuel." + stoichRatioPrimary = "Stoichiometric ratio for your primary fuel. When Flex Fuel is enabled, this value is used when the Flex Fuel sensor indicates E0." + stoichRatioSecondary = "Stoichiometric ratio for your secondary fuel. This value is used when the Flex Fuel sensor indicates E100." cylinderBankSelect1 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" cylinderBankSelect2 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" cylinderBankSelect3 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" @@ -3226,7 +3228,8 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Injector reference pressure", fuelReferencePressure, { isInjectionEnabled && injectorCompensationMode != 0 } dialog = fuelParams, "Fuel characteristics", yAxis - field = "Stoichiometric ratio", stoichRatioPrimary, {isInjectionEnabled == 1} + field = "Stoichiometric ratio", stoichRatioPrimary, {isInjectionEnabled == 1} + field = "E100 stoichiometric ratio", stoichRatioSecondary, {isInjectionEnabled == 1 && flexSensorPin != 0 } dialog = injectorOutputSettings, "Injector Outputs", yAxis field = "Use only first half of pins for batch mode" diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index 145457227a..bf4260a01d 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.05.mre_f4.3356919620" + signature = "rusEFI 2021.01.05.mre_f4.2738909952" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.01.05.mre_f4.3356919620" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.01.05.mre_f4.2738909952" ; 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 Tue Jan 05 12:58:36 UTC 2021 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jan 05 21:31:22 UTC 2021 pageSize = 20000 page = 1 @@ -1099,7 +1099,8 @@ page = 1 stoichRatioPrimary = scalar, U08, 4005, ":1", 0.1,0, 5, 25.0, 1 idlerpmpid_iTermMax = scalar, S16, 4006, "", 1.0, 0, -30000, 30000.0, 0 mc33972spiDevice = bits,U32, 4008, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4", "INVALID", "INVALID", "INVALID" - unusedSpiPadding8 = array, U08, 4009, [3], "units", 1.0, 0, -20, 100, 0 + stoichRatioSecondary = scalar, U08, 4009, ":1", 0.1,0, 5, 25.0, 1 + unusedSpiPadding8 = array, U08, 4010, [2], "units", 1.0, 0, -20, 100, 0 etbIdleThrottleRange = scalar, F32, 4012, "%", 1.0, 0, 0, 15, 0 cylinderBankSelect1 = scalar, U08, 4016, "", 1.0, 1, 1, 2, 0 cylinderBankSelect2 = scalar, U08, 4017, "", 1.0, 1, 1, 2, 0 @@ -1445,7 +1446,8 @@ page = 1 idlePidFalloffDeltaRpm = "Taper out idle timing control over this range as the engine leaves idle conditions" tpsAccelFractionPeriod = "A delay in cycles between fuel-enrich. portions" tpsAccelFractionDivisor = "A fraction divisor: 1 or less = entire portion at once, or split into diminishing fractions" - stoichRatioPrimary = "Stoichiometric ratio for your primary fuel." + stoichRatioPrimary = "Stoichiometric ratio for your primary fuel. When Flex Fuel is enabled, this value is used when the Flex Fuel sensor indicates E0." + stoichRatioSecondary = "Stoichiometric ratio for your secondary fuel. This value is used when the Flex Fuel sensor indicates E100." cylinderBankSelect1 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" cylinderBankSelect2 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" cylinderBankSelect3 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" @@ -3221,7 +3223,8 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Injector reference pressure", fuelReferencePressure, { isInjectionEnabled && injectorCompensationMode != 0 } dialog = fuelParams, "Fuel characteristics", yAxis - field = "Stoichiometric ratio", stoichRatioPrimary, {isInjectionEnabled == 1} + field = "Stoichiometric ratio", stoichRatioPrimary, {isInjectionEnabled == 1} + field = "E100 stoichiometric ratio", stoichRatioSecondary, {isInjectionEnabled == 1 && flexSensorPin != 0 } dialog = injectorOutputSettings, "Injector Outputs", yAxis field = "Use only first half of pins for batch mode" diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index eb1ce7773a..cd6f98434c 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.05.mre_f7.3356919620" + signature = "rusEFI 2021.01.05.mre_f7.2738909952" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.01.05.mre_f7.3356919620" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.01.05.mre_f7.2738909952" ; 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 Tue Jan 05 12:58:34 UTC 2021 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jan 05 21:31:20 UTC 2021 pageSize = 20000 page = 1 @@ -1099,7 +1099,8 @@ page = 1 stoichRatioPrimary = scalar, U08, 4005, ":1", 0.1,0, 5, 25.0, 1 idlerpmpid_iTermMax = scalar, S16, 4006, "", 1.0, 0, -30000, 30000.0, 0 mc33972spiDevice = bits,U32, 4008, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4", "INVALID", "INVALID", "INVALID" - unusedSpiPadding8 = array, U08, 4009, [3], "units", 1.0, 0, -20, 100, 0 + stoichRatioSecondary = scalar, U08, 4009, ":1", 0.1,0, 5, 25.0, 1 + unusedSpiPadding8 = array, U08, 4010, [2], "units", 1.0, 0, -20, 100, 0 etbIdleThrottleRange = scalar, F32, 4012, "%", 1.0, 0, 0, 15, 0 cylinderBankSelect1 = scalar, U08, 4016, "", 1.0, 1, 1, 2, 0 cylinderBankSelect2 = scalar, U08, 4017, "", 1.0, 1, 1, 2, 0 @@ -1445,7 +1446,8 @@ page = 1 idlePidFalloffDeltaRpm = "Taper out idle timing control over this range as the engine leaves idle conditions" tpsAccelFractionPeriod = "A delay in cycles between fuel-enrich. portions" tpsAccelFractionDivisor = "A fraction divisor: 1 or less = entire portion at once, or split into diminishing fractions" - stoichRatioPrimary = "Stoichiometric ratio for your primary fuel." + stoichRatioPrimary = "Stoichiometric ratio for your primary fuel. When Flex Fuel is enabled, this value is used when the Flex Fuel sensor indicates E0." + stoichRatioSecondary = "Stoichiometric ratio for your secondary fuel. This value is used when the Flex Fuel sensor indicates E100." cylinderBankSelect1 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" cylinderBankSelect2 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" cylinderBankSelect3 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" @@ -3221,7 +3223,8 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Injector reference pressure", fuelReferencePressure, { isInjectionEnabled && injectorCompensationMode != 0 } dialog = fuelParams, "Fuel characteristics", yAxis - field = "Stoichiometric ratio", stoichRatioPrimary, {isInjectionEnabled == 1} + field = "Stoichiometric ratio", stoichRatioPrimary, {isInjectionEnabled == 1} + field = "E100 stoichiometric ratio", stoichRatioSecondary, {isInjectionEnabled == 1 && flexSensorPin != 0 } dialog = injectorOutputSettings, "Injector Outputs", yAxis field = "Use only first half of pins for batch mode" diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index 54e242eb6f..a0977259e8 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.05.prometheus_405.2636013420" + signature = "rusEFI 2021.01.05.prometheus_405.4131957544" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.01.05.prometheus_405.2636013420" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.01.05.prometheus_405.4131957544" ; 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 Tue Jan 05 12:58:42 UTC 2021 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jan 05 21:31:28 UTC 2021 pageSize = 20000 page = 1 @@ -1099,7 +1099,8 @@ page = 1 stoichRatioPrimary = scalar, U08, 4005, ":1", 0.1,0, 5, 25.0, 1 idlerpmpid_iTermMax = scalar, S16, 4006, "", 1.0, 0, -30000, 30000.0, 0 mc33972spiDevice = bits,U32, 4008, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4", "INVALID", "INVALID", "INVALID" - unusedSpiPadding8 = array, U08, 4009, [3], "units", 1.0, 0, -20, 100, 0 + stoichRatioSecondary = scalar, U08, 4009, ":1", 0.1,0, 5, 25.0, 1 + unusedSpiPadding8 = array, U08, 4010, [2], "units", 1.0, 0, -20, 100, 0 etbIdleThrottleRange = scalar, F32, 4012, "%", 1.0, 0, 0, 15, 0 cylinderBankSelect1 = scalar, U08, 4016, "", 1.0, 1, 1, 2, 0 cylinderBankSelect2 = scalar, U08, 4017, "", 1.0, 1, 1, 2, 0 @@ -1445,7 +1446,8 @@ page = 1 idlePidFalloffDeltaRpm = "Taper out idle timing control over this range as the engine leaves idle conditions" tpsAccelFractionPeriod = "A delay in cycles between fuel-enrich. portions" tpsAccelFractionDivisor = "A fraction divisor: 1 or less = entire portion at once, or split into diminishing fractions" - stoichRatioPrimary = "Stoichiometric ratio for your primary fuel." + stoichRatioPrimary = "Stoichiometric ratio for your primary fuel. When Flex Fuel is enabled, this value is used when the Flex Fuel sensor indicates E0." + stoichRatioSecondary = "Stoichiometric ratio for your secondary fuel. This value is used when the Flex Fuel sensor indicates E100." cylinderBankSelect1 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" cylinderBankSelect2 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" cylinderBankSelect3 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" @@ -3221,7 +3223,8 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Injector reference pressure", fuelReferencePressure, { isInjectionEnabled && injectorCompensationMode != 0 } dialog = fuelParams, "Fuel characteristics", yAxis - field = "Stoichiometric ratio", stoichRatioPrimary, {isInjectionEnabled == 1} + field = "Stoichiometric ratio", stoichRatioPrimary, {isInjectionEnabled == 1} + field = "E100 stoichiometric ratio", stoichRatioSecondary, {isInjectionEnabled == 1 && flexSensorPin != 0 } dialog = injectorOutputSettings, "Injector Outputs", yAxis field = "Use only first half of pins for batch mode" diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index f37860c34f..97419efe31 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.05.prometheus_469.2636013420" + signature = "rusEFI 2021.01.05.prometheus_469.4131957544" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.01.05.prometheus_469.2636013420" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.01.05.prometheus_469.4131957544" ; 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 Tue Jan 05 12:58:40 UTC 2021 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jan 05 21:31:26 UTC 2021 pageSize = 20000 page = 1 @@ -1099,7 +1099,8 @@ page = 1 stoichRatioPrimary = scalar, U08, 4005, ":1", 0.1,0, 5, 25.0, 1 idlerpmpid_iTermMax = scalar, S16, 4006, "", 1.0, 0, -30000, 30000.0, 0 mc33972spiDevice = bits,U32, 4008, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4", "INVALID", "INVALID", "INVALID" - unusedSpiPadding8 = array, U08, 4009, [3], "units", 1.0, 0, -20, 100, 0 + stoichRatioSecondary = scalar, U08, 4009, ":1", 0.1,0, 5, 25.0, 1 + unusedSpiPadding8 = array, U08, 4010, [2], "units", 1.0, 0, -20, 100, 0 etbIdleThrottleRange = scalar, F32, 4012, "%", 1.0, 0, 0, 15, 0 cylinderBankSelect1 = scalar, U08, 4016, "", 1.0, 1, 1, 2, 0 cylinderBankSelect2 = scalar, U08, 4017, "", 1.0, 1, 1, 2, 0 @@ -1445,7 +1446,8 @@ page = 1 idlePidFalloffDeltaRpm = "Taper out idle timing control over this range as the engine leaves idle conditions" tpsAccelFractionPeriod = "A delay in cycles between fuel-enrich. portions" tpsAccelFractionDivisor = "A fraction divisor: 1 or less = entire portion at once, or split into diminishing fractions" - stoichRatioPrimary = "Stoichiometric ratio for your primary fuel." + stoichRatioPrimary = "Stoichiometric ratio for your primary fuel. When Flex Fuel is enabled, this value is used when the Flex Fuel sensor indicates E0." + stoichRatioSecondary = "Stoichiometric ratio for your secondary fuel. This value is used when the Flex Fuel sensor indicates E100." cylinderBankSelect1 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" cylinderBankSelect2 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" cylinderBankSelect3 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" @@ -3221,7 +3223,8 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Injector reference pressure", fuelReferencePressure, { isInjectionEnabled && injectorCompensationMode != 0 } dialog = fuelParams, "Fuel characteristics", yAxis - field = "Stoichiometric ratio", stoichRatioPrimary, {isInjectionEnabled == 1} + field = "Stoichiometric ratio", stoichRatioPrimary, {isInjectionEnabled == 1} + field = "E100 stoichiometric ratio", stoichRatioSecondary, {isInjectionEnabled == 1 && flexSensorPin != 0 } dialog = injectorOutputSettings, "Injector Outputs", yAxis field = "Use only first half of pins for batch mode" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index 6b4194b4b2..bbb61cf7a8 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.05.proteus_f4.376181731" + signature = "rusEFI 2021.01.05.proteus_f4.2101012391" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.01.05.proteus_f4.376181731" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.01.05.proteus_f4.2101012391" ; 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 Tue Jan 05 12:58:45 UTC 2021 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jan 05 21:31:33 UTC 2021 pageSize = 20000 page = 1 @@ -1099,7 +1099,8 @@ page = 1 stoichRatioPrimary = scalar, U08, 4005, ":1", 0.1,0, 5, 25.0, 1 idlerpmpid_iTermMax = scalar, S16, 4006, "", 1.0, 0, -30000, 30000.0, 0 mc33972spiDevice = bits,U32, 4008, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4", "INVALID", "INVALID", "INVALID" - unusedSpiPadding8 = array, U08, 4009, [3], "units", 1.0, 0, -20, 100, 0 + stoichRatioSecondary = scalar, U08, 4009, ":1", 0.1,0, 5, 25.0, 1 + unusedSpiPadding8 = array, U08, 4010, [2], "units", 1.0, 0, -20, 100, 0 etbIdleThrottleRange = scalar, F32, 4012, "%", 1.0, 0, 0, 15, 0 cylinderBankSelect1 = scalar, U08, 4016, "", 1.0, 1, 1, 2, 0 cylinderBankSelect2 = scalar, U08, 4017, "", 1.0, 1, 1, 2, 0 @@ -1445,7 +1446,8 @@ page = 1 idlePidFalloffDeltaRpm = "Taper out idle timing control over this range as the engine leaves idle conditions" tpsAccelFractionPeriod = "A delay in cycles between fuel-enrich. portions" tpsAccelFractionDivisor = "A fraction divisor: 1 or less = entire portion at once, or split into diminishing fractions" - stoichRatioPrimary = "Stoichiometric ratio for your primary fuel." + stoichRatioPrimary = "Stoichiometric ratio for your primary fuel. When Flex Fuel is enabled, this value is used when the Flex Fuel sensor indicates E0." + stoichRatioSecondary = "Stoichiometric ratio for your secondary fuel. This value is used when the Flex Fuel sensor indicates E100." cylinderBankSelect1 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" cylinderBankSelect2 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" cylinderBankSelect3 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" @@ -3217,7 +3219,8 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Injector reference pressure", fuelReferencePressure, { isInjectionEnabled && injectorCompensationMode != 0 } dialog = fuelParams, "Fuel characteristics", yAxis - field = "Stoichiometric ratio", stoichRatioPrimary, {isInjectionEnabled == 1} + field = "Stoichiometric ratio", stoichRatioPrimary, {isInjectionEnabled == 1} + field = "E100 stoichiometric ratio", stoichRatioSecondary, {isInjectionEnabled == 1 && flexSensorPin != 0 } dialog = injectorOutputSettings, "Injector Outputs", yAxis field = "Use only first half of pins for batch mode" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index 4addeff6da..bc4a0523af 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.05.proteus_f7.376181731" + signature = "rusEFI 2021.01.05.proteus_f7.2101012391" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.01.05.proteus_f7.376181731" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.01.05.proteus_f7.2101012391" ; 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 Tue Jan 05 12:58:43 UTC 2021 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jan 05 21:31:30 UTC 2021 pageSize = 20000 page = 1 @@ -1099,7 +1099,8 @@ page = 1 stoichRatioPrimary = scalar, U08, 4005, ":1", 0.1,0, 5, 25.0, 1 idlerpmpid_iTermMax = scalar, S16, 4006, "", 1.0, 0, -30000, 30000.0, 0 mc33972spiDevice = bits,U32, 4008, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4", "INVALID", "INVALID", "INVALID" - unusedSpiPadding8 = array, U08, 4009, [3], "units", 1.0, 0, -20, 100, 0 + stoichRatioSecondary = scalar, U08, 4009, ":1", 0.1,0, 5, 25.0, 1 + unusedSpiPadding8 = array, U08, 4010, [2], "units", 1.0, 0, -20, 100, 0 etbIdleThrottleRange = scalar, F32, 4012, "%", 1.0, 0, 0, 15, 0 cylinderBankSelect1 = scalar, U08, 4016, "", 1.0, 1, 1, 2, 0 cylinderBankSelect2 = scalar, U08, 4017, "", 1.0, 1, 1, 2, 0 @@ -1445,7 +1446,8 @@ page = 1 idlePidFalloffDeltaRpm = "Taper out idle timing control over this range as the engine leaves idle conditions" tpsAccelFractionPeriod = "A delay in cycles between fuel-enrich. portions" tpsAccelFractionDivisor = "A fraction divisor: 1 or less = entire portion at once, or split into diminishing fractions" - stoichRatioPrimary = "Stoichiometric ratio for your primary fuel." + stoichRatioPrimary = "Stoichiometric ratio for your primary fuel. When Flex Fuel is enabled, this value is used when the Flex Fuel sensor indicates E0." + stoichRatioSecondary = "Stoichiometric ratio for your secondary fuel. This value is used when the Flex Fuel sensor indicates E100." cylinderBankSelect1 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" cylinderBankSelect2 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" cylinderBankSelect3 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" @@ -3217,7 +3219,8 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Injector reference pressure", fuelReferencePressure, { isInjectionEnabled && injectorCompensationMode != 0 } dialog = fuelParams, "Fuel characteristics", yAxis - field = "Stoichiometric ratio", stoichRatioPrimary, {isInjectionEnabled == 1} + field = "Stoichiometric ratio", stoichRatioPrimary, {isInjectionEnabled == 1} + field = "E100 stoichiometric ratio", stoichRatioSecondary, {isInjectionEnabled == 1 && flexSensorPin != 0 } dialog = injectorOutputSettings, "Injector Outputs", yAxis field = "Use only first half of pins for batch mode" 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 5c6703d960..68b5b9c4e2 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 Tue Jan 05 12:58:32 UTC 2021 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jan 05 21:31:17 UTC 2021 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -1276,6 +1276,7 @@ public class Fields { public static final int stft_startupDelay_offset = 1071; public static final int stftIgnoreErrorMagnitude_offset = 976; public static final int stoichRatioPrimary_offset = 4005; + public static final int stoichRatioSecondary_offset = 4009; public static final int tachOutputPin_offset = 704; public static final int tachOutputPinMode_offset = 705; public static final int tachPulseDuractionMs_offset = 1704; @@ -1477,7 +1478,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.05.all.3754318141"; + public static final String TS_SIGNATURE = "rusEFI 2021.01.05.all.3029380473"; 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; @@ -1594,7 +1595,7 @@ public class Fields { public static final int unusedOldBiquad_offset = 2332; public static final int unusedSpiPadding4_offset = 2593; public static final int unusedSpiPadding5_offset = 2715; - public static final int unusedSpiPadding8_offset = 4009; + public static final int unusedSpiPadding8_offset = 4010; public static final int useAdvanceCorrectionsForCranking_offset = 1476; public static final int useCicPidForIdle_offset = 76; public static final int useConstantDwellDuringCranking_offset = 1464; @@ -2646,6 +2647,7 @@ public class Fields { public static final Field STOICHRATIOPRIMARY = Field.create("STOICHRATIOPRIMARY", 4005, FieldType.INT8); public static final Field IDLERPMPID_ITERMMAX = Field.create("IDLERPMPID_ITERMMAX", 4006, FieldType.INT16); public static final Field MC33972SPIDEVICE = Field.create("MC33972SPIDEVICE", 4008, FieldType.INT8); + public static final Field STOICHRATIOSECONDARY = Field.create("STOICHRATIOSECONDARY", 4009, FieldType.INT8); public static final Field ETBIDLETHROTTLERANGE = Field.create("ETBIDLETHROTTLERANGE", 4012, FieldType.FLOAT); public static final Field CYLINDERBANKSELECT1 = Field.create("CYLINDERBANKSELECT1", 4016, FieldType.INT8); public static final Field CYLINDERBANKSELECT2 = Field.create("CYLINDERBANKSELECT2", 4017, FieldType.INT8); @@ -3722,6 +3724,7 @@ public class Fields { STOICHRATIOPRIMARY, IDLERPMPID_ITERMMAX, MC33972SPIDEVICE, + STOICHRATIOSECONDARY, ETBIDLETHROTTLERANGE, CYLINDERBANKSELECT1, CYLINDERBANKSELECT2, diff --git a/java_console/rusefi.xml b/java_console/rusefi.xml index 2f6f32480c..04ecaff6b0 100644 --- a/java_console/rusefi.xml +++ b/java_console/rusefi.xml @@ -1,6 +1,6 @@ - +