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 7698aed316..88b6daea5d 100644 --- a/firmware/config/boards/hellen/cypress/config/controllers/algo/engine_configuration_generated_structures.h +++ b/firmware/config/boards/hellen/cypress/config/controllers/algo/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Mon Oct 26 11:25:05 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Mon Oct 26 22:16:57 UTC 2020 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3672,15 +3672,15 @@ struct persistent_config_s { /** * offset 18592 */ - afr_table_t afrTable; + lambda_table_t lambdaTable; /** * offset 18848 */ - float afrLoadBins[FUEL_LOAD_COUNT]; + float lambdaLoadBins[FUEL_LOAD_COUNT]; /** * offset 18912 */ - float afrRpmBins[FUEL_RPM_COUNT]; + float lambdaRpmBins[FUEL_RPM_COUNT]; /** * offset 18976 */ @@ -3752,4 +3752,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 Mon Oct 26 11:25:05 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Mon Oct 26 22:16:57 UTC 2020 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 349a5a63d6..76df5bbf6c 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 @@ -34,10 +34,7 @@ #define afr_v2_offset 572 #define afr_value1_offset 568 #define afr_value2_offset 576 -#define afrLoadBins_offset 18848 #define afrOverrideMode_offset 2111 -#define afrRpmBins_offset 18912 -#define afrTable_offset 18592 #define afterCrankingIACtaperDuration_offset 2036 #define AFTERSTART_DECAY_CURVE_SIZE 8 #define AFTERSTART_ENRICH_CURVE_SIZE 8 @@ -612,7 +609,6 @@ #define GAUGE_NAME_ACCEL_X "Acceleration: X" #define GAUGE_NAME_ACCEL_Y "Acceleration: Y" #define GAUGE_NAME_ACCEL_Z "Acceleration: Z" -#define GAUGE_NAME_AFR "Air/Fuel Ratio" #define GAUGE_NAME_AIR_FLOW "MAF air flow" #define GAUGE_NAME_AIR_MASS "air mass" #define GAUGE_NAME_BARO_PRESSURE "Barometric pressure" @@ -661,6 +657,7 @@ #define GAUGE_NAME_INJECTOR_LAG "fuel: injector lag" #define GAUGE_NAME_KNOCK_COUNTER "knock: counter" #define GAUGE_NAME_KNOCK_LEVEL "knock: current level" +#define GAUGE_NAME_LAMBDA "Lambda" #define GAUGE_NAME_MAF "MAF" #define GAUGE_NAME_MAP "MAP" #define GAUGE_NAME_RPM "RPM" @@ -969,6 +966,9 @@ #define knockNoise_offset 1820 #define knockNoiseRpmBins_offset 1852 #define knockVThreshold_offset 1512 +#define lambdaLoadBins_offset 18848 +#define lambdaRpmBins_offset 18912 +#define lambdaTable_offset 18592 #define launchActivateDelay_offset 1060 #define launchActivatePin_offset 991 #define launchActivationMode_e_auto_enum "SWITCH_INPUT_LAUNCH", "CLUTCH_INPUT_LAUNCH", "ALWAYS_ACTIVE_LAUNCH" @@ -1122,6 +1122,8 @@ #define PACK_MULT_ANGLE 50 #define PACK_MULT_FUEL_MASS 100 #define PACK_MULT_HIGH_PRESSURE 10 +#define PACK_MULT_LAMBDA 10000 +#define PACK_MULT_LAMBDA_CFG 147 #define PACK_MULT_MASS_FLOW 10 #define PACK_MULT_MS 300 #define PACK_MULT_PERCENT 100 @@ -1198,7 +1200,7 @@ #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD hellen_cypress #define SIGNATURE_DATE 2020.10.26 -#define SIGNATURE_HASH 1917503311 +#define SIGNATURE_HASH 144989744 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1517,7 +1519,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2020.10.26.hellen_cypress.1917503311" +#define TS_SIGNATURE "rusEFI 2020.10.26.hellen_cypress.144989744" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' // 0x74 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 6a47d163eb..27dbf82453 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Mon Oct 26 11:25:03 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Mon Oct 26 22:16:55 UTC 2020 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3672,15 +3672,15 @@ struct persistent_config_s { /** * offset 18592 */ - afr_table_t afrTable; + lambda_table_t lambdaTable; /** * offset 18848 */ - float afrLoadBins[FUEL_LOAD_COUNT]; + float lambdaLoadBins[FUEL_LOAD_COUNT]; /** * offset 18912 */ - float afrRpmBins[FUEL_RPM_COUNT]; + float lambdaRpmBins[FUEL_RPM_COUNT]; /** * offset 18976 */ @@ -3752,4 +3752,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 Mon Oct 26 11:25:03 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Mon Oct 26 22:16:55 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 9e3d340d5c..58a1ebfde2 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -34,10 +34,7 @@ #define afr_v2_offset 572 #define afr_value1_offset 568 #define afr_value2_offset 576 -#define afrLoadBins_offset 18848 #define afrOverrideMode_offset 2111 -#define afrRpmBins_offset 18912 -#define afrTable_offset 18592 #define afterCrankingIACtaperDuration_offset 2036 #define AFTERSTART_DECAY_CURVE_SIZE 8 #define AFTERSTART_ENRICH_CURVE_SIZE 8 @@ -612,7 +609,6 @@ #define GAUGE_NAME_ACCEL_X "Acceleration: X" #define GAUGE_NAME_ACCEL_Y "Acceleration: Y" #define GAUGE_NAME_ACCEL_Z "Acceleration: Z" -#define GAUGE_NAME_AFR "Air/Fuel Ratio" #define GAUGE_NAME_AIR_FLOW "MAF air flow" #define GAUGE_NAME_AIR_MASS "air mass" #define GAUGE_NAME_BARO_PRESSURE "Barometric pressure" @@ -661,6 +657,7 @@ #define GAUGE_NAME_INJECTOR_LAG "fuel: injector lag" #define GAUGE_NAME_KNOCK_COUNTER "knock: counter" #define GAUGE_NAME_KNOCK_LEVEL "knock: current level" +#define GAUGE_NAME_LAMBDA "Lambda" #define GAUGE_NAME_MAF "MAF" #define GAUGE_NAME_MAP "MAP" #define GAUGE_NAME_RPM "RPM" @@ -969,6 +966,9 @@ #define knockNoise_offset 1820 #define knockNoiseRpmBins_offset 1852 #define knockVThreshold_offset 1512 +#define lambdaLoadBins_offset 18848 +#define lambdaRpmBins_offset 18912 +#define lambdaTable_offset 18592 #define launchActivateDelay_offset 1060 #define launchActivatePin_offset 991 #define launchActivationMode_e_auto_enum "SWITCH_INPUT_LAUNCH", "CLUTCH_INPUT_LAUNCH", "ALWAYS_ACTIVE_LAUNCH" @@ -1122,6 +1122,8 @@ #define PACK_MULT_ANGLE 50 #define PACK_MULT_FUEL_MASS 100 #define PACK_MULT_HIGH_PRESSURE 10 +#define PACK_MULT_LAMBDA 10000 +#define PACK_MULT_LAMBDA_CFG 147 #define PACK_MULT_MASS_FLOW 10 #define PACK_MULT_MS 300 #define PACK_MULT_PERCENT 100 @@ -1198,7 +1200,7 @@ #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD kin #define SIGNATURE_DATE 2020.10.26 -#define SIGNATURE_HASH 592903605 +#define SIGNATURE_HASH 1505256650 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1517,7 +1519,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator true #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2020.10.26.kin.592903605" +#define TS_SIGNATURE "rusEFI 2020.10.26.kin.1505256650" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' // 0x74 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures.h b/firmware/controllers/generated/engine_configuration_generated_structures.h index 442ed39378..cc06d1074a 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 26 11:24:42 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 26 22:16:34 UTC 2020 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3672,15 +3672,15 @@ struct persistent_config_s { /** * offset 18592 */ - afr_table_t afrTable; + lambda_table_t lambdaTable; /** * offset 18848 */ - float afrLoadBins[FUEL_LOAD_COUNT]; + float lambdaLoadBins[FUEL_LOAD_COUNT]; /** * offset 18912 */ - float afrRpmBins[FUEL_RPM_COUNT]; + float lambdaRpmBins[FUEL_RPM_COUNT]; /** * offset 18976 */ @@ -3752,4 +3752,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 Mon Oct 26 11:24:42 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 26 22:16:34 UTC 2020 diff --git a/firmware/controllers/generated/fsio_enums_generated.def b/firmware/controllers/generated/fsio_enums_generated.def index fe51949155..502d74a5b8 100644 --- a/firmware/controllers/generated/fsio_enums_generated.def +++ b/firmware/controllers/generated/fsio_enums_generated.def @@ -1,4 +1,4 @@ -// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 26 11:24:42 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 26 22:16:34 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 aa5a02df86..d87abb6418 100644 --- a/firmware/controllers/generated/fsio_getters.def +++ b/firmware/controllers/generated/fsio_getters.def @@ -1,4 +1,4 @@ -// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 26 11:24:42 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 26 22:16:34 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 16042a8221..651bf99a33 100644 --- a/firmware/controllers/generated/fsio_names.def +++ b/firmware/controllers/generated/fsio_names.def @@ -1,4 +1,4 @@ -// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 26 11:24:42 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 26 22:16:34 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 f6ef299811..5d1ff115d9 100644 --- a/firmware/controllers/generated/fsio_strings.def +++ b/firmware/controllers/generated/fsio_strings.def @@ -1,4 +1,4 @@ -// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 26 11:24:42 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 26 22:16:34 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 c2094b6ed3..09d0c9b49c 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -34,10 +34,7 @@ #define afr_v2_offset 572 #define afr_value1_offset 568 #define afr_value2_offset 576 -#define afrLoadBins_offset 18848 #define afrOverrideMode_offset 2111 -#define afrRpmBins_offset 18912 -#define afrTable_offset 18592 #define afterCrankingIACtaperDuration_offset 2036 #define AFTERSTART_DECAY_CURVE_SIZE 8 #define AFTERSTART_ENRICH_CURVE_SIZE 8 @@ -612,7 +609,6 @@ #define GAUGE_NAME_ACCEL_X "Acceleration: X" #define GAUGE_NAME_ACCEL_Y "Acceleration: Y" #define GAUGE_NAME_ACCEL_Z "Acceleration: Z" -#define GAUGE_NAME_AFR "Air/Fuel Ratio" #define GAUGE_NAME_AIR_FLOW "MAF air flow" #define GAUGE_NAME_AIR_MASS "air mass" #define GAUGE_NAME_BARO_PRESSURE "Barometric pressure" @@ -661,6 +657,7 @@ #define GAUGE_NAME_INJECTOR_LAG "fuel: injector lag" #define GAUGE_NAME_KNOCK_COUNTER "knock: counter" #define GAUGE_NAME_KNOCK_LEVEL "knock: current level" +#define GAUGE_NAME_LAMBDA "Lambda" #define GAUGE_NAME_MAF "MAF" #define GAUGE_NAME_MAP "MAP" #define GAUGE_NAME_RPM "RPM" @@ -969,6 +966,9 @@ #define knockNoise_offset 1820 #define knockNoiseRpmBins_offset 1852 #define knockVThreshold_offset 1512 +#define lambdaLoadBins_offset 18848 +#define lambdaRpmBins_offset 18912 +#define lambdaTable_offset 18592 #define launchActivateDelay_offset 1060 #define launchActivatePin_offset 991 #define launchActivationMode_e_auto_enum "SWITCH_INPUT_LAUNCH", "CLUTCH_INPUT_LAUNCH", "ALWAYS_ACTIVE_LAUNCH" @@ -1122,6 +1122,8 @@ #define PACK_MULT_ANGLE 50 #define PACK_MULT_FUEL_MASS 100 #define PACK_MULT_HIGH_PRESSURE 10 +#define PACK_MULT_LAMBDA 10000 +#define PACK_MULT_LAMBDA_CFG 147 #define PACK_MULT_MASS_FLOW 10 #define PACK_MULT_MS 300 #define PACK_MULT_PERCENT 100 @@ -1198,7 +1200,7 @@ #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD all #define SIGNATURE_DATE 2020.10.26 -#define SIGNATURE_HASH 3364734513 +#define SIGNATURE_HASH 3243636979 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1517,7 +1519,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2020.10.26.all.3364734513" +#define TS_SIGNATURE "rusEFI 2020.10.26.all.3243636979" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' // 0x74 diff --git a/firmware/controllers/generated/signature_all.h b/firmware/controllers/generated/signature_all.h index 2ae4feb462..21d1a4b96b 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.10.26 -#define SIGNATURE_HASH 3364734513 -#define TS_SIGNATURE "rusEFI 2020.10.26.all.3364734513" +#define SIGNATURE_HASH 3243636979 +#define TS_SIGNATURE "rusEFI 2020.10.26.all.3243636979" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index a4ce906073..d6c37efcd9 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.10.26 -#define SIGNATURE_HASH 609167099 -#define TS_SIGNATURE "rusEFI 2020.10.26.frankenso_na6.609167099" +#define SIGNATURE_HASH 1587658628 +#define TS_SIGNATURE "rusEFI 2020.10.26.frankenso_na6.1587658628" diff --git a/firmware/controllers/generated/signature_hellen_cypress.h b/firmware/controllers/generated/signature_hellen_cypress.h index c08d93c483..10f6f7c4a2 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 2020.10.26 -#define SIGNATURE_HASH 1917503311 -#define TS_SIGNATURE "rusEFI 2020.10.26.hellen_cypress.1917503311" +#define SIGNATURE_HASH 144989744 +#define TS_SIGNATURE "rusEFI 2020.10.26.hellen_cypress.144989744" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index 805605c13a..8118a936f9 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.10.26 -#define SIGNATURE_HASH 592903605 -#define TS_SIGNATURE "rusEFI 2020.10.26.kin.592903605" +#define SIGNATURE_HASH 1505256650 +#define TS_SIGNATURE "rusEFI 2020.10.26.kin.1505256650" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index c76d7f24b2..ea8f92aae7 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.10.26 -#define SIGNATURE_HASH 3634354280 -#define TS_SIGNATURE "rusEFI 2020.10.26.mre_f4.3634354280" +#define SIGNATURE_HASH 2725331223 +#define TS_SIGNATURE "rusEFI 2020.10.26.mre_f4.2725331223" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index ee8354cbd1..7fc10464cf 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.10.26 -#define SIGNATURE_HASH 3634354280 -#define TS_SIGNATURE "rusEFI 2020.10.26.mre_f7.3634354280" +#define SIGNATURE_HASH 2725331223 +#define TS_SIGNATURE "rusEFI 2020.10.26.mre_f7.2725331223" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index 0c47a92657..7da53a614b 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.10.26 -#define SIGNATURE_HASH 628269857 -#define TS_SIGNATURE "rusEFI 2020.10.26.prometheus_405.628269857" +#define SIGNATURE_HASH 1604074078 +#define TS_SIGNATURE "rusEFI 2020.10.26.prometheus_405.1604074078" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index 0399d2e82d..f2593a1956 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.10.26 -#define SIGNATURE_HASH 628269857 -#define TS_SIGNATURE "rusEFI 2020.10.26.prometheus_469.628269857" +#define SIGNATURE_HASH 1604074078 +#define TS_SIGNATURE "rusEFI 2020.10.26.prometheus_469.1604074078" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index aec3b307c2..9aff95b266 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.10.26 -#define SIGNATURE_HASH 1052413234 -#define TS_SIGNATURE "rusEFI 2020.10.26.proteus_f4.1052413234" +#define SIGNATURE_HASH 1146360909 +#define TS_SIGNATURE "rusEFI 2020.10.26.proteus_f4.1146360909" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index c91d43e2b8..6e705ef474 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.10.26 -#define SIGNATURE_HASH 1052413234 -#define TS_SIGNATURE "rusEFI 2020.10.26.proteus_f7.1052413234" +#define SIGNATURE_HASH 1146360909 +#define TS_SIGNATURE "rusEFI 2020.10.26.proteus_f7.1146360909" diff --git a/firmware/tunerstudio/generated/cache.zip b/firmware/tunerstudio/generated/cache.zip index 8973c2e57c..ef7705c4fa 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 1ef37bf89b..d537f76a96 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.10.26.all.3364734513" + signature = "rusEFI 2020.10.26.all.3243636979" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.10.26.all.3364734513" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.10.26.all.3243636979" ; 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 Mon Oct 26 11:24:42 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 26 22:16:34 UTC 2020 pageSize = 20000 page = 1 @@ -1234,9 +1234,9 @@ page = 1 veTable = array, F32, 17440, [16x16],"%", 1.0, 0, 0, 999.0, 2 veLoadBins = array, F32, 18464, [16], "kPa", 1.0, 0.0, 0, 400.0, 2 veRpmBins = array, F32, 18528, [16], "RPM", 1.0, 0.0, 0, 18000.0, 2 - afrTable = array, U08, 18592, [16x16],"deg", 0.1, 0, 0, 25.0, 1 - afrLoadBins = array, F32, 18848, [16], "", 1.0, 0.0, 0, 500.0, 2 - afrRpmBins = array, F32, 18912, [16], "RPM", 1.0, 0.0, 0, 18000.0, 2 + lambdaTable = array, U08, 18592, [16x16],"deg", 0.006802721088435374, 0, 0.6, 1.5, 2 + lambdaLoadBins = array, F32, 18848, [16], "", 1.0, 0.0, 0, 500.0, 2 + lambdaRpmBins = array, F32, 18912, [16], "RPM", 1.0, 0.0, 0, 18000.0, 2 tpsTpsAccelTable = array, F32, 18976, [8x8],"value", 1.0, 0, 0.0, 30000.0, 2 tpsTpsAccelFromRpmBins = array, F32, 19232, [8], "from", 1.0, 0, 0.0, 30000.0, 2 tpsTpsAccelToRpmBins = array, F32, 19264, [8], "to", 1.0, 0, 0.0, 25500.0, 2 @@ -1457,7 +1457,7 @@ page = 1 pageButtons = "&EGO" gauge1 = RPMGauge - gauge2 = afr1Gauge + gauge2 = lambda1Gauge gauge3 = MAPGauge gauge4 = veValueGauge @@ -1502,8 +1502,8 @@ page = 1 [VeAnalyze] ; tableName, lambdaTargetTableName, lambdaChannel, egoCorrectionChannel, activeCondition - veAnalyzeMap = veTableTbl, afrTableTbl, AFRValue, egoCorrection, { 1 } - lambdaTargetTables = afrTableTbl, afrTSCustom + veAnalyzeMap = veTableTbl, lambdaTableTbl, lambdaValue, egoCorrection, { 1 } + lambdaTargetTables = lambdaTableTbl, afrTSCustom ; filter = Name, "DisplayName", outputChannel, operator, defaultVal, userAdjustable filter = minRPMFilter, "Minimum RPM", RPMValue, < , 500, , true @@ -1581,7 +1581,7 @@ page = 1 massAirFlowValue= scalar, U16, 28, "Kg/h", {1/10}, 0 MAPValue = scalar, U16, 30, "kPa",{1/30}, 0.0 baroPressure = scalar, U16, 32, "kPa",{1/30}, 0.0 - AFRValue = scalar, U16, 34, "AFR",,{1/1000},, 0.0 + lambdaValue = scalar, U16, 34, "",,{1/10000},, 0.0 engineLoad = scalar, U16, 36, "%",{1/100}, 0.0 ; Blend of MAP and TPS, depends on algorithm ; misc sensors @@ -1896,7 +1896,7 @@ page = 1 yAxis = 0, 28, 10 xBins = narrowToWideOxygenBins yBins = narrowToWideOxygen - gauge = afr1Gauge + gauge = lambda1Gauge curve = fsioCurve1, "FSIO Curve #1" columnLabel = "X", "Y" @@ -2074,7 +2074,7 @@ page = 1 yAxis = 0, 250, 10 xBins = idleVeBins, RPMValue yBins = idleVe - gauge = afr1Gauge + gauge = lambda1Gauge curve = crankingAdvanceCurve, "Cranking Advance Angle" columnLabel = "RPM", "degrees" @@ -2203,11 +2203,11 @@ page = 1 upDownLabel = "(Later)", "(Sooner)" - table = afrTableTbl, afrTableMap, "Target AFR Table", 1 + table = lambdaTableTbl, lambdaTableMap, "Target Lambda Table", 1 ; constant, variable - xBins = afrRpmBins, RPMValue - yBins = afrLoadBins, afrTableYAxis - zBins = afrTable + xBins = lambdaRpmBins, RPMValue + yBins = lambdaLoadBins, afrTableYAxis + zBins = lambdaTable ; gridHeight = 2.0 gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. upDownLabel = "(RICHER)", "(LEANER)" @@ -2305,7 +2305,7 @@ gaugeCategory = Sensors - Basic RPMGauge = RPMValue, "RPM - engine speed", "RPM", 0, 15000, 200, 500, 6000, 6000, 0, 0 CLTGauge = coolant, "Coolant temp", "deg C", -40, 140, -15, 1, 95, 110, 1, 1 IATGauge = intake, "Intake air temp", "deg C", -40, 140, -15, 1, 95, 110, 1, 1 - afr1Gauge = AFRValue, "Air fuel ratio", "", 10, 19.4, 12, 13, 15, 16, 2, 2 + lambda1Gauge = lambdaValue, "Lambda", "", 0.65, 1.2, 0.7, 0.75, 1.1, 1.15, 3, 2 MAFGauge = MAFValue, "Mass air flow", "v", 0, 5, 0, 1, 3, 4, 1, 1 VBattGauge = VBatt, "Battery voltage", "V", 8, 21, 9, 10, 17, 19, 1, 1 MAPGauge = MAPValue, "MAP", "kPa", 0, 300, 10, 10, 200, 200, 0, 0 @@ -2396,9 +2396,9 @@ gaugeCategory = Knock [WueAnalyze] ; wueCurveName, afrTempCompensationCurve, lambdaTargetTableName, lambdaChannel, coolantTempChannel, egoCorrectionChannel, wueChannel, activeCondition - wueAnalyzeMap = wueAnalyzer_warmup_curve, wueAfrTargetOffsetCurve, afrTableTbl, AFRValue, coolant, cltCorrection, egoCorrection + wueAnalyzeMap = wueAnalyzer_warmup_curve, wueAfrTargetOffsetCurve, lambdaTableTbl, lambdaValue, coolant, cltCorrection, egoCorrection - lambdaTargetTables = afrTableTbl, afrTSCustom + lambdaTargetTables = lambdaTableTbl, afrTSCustom wuePercentOffset = 0 ; for working with 0 based enrichment set to 100 option = disableLiveUpdates @@ -2429,7 +2429,7 @@ gaugeCategory = Knock gauge2 = CLTGauge gauge3 = TPSGauge gauge4 = MAPGauge - gauge5 = afr1Gauge + gauge5 = lambda1Gauge gauge6 = VBattGauge gauge7 = dwellGauge gauge8 = ignadvGauge @@ -2496,7 +2496,7 @@ gaugeCategory = Knock entry = TPS2Value, "TPS2", float, "%.2f" entry = MAFValue, "MAF", float, "%.2f" entry = MAPValue, "MAP", float, "%.1f" - entry = AFRValue, "Air/Fuel Ratio", float, "%.2f" + entry = lambdaValue, "Lambda", float, "%.2f" entry = VBatt, "VBatt", float, "%.2f" entry = engineLoad, "Engine Load", float, "%.1f" entry = fuelingLoad, "fuel: load", float, "%.1f" @@ -2654,7 +2654,7 @@ menuDialog = main subMenu = std_separator # Fuel model - subMenu = afrTableTbl, "Target AFR", 0, {isInjectionEnabled == 1} + subMenu = lambdaTableTbl, "Target lambda", 0, {isInjectionEnabled == 1} subMenu = cltFuelCorrCurve, "CLT multiplier", 0, {isInjectionEnabled == 1} subMenu = iatFuelCorrCurve, "IAT multiplier", 0, {isInjectionEnabled == 1} subMenu = fuelClosedLoopDialog, "Closed loop fuel correction", 0, {isInjectionEnabled == 1} @@ -4729,4 +4729,3 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" [Tools] ;addTool = toolName, PanelName addTool = veTableGenerator, "VE Table Generator", veTableTbl - addTool = afrTableGenerator, "AFR Table Generator", afrTableTbl diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index 863a85b28e..8636f4105b 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.10.26.frankenso_na6.609167099" + signature = "rusEFI 2020.10.26.frankenso_na6.1587658628" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.10.26.frankenso_na6.609167099" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.10.26.frankenso_na6.1587658628" ; 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 Mon Oct 26 11:24:54 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 26 22:16:46 UTC 2020 pageSize = 20000 page = 1 @@ -1234,9 +1234,9 @@ page = 1 veTable = array, F32, 17440, [16x16],"%", 1.0, 0, 0, 999.0, 2 veLoadBins = array, F32, 18464, [16], "kPa", 1.0, 0.0, 0, 400.0, 2 veRpmBins = array, F32, 18528, [16], "RPM", 1.0, 0.0, 0, 18000.0, 2 - afrTable = array, U08, 18592, [16x16],"deg", 0.1, 0, 0, 25.0, 1 - afrLoadBins = array, F32, 18848, [16], "", 1.0, 0.0, 0, 500.0, 2 - afrRpmBins = array, F32, 18912, [16], "RPM", 1.0, 0.0, 0, 18000.0, 2 + lambdaTable = array, U08, 18592, [16x16],"deg", 0.006802721088435374, 0, 0.6, 1.5, 2 + lambdaLoadBins = array, F32, 18848, [16], "", 1.0, 0.0, 0, 500.0, 2 + lambdaRpmBins = array, F32, 18912, [16], "RPM", 1.0, 0.0, 0, 18000.0, 2 tpsTpsAccelTable = array, F32, 18976, [8x8],"value", 1.0, 0, 0.0, 30000.0, 2 tpsTpsAccelFromRpmBins = array, F32, 19232, [8], "from", 1.0, 0, 0.0, 30000.0, 2 tpsTpsAccelToRpmBins = array, F32, 19264, [8], "to", 1.0, 0, 0.0, 25500.0, 2 @@ -1457,7 +1457,7 @@ page = 1 pageButtons = "&EGO" gauge1 = RPMGauge - gauge2 = afr1Gauge + gauge2 = lambda1Gauge gauge3 = MAPGauge gauge4 = veValueGauge @@ -1502,8 +1502,8 @@ page = 1 [VeAnalyze] ; tableName, lambdaTargetTableName, lambdaChannel, egoCorrectionChannel, activeCondition - veAnalyzeMap = veTableTbl, afrTableTbl, AFRValue, egoCorrection, { 1 } - lambdaTargetTables = afrTableTbl, afrTSCustom + veAnalyzeMap = veTableTbl, lambdaTableTbl, lambdaValue, egoCorrection, { 1 } + lambdaTargetTables = lambdaTableTbl, afrTSCustom ; filter = Name, "DisplayName", outputChannel, operator, defaultVal, userAdjustable filter = minRPMFilter, "Minimum RPM", RPMValue, < , 500, , true @@ -1581,7 +1581,7 @@ page = 1 massAirFlowValue= scalar, U16, 28, "Kg/h", {1/10}, 0 MAPValue = scalar, U16, 30, "kPa",{1/30}, 0.0 baroPressure = scalar, U16, 32, "kPa",{1/30}, 0.0 - AFRValue = scalar, U16, 34, "AFR",,{1/1000},, 0.0 + lambdaValue = scalar, U16, 34, "",,{1/10000},, 0.0 engineLoad = scalar, U16, 36, "%",{1/100}, 0.0 ; Blend of MAP and TPS, depends on algorithm ; misc sensors @@ -1896,7 +1896,7 @@ page = 1 yAxis = 0, 28, 10 xBins = narrowToWideOxygenBins yBins = narrowToWideOxygen - gauge = afr1Gauge + gauge = lambda1Gauge curve = fsioCurve1, "FSIO Curve #1" columnLabel = "X", "Y" @@ -2074,7 +2074,7 @@ page = 1 yAxis = 0, 250, 10 xBins = idleVeBins, RPMValue yBins = idleVe - gauge = afr1Gauge + gauge = lambda1Gauge curve = crankingAdvanceCurve, "Cranking Advance Angle" columnLabel = "RPM", "degrees" @@ -2203,11 +2203,11 @@ page = 1 upDownLabel = "(Later)", "(Sooner)" - table = afrTableTbl, afrTableMap, "Target AFR Table", 1 + table = lambdaTableTbl, lambdaTableMap, "Target Lambda Table", 1 ; constant, variable - xBins = afrRpmBins, RPMValue - yBins = afrLoadBins, afrTableYAxis - zBins = afrTable + xBins = lambdaRpmBins, RPMValue + yBins = lambdaLoadBins, afrTableYAxis + zBins = lambdaTable ; gridHeight = 2.0 gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. upDownLabel = "(RICHER)", "(LEANER)" @@ -2305,7 +2305,7 @@ gaugeCategory = Sensors - Basic RPMGauge = RPMValue, "RPM - engine speed", "RPM", 0, 15000, 200, 500, 6000, 6000, 0, 0 CLTGauge = coolant, "Coolant temp", "deg C", -40, 140, -15, 1, 95, 110, 1, 1 IATGauge = intake, "Intake air temp", "deg C", -40, 140, -15, 1, 95, 110, 1, 1 - afr1Gauge = AFRValue, "Air fuel ratio", "", 10, 19.4, 12, 13, 15, 16, 2, 2 + lambda1Gauge = lambdaValue, "Lambda", "", 0.65, 1.2, 0.7, 0.75, 1.1, 1.15, 3, 2 MAFGauge = MAFValue, "Mass air flow", "v", 0, 5, 0, 1, 3, 4, 1, 1 VBattGauge = VBatt, "Battery voltage", "V", 8, 21, 9, 10, 17, 19, 1, 1 MAPGauge = MAPValue, "MAP", "kPa", 0, 300, 10, 10, 200, 200, 0, 0 @@ -2396,9 +2396,9 @@ gaugeCategory = Knock [WueAnalyze] ; wueCurveName, afrTempCompensationCurve, lambdaTargetTableName, lambdaChannel, coolantTempChannel, egoCorrectionChannel, wueChannel, activeCondition - wueAnalyzeMap = wueAnalyzer_warmup_curve, wueAfrTargetOffsetCurve, afrTableTbl, AFRValue, coolant, cltCorrection, egoCorrection + wueAnalyzeMap = wueAnalyzer_warmup_curve, wueAfrTargetOffsetCurve, lambdaTableTbl, lambdaValue, coolant, cltCorrection, egoCorrection - lambdaTargetTables = afrTableTbl, afrTSCustom + lambdaTargetTables = lambdaTableTbl, afrTSCustom wuePercentOffset = 0 ; for working with 0 based enrichment set to 100 option = disableLiveUpdates @@ -2429,7 +2429,7 @@ gaugeCategory = Knock gauge2 = CLTGauge gauge3 = TPSGauge gauge4 = MAPGauge - gauge5 = afr1Gauge + gauge5 = lambda1Gauge gauge6 = VBattGauge gauge7 = dwellGauge gauge8 = ignadvGauge @@ -2496,7 +2496,7 @@ gaugeCategory = Knock entry = TPS2Value, "TPS2", float, "%.2f" entry = MAFValue, "MAF", float, "%.2f" entry = MAPValue, "MAP", float, "%.1f" - entry = AFRValue, "Air/Fuel Ratio", float, "%.2f" + entry = lambdaValue, "Lambda", float, "%.2f" entry = VBatt, "VBatt", float, "%.2f" entry = engineLoad, "Engine Load", float, "%.1f" entry = fuelingLoad, "fuel: load", float, "%.1f" @@ -2654,7 +2654,7 @@ menuDialog = main subMenu = std_separator # Fuel model - subMenu = afrTableTbl, "Target AFR", 0, {isInjectionEnabled == 1} + subMenu = lambdaTableTbl, "Target lambda", 0, {isInjectionEnabled == 1} subMenu = cltFuelCorrCurve, "CLT multiplier", 0, {isInjectionEnabled == 1} subMenu = iatFuelCorrCurve, "IAT multiplier", 0, {isInjectionEnabled == 1} subMenu = fuelClosedLoopDialog, "Closed loop fuel correction", 0, {isInjectionEnabled == 1} @@ -4722,4 +4722,3 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" [Tools] ;addTool = toolName, PanelName addTool = veTableGenerator, "VE Table Generator", veTableTbl - addTool = afrTableGenerator, "AFR Table Generator", afrTableTbl diff --git a/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini b/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini index bfbd25f545..c432bcb051 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 2020.10.26.hellen_cypress.1917503311" + signature = "rusEFI 2020.10.26.hellen_cypress.144989744" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.10.26.hellen_cypress.1917503311" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.10.26.hellen_cypress.144989744" ; 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 hellen_cypress_gen_config.bat integration/rusefi_config.txt Mon Oct 26 11:25:05 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Mon Oct 26 22:16:57 UTC 2020 pageSize = 20000 page = 1 @@ -1234,9 +1234,9 @@ page = 1 veTable = array, F32, 17440, [16x16],"%", 1.0, 0, 0, 999.0, 2 veLoadBins = array, F32, 18464, [16], "kPa", 1.0, 0.0, 0, 400.0, 2 veRpmBins = array, F32, 18528, [16], "RPM", 1.0, 0.0, 0, 18000.0, 2 - afrTable = array, U08, 18592, [16x16],"deg", 0.1, 0, 0, 25.0, 1 - afrLoadBins = array, F32, 18848, [16], "", 1.0, 0.0, 0, 500.0, 2 - afrRpmBins = array, F32, 18912, [16], "RPM", 1.0, 0.0, 0, 18000.0, 2 + lambdaTable = array, U08, 18592, [16x16],"deg", 0.006802721088435374, 0, 0.6, 1.5, 2 + lambdaLoadBins = array, F32, 18848, [16], "", 1.0, 0.0, 0, 500.0, 2 + lambdaRpmBins = array, F32, 18912, [16], "RPM", 1.0, 0.0, 0, 18000.0, 2 tpsTpsAccelTable = array, F32, 18976, [8x8],"value", 1.0, 0, 0.0, 30000.0, 2 tpsTpsAccelFromRpmBins = array, F32, 19232, [8], "from", 1.0, 0, 0.0, 30000.0, 2 tpsTpsAccelToRpmBins = array, F32, 19264, [8], "to", 1.0, 0, 0.0, 25500.0, 2 @@ -1457,7 +1457,7 @@ page = 1 pageButtons = "&EGO" gauge1 = RPMGauge - gauge2 = afr1Gauge + gauge2 = lambda1Gauge gauge3 = MAPGauge gauge4 = veValueGauge @@ -1502,8 +1502,8 @@ page = 1 [VeAnalyze] ; tableName, lambdaTargetTableName, lambdaChannel, egoCorrectionChannel, activeCondition - veAnalyzeMap = veTableTbl, afrTableTbl, AFRValue, egoCorrection, { 1 } - lambdaTargetTables = afrTableTbl, afrTSCustom + veAnalyzeMap = veTableTbl, lambdaTableTbl, lambdaValue, egoCorrection, { 1 } + lambdaTargetTables = lambdaTableTbl, afrTSCustom ; filter = Name, "DisplayName", outputChannel, operator, defaultVal, userAdjustable filter = minRPMFilter, "Minimum RPM", RPMValue, < , 500, , true @@ -1581,7 +1581,7 @@ page = 1 massAirFlowValue= scalar, U16, 28, "Kg/h", {1/10}, 0 MAPValue = scalar, U16, 30, "kPa",{1/30}, 0.0 baroPressure = scalar, U16, 32, "kPa",{1/30}, 0.0 - AFRValue = scalar, U16, 34, "AFR",,{1/1000},, 0.0 + lambdaValue = scalar, U16, 34, "",,{1/10000},, 0.0 engineLoad = scalar, U16, 36, "%",{1/100}, 0.0 ; Blend of MAP and TPS, depends on algorithm ; misc sensors @@ -1896,7 +1896,7 @@ page = 1 yAxis = 0, 28, 10 xBins = narrowToWideOxygenBins yBins = narrowToWideOxygen - gauge = afr1Gauge + gauge = lambda1Gauge curve = fsioCurve1, "FSIO Curve #1" columnLabel = "X", "Y" @@ -2074,7 +2074,7 @@ page = 1 yAxis = 0, 250, 10 xBins = idleVeBins, RPMValue yBins = idleVe - gauge = afr1Gauge + gauge = lambda1Gauge curve = crankingAdvanceCurve, "Cranking Advance Angle" columnLabel = "RPM", "degrees" @@ -2203,11 +2203,11 @@ page = 1 upDownLabel = "(Later)", "(Sooner)" - table = afrTableTbl, afrTableMap, "Target AFR Table", 1 + table = lambdaTableTbl, lambdaTableMap, "Target Lambda Table", 1 ; constant, variable - xBins = afrRpmBins, RPMValue - yBins = afrLoadBins, afrTableYAxis - zBins = afrTable + xBins = lambdaRpmBins, RPMValue + yBins = lambdaLoadBins, afrTableYAxis + zBins = lambdaTable ; gridHeight = 2.0 gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. upDownLabel = "(RICHER)", "(LEANER)" @@ -2305,7 +2305,7 @@ gaugeCategory = Sensors - Basic RPMGauge = RPMValue, "RPM - engine speed", "RPM", 0, 15000, 200, 500, 6000, 6000, 0, 0 CLTGauge = coolant, "Coolant temp", "deg C", -40, 140, -15, 1, 95, 110, 1, 1 IATGauge = intake, "Intake air temp", "deg C", -40, 140, -15, 1, 95, 110, 1, 1 - afr1Gauge = AFRValue, "Air fuel ratio", "", 10, 19.4, 12, 13, 15, 16, 2, 2 + lambda1Gauge = lambdaValue, "Lambda", "", 0.65, 1.2, 0.7, 0.75, 1.1, 1.15, 3, 2 MAFGauge = MAFValue, "Mass air flow", "v", 0, 5, 0, 1, 3, 4, 1, 1 VBattGauge = VBatt, "Battery voltage", "V", 8, 21, 9, 10, 17, 19, 1, 1 MAPGauge = MAPValue, "MAP", "kPa", 0, 300, 10, 10, 200, 200, 0, 0 @@ -2396,9 +2396,9 @@ gaugeCategory = Knock [WueAnalyze] ; wueCurveName, afrTempCompensationCurve, lambdaTargetTableName, lambdaChannel, coolantTempChannel, egoCorrectionChannel, wueChannel, activeCondition - wueAnalyzeMap = wueAnalyzer_warmup_curve, wueAfrTargetOffsetCurve, afrTableTbl, AFRValue, coolant, cltCorrection, egoCorrection + wueAnalyzeMap = wueAnalyzer_warmup_curve, wueAfrTargetOffsetCurve, lambdaTableTbl, lambdaValue, coolant, cltCorrection, egoCorrection - lambdaTargetTables = afrTableTbl, afrTSCustom + lambdaTargetTables = lambdaTableTbl, afrTSCustom wuePercentOffset = 0 ; for working with 0 based enrichment set to 100 option = disableLiveUpdates @@ -2429,7 +2429,7 @@ gaugeCategory = Knock gauge2 = CLTGauge gauge3 = TPSGauge gauge4 = MAPGauge - gauge5 = afr1Gauge + gauge5 = lambda1Gauge gauge6 = VBattGauge gauge7 = dwellGauge gauge8 = ignadvGauge @@ -2496,7 +2496,7 @@ gaugeCategory = Knock entry = TPS2Value, "TPS2", float, "%.2f" entry = MAFValue, "MAF", float, "%.2f" entry = MAPValue, "MAP", float, "%.1f" - entry = AFRValue, "Air/Fuel Ratio", float, "%.2f" + entry = lambdaValue, "Lambda", float, "%.2f" entry = VBatt, "VBatt", float, "%.2f" entry = engineLoad, "Engine Load", float, "%.1f" entry = fuelingLoad, "fuel: load", float, "%.1f" @@ -2654,7 +2654,7 @@ menuDialog = main subMenu = std_separator # Fuel model - subMenu = afrTableTbl, "Target AFR", 0, {isInjectionEnabled == 1} + subMenu = lambdaTableTbl, "Target lambda", 0, {isInjectionEnabled == 1} subMenu = cltFuelCorrCurve, "CLT multiplier", 0, {isInjectionEnabled == 1} subMenu = iatFuelCorrCurve, "IAT multiplier", 0, {isInjectionEnabled == 1} subMenu = fuelClosedLoopDialog, "Closed loop fuel correction", 0, {isInjectionEnabled == 1} @@ -4729,4 +4729,3 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" [Tools] ;addTool = toolName, PanelName addTool = veTableGenerator, "VE Table Generator", veTableTbl - addTool = afrTableGenerator, "AFR Table Generator", afrTableTbl diff --git a/firmware/tunerstudio/generated/rusefi_kinetis.ini b/firmware/tunerstudio/generated/rusefi_kinetis.ini index 6ddb091d12..b6cf8e2376 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.10.26.kin.592903605" + signature = "rusEFI 2020.10.26.kin.1505256650" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.10.26.kin.592903605" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.10.26.kin.1505256650" ; 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 Mon Oct 26 11:25:03 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Mon Oct 26 22:16:55 UTC 2020 pageSize = 20000 page = 1 @@ -1234,9 +1234,9 @@ page = 1 veTable = array, F32, 17440, [16x16],"%", 1.0, 0, 0, 999.0, 2 veLoadBins = array, F32, 18464, [16], "kPa", 1.0, 0.0, 0, 400.0, 2 veRpmBins = array, F32, 18528, [16], "RPM", 1.0, 0.0, 0, 18000.0, 2 - afrTable = array, U08, 18592, [16x16],"deg", 0.1, 0, 0, 25.0, 1 - afrLoadBins = array, F32, 18848, [16], "", 1.0, 0.0, 0, 500.0, 2 - afrRpmBins = array, F32, 18912, [16], "RPM", 1.0, 0.0, 0, 18000.0, 2 + lambdaTable = array, U08, 18592, [16x16],"deg", 0.006802721088435374, 0, 0.6, 1.5, 2 + lambdaLoadBins = array, F32, 18848, [16], "", 1.0, 0.0, 0, 500.0, 2 + lambdaRpmBins = array, F32, 18912, [16], "RPM", 1.0, 0.0, 0, 18000.0, 2 tpsTpsAccelTable = array, F32, 18976, [8x8],"value", 1.0, 0, 0.0, 30000.0, 2 tpsTpsAccelFromRpmBins = array, F32, 19232, [8], "from", 1.0, 0, 0.0, 30000.0, 2 tpsTpsAccelToRpmBins = array, F32, 19264, [8], "to", 1.0, 0, 0.0, 25500.0, 2 @@ -1457,7 +1457,7 @@ page = 1 pageButtons = "&EGO" gauge1 = RPMGauge - gauge2 = afr1Gauge + gauge2 = lambda1Gauge gauge3 = MAPGauge gauge4 = veValueGauge @@ -1502,8 +1502,8 @@ page = 1 [VeAnalyze] ; tableName, lambdaTargetTableName, lambdaChannel, egoCorrectionChannel, activeCondition - veAnalyzeMap = veTableTbl, afrTableTbl, AFRValue, egoCorrection, { 1 } - lambdaTargetTables = afrTableTbl, afrTSCustom + veAnalyzeMap = veTableTbl, lambdaTableTbl, lambdaValue, egoCorrection, { 1 } + lambdaTargetTables = lambdaTableTbl, afrTSCustom ; filter = Name, "DisplayName", outputChannel, operator, defaultVal, userAdjustable filter = minRPMFilter, "Minimum RPM", RPMValue, < , 500, , true @@ -1581,7 +1581,7 @@ page = 1 massAirFlowValue= scalar, U16, 28, "Kg/h", {1/10}, 0 MAPValue = scalar, U16, 30, "kPa",{1/30}, 0.0 baroPressure = scalar, U16, 32, "kPa",{1/30}, 0.0 - AFRValue = scalar, U16, 34, "AFR",,{1/1000},, 0.0 + lambdaValue = scalar, U16, 34, "",,{1/10000},, 0.0 engineLoad = scalar, U16, 36, "%",{1/100}, 0.0 ; Blend of MAP and TPS, depends on algorithm ; misc sensors @@ -1896,7 +1896,7 @@ page = 1 yAxis = 0, 28, 10 xBins = narrowToWideOxygenBins yBins = narrowToWideOxygen - gauge = afr1Gauge + gauge = lambda1Gauge curve = fsioCurve1, "FSIO Curve #1" columnLabel = "X", "Y" @@ -2074,7 +2074,7 @@ page = 1 yAxis = 0, 250, 10 xBins = idleVeBins, RPMValue yBins = idleVe - gauge = afr1Gauge + gauge = lambda1Gauge curve = crankingAdvanceCurve, "Cranking Advance Angle" columnLabel = "RPM", "degrees" @@ -2203,11 +2203,11 @@ page = 1 upDownLabel = "(Later)", "(Sooner)" - table = afrTableTbl, afrTableMap, "Target AFR Table", 1 + table = lambdaTableTbl, lambdaTableMap, "Target Lambda Table", 1 ; constant, variable - xBins = afrRpmBins, RPMValue - yBins = afrLoadBins, afrTableYAxis - zBins = afrTable + xBins = lambdaRpmBins, RPMValue + yBins = lambdaLoadBins, afrTableYAxis + zBins = lambdaTable ; gridHeight = 2.0 gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. upDownLabel = "(RICHER)", "(LEANER)" @@ -2305,7 +2305,7 @@ gaugeCategory = Sensors - Basic RPMGauge = RPMValue, "RPM - engine speed", "RPM", 0, 15000, 200, 500, 6000, 6000, 0, 0 CLTGauge = coolant, "Coolant temp", "deg C", -40, 140, -15, 1, 95, 110, 1, 1 IATGauge = intake, "Intake air temp", "deg C", -40, 140, -15, 1, 95, 110, 1, 1 - afr1Gauge = AFRValue, "Air fuel ratio", "", 10, 19.4, 12, 13, 15, 16, 2, 2 + lambda1Gauge = lambdaValue, "Lambda", "", 0.65, 1.2, 0.7, 0.75, 1.1, 1.15, 3, 2 MAFGauge = MAFValue, "Mass air flow", "v", 0, 5, 0, 1, 3, 4, 1, 1 VBattGauge = VBatt, "Battery voltage", "V", 8, 21, 9, 10, 17, 19, 1, 1 MAPGauge = MAPValue, "MAP", "kPa", 0, 300, 10, 10, 200, 200, 0, 0 @@ -2396,9 +2396,9 @@ gaugeCategory = Knock [WueAnalyze] ; wueCurveName, afrTempCompensationCurve, lambdaTargetTableName, lambdaChannel, coolantTempChannel, egoCorrectionChannel, wueChannel, activeCondition - wueAnalyzeMap = wueAnalyzer_warmup_curve, wueAfrTargetOffsetCurve, afrTableTbl, AFRValue, coolant, cltCorrection, egoCorrection + wueAnalyzeMap = wueAnalyzer_warmup_curve, wueAfrTargetOffsetCurve, lambdaTableTbl, lambdaValue, coolant, cltCorrection, egoCorrection - lambdaTargetTables = afrTableTbl, afrTSCustom + lambdaTargetTables = lambdaTableTbl, afrTSCustom wuePercentOffset = 0 ; for working with 0 based enrichment set to 100 option = disableLiveUpdates @@ -2429,7 +2429,7 @@ gaugeCategory = Knock gauge2 = CLTGauge gauge3 = TPSGauge gauge4 = MAPGauge - gauge5 = afr1Gauge + gauge5 = lambda1Gauge gauge6 = VBattGauge gauge7 = dwellGauge gauge8 = ignadvGauge @@ -2496,7 +2496,7 @@ gaugeCategory = Knock entry = TPS2Value, "TPS2", float, "%.2f" entry = MAFValue, "MAF", float, "%.2f" entry = MAPValue, "MAP", float, "%.1f" - entry = AFRValue, "Air/Fuel Ratio", float, "%.2f" + entry = lambdaValue, "Lambda", float, "%.2f" entry = VBatt, "VBatt", float, "%.2f" entry = engineLoad, "Engine Load", float, "%.1f" entry = fuelingLoad, "fuel: load", float, "%.1f" @@ -2654,7 +2654,7 @@ menuDialog = main subMenu = std_separator # Fuel model - subMenu = afrTableTbl, "Target AFR", 0, {isInjectionEnabled == 1} + subMenu = lambdaTableTbl, "Target lambda", 0, {isInjectionEnabled == 1} subMenu = cltFuelCorrCurve, "CLT multiplier", 0, {isInjectionEnabled == 1} subMenu = iatFuelCorrCurve, "IAT multiplier", 0, {isInjectionEnabled == 1} subMenu = fuelClosedLoopDialog, "Closed loop fuel correction", 0, {isInjectionEnabled == 1} @@ -4730,4 +4730,3 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" [Tools] ;addTool = toolName, PanelName addTool = veTableGenerator, "VE Table Generator", veTableTbl - addTool = afrTableGenerator, "AFR Table Generator", afrTableTbl diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index 4793061ad9..1529505958 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.10.26.mre_f4.3634354280" + signature = "rusEFI 2020.10.26.mre_f4.2725331223" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.10.26.mre_f4.3634354280" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.10.26.mre_f4.2725331223" ; 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 Mon Oct 26 11:24:52 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 26 22:16:44 UTC 2020 pageSize = 20000 page = 1 @@ -1234,9 +1234,9 @@ page = 1 veTable = array, F32, 17440, [16x16],"%", 1.0, 0, 0, 999.0, 2 veLoadBins = array, F32, 18464, [16], "kPa", 1.0, 0.0, 0, 400.0, 2 veRpmBins = array, F32, 18528, [16], "RPM", 1.0, 0.0, 0, 18000.0, 2 - afrTable = array, U08, 18592, [16x16],"deg", 0.1, 0, 0, 25.0, 1 - afrLoadBins = array, F32, 18848, [16], "", 1.0, 0.0, 0, 500.0, 2 - afrRpmBins = array, F32, 18912, [16], "RPM", 1.0, 0.0, 0, 18000.0, 2 + lambdaTable = array, U08, 18592, [16x16],"deg", 0.006802721088435374, 0, 0.6, 1.5, 2 + lambdaLoadBins = array, F32, 18848, [16], "", 1.0, 0.0, 0, 500.0, 2 + lambdaRpmBins = array, F32, 18912, [16], "RPM", 1.0, 0.0, 0, 18000.0, 2 tpsTpsAccelTable = array, F32, 18976, [8x8],"value", 1.0, 0, 0.0, 30000.0, 2 tpsTpsAccelFromRpmBins = array, F32, 19232, [8], "from", 1.0, 0, 0.0, 30000.0, 2 tpsTpsAccelToRpmBins = array, F32, 19264, [8], "to", 1.0, 0, 0.0, 25500.0, 2 @@ -1457,7 +1457,7 @@ page = 1 pageButtons = "&EGO" gauge1 = RPMGauge - gauge2 = afr1Gauge + gauge2 = lambda1Gauge gauge3 = MAPGauge gauge4 = veValueGauge @@ -1502,8 +1502,8 @@ page = 1 [VeAnalyze] ; tableName, lambdaTargetTableName, lambdaChannel, egoCorrectionChannel, activeCondition - veAnalyzeMap = veTableTbl, afrTableTbl, AFRValue, egoCorrection, { 1 } - lambdaTargetTables = afrTableTbl, afrTSCustom + veAnalyzeMap = veTableTbl, lambdaTableTbl, lambdaValue, egoCorrection, { 1 } + lambdaTargetTables = lambdaTableTbl, afrTSCustom ; filter = Name, "DisplayName", outputChannel, operator, defaultVal, userAdjustable filter = minRPMFilter, "Minimum RPM", RPMValue, < , 500, , true @@ -1581,7 +1581,7 @@ page = 1 massAirFlowValue= scalar, U16, 28, "Kg/h", {1/10}, 0 MAPValue = scalar, U16, 30, "kPa",{1/30}, 0.0 baroPressure = scalar, U16, 32, "kPa",{1/30}, 0.0 - AFRValue = scalar, U16, 34, "AFR",,{1/1000},, 0.0 + lambdaValue = scalar, U16, 34, "",,{1/10000},, 0.0 engineLoad = scalar, U16, 36, "%",{1/100}, 0.0 ; Blend of MAP and TPS, depends on algorithm ; misc sensors @@ -1896,7 +1896,7 @@ page = 1 yAxis = 0, 28, 10 xBins = narrowToWideOxygenBins yBins = narrowToWideOxygen - gauge = afr1Gauge + gauge = lambda1Gauge curve = fsioCurve1, "FSIO Curve #1" columnLabel = "X", "Y" @@ -2074,7 +2074,7 @@ page = 1 yAxis = 0, 250, 10 xBins = idleVeBins, RPMValue yBins = idleVe - gauge = afr1Gauge + gauge = lambda1Gauge curve = crankingAdvanceCurve, "Cranking Advance Angle" columnLabel = "RPM", "degrees" @@ -2203,11 +2203,11 @@ page = 1 upDownLabel = "(Later)", "(Sooner)" - table = afrTableTbl, afrTableMap, "Target AFR Table", 1 + table = lambdaTableTbl, lambdaTableMap, "Target Lambda Table", 1 ; constant, variable - xBins = afrRpmBins, RPMValue - yBins = afrLoadBins, afrTableYAxis - zBins = afrTable + xBins = lambdaRpmBins, RPMValue + yBins = lambdaLoadBins, afrTableYAxis + zBins = lambdaTable ; gridHeight = 2.0 gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. upDownLabel = "(RICHER)", "(LEANER)" @@ -2305,7 +2305,7 @@ gaugeCategory = Sensors - Basic RPMGauge = RPMValue, "RPM - engine speed", "RPM", 0, 15000, 200, 500, 6000, 6000, 0, 0 CLTGauge = coolant, "Coolant temp", "deg C", -40, 140, -15, 1, 95, 110, 1, 1 IATGauge = intake, "Intake air temp", "deg C", -40, 140, -15, 1, 95, 110, 1, 1 - afr1Gauge = AFRValue, "Air fuel ratio", "", 10, 19.4, 12, 13, 15, 16, 2, 2 + lambda1Gauge = lambdaValue, "Lambda", "", 0.65, 1.2, 0.7, 0.75, 1.1, 1.15, 3, 2 MAFGauge = MAFValue, "Mass air flow", "v", 0, 5, 0, 1, 3, 4, 1, 1 VBattGauge = VBatt, "Battery voltage", "V", 8, 21, 9, 10, 17, 19, 1, 1 MAPGauge = MAPValue, "MAP", "kPa", 0, 300, 10, 10, 200, 200, 0, 0 @@ -2396,9 +2396,9 @@ gaugeCategory = Knock [WueAnalyze] ; wueCurveName, afrTempCompensationCurve, lambdaTargetTableName, lambdaChannel, coolantTempChannel, egoCorrectionChannel, wueChannel, activeCondition - wueAnalyzeMap = wueAnalyzer_warmup_curve, wueAfrTargetOffsetCurve, afrTableTbl, AFRValue, coolant, cltCorrection, egoCorrection + wueAnalyzeMap = wueAnalyzer_warmup_curve, wueAfrTargetOffsetCurve, lambdaTableTbl, lambdaValue, coolant, cltCorrection, egoCorrection - lambdaTargetTables = afrTableTbl, afrTSCustom + lambdaTargetTables = lambdaTableTbl, afrTSCustom wuePercentOffset = 0 ; for working with 0 based enrichment set to 100 option = disableLiveUpdates @@ -2429,7 +2429,7 @@ gaugeCategory = Knock gauge2 = CLTGauge gauge3 = TPSGauge gauge4 = MAPGauge - gauge5 = afr1Gauge + gauge5 = lambda1Gauge gauge6 = VBattGauge gauge7 = dwellGauge gauge8 = ignadvGauge @@ -2496,7 +2496,7 @@ gaugeCategory = Knock entry = TPS2Value, "TPS2", float, "%.2f" entry = MAFValue, "MAF", float, "%.2f" entry = MAPValue, "MAP", float, "%.1f" - entry = AFRValue, "Air/Fuel Ratio", float, "%.2f" + entry = lambdaValue, "Lambda", float, "%.2f" entry = VBatt, "VBatt", float, "%.2f" entry = engineLoad, "Engine Load", float, "%.1f" entry = fuelingLoad, "fuel: load", float, "%.1f" @@ -2654,7 +2654,7 @@ menuDialog = main subMenu = std_separator # Fuel model - subMenu = afrTableTbl, "Target AFR", 0, {isInjectionEnabled == 1} + subMenu = lambdaTableTbl, "Target lambda", 0, {isInjectionEnabled == 1} subMenu = cltFuelCorrCurve, "CLT multiplier", 0, {isInjectionEnabled == 1} subMenu = iatFuelCorrCurve, "IAT multiplier", 0, {isInjectionEnabled == 1} subMenu = fuelClosedLoopDialog, "Closed loop fuel correction", 0, {isInjectionEnabled == 1} @@ -4698,4 +4698,3 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" [Tools] ;addTool = toolName, PanelName addTool = veTableGenerator, "VE Table Generator", veTableTbl - addTool = afrTableGenerator, "AFR Table Generator", afrTableTbl diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index ab56232c06..ab7dffbcb6 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.10.26.mre_f7.3634354280" + signature = "rusEFI 2020.10.26.mre_f7.2725331223" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.10.26.mre_f7.3634354280" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.10.26.mre_f7.2725331223" ; 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 Mon Oct 26 11:24:50 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 26 22:16:39 UTC 2020 pageSize = 20000 page = 1 @@ -1234,9 +1234,9 @@ page = 1 veTable = array, F32, 17440, [16x16],"%", 1.0, 0, 0, 999.0, 2 veLoadBins = array, F32, 18464, [16], "kPa", 1.0, 0.0, 0, 400.0, 2 veRpmBins = array, F32, 18528, [16], "RPM", 1.0, 0.0, 0, 18000.0, 2 - afrTable = array, U08, 18592, [16x16],"deg", 0.1, 0, 0, 25.0, 1 - afrLoadBins = array, F32, 18848, [16], "", 1.0, 0.0, 0, 500.0, 2 - afrRpmBins = array, F32, 18912, [16], "RPM", 1.0, 0.0, 0, 18000.0, 2 + lambdaTable = array, U08, 18592, [16x16],"deg", 0.006802721088435374, 0, 0.6, 1.5, 2 + lambdaLoadBins = array, F32, 18848, [16], "", 1.0, 0.0, 0, 500.0, 2 + lambdaRpmBins = array, F32, 18912, [16], "RPM", 1.0, 0.0, 0, 18000.0, 2 tpsTpsAccelTable = array, F32, 18976, [8x8],"value", 1.0, 0, 0.0, 30000.0, 2 tpsTpsAccelFromRpmBins = array, F32, 19232, [8], "from", 1.0, 0, 0.0, 30000.0, 2 tpsTpsAccelToRpmBins = array, F32, 19264, [8], "to", 1.0, 0, 0.0, 25500.0, 2 @@ -1457,7 +1457,7 @@ page = 1 pageButtons = "&EGO" gauge1 = RPMGauge - gauge2 = afr1Gauge + gauge2 = lambda1Gauge gauge3 = MAPGauge gauge4 = veValueGauge @@ -1502,8 +1502,8 @@ page = 1 [VeAnalyze] ; tableName, lambdaTargetTableName, lambdaChannel, egoCorrectionChannel, activeCondition - veAnalyzeMap = veTableTbl, afrTableTbl, AFRValue, egoCorrection, { 1 } - lambdaTargetTables = afrTableTbl, afrTSCustom + veAnalyzeMap = veTableTbl, lambdaTableTbl, lambdaValue, egoCorrection, { 1 } + lambdaTargetTables = lambdaTableTbl, afrTSCustom ; filter = Name, "DisplayName", outputChannel, operator, defaultVal, userAdjustable filter = minRPMFilter, "Minimum RPM", RPMValue, < , 500, , true @@ -1581,7 +1581,7 @@ page = 1 massAirFlowValue= scalar, U16, 28, "Kg/h", {1/10}, 0 MAPValue = scalar, U16, 30, "kPa",{1/30}, 0.0 baroPressure = scalar, U16, 32, "kPa",{1/30}, 0.0 - AFRValue = scalar, U16, 34, "AFR",,{1/1000},, 0.0 + lambdaValue = scalar, U16, 34, "",,{1/10000},, 0.0 engineLoad = scalar, U16, 36, "%",{1/100}, 0.0 ; Blend of MAP and TPS, depends on algorithm ; misc sensors @@ -1896,7 +1896,7 @@ page = 1 yAxis = 0, 28, 10 xBins = narrowToWideOxygenBins yBins = narrowToWideOxygen - gauge = afr1Gauge + gauge = lambda1Gauge curve = fsioCurve1, "FSIO Curve #1" columnLabel = "X", "Y" @@ -2074,7 +2074,7 @@ page = 1 yAxis = 0, 250, 10 xBins = idleVeBins, RPMValue yBins = idleVe - gauge = afr1Gauge + gauge = lambda1Gauge curve = crankingAdvanceCurve, "Cranking Advance Angle" columnLabel = "RPM", "degrees" @@ -2203,11 +2203,11 @@ page = 1 upDownLabel = "(Later)", "(Sooner)" - table = afrTableTbl, afrTableMap, "Target AFR Table", 1 + table = lambdaTableTbl, lambdaTableMap, "Target Lambda Table", 1 ; constant, variable - xBins = afrRpmBins, RPMValue - yBins = afrLoadBins, afrTableYAxis - zBins = afrTable + xBins = lambdaRpmBins, RPMValue + yBins = lambdaLoadBins, afrTableYAxis + zBins = lambdaTable ; gridHeight = 2.0 gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. upDownLabel = "(RICHER)", "(LEANER)" @@ -2305,7 +2305,7 @@ gaugeCategory = Sensors - Basic RPMGauge = RPMValue, "RPM - engine speed", "RPM", 0, 15000, 200, 500, 6000, 6000, 0, 0 CLTGauge = coolant, "Coolant temp", "deg C", -40, 140, -15, 1, 95, 110, 1, 1 IATGauge = intake, "Intake air temp", "deg C", -40, 140, -15, 1, 95, 110, 1, 1 - afr1Gauge = AFRValue, "Air fuel ratio", "", 10, 19.4, 12, 13, 15, 16, 2, 2 + lambda1Gauge = lambdaValue, "Lambda", "", 0.65, 1.2, 0.7, 0.75, 1.1, 1.15, 3, 2 MAFGauge = MAFValue, "Mass air flow", "v", 0, 5, 0, 1, 3, 4, 1, 1 VBattGauge = VBatt, "Battery voltage", "V", 8, 21, 9, 10, 17, 19, 1, 1 MAPGauge = MAPValue, "MAP", "kPa", 0, 300, 10, 10, 200, 200, 0, 0 @@ -2396,9 +2396,9 @@ gaugeCategory = Knock [WueAnalyze] ; wueCurveName, afrTempCompensationCurve, lambdaTargetTableName, lambdaChannel, coolantTempChannel, egoCorrectionChannel, wueChannel, activeCondition - wueAnalyzeMap = wueAnalyzer_warmup_curve, wueAfrTargetOffsetCurve, afrTableTbl, AFRValue, coolant, cltCorrection, egoCorrection + wueAnalyzeMap = wueAnalyzer_warmup_curve, wueAfrTargetOffsetCurve, lambdaTableTbl, lambdaValue, coolant, cltCorrection, egoCorrection - lambdaTargetTables = afrTableTbl, afrTSCustom + lambdaTargetTables = lambdaTableTbl, afrTSCustom wuePercentOffset = 0 ; for working with 0 based enrichment set to 100 option = disableLiveUpdates @@ -2429,7 +2429,7 @@ gaugeCategory = Knock gauge2 = CLTGauge gauge3 = TPSGauge gauge4 = MAPGauge - gauge5 = afr1Gauge + gauge5 = lambda1Gauge gauge6 = VBattGauge gauge7 = dwellGauge gauge8 = ignadvGauge @@ -2496,7 +2496,7 @@ gaugeCategory = Knock entry = TPS2Value, "TPS2", float, "%.2f" entry = MAFValue, "MAF", float, "%.2f" entry = MAPValue, "MAP", float, "%.1f" - entry = AFRValue, "Air/Fuel Ratio", float, "%.2f" + entry = lambdaValue, "Lambda", float, "%.2f" entry = VBatt, "VBatt", float, "%.2f" entry = engineLoad, "Engine Load", float, "%.1f" entry = fuelingLoad, "fuel: load", float, "%.1f" @@ -2654,7 +2654,7 @@ menuDialog = main subMenu = std_separator # Fuel model - subMenu = afrTableTbl, "Target AFR", 0, {isInjectionEnabled == 1} + subMenu = lambdaTableTbl, "Target lambda", 0, {isInjectionEnabled == 1} subMenu = cltFuelCorrCurve, "CLT multiplier", 0, {isInjectionEnabled == 1} subMenu = iatFuelCorrCurve, "IAT multiplier", 0, {isInjectionEnabled == 1} subMenu = fuelClosedLoopDialog, "Closed loop fuel correction", 0, {isInjectionEnabled == 1} @@ -4698,4 +4698,3 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" [Tools] ;addTool = toolName, PanelName addTool = veTableGenerator, "VE Table Generator", veTableTbl - addTool = afrTableGenerator, "AFR Table Generator", afrTableTbl diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index 4927d943f1..6b06769601 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.10.26.prometheus_405.628269857" + signature = "rusEFI 2020.10.26.prometheus_405.1604074078" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.10.26.prometheus_405.628269857" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.10.26.prometheus_405.1604074078" ; 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 Mon Oct 26 11:24:58 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 26 22:16:49 UTC 2020 pageSize = 20000 page = 1 @@ -1234,9 +1234,9 @@ page = 1 veTable = array, F32, 17440, [16x16],"%", 1.0, 0, 0, 999.0, 2 veLoadBins = array, F32, 18464, [16], "kPa", 1.0, 0.0, 0, 400.0, 2 veRpmBins = array, F32, 18528, [16], "RPM", 1.0, 0.0, 0, 18000.0, 2 - afrTable = array, U08, 18592, [16x16],"deg", 0.1, 0, 0, 25.0, 1 - afrLoadBins = array, F32, 18848, [16], "", 1.0, 0.0, 0, 500.0, 2 - afrRpmBins = array, F32, 18912, [16], "RPM", 1.0, 0.0, 0, 18000.0, 2 + lambdaTable = array, U08, 18592, [16x16],"deg", 0.006802721088435374, 0, 0.6, 1.5, 2 + lambdaLoadBins = array, F32, 18848, [16], "", 1.0, 0.0, 0, 500.0, 2 + lambdaRpmBins = array, F32, 18912, [16], "RPM", 1.0, 0.0, 0, 18000.0, 2 tpsTpsAccelTable = array, F32, 18976, [8x8],"value", 1.0, 0, 0.0, 30000.0, 2 tpsTpsAccelFromRpmBins = array, F32, 19232, [8], "from", 1.0, 0, 0.0, 30000.0, 2 tpsTpsAccelToRpmBins = array, F32, 19264, [8], "to", 1.0, 0, 0.0, 25500.0, 2 @@ -1457,7 +1457,7 @@ page = 1 pageButtons = "&EGO" gauge1 = RPMGauge - gauge2 = afr1Gauge + gauge2 = lambda1Gauge gauge3 = MAPGauge gauge4 = veValueGauge @@ -1502,8 +1502,8 @@ page = 1 [VeAnalyze] ; tableName, lambdaTargetTableName, lambdaChannel, egoCorrectionChannel, activeCondition - veAnalyzeMap = veTableTbl, afrTableTbl, AFRValue, egoCorrection, { 1 } - lambdaTargetTables = afrTableTbl, afrTSCustom + veAnalyzeMap = veTableTbl, lambdaTableTbl, lambdaValue, egoCorrection, { 1 } + lambdaTargetTables = lambdaTableTbl, afrTSCustom ; filter = Name, "DisplayName", outputChannel, operator, defaultVal, userAdjustable filter = minRPMFilter, "Minimum RPM", RPMValue, < , 500, , true @@ -1581,7 +1581,7 @@ page = 1 massAirFlowValue= scalar, U16, 28, "Kg/h", {1/10}, 0 MAPValue = scalar, U16, 30, "kPa",{1/30}, 0.0 baroPressure = scalar, U16, 32, "kPa",{1/30}, 0.0 - AFRValue = scalar, U16, 34, "AFR",,{1/1000},, 0.0 + lambdaValue = scalar, U16, 34, "",,{1/10000},, 0.0 engineLoad = scalar, U16, 36, "%",{1/100}, 0.0 ; Blend of MAP and TPS, depends on algorithm ; misc sensors @@ -1896,7 +1896,7 @@ page = 1 yAxis = 0, 28, 10 xBins = narrowToWideOxygenBins yBins = narrowToWideOxygen - gauge = afr1Gauge + gauge = lambda1Gauge curve = fsioCurve1, "FSIO Curve #1" columnLabel = "X", "Y" @@ -2074,7 +2074,7 @@ page = 1 yAxis = 0, 250, 10 xBins = idleVeBins, RPMValue yBins = idleVe - gauge = afr1Gauge + gauge = lambda1Gauge curve = crankingAdvanceCurve, "Cranking Advance Angle" columnLabel = "RPM", "degrees" @@ -2203,11 +2203,11 @@ page = 1 upDownLabel = "(Later)", "(Sooner)" - table = afrTableTbl, afrTableMap, "Target AFR Table", 1 + table = lambdaTableTbl, lambdaTableMap, "Target Lambda Table", 1 ; constant, variable - xBins = afrRpmBins, RPMValue - yBins = afrLoadBins, afrTableYAxis - zBins = afrTable + xBins = lambdaRpmBins, RPMValue + yBins = lambdaLoadBins, afrTableYAxis + zBins = lambdaTable ; gridHeight = 2.0 gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. upDownLabel = "(RICHER)", "(LEANER)" @@ -2305,7 +2305,7 @@ gaugeCategory = Sensors - Basic RPMGauge = RPMValue, "RPM - engine speed", "RPM", 0, 15000, 200, 500, 6000, 6000, 0, 0 CLTGauge = coolant, "Coolant temp", "deg C", -40, 140, -15, 1, 95, 110, 1, 1 IATGauge = intake, "Intake air temp", "deg C", -40, 140, -15, 1, 95, 110, 1, 1 - afr1Gauge = AFRValue, "Air fuel ratio", "", 10, 19.4, 12, 13, 15, 16, 2, 2 + lambda1Gauge = lambdaValue, "Lambda", "", 0.65, 1.2, 0.7, 0.75, 1.1, 1.15, 3, 2 MAFGauge = MAFValue, "Mass air flow", "v", 0, 5, 0, 1, 3, 4, 1, 1 VBattGauge = VBatt, "Battery voltage", "V", 8, 21, 9, 10, 17, 19, 1, 1 MAPGauge = MAPValue, "MAP", "kPa", 0, 300, 10, 10, 200, 200, 0, 0 @@ -2396,9 +2396,9 @@ gaugeCategory = Knock [WueAnalyze] ; wueCurveName, afrTempCompensationCurve, lambdaTargetTableName, lambdaChannel, coolantTempChannel, egoCorrectionChannel, wueChannel, activeCondition - wueAnalyzeMap = wueAnalyzer_warmup_curve, wueAfrTargetOffsetCurve, afrTableTbl, AFRValue, coolant, cltCorrection, egoCorrection + wueAnalyzeMap = wueAnalyzer_warmup_curve, wueAfrTargetOffsetCurve, lambdaTableTbl, lambdaValue, coolant, cltCorrection, egoCorrection - lambdaTargetTables = afrTableTbl, afrTSCustom + lambdaTargetTables = lambdaTableTbl, afrTSCustom wuePercentOffset = 0 ; for working with 0 based enrichment set to 100 option = disableLiveUpdates @@ -2429,7 +2429,7 @@ gaugeCategory = Knock gauge2 = CLTGauge gauge3 = TPSGauge gauge4 = MAPGauge - gauge5 = afr1Gauge + gauge5 = lambda1Gauge gauge6 = VBattGauge gauge7 = dwellGauge gauge8 = ignadvGauge @@ -2496,7 +2496,7 @@ gaugeCategory = Knock entry = TPS2Value, "TPS2", float, "%.2f" entry = MAFValue, "MAF", float, "%.2f" entry = MAPValue, "MAP", float, "%.1f" - entry = AFRValue, "Air/Fuel Ratio", float, "%.2f" + entry = lambdaValue, "Lambda", float, "%.2f" entry = VBatt, "VBatt", float, "%.2f" entry = engineLoad, "Engine Load", float, "%.1f" entry = fuelingLoad, "fuel: load", float, "%.1f" @@ -2654,7 +2654,7 @@ menuDialog = main subMenu = std_separator # Fuel model - subMenu = afrTableTbl, "Target AFR", 0, {isInjectionEnabled == 1} + subMenu = lambdaTableTbl, "Target lambda", 0, {isInjectionEnabled == 1} subMenu = cltFuelCorrCurve, "CLT multiplier", 0, {isInjectionEnabled == 1} subMenu = iatFuelCorrCurve, "IAT multiplier", 0, {isInjectionEnabled == 1} subMenu = fuelClosedLoopDialog, "Closed loop fuel correction", 0, {isInjectionEnabled == 1} @@ -4725,4 +4725,3 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" [Tools] ;addTool = toolName, PanelName addTool = veTableGenerator, "VE Table Generator", veTableTbl - addTool = afrTableGenerator, "AFR Table Generator", afrTableTbl diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index e6f3df2d21..72a601a6c9 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.10.26.prometheus_469.628269857" + signature = "rusEFI 2020.10.26.prometheus_469.1604074078" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.10.26.prometheus_469.628269857" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.10.26.prometheus_469.1604074078" ; 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 Mon Oct 26 11:24:56 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 26 22:16:48 UTC 2020 pageSize = 20000 page = 1 @@ -1234,9 +1234,9 @@ page = 1 veTable = array, F32, 17440, [16x16],"%", 1.0, 0, 0, 999.0, 2 veLoadBins = array, F32, 18464, [16], "kPa", 1.0, 0.0, 0, 400.0, 2 veRpmBins = array, F32, 18528, [16], "RPM", 1.0, 0.0, 0, 18000.0, 2 - afrTable = array, U08, 18592, [16x16],"deg", 0.1, 0, 0, 25.0, 1 - afrLoadBins = array, F32, 18848, [16], "", 1.0, 0.0, 0, 500.0, 2 - afrRpmBins = array, F32, 18912, [16], "RPM", 1.0, 0.0, 0, 18000.0, 2 + lambdaTable = array, U08, 18592, [16x16],"deg", 0.006802721088435374, 0, 0.6, 1.5, 2 + lambdaLoadBins = array, F32, 18848, [16], "", 1.0, 0.0, 0, 500.0, 2 + lambdaRpmBins = array, F32, 18912, [16], "RPM", 1.0, 0.0, 0, 18000.0, 2 tpsTpsAccelTable = array, F32, 18976, [8x8],"value", 1.0, 0, 0.0, 30000.0, 2 tpsTpsAccelFromRpmBins = array, F32, 19232, [8], "from", 1.0, 0, 0.0, 30000.0, 2 tpsTpsAccelToRpmBins = array, F32, 19264, [8], "to", 1.0, 0, 0.0, 25500.0, 2 @@ -1457,7 +1457,7 @@ page = 1 pageButtons = "&EGO" gauge1 = RPMGauge - gauge2 = afr1Gauge + gauge2 = lambda1Gauge gauge3 = MAPGauge gauge4 = veValueGauge @@ -1502,8 +1502,8 @@ page = 1 [VeAnalyze] ; tableName, lambdaTargetTableName, lambdaChannel, egoCorrectionChannel, activeCondition - veAnalyzeMap = veTableTbl, afrTableTbl, AFRValue, egoCorrection, { 1 } - lambdaTargetTables = afrTableTbl, afrTSCustom + veAnalyzeMap = veTableTbl, lambdaTableTbl, lambdaValue, egoCorrection, { 1 } + lambdaTargetTables = lambdaTableTbl, afrTSCustom ; filter = Name, "DisplayName", outputChannel, operator, defaultVal, userAdjustable filter = minRPMFilter, "Minimum RPM", RPMValue, < , 500, , true @@ -1581,7 +1581,7 @@ page = 1 massAirFlowValue= scalar, U16, 28, "Kg/h", {1/10}, 0 MAPValue = scalar, U16, 30, "kPa",{1/30}, 0.0 baroPressure = scalar, U16, 32, "kPa",{1/30}, 0.0 - AFRValue = scalar, U16, 34, "AFR",,{1/1000},, 0.0 + lambdaValue = scalar, U16, 34, "",,{1/10000},, 0.0 engineLoad = scalar, U16, 36, "%",{1/100}, 0.0 ; Blend of MAP and TPS, depends on algorithm ; misc sensors @@ -1896,7 +1896,7 @@ page = 1 yAxis = 0, 28, 10 xBins = narrowToWideOxygenBins yBins = narrowToWideOxygen - gauge = afr1Gauge + gauge = lambda1Gauge curve = fsioCurve1, "FSIO Curve #1" columnLabel = "X", "Y" @@ -2074,7 +2074,7 @@ page = 1 yAxis = 0, 250, 10 xBins = idleVeBins, RPMValue yBins = idleVe - gauge = afr1Gauge + gauge = lambda1Gauge curve = crankingAdvanceCurve, "Cranking Advance Angle" columnLabel = "RPM", "degrees" @@ -2203,11 +2203,11 @@ page = 1 upDownLabel = "(Later)", "(Sooner)" - table = afrTableTbl, afrTableMap, "Target AFR Table", 1 + table = lambdaTableTbl, lambdaTableMap, "Target Lambda Table", 1 ; constant, variable - xBins = afrRpmBins, RPMValue - yBins = afrLoadBins, afrTableYAxis - zBins = afrTable + xBins = lambdaRpmBins, RPMValue + yBins = lambdaLoadBins, afrTableYAxis + zBins = lambdaTable ; gridHeight = 2.0 gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. upDownLabel = "(RICHER)", "(LEANER)" @@ -2305,7 +2305,7 @@ gaugeCategory = Sensors - Basic RPMGauge = RPMValue, "RPM - engine speed", "RPM", 0, 15000, 200, 500, 6000, 6000, 0, 0 CLTGauge = coolant, "Coolant temp", "deg C", -40, 140, -15, 1, 95, 110, 1, 1 IATGauge = intake, "Intake air temp", "deg C", -40, 140, -15, 1, 95, 110, 1, 1 - afr1Gauge = AFRValue, "Air fuel ratio", "", 10, 19.4, 12, 13, 15, 16, 2, 2 + lambda1Gauge = lambdaValue, "Lambda", "", 0.65, 1.2, 0.7, 0.75, 1.1, 1.15, 3, 2 MAFGauge = MAFValue, "Mass air flow", "v", 0, 5, 0, 1, 3, 4, 1, 1 VBattGauge = VBatt, "Battery voltage", "V", 8, 21, 9, 10, 17, 19, 1, 1 MAPGauge = MAPValue, "MAP", "kPa", 0, 300, 10, 10, 200, 200, 0, 0 @@ -2396,9 +2396,9 @@ gaugeCategory = Knock [WueAnalyze] ; wueCurveName, afrTempCompensationCurve, lambdaTargetTableName, lambdaChannel, coolantTempChannel, egoCorrectionChannel, wueChannel, activeCondition - wueAnalyzeMap = wueAnalyzer_warmup_curve, wueAfrTargetOffsetCurve, afrTableTbl, AFRValue, coolant, cltCorrection, egoCorrection + wueAnalyzeMap = wueAnalyzer_warmup_curve, wueAfrTargetOffsetCurve, lambdaTableTbl, lambdaValue, coolant, cltCorrection, egoCorrection - lambdaTargetTables = afrTableTbl, afrTSCustom + lambdaTargetTables = lambdaTableTbl, afrTSCustom wuePercentOffset = 0 ; for working with 0 based enrichment set to 100 option = disableLiveUpdates @@ -2429,7 +2429,7 @@ gaugeCategory = Knock gauge2 = CLTGauge gauge3 = TPSGauge gauge4 = MAPGauge - gauge5 = afr1Gauge + gauge5 = lambda1Gauge gauge6 = VBattGauge gauge7 = dwellGauge gauge8 = ignadvGauge @@ -2496,7 +2496,7 @@ gaugeCategory = Knock entry = TPS2Value, "TPS2", float, "%.2f" entry = MAFValue, "MAF", float, "%.2f" entry = MAPValue, "MAP", float, "%.1f" - entry = AFRValue, "Air/Fuel Ratio", float, "%.2f" + entry = lambdaValue, "Lambda", float, "%.2f" entry = VBatt, "VBatt", float, "%.2f" entry = engineLoad, "Engine Load", float, "%.1f" entry = fuelingLoad, "fuel: load", float, "%.1f" @@ -2654,7 +2654,7 @@ menuDialog = main subMenu = std_separator # Fuel model - subMenu = afrTableTbl, "Target AFR", 0, {isInjectionEnabled == 1} + subMenu = lambdaTableTbl, "Target lambda", 0, {isInjectionEnabled == 1} subMenu = cltFuelCorrCurve, "CLT multiplier", 0, {isInjectionEnabled == 1} subMenu = iatFuelCorrCurve, "IAT multiplier", 0, {isInjectionEnabled == 1} subMenu = fuelClosedLoopDialog, "Closed loop fuel correction", 0, {isInjectionEnabled == 1} @@ -4725,4 +4725,3 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" [Tools] ;addTool = toolName, PanelName addTool = veTableGenerator, "VE Table Generator", veTableTbl - addTool = afrTableGenerator, "AFR Table Generator", afrTableTbl diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index f564522eef..fd07848469 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.10.26.proteus_f4.1052413234" + signature = "rusEFI 2020.10.26.proteus_f4.1146360909" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.10.26.proteus_f4.1052413234" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.10.26.proteus_f4.1146360909" ; 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 Mon Oct 26 11:25:01 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 26 22:16:53 UTC 2020 pageSize = 20000 page = 1 @@ -1234,9 +1234,9 @@ page = 1 veTable = array, F32, 17440, [16x16],"%", 1.0, 0, 0, 999.0, 2 veLoadBins = array, F32, 18464, [16], "kPa", 1.0, 0.0, 0, 400.0, 2 veRpmBins = array, F32, 18528, [16], "RPM", 1.0, 0.0, 0, 18000.0, 2 - afrTable = array, U08, 18592, [16x16],"deg", 0.1, 0, 0, 25.0, 1 - afrLoadBins = array, F32, 18848, [16], "", 1.0, 0.0, 0, 500.0, 2 - afrRpmBins = array, F32, 18912, [16], "RPM", 1.0, 0.0, 0, 18000.0, 2 + lambdaTable = array, U08, 18592, [16x16],"deg", 0.006802721088435374, 0, 0.6, 1.5, 2 + lambdaLoadBins = array, F32, 18848, [16], "", 1.0, 0.0, 0, 500.0, 2 + lambdaRpmBins = array, F32, 18912, [16], "RPM", 1.0, 0.0, 0, 18000.0, 2 tpsTpsAccelTable = array, F32, 18976, [8x8],"value", 1.0, 0, 0.0, 30000.0, 2 tpsTpsAccelFromRpmBins = array, F32, 19232, [8], "from", 1.0, 0, 0.0, 30000.0, 2 tpsTpsAccelToRpmBins = array, F32, 19264, [8], "to", 1.0, 0, 0.0, 25500.0, 2 @@ -1457,7 +1457,7 @@ page = 1 pageButtons = "&EGO" gauge1 = RPMGauge - gauge2 = afr1Gauge + gauge2 = lambda1Gauge gauge3 = MAPGauge gauge4 = veValueGauge @@ -1502,8 +1502,8 @@ page = 1 [VeAnalyze] ; tableName, lambdaTargetTableName, lambdaChannel, egoCorrectionChannel, activeCondition - veAnalyzeMap = veTableTbl, afrTableTbl, AFRValue, egoCorrection, { 1 } - lambdaTargetTables = afrTableTbl, afrTSCustom + veAnalyzeMap = veTableTbl, lambdaTableTbl, lambdaValue, egoCorrection, { 1 } + lambdaTargetTables = lambdaTableTbl, afrTSCustom ; filter = Name, "DisplayName", outputChannel, operator, defaultVal, userAdjustable filter = minRPMFilter, "Minimum RPM", RPMValue, < , 500, , true @@ -1581,7 +1581,7 @@ page = 1 massAirFlowValue= scalar, U16, 28, "Kg/h", {1/10}, 0 MAPValue = scalar, U16, 30, "kPa",{1/30}, 0.0 baroPressure = scalar, U16, 32, "kPa",{1/30}, 0.0 - AFRValue = scalar, U16, 34, "AFR",,{1/1000},, 0.0 + lambdaValue = scalar, U16, 34, "",,{1/10000},, 0.0 engineLoad = scalar, U16, 36, "%",{1/100}, 0.0 ; Blend of MAP and TPS, depends on algorithm ; misc sensors @@ -1896,7 +1896,7 @@ page = 1 yAxis = 0, 28, 10 xBins = narrowToWideOxygenBins yBins = narrowToWideOxygen - gauge = afr1Gauge + gauge = lambda1Gauge curve = fsioCurve1, "FSIO Curve #1" columnLabel = "X", "Y" @@ -2074,7 +2074,7 @@ page = 1 yAxis = 0, 250, 10 xBins = idleVeBins, RPMValue yBins = idleVe - gauge = afr1Gauge + gauge = lambda1Gauge curve = crankingAdvanceCurve, "Cranking Advance Angle" columnLabel = "RPM", "degrees" @@ -2203,11 +2203,11 @@ page = 1 upDownLabel = "(Later)", "(Sooner)" - table = afrTableTbl, afrTableMap, "Target AFR Table", 1 + table = lambdaTableTbl, lambdaTableMap, "Target Lambda Table", 1 ; constant, variable - xBins = afrRpmBins, RPMValue - yBins = afrLoadBins, afrTableYAxis - zBins = afrTable + xBins = lambdaRpmBins, RPMValue + yBins = lambdaLoadBins, afrTableYAxis + zBins = lambdaTable ; gridHeight = 2.0 gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. upDownLabel = "(RICHER)", "(LEANER)" @@ -2305,7 +2305,7 @@ gaugeCategory = Sensors - Basic RPMGauge = RPMValue, "RPM - engine speed", "RPM", 0, 15000, 200, 500, 6000, 6000, 0, 0 CLTGauge = coolant, "Coolant temp", "deg C", -40, 140, -15, 1, 95, 110, 1, 1 IATGauge = intake, "Intake air temp", "deg C", -40, 140, -15, 1, 95, 110, 1, 1 - afr1Gauge = AFRValue, "Air fuel ratio", "", 10, 19.4, 12, 13, 15, 16, 2, 2 + lambda1Gauge = lambdaValue, "Lambda", "", 0.65, 1.2, 0.7, 0.75, 1.1, 1.15, 3, 2 MAFGauge = MAFValue, "Mass air flow", "v", 0, 5, 0, 1, 3, 4, 1, 1 VBattGauge = VBatt, "Battery voltage", "V", 8, 21, 9, 10, 17, 19, 1, 1 MAPGauge = MAPValue, "MAP", "kPa", 0, 300, 10, 10, 200, 200, 0, 0 @@ -2396,9 +2396,9 @@ gaugeCategory = Knock [WueAnalyze] ; wueCurveName, afrTempCompensationCurve, lambdaTargetTableName, lambdaChannel, coolantTempChannel, egoCorrectionChannel, wueChannel, activeCondition - wueAnalyzeMap = wueAnalyzer_warmup_curve, wueAfrTargetOffsetCurve, afrTableTbl, AFRValue, coolant, cltCorrection, egoCorrection + wueAnalyzeMap = wueAnalyzer_warmup_curve, wueAfrTargetOffsetCurve, lambdaTableTbl, lambdaValue, coolant, cltCorrection, egoCorrection - lambdaTargetTables = afrTableTbl, afrTSCustom + lambdaTargetTables = lambdaTableTbl, afrTSCustom wuePercentOffset = 0 ; for working with 0 based enrichment set to 100 option = disableLiveUpdates @@ -2429,7 +2429,7 @@ gaugeCategory = Knock gauge2 = CLTGauge gauge3 = TPSGauge gauge4 = MAPGauge - gauge5 = afr1Gauge + gauge5 = lambda1Gauge gauge6 = VBattGauge gauge7 = dwellGauge gauge8 = ignadvGauge @@ -2496,7 +2496,7 @@ gaugeCategory = Knock entry = TPS2Value, "TPS2", float, "%.2f" entry = MAFValue, "MAF", float, "%.2f" entry = MAPValue, "MAP", float, "%.1f" - entry = AFRValue, "Air/Fuel Ratio", float, "%.2f" + entry = lambdaValue, "Lambda", float, "%.2f" entry = VBatt, "VBatt", float, "%.2f" entry = engineLoad, "Engine Load", float, "%.1f" entry = fuelingLoad, "fuel: load", float, "%.1f" @@ -2654,7 +2654,7 @@ menuDialog = main subMenu = std_separator # Fuel model - subMenu = afrTableTbl, "Target AFR", 0, {isInjectionEnabled == 1} + subMenu = lambdaTableTbl, "Target lambda", 0, {isInjectionEnabled == 1} subMenu = cltFuelCorrCurve, "CLT multiplier", 0, {isInjectionEnabled == 1} subMenu = iatFuelCorrCurve, "IAT multiplier", 0, {isInjectionEnabled == 1} subMenu = fuelClosedLoopDialog, "Closed loop fuel correction", 0, {isInjectionEnabled == 1} @@ -4686,4 +4686,3 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" [Tools] ;addTool = toolName, PanelName addTool = veTableGenerator, "VE Table Generator", veTableTbl - addTool = afrTableGenerator, "AFR Table Generator", afrTableTbl diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index a2ad960bb5..f7820d5d16 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.10.26.proteus_f7.1052413234" + signature = "rusEFI 2020.10.26.proteus_f7.1146360909" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.10.26.proteus_f7.1052413234" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.10.26.proteus_f7.1146360909" ; 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 Mon Oct 26 11:25:00 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 26 22:16:51 UTC 2020 pageSize = 20000 page = 1 @@ -1234,9 +1234,9 @@ page = 1 veTable = array, F32, 17440, [16x16],"%", 1.0, 0, 0, 999.0, 2 veLoadBins = array, F32, 18464, [16], "kPa", 1.0, 0.0, 0, 400.0, 2 veRpmBins = array, F32, 18528, [16], "RPM", 1.0, 0.0, 0, 18000.0, 2 - afrTable = array, U08, 18592, [16x16],"deg", 0.1, 0, 0, 25.0, 1 - afrLoadBins = array, F32, 18848, [16], "", 1.0, 0.0, 0, 500.0, 2 - afrRpmBins = array, F32, 18912, [16], "RPM", 1.0, 0.0, 0, 18000.0, 2 + lambdaTable = array, U08, 18592, [16x16],"deg", 0.006802721088435374, 0, 0.6, 1.5, 2 + lambdaLoadBins = array, F32, 18848, [16], "", 1.0, 0.0, 0, 500.0, 2 + lambdaRpmBins = array, F32, 18912, [16], "RPM", 1.0, 0.0, 0, 18000.0, 2 tpsTpsAccelTable = array, F32, 18976, [8x8],"value", 1.0, 0, 0.0, 30000.0, 2 tpsTpsAccelFromRpmBins = array, F32, 19232, [8], "from", 1.0, 0, 0.0, 30000.0, 2 tpsTpsAccelToRpmBins = array, F32, 19264, [8], "to", 1.0, 0, 0.0, 25500.0, 2 @@ -1457,7 +1457,7 @@ page = 1 pageButtons = "&EGO" gauge1 = RPMGauge - gauge2 = afr1Gauge + gauge2 = lambda1Gauge gauge3 = MAPGauge gauge4 = veValueGauge @@ -1502,8 +1502,8 @@ page = 1 [VeAnalyze] ; tableName, lambdaTargetTableName, lambdaChannel, egoCorrectionChannel, activeCondition - veAnalyzeMap = veTableTbl, afrTableTbl, AFRValue, egoCorrection, { 1 } - lambdaTargetTables = afrTableTbl, afrTSCustom + veAnalyzeMap = veTableTbl, lambdaTableTbl, lambdaValue, egoCorrection, { 1 } + lambdaTargetTables = lambdaTableTbl, afrTSCustom ; filter = Name, "DisplayName", outputChannel, operator, defaultVal, userAdjustable filter = minRPMFilter, "Minimum RPM", RPMValue, < , 500, , true @@ -1581,7 +1581,7 @@ page = 1 massAirFlowValue= scalar, U16, 28, "Kg/h", {1/10}, 0 MAPValue = scalar, U16, 30, "kPa",{1/30}, 0.0 baroPressure = scalar, U16, 32, "kPa",{1/30}, 0.0 - AFRValue = scalar, U16, 34, "AFR",,{1/1000},, 0.0 + lambdaValue = scalar, U16, 34, "",,{1/10000},, 0.0 engineLoad = scalar, U16, 36, "%",{1/100}, 0.0 ; Blend of MAP and TPS, depends on algorithm ; misc sensors @@ -1896,7 +1896,7 @@ page = 1 yAxis = 0, 28, 10 xBins = narrowToWideOxygenBins yBins = narrowToWideOxygen - gauge = afr1Gauge + gauge = lambda1Gauge curve = fsioCurve1, "FSIO Curve #1" columnLabel = "X", "Y" @@ -2074,7 +2074,7 @@ page = 1 yAxis = 0, 250, 10 xBins = idleVeBins, RPMValue yBins = idleVe - gauge = afr1Gauge + gauge = lambda1Gauge curve = crankingAdvanceCurve, "Cranking Advance Angle" columnLabel = "RPM", "degrees" @@ -2203,11 +2203,11 @@ page = 1 upDownLabel = "(Later)", "(Sooner)" - table = afrTableTbl, afrTableMap, "Target AFR Table", 1 + table = lambdaTableTbl, lambdaTableMap, "Target Lambda Table", 1 ; constant, variable - xBins = afrRpmBins, RPMValue - yBins = afrLoadBins, afrTableYAxis - zBins = afrTable + xBins = lambdaRpmBins, RPMValue + yBins = lambdaLoadBins, afrTableYAxis + zBins = lambdaTable ; gridHeight = 2.0 gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. upDownLabel = "(RICHER)", "(LEANER)" @@ -2305,7 +2305,7 @@ gaugeCategory = Sensors - Basic RPMGauge = RPMValue, "RPM - engine speed", "RPM", 0, 15000, 200, 500, 6000, 6000, 0, 0 CLTGauge = coolant, "Coolant temp", "deg C", -40, 140, -15, 1, 95, 110, 1, 1 IATGauge = intake, "Intake air temp", "deg C", -40, 140, -15, 1, 95, 110, 1, 1 - afr1Gauge = AFRValue, "Air fuel ratio", "", 10, 19.4, 12, 13, 15, 16, 2, 2 + lambda1Gauge = lambdaValue, "Lambda", "", 0.65, 1.2, 0.7, 0.75, 1.1, 1.15, 3, 2 MAFGauge = MAFValue, "Mass air flow", "v", 0, 5, 0, 1, 3, 4, 1, 1 VBattGauge = VBatt, "Battery voltage", "V", 8, 21, 9, 10, 17, 19, 1, 1 MAPGauge = MAPValue, "MAP", "kPa", 0, 300, 10, 10, 200, 200, 0, 0 @@ -2396,9 +2396,9 @@ gaugeCategory = Knock [WueAnalyze] ; wueCurveName, afrTempCompensationCurve, lambdaTargetTableName, lambdaChannel, coolantTempChannel, egoCorrectionChannel, wueChannel, activeCondition - wueAnalyzeMap = wueAnalyzer_warmup_curve, wueAfrTargetOffsetCurve, afrTableTbl, AFRValue, coolant, cltCorrection, egoCorrection + wueAnalyzeMap = wueAnalyzer_warmup_curve, wueAfrTargetOffsetCurve, lambdaTableTbl, lambdaValue, coolant, cltCorrection, egoCorrection - lambdaTargetTables = afrTableTbl, afrTSCustom + lambdaTargetTables = lambdaTableTbl, afrTSCustom wuePercentOffset = 0 ; for working with 0 based enrichment set to 100 option = disableLiveUpdates @@ -2429,7 +2429,7 @@ gaugeCategory = Knock gauge2 = CLTGauge gauge3 = TPSGauge gauge4 = MAPGauge - gauge5 = afr1Gauge + gauge5 = lambda1Gauge gauge6 = VBattGauge gauge7 = dwellGauge gauge8 = ignadvGauge @@ -2496,7 +2496,7 @@ gaugeCategory = Knock entry = TPS2Value, "TPS2", float, "%.2f" entry = MAFValue, "MAF", float, "%.2f" entry = MAPValue, "MAP", float, "%.1f" - entry = AFRValue, "Air/Fuel Ratio", float, "%.2f" + entry = lambdaValue, "Lambda", float, "%.2f" entry = VBatt, "VBatt", float, "%.2f" entry = engineLoad, "Engine Load", float, "%.1f" entry = fuelingLoad, "fuel: load", float, "%.1f" @@ -2654,7 +2654,7 @@ menuDialog = main subMenu = std_separator # Fuel model - subMenu = afrTableTbl, "Target AFR", 0, {isInjectionEnabled == 1} + subMenu = lambdaTableTbl, "Target lambda", 0, {isInjectionEnabled == 1} subMenu = cltFuelCorrCurve, "CLT multiplier", 0, {isInjectionEnabled == 1} subMenu = iatFuelCorrCurve, "IAT multiplier", 0, {isInjectionEnabled == 1} subMenu = fuelClosedLoopDialog, "Closed loop fuel correction", 0, {isInjectionEnabled == 1} @@ -4686,4 +4686,3 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" [Tools] ;addTool = toolName, PanelName addTool = veTableGenerator, "VE Table Generator", veTableTbl - addTool = afrTableGenerator, "AFR Table Generator", afrTableTbl 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 b74061b529..228ce6d98e 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 26 11:24:42 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 26 22:16:34 UTC 2020 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -1422,7 +1422,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.10.26.all.3364734513"; + public static final String TS_SIGNATURE = "rusEFI 2020.10.26.all.3243636979"; public static final char TS_SINGLE_WRITE_COMMAND = 'W'; public static final int TT_TT_60_2_VW = 20; public static final int TT_TT_ONE = 18; diff --git a/java_console/rusefi.xml b/java_console/rusefi.xml index c06e3a67d7..44fdf14d2a 100644 --- a/java_console/rusefi.xml +++ b/java_console/rusefi.xml @@ -1,6 +1,6 @@ - + @@ -136,7 +136,7 @@ category="Fuel" storageaddress="48a0" sizex="16" sizey="16" storagetype="uint8" endian="big"> -