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 4828314097..f1d0622ce4 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 Fri Aug 21 18:13:46 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Fri Aug 21 23:45:11 UTC 2020 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3235,9 +3235,10 @@ struct engine_configuration_s { */ spi_device_e tle6240spiDevice; /** + * Stoichiometric ratio for your primary fuel. * offset 4005 */ - uint8_t unusedSpiPadding7; + uint8_t stoichRatioPrimary; /** * iTerm max value * offset 4006 @@ -3651,4 +3652,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 Fri Aug 21 18:13:46 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Fri Aug 21 23:45:11 UTC 2020 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 0491923c7d..b1a835caa5 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -1045,6 +1045,7 @@ #define overrideCrankingIacSetting_offset 1476 #define PACK_ADD_TEMPERATURE 40 #define PACK_MULT_AFR 1000 +#define PACK_MULT_AFR_CFG 10 #define PACK_MULT_ANGLE 50 #define PACK_MULT_MASS_FLOW 10 #define PACK_MULT_MS 300 @@ -1122,7 +1123,7 @@ #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD kin #define SIGNATURE_DATE 2020.08.21 -#define SIGNATURE_HASH 3501893304 +#define SIGNATURE_HASH 3683315284 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1191,6 +1192,7 @@ #define stft_s_size 24 #define stft_startupDelay_offset 1071 #define stftIgnoreErrorMagnitude_offset 976 +#define stoichRatioPrimary_offset 4005 #define storageMode_offset 2260 #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 @@ -1427,7 +1429,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator true #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2020.08.21.kin.3501893304" +#define TS_SIGNATURE "rusEFI 2020.08.21.kin.3683315284" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' // 0x74 @@ -1524,7 +1526,6 @@ #define unusedSomethingWasHere_offset 2417 #define unusedSpiPadding4_offset 2593 #define unusedSpiPadding5_offset 2715 -#define unusedSpiPadding7_offset 4005 #define unusedSpiPadding8_offset 4009 #define unusedsw_offset 4020 #define unusedvref_offset 4016 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures.h b/firmware/controllers/generated/engine_configuration_generated_structures.h index 7a992ec5ab..b875ed128f 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 Fri Aug 21 18:13:29 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Aug 21 23:44:59 UTC 2020 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3235,9 +3235,10 @@ struct engine_configuration_s { */ spi_device_e tle6240spiDevice; /** + * Stoichiometric ratio for your primary fuel. * offset 4005 */ - uint8_t unusedSpiPadding7; + uint8_t stoichRatioPrimary; /** * iTerm max value * offset 4006 @@ -3651,4 +3652,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 Fri Aug 21 18:13:29 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Aug 21 23:44:59 UTC 2020 diff --git a/firmware/controllers/generated/fsio_enums_generated.def b/firmware/controllers/generated/fsio_enums_generated.def index a6753ba26c..118592d457 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 Fri Aug 21 18:13:29 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Aug 21 23:44:59 UTC 2020 // 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 5abe1569c8..8c1e534ffb 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 Fri Aug 21 18:13:29 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Aug 21 23:44:59 UTC 2020 // 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 f3da9676ff..60390059ee 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 Fri Aug 21 18:13:29 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Aug 21 23:44:59 UTC 2020 // 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 ffacc28779..ba217923f7 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 Fri Aug 21 18:13:29 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Aug 21 23:44:59 UTC 2020 // 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 6d59a5654d..ed227c8115 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -1045,6 +1045,7 @@ #define overrideCrankingIacSetting_offset 1476 #define PACK_ADD_TEMPERATURE 40 #define PACK_MULT_AFR 1000 +#define PACK_MULT_AFR_CFG 10 #define PACK_MULT_ANGLE 50 #define PACK_MULT_MASS_FLOW 10 #define PACK_MULT_MS 300 @@ -1122,7 +1123,7 @@ #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD all #define SIGNATURE_DATE 2020.08.21 -#define SIGNATURE_HASH 4285457176 +#define SIGNATURE_HASH 4099845108 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1191,6 +1192,7 @@ #define stft_s_size 24 #define stft_startupDelay_offset 1071 #define stftIgnoreErrorMagnitude_offset 976 +#define stoichRatioPrimary_offset 4005 #define storageMode_offset 2260 #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 @@ -1427,7 +1429,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2020.08.21.all.4285457176" +#define TS_SIGNATURE "rusEFI 2020.08.21.all.4099845108" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' // 0x74 @@ -1524,7 +1526,6 @@ #define unusedSomethingWasHere_offset 2417 #define unusedSpiPadding4_offset 2593 #define unusedSpiPadding5_offset 2715 -#define unusedSpiPadding7_offset 4005 #define unusedSpiPadding8_offset 4009 #define unusedsw_offset 4020 #define unusedvref_offset 4016 diff --git a/firmware/controllers/generated/signature_all.h b/firmware/controllers/generated/signature_all.h index efcdd048e6..ce162c452f 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 2020.08.21 -#define SIGNATURE_HASH 4285457176 -#define TS_SIGNATURE "rusEFI 2020.08.21.all.4285457176" +#define SIGNATURE_HASH 4099845108 +#define TS_SIGNATURE "rusEFI 2020.08.21.all.4099845108" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index 5519f02716..eb872a9f0e 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 2020.08.21 -#define SIGNATURE_HASH 936568337 -#define TS_SIGNATURE "rusEFI 2020.08.21.frankenso_na6.936568337" +#define SIGNATURE_HASH 1021488893 +#define TS_SIGNATURE "rusEFI 2020.08.21.frankenso_na6.1021488893" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index 1da8faca47..e8f83a8124 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 2020.08.21 -#define SIGNATURE_HASH 3501893304 -#define TS_SIGNATURE "rusEFI 2020.08.21.kin.3501893304" +#define SIGNATURE_HASH 3683315284 +#define TS_SIGNATURE "rusEFI 2020.08.21.kin.3683315284" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index c8b82936d6..400b203952 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 2020.08.21 -#define SIGNATURE_HASH 79722051 -#define TS_SIGNATURE "rusEFI 2020.08.21.mre_f4.79722051" +#define SIGNATURE_HASH 267402927 +#define TS_SIGNATURE "rusEFI 2020.08.21.mre_f4.267402927" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index f417e31afc..9c6ff42a8b 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 2020.08.21 -#define SIGNATURE_HASH 79722051 -#define TS_SIGNATURE "rusEFI 2020.08.21.mre_f7.79722051" +#define SIGNATURE_HASH 267402927 +#define TS_SIGNATURE "rusEFI 2020.08.21.mre_f7.267402927" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index faed86264a..1447a365e6 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 2020.08.21 -#define SIGNATURE_HASH 3902317222 -#define TS_SIGNATURE "rusEFI 2020.08.21.prometheus_405.3902317222" +#define SIGNATURE_HASH 3819498058 +#define TS_SIGNATURE "rusEFI 2020.08.21.prometheus_405.3819498058" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index 3a95ae7da5..d5496ad9f3 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 2020.08.21 -#define SIGNATURE_HASH 3902317222 -#define TS_SIGNATURE "rusEFI 2020.08.21.prometheus_469.3902317222" +#define SIGNATURE_HASH 3819498058 +#define TS_SIGNATURE "rusEFI 2020.08.21.prometheus_469.3819498058" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index 6992372f24..41bc5a169c 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 2020.08.21 -#define SIGNATURE_HASH 516898115 -#define TS_SIGNATURE "rusEFI 2020.08.21.proteus_f4.516898115" +#define SIGNATURE_HASH 369063343 +#define TS_SIGNATURE "rusEFI 2020.08.21.proteus_f4.369063343" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index 0e1d3b11b5..b51af4ac49 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 2020.08.21 -#define SIGNATURE_HASH 516898115 -#define TS_SIGNATURE "rusEFI 2020.08.21.proteus_f7.516898115" +#define SIGNATURE_HASH 369063343 +#define TS_SIGNATURE "rusEFI 2020.08.21.proteus_f7.369063343" diff --git a/firmware/tunerstudio/generated/cache.zip b/firmware/tunerstudio/generated/cache.zip index 6d121b4db1..46e0278391 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 13f8e173f4..6f67b6f885 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 2020.08.21.all.4285457176" + signature = "rusEFI 2020.08.21.all.4099845108" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.08.21.all.4285457176" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.08.21.all.4099845108" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,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 Fri Aug 21 18:13:29 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Aug 21 23:44:59 UTC 2020 pageSize = 20000 page = 1 @@ -1058,7 +1058,7 @@ page = 1 mc33816spiDevice = bits,U32, 4001, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4", "INVALID", "INVALID", "INVALID" idlerpmpid_iTermMin = scalar, S16, 4002, "", 1, 0, -30000, 30000.0, 0 tle6240spiDevice = bits,U32, 4004, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4", "INVALID", "INVALID", "INVALID" - unusedSpiPadding7 = scalar, U08, 4005, "units", 1, 0, -20, 100, 0 + stoichRatioPrimary = scalar, U08, 4005, ":1", {1/PACK_MULT_AFR_CFG},0, 5, 25.0, 1 idlerpmpid_iTermMax = scalar, S16, 4006, "", 1, 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, -20, 100, 0 @@ -1194,7 +1194,7 @@ page = 1 veTable = array, F32, 17440, [16x16],"%", 1, 0, 0, 999.0, 2 veLoadBins = array, F32, 18464, [16], "kPa", 1, 0.0, 0, 400.0, 2 veRpmBins = array, F32, 18528, [16], "RPM", 1, 0.0, 0, 18000.0, 2 - afrTable = array, U08, 18592, [16x16],"deg", 0.1, 0, 0, 25.0, 1 + afrTable = array, U08, 18592, [16x16],"deg", {1/PACK_MULT_AFR_CFG}, 0, 0, 25.0, 1 afrLoadBins = array, F32, 18848, [16], "", 1, 0.0, 0, 500.0, 2 afrRpmBins = array, F32, 18912, [16], "RPM", 1, 0.0, 0, 18000.0, 2 tpsTpsAccelTable = array, F32, 18976, [8x8],"value", 1, 0, 0.0, 30000.0, 2 @@ -1368,6 +1368,7 @@ 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." triggerCompCenterVolt = "Trigger comparator center point voltage" triggerCompHystMin = "Trigger comparator hysteresis voltage (Min)" triggerCompHystMax = "Trigger comparator hysteresis voltage (Max)" @@ -2936,6 +2937,9 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = injChars, "Injector Settings", yAxis field = "Injector Flow", injector_flow, {isInjectionEnabled == 1} + dialog = fuelParams, "Fuel characteristics", yAxis + field = "Stoichiometric ratio", stoichRatioPrimary, {isInjectionEnabled == 1} + dialog = injectorOutputSettings, "Injector Outputs", yAxis field = "Use only first half of pins for batch mode" field = "Injection Pin 1", injectionPins1, {isInjectionEnabled == 1} @@ -2983,6 +2987,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" topicHelp = "fuelHelp" panel = baseInjection panel = injChars + panel = fuelParams panel = injectorsDeadTime dialog = ignitionCylExtra, "Ignition Cylinder Extra Timing" diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index aabad19fdd..837ba11a53 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 2020.08.21.frankenso_na6.936568337" + signature = "rusEFI 2020.08.21.frankenso_na6.1021488893" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.08.21.frankenso_na6.936568337" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.08.21.frankenso_na6.1021488893" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,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 Fri Aug 21 18:13:35 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Aug 21 23:45:04 UTC 2020 pageSize = 20000 page = 1 @@ -1058,7 +1058,7 @@ page = 1 mc33816spiDevice = bits,U32, 4001, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4", "INVALID", "INVALID", "INVALID" idlerpmpid_iTermMin = scalar, S16, 4002, "", 1, 0, -30000, 30000.0, 0 tle6240spiDevice = bits,U32, 4004, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4", "INVALID", "INVALID", "INVALID" - unusedSpiPadding7 = scalar, U08, 4005, "units", 1, 0, -20, 100, 0 + stoichRatioPrimary = scalar, U08, 4005, ":1", {1/PACK_MULT_AFR_CFG},0, 5, 25.0, 1 idlerpmpid_iTermMax = scalar, S16, 4006, "", 1, 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, -20, 100, 0 @@ -1194,7 +1194,7 @@ page = 1 veTable = array, F32, 17440, [16x16],"%", 1, 0, 0, 999.0, 2 veLoadBins = array, F32, 18464, [16], "kPa", 1, 0.0, 0, 400.0, 2 veRpmBins = array, F32, 18528, [16], "RPM", 1, 0.0, 0, 18000.0, 2 - afrTable = array, U08, 18592, [16x16],"deg", 0.1, 0, 0, 25.0, 1 + afrTable = array, U08, 18592, [16x16],"deg", {1/PACK_MULT_AFR_CFG}, 0, 0, 25.0, 1 afrLoadBins = array, F32, 18848, [16], "", 1, 0.0, 0, 500.0, 2 afrRpmBins = array, F32, 18912, [16], "RPM", 1, 0.0, 0, 18000.0, 2 tpsTpsAccelTable = array, F32, 18976, [8x8],"value", 1, 0, 0.0, 30000.0, 2 @@ -1368,6 +1368,7 @@ 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." triggerCompCenterVolt = "Trigger comparator center point voltage" triggerCompHystMin = "Trigger comparator hysteresis voltage (Min)" triggerCompHystMax = "Trigger comparator hysteresis voltage (Max)" @@ -2936,6 +2937,9 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = injChars, "Injector Settings", yAxis field = "Injector Flow", injector_flow, {isInjectionEnabled == 1} + dialog = fuelParams, "Fuel characteristics", yAxis + field = "Stoichiometric ratio", stoichRatioPrimary, {isInjectionEnabled == 1} + dialog = injectorOutputSettings, "Injector Outputs", yAxis field = "Use only first half of pins for batch mode" field = "Injection Pin 1", injectionPins1, {isInjectionEnabled == 1} @@ -2983,6 +2987,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" topicHelp = "fuelHelp" panel = baseInjection panel = injChars + panel = fuelParams panel = injectorsDeadTime dialog = ignitionCylExtra, "Ignition Cylinder Extra Timing" diff --git a/firmware/tunerstudio/generated/rusefi_kinetis.ini b/firmware/tunerstudio/generated/rusefi_kinetis.ini index fafbd45d41..a12b33d945 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 2020.08.21.kin.3501893304" + signature = "rusEFI 2020.08.21.kin.3683315284" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.08.21.kin.3501893304" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.08.21.kin.3683315284" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,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 Fri Aug 21 18:13:46 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Fri Aug 21 23:45:11 UTC 2020 pageSize = 20000 page = 1 @@ -1058,7 +1058,7 @@ page = 1 mc33816spiDevice = bits,U32, 4001, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4", "INVALID", "INVALID", "INVALID" idlerpmpid_iTermMin = scalar, S16, 4002, "", 1, 0, -30000, 30000.0, 0 tle6240spiDevice = bits,U32, 4004, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4", "INVALID", "INVALID", "INVALID" - unusedSpiPadding7 = scalar, U08, 4005, "units", 1, 0, -20, 100, 0 + stoichRatioPrimary = scalar, U08, 4005, ":1", {1/PACK_MULT_AFR_CFG},0, 5, 25.0, 1 idlerpmpid_iTermMax = scalar, S16, 4006, "", 1, 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, -20, 100, 0 @@ -1194,7 +1194,7 @@ page = 1 veTable = array, F32, 17440, [16x16],"%", 1, 0, 0, 999.0, 2 veLoadBins = array, F32, 18464, [16], "kPa", 1, 0.0, 0, 400.0, 2 veRpmBins = array, F32, 18528, [16], "RPM", 1, 0.0, 0, 18000.0, 2 - afrTable = array, U08, 18592, [16x16],"deg", 0.1, 0, 0, 25.0, 1 + afrTable = array, U08, 18592, [16x16],"deg", {1/PACK_MULT_AFR_CFG}, 0, 0, 25.0, 1 afrLoadBins = array, F32, 18848, [16], "", 1, 0.0, 0, 500.0, 2 afrRpmBins = array, F32, 18912, [16], "RPM", 1, 0.0, 0, 18000.0, 2 tpsTpsAccelTable = array, F32, 18976, [8x8],"value", 1, 0, 0.0, 30000.0, 2 @@ -1368,6 +1368,7 @@ 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." triggerCompCenterVolt = "Trigger comparator center point voltage" triggerCompHystMin = "Trigger comparator hysteresis voltage (Min)" triggerCompHystMax = "Trigger comparator hysteresis voltage (Max)" @@ -2937,6 +2938,9 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = injChars, "Injector Settings", yAxis field = "Injector Flow", injector_flow, {isInjectionEnabled == 1} + dialog = fuelParams, "Fuel characteristics", yAxis + field = "Stoichiometric ratio", stoichRatioPrimary, {isInjectionEnabled == 1} + dialog = injectorOutputSettings, "Injector Outputs", yAxis field = "Use only first half of pins for batch mode" field = "Injection Pin 1", injectionPins1, {isInjectionEnabled == 1} @@ -2984,6 +2988,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" topicHelp = "fuelHelp" panel = baseInjection panel = injChars + panel = fuelParams panel = injectorsDeadTime dialog = ignitionCylExtra, "Ignition Cylinder Extra Timing" diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index 2858bca7a4..ef02d7141e 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 2020.08.21.mre_f4.79722051" + signature = "rusEFI 2020.08.21.mre_f4.267402927" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.08.21.mre_f4.79722051" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.08.21.mre_f4.267402927" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,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 Fri Aug 21 18:13:33 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Aug 21 23:45:02 UTC 2020 pageSize = 20000 page = 1 @@ -1058,7 +1058,7 @@ page = 1 mc33816spiDevice = bits,U32, 4001, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4", "INVALID", "INVALID", "INVALID" idlerpmpid_iTermMin = scalar, S16, 4002, "", 1, 0, -30000, 30000.0, 0 tle6240spiDevice = bits,U32, 4004, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4", "INVALID", "INVALID", "INVALID" - unusedSpiPadding7 = scalar, U08, 4005, "units", 1, 0, -20, 100, 0 + stoichRatioPrimary = scalar, U08, 4005, ":1", {1/PACK_MULT_AFR_CFG},0, 5, 25.0, 1 idlerpmpid_iTermMax = scalar, S16, 4006, "", 1, 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, -20, 100, 0 @@ -1194,7 +1194,7 @@ page = 1 veTable = array, F32, 17440, [16x16],"%", 1, 0, 0, 999.0, 2 veLoadBins = array, F32, 18464, [16], "kPa", 1, 0.0, 0, 400.0, 2 veRpmBins = array, F32, 18528, [16], "RPM", 1, 0.0, 0, 18000.0, 2 - afrTable = array, U08, 18592, [16x16],"deg", 0.1, 0, 0, 25.0, 1 + afrTable = array, U08, 18592, [16x16],"deg", {1/PACK_MULT_AFR_CFG}, 0, 0, 25.0, 1 afrLoadBins = array, F32, 18848, [16], "", 1, 0.0, 0, 500.0, 2 afrRpmBins = array, F32, 18912, [16], "RPM", 1, 0.0, 0, 18000.0, 2 tpsTpsAccelTable = array, F32, 18976, [8x8],"value", 1, 0, 0.0, 30000.0, 2 @@ -1368,6 +1368,7 @@ 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." triggerCompCenterVolt = "Trigger comparator center point voltage" triggerCompHystMin = "Trigger comparator hysteresis voltage (Min)" triggerCompHystMax = "Trigger comparator hysteresis voltage (Max)" @@ -2931,6 +2932,9 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = injChars, "Injector Settings", yAxis field = "Injector Flow", injector_flow, {isInjectionEnabled == 1} + dialog = fuelParams, "Fuel characteristics", yAxis + field = "Stoichiometric ratio", stoichRatioPrimary, {isInjectionEnabled == 1} + dialog = injectorOutputSettings, "Injector Outputs", yAxis field = "Use only first half of pins for batch mode" field = "Injection Pin 1", injectionPins1, {isInjectionEnabled == 1} @@ -2978,6 +2982,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" topicHelp = "fuelHelp" panel = baseInjection panel = injChars + panel = fuelParams panel = injectorsDeadTime dialog = ignitionCylExtra, "Ignition Cylinder Extra Timing" diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index a1643a2c6a..81d87986f5 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 2020.08.21.mre_f7.79722051" + signature = "rusEFI 2020.08.21.mre_f7.267402927" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.08.21.mre_f7.79722051" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.08.21.mre_f7.267402927" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,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 Fri Aug 21 18:13:32 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Aug 21 23:45:01 UTC 2020 pageSize = 20000 page = 1 @@ -1058,7 +1058,7 @@ page = 1 mc33816spiDevice = bits,U32, 4001, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4", "INVALID", "INVALID", "INVALID" idlerpmpid_iTermMin = scalar, S16, 4002, "", 1, 0, -30000, 30000.0, 0 tle6240spiDevice = bits,U32, 4004, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4", "INVALID", "INVALID", "INVALID" - unusedSpiPadding7 = scalar, U08, 4005, "units", 1, 0, -20, 100, 0 + stoichRatioPrimary = scalar, U08, 4005, ":1", {1/PACK_MULT_AFR_CFG},0, 5, 25.0, 1 idlerpmpid_iTermMax = scalar, S16, 4006, "", 1, 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, -20, 100, 0 @@ -1194,7 +1194,7 @@ page = 1 veTable = array, F32, 17440, [16x16],"%", 1, 0, 0, 999.0, 2 veLoadBins = array, F32, 18464, [16], "kPa", 1, 0.0, 0, 400.0, 2 veRpmBins = array, F32, 18528, [16], "RPM", 1, 0.0, 0, 18000.0, 2 - afrTable = array, U08, 18592, [16x16],"deg", 0.1, 0, 0, 25.0, 1 + afrTable = array, U08, 18592, [16x16],"deg", {1/PACK_MULT_AFR_CFG}, 0, 0, 25.0, 1 afrLoadBins = array, F32, 18848, [16], "", 1, 0.0, 0, 500.0, 2 afrRpmBins = array, F32, 18912, [16], "RPM", 1, 0.0, 0, 18000.0, 2 tpsTpsAccelTable = array, F32, 18976, [8x8],"value", 1, 0, 0.0, 30000.0, 2 @@ -1368,6 +1368,7 @@ 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." triggerCompCenterVolt = "Trigger comparator center point voltage" triggerCompHystMin = "Trigger comparator hysteresis voltage (Min)" triggerCompHystMax = "Trigger comparator hysteresis voltage (Max)" @@ -2931,6 +2932,9 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = injChars, "Injector Settings", yAxis field = "Injector Flow", injector_flow, {isInjectionEnabled == 1} + dialog = fuelParams, "Fuel characteristics", yAxis + field = "Stoichiometric ratio", stoichRatioPrimary, {isInjectionEnabled == 1} + dialog = injectorOutputSettings, "Injector Outputs", yAxis field = "Use only first half of pins for batch mode" field = "Injection Pin 1", injectionPins1, {isInjectionEnabled == 1} @@ -2978,6 +2982,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" topicHelp = "fuelHelp" panel = baseInjection panel = injChars + panel = fuelParams panel = injectorsDeadTime dialog = ignitionCylExtra, "Ignition Cylinder Extra Timing" diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index 802055e958..be67d0fe2d 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 2020.08.21.prometheus_405.3902317222" + signature = "rusEFI 2020.08.21.prometheus_405.3819498058" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.08.21.prometheus_405.3902317222" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.08.21.prometheus_405.3819498058" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,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 Fri Aug 21 18:13:38 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Aug 21 23:45:07 UTC 2020 pageSize = 20000 page = 1 @@ -1058,7 +1058,7 @@ page = 1 mc33816spiDevice = bits,U32, 4001, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4", "INVALID", "INVALID", "INVALID" idlerpmpid_iTermMin = scalar, S16, 4002, "", 1, 0, -30000, 30000.0, 0 tle6240spiDevice = bits,U32, 4004, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4", "INVALID", "INVALID", "INVALID" - unusedSpiPadding7 = scalar, U08, 4005, "units", 1, 0, -20, 100, 0 + stoichRatioPrimary = scalar, U08, 4005, ":1", {1/PACK_MULT_AFR_CFG},0, 5, 25.0, 1 idlerpmpid_iTermMax = scalar, S16, 4006, "", 1, 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, -20, 100, 0 @@ -1194,7 +1194,7 @@ page = 1 veTable = array, F32, 17440, [16x16],"%", 1, 0, 0, 999.0, 2 veLoadBins = array, F32, 18464, [16], "kPa", 1, 0.0, 0, 400.0, 2 veRpmBins = array, F32, 18528, [16], "RPM", 1, 0.0, 0, 18000.0, 2 - afrTable = array, U08, 18592, [16x16],"deg", 0.1, 0, 0, 25.0, 1 + afrTable = array, U08, 18592, [16x16],"deg", {1/PACK_MULT_AFR_CFG}, 0, 0, 25.0, 1 afrLoadBins = array, F32, 18848, [16], "", 1, 0.0, 0, 500.0, 2 afrRpmBins = array, F32, 18912, [16], "RPM", 1, 0.0, 0, 18000.0, 2 tpsTpsAccelTable = array, F32, 18976, [8x8],"value", 1, 0, 0.0, 30000.0, 2 @@ -1368,6 +1368,7 @@ 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." triggerCompCenterVolt = "Trigger comparator center point voltage" triggerCompHystMin = "Trigger comparator hysteresis voltage (Min)" triggerCompHystMax = "Trigger comparator hysteresis voltage (Max)" @@ -2932,6 +2933,9 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = injChars, "Injector Settings", yAxis field = "Injector Flow", injector_flow, {isInjectionEnabled == 1} + dialog = fuelParams, "Fuel characteristics", yAxis + field = "Stoichiometric ratio", stoichRatioPrimary, {isInjectionEnabled == 1} + dialog = injectorOutputSettings, "Injector Outputs", yAxis field = "Use only first half of pins for batch mode" field = "Injection Pin 1", injectionPins1, {isInjectionEnabled == 1} @@ -2979,6 +2983,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" topicHelp = "fuelHelp" panel = baseInjection panel = injChars + panel = fuelParams panel = injectorsDeadTime dialog = ignitionCylExtra, "Ignition Cylinder Extra Timing" diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index 43cf7531e9..aaee6310c7 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 2020.08.21.prometheus_469.3902317222" + signature = "rusEFI 2020.08.21.prometheus_469.3819498058" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.08.21.prometheus_469.3902317222" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.08.21.prometheus_469.3819498058" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,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 Fri Aug 21 18:13:36 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Aug 21 23:45:05 UTC 2020 pageSize = 20000 page = 1 @@ -1058,7 +1058,7 @@ page = 1 mc33816spiDevice = bits,U32, 4001, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4", "INVALID", "INVALID", "INVALID" idlerpmpid_iTermMin = scalar, S16, 4002, "", 1, 0, -30000, 30000.0, 0 tle6240spiDevice = bits,U32, 4004, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4", "INVALID", "INVALID", "INVALID" - unusedSpiPadding7 = scalar, U08, 4005, "units", 1, 0, -20, 100, 0 + stoichRatioPrimary = scalar, U08, 4005, ":1", {1/PACK_MULT_AFR_CFG},0, 5, 25.0, 1 idlerpmpid_iTermMax = scalar, S16, 4006, "", 1, 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, -20, 100, 0 @@ -1194,7 +1194,7 @@ page = 1 veTable = array, F32, 17440, [16x16],"%", 1, 0, 0, 999.0, 2 veLoadBins = array, F32, 18464, [16], "kPa", 1, 0.0, 0, 400.0, 2 veRpmBins = array, F32, 18528, [16], "RPM", 1, 0.0, 0, 18000.0, 2 - afrTable = array, U08, 18592, [16x16],"deg", 0.1, 0, 0, 25.0, 1 + afrTable = array, U08, 18592, [16x16],"deg", {1/PACK_MULT_AFR_CFG}, 0, 0, 25.0, 1 afrLoadBins = array, F32, 18848, [16], "", 1, 0.0, 0, 500.0, 2 afrRpmBins = array, F32, 18912, [16], "RPM", 1, 0.0, 0, 18000.0, 2 tpsTpsAccelTable = array, F32, 18976, [8x8],"value", 1, 0, 0.0, 30000.0, 2 @@ -1368,6 +1368,7 @@ 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." triggerCompCenterVolt = "Trigger comparator center point voltage" triggerCompHystMin = "Trigger comparator hysteresis voltage (Min)" triggerCompHystMax = "Trigger comparator hysteresis voltage (Max)" @@ -2932,6 +2933,9 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = injChars, "Injector Settings", yAxis field = "Injector Flow", injector_flow, {isInjectionEnabled == 1} + dialog = fuelParams, "Fuel characteristics", yAxis + field = "Stoichiometric ratio", stoichRatioPrimary, {isInjectionEnabled == 1} + dialog = injectorOutputSettings, "Injector Outputs", yAxis field = "Use only first half of pins for batch mode" field = "Injection Pin 1", injectionPins1, {isInjectionEnabled == 1} @@ -2979,6 +2983,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" topicHelp = "fuelHelp" panel = baseInjection panel = injChars + panel = fuelParams panel = injectorsDeadTime dialog = ignitionCylExtra, "Ignition Cylinder Extra Timing" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index 259b0adcd3..4822f8776f 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 2020.08.21.proteus_f4.516898115" + signature = "rusEFI 2020.08.21.proteus_f4.369063343" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.08.21.proteus_f4.516898115" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.08.21.proteus_f4.369063343" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,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 Fri Aug 21 18:13:42 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Aug 21 23:45:10 UTC 2020 pageSize = 20000 page = 1 @@ -1058,7 +1058,7 @@ page = 1 mc33816spiDevice = bits,U32, 4001, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4", "INVALID", "INVALID", "INVALID" idlerpmpid_iTermMin = scalar, S16, 4002, "", 1, 0, -30000, 30000.0, 0 tle6240spiDevice = bits,U32, 4004, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4", "INVALID", "INVALID", "INVALID" - unusedSpiPadding7 = scalar, U08, 4005, "units", 1, 0, -20, 100, 0 + stoichRatioPrimary = scalar, U08, 4005, ":1", {1/PACK_MULT_AFR_CFG},0, 5, 25.0, 1 idlerpmpid_iTermMax = scalar, S16, 4006, "", 1, 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, -20, 100, 0 @@ -1194,7 +1194,7 @@ page = 1 veTable = array, F32, 17440, [16x16],"%", 1, 0, 0, 999.0, 2 veLoadBins = array, F32, 18464, [16], "kPa", 1, 0.0, 0, 400.0, 2 veRpmBins = array, F32, 18528, [16], "RPM", 1, 0.0, 0, 18000.0, 2 - afrTable = array, U08, 18592, [16x16],"deg", 0.1, 0, 0, 25.0, 1 + afrTable = array, U08, 18592, [16x16],"deg", {1/PACK_MULT_AFR_CFG}, 0, 0, 25.0, 1 afrLoadBins = array, F32, 18848, [16], "", 1, 0.0, 0, 500.0, 2 afrRpmBins = array, F32, 18912, [16], "RPM", 1, 0.0, 0, 18000.0, 2 tpsTpsAccelTable = array, F32, 18976, [8x8],"value", 1, 0, 0.0, 30000.0, 2 @@ -1368,6 +1368,7 @@ 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." triggerCompCenterVolt = "Trigger comparator center point voltage" triggerCompHystMin = "Trigger comparator hysteresis voltage (Min)" triggerCompHystMax = "Trigger comparator hysteresis voltage (Max)" @@ -2926,6 +2927,9 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = injChars, "Injector Settings", yAxis field = "Injector Flow", injector_flow, {isInjectionEnabled == 1} + dialog = fuelParams, "Fuel characteristics", yAxis + field = "Stoichiometric ratio", stoichRatioPrimary, {isInjectionEnabled == 1} + dialog = injectorOutputSettings, "Injector Outputs", yAxis field = "Use only first half of pins for batch mode" field = "Injection Pin 1", injectionPins1, {isInjectionEnabled == 1} @@ -2973,6 +2977,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" topicHelp = "fuelHelp" panel = baseInjection panel = injChars + panel = fuelParams panel = injectorsDeadTime dialog = ignitionCylExtra, "Ignition Cylinder Extra Timing" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index 5dc68530d9..f95ff2444a 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 2020.08.21.proteus_f7.516898115" + signature = "rusEFI 2020.08.21.proteus_f7.369063343" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.08.21.proteus_f7.516898115" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.08.21.proteus_f7.369063343" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,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 Fri Aug 21 18:13:39 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Aug 21 23:45:08 UTC 2020 pageSize = 20000 page = 1 @@ -1058,7 +1058,7 @@ page = 1 mc33816spiDevice = bits,U32, 4001, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4", "INVALID", "INVALID", "INVALID" idlerpmpid_iTermMin = scalar, S16, 4002, "", 1, 0, -30000, 30000.0, 0 tle6240spiDevice = bits,U32, 4004, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4", "INVALID", "INVALID", "INVALID" - unusedSpiPadding7 = scalar, U08, 4005, "units", 1, 0, -20, 100, 0 + stoichRatioPrimary = scalar, U08, 4005, ":1", {1/PACK_MULT_AFR_CFG},0, 5, 25.0, 1 idlerpmpid_iTermMax = scalar, S16, 4006, "", 1, 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, -20, 100, 0 @@ -1194,7 +1194,7 @@ page = 1 veTable = array, F32, 17440, [16x16],"%", 1, 0, 0, 999.0, 2 veLoadBins = array, F32, 18464, [16], "kPa", 1, 0.0, 0, 400.0, 2 veRpmBins = array, F32, 18528, [16], "RPM", 1, 0.0, 0, 18000.0, 2 - afrTable = array, U08, 18592, [16x16],"deg", 0.1, 0, 0, 25.0, 1 + afrTable = array, U08, 18592, [16x16],"deg", {1/PACK_MULT_AFR_CFG}, 0, 0, 25.0, 1 afrLoadBins = array, F32, 18848, [16], "", 1, 0.0, 0, 500.0, 2 afrRpmBins = array, F32, 18912, [16], "RPM", 1, 0.0, 0, 18000.0, 2 tpsTpsAccelTable = array, F32, 18976, [8x8],"value", 1, 0, 0.0, 30000.0, 2 @@ -1368,6 +1368,7 @@ 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." triggerCompCenterVolt = "Trigger comparator center point voltage" triggerCompHystMin = "Trigger comparator hysteresis voltage (Min)" triggerCompHystMax = "Trigger comparator hysteresis voltage (Max)" @@ -2926,6 +2927,9 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = injChars, "Injector Settings", yAxis field = "Injector Flow", injector_flow, {isInjectionEnabled == 1} + dialog = fuelParams, "Fuel characteristics", yAxis + field = "Stoichiometric ratio", stoichRatioPrimary, {isInjectionEnabled == 1} + dialog = injectorOutputSettings, "Injector Outputs", yAxis field = "Use only first half of pins for batch mode" field = "Injection Pin 1", injectionPins1, {isInjectionEnabled == 1} @@ -2973,6 +2977,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" topicHelp = "fuelHelp" panel = baseInjection panel = injChars + panel = fuelParams panel = injectorsDeadTime dialog = ignitionCylExtra, "Ignition Cylinder Extra Timing" 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 25d8c750eb..83f06c7202 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 Fri Aug 21 18:13:29 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Aug 21 23:44:59 UTC 2020 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -1015,6 +1015,7 @@ public class Fields { public static final int overrideCrankingIacSetting_offset = 1476; public static final int PACK_ADD_TEMPERATURE = 40; public static final int PACK_MULT_AFR = 1000; + public static final int PACK_MULT_AFR_CFG = 10; public static final int PACK_MULT_ANGLE = 50; public static final int PACK_MULT_MASS_FLOW = 10; public static final int PACK_MULT_MS = 300; @@ -1147,6 +1148,7 @@ public class Fields { public static final int stft_s_size = 24; 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 storageMode_offset = 2260; public static final int tachOutputPin_offset = 704; public static final int tachOutputPinMode_offset = 705; @@ -1335,7 +1337,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 2020.08.21.all.4285457176"; + public static final String TS_SIGNATURE = "rusEFI 2020.08.21.all.4099845108"; public static final char TS_SINGLE_WRITE_COMMAND = 'W'; public static final int tunerStudioSerialSpeed_offset = 728; public static final int twoWireBatchIgnition_offset = 1476; @@ -1429,7 +1431,6 @@ public class Fields { public static final int unusedSomethingWasHere_offset = 2417; public static final int unusedSpiPadding4_offset = 2593; public static final int unusedSpiPadding5_offset = 2715; - public static final int unusedSpiPadding7_offset = 4005; public static final int unusedSpiPadding8_offset = 4009; public static final int unusedsw_offset = 4020; public static final int unusedvref_offset = 4016; @@ -2437,7 +2438,7 @@ public class Fields { public static final Field MC33816SPIDEVICE = Field.create("MC33816SPIDEVICE", 4001, FieldType.INT8); public static final Field IDLERPMPID_ITERMMIN = Field.create("IDLERPMPID_ITERMMIN", 4002, FieldType.INT16); public static final Field TLE6240SPIDEVICE = Field.create("TLE6240SPIDEVICE", 4004, FieldType.INT8); - public static final Field UNUSEDSPIPADDING7 = Field.create("UNUSEDSPIPADDING7", 4005, FieldType.INT8); + 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 ETBIDLETHROTTLERANGE = Field.create("ETBIDLETHROTTLERANGE", 4012, FieldType.FLOAT); @@ -3453,7 +3454,7 @@ public class Fields { MC33816SPIDEVICE, IDLERPMPID_ITERMMIN, TLE6240SPIDEVICE, - UNUSEDSPIPADDING7, + STOICHRATIOPRIMARY, IDLERPMPID_ITERMMAX, MC33972SPIDEVICE, ETBIDLETHROTTLERANGE, diff --git a/java_console/rusefi.xml b/java_console/rusefi.xml index def02d812f..d979371761 100644 --- a/java_console/rusefi.xml +++ b/java_console/rusefi.xml @@ -1,6 +1,6 @@ - +