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 44f2958705..11c9248f37 100644 --- a/firmware/config/boards/hellen/cypress/config/controllers/algo/engine_configuration_generated_structures.h +++ b/firmware/config/boards/hellen/cypress/config/controllers/algo/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Tue Sep 29 10:36:25 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Thu Oct 01 00:21:23 UTC 2020 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3728,4 +3728,4 @@ struct persistent_config_s { typedef struct persistent_config_s persistent_config_s; // end -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Tue Sep 29 10:36:25 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Thu Oct 01 00:21:23 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 213d585fa6..f568ae4176 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 @@ -624,7 +624,7 @@ #define GAUGE_NAME_ETB_ERROR "ETB position error" #define GAUGE_NAME_ETB_TARGET "ETB position target" #define GAUGE_NAME_FUEL_BARO_CORR "fuel: Barometric pressure correction" -#define GAUGE_NAME_FUEL_BASE "fuel: base" +#define GAUGE_NAME_FUEL_BASE "fuel: base mass" #define GAUGE_NAME_FUEL_CHARGE_TEMP "fuel: Estimated charge temperature" #define GAUGE_NAME_FUEL_CLT_CORR "fuel: CLT correction" #define GAUGE_NAME_FUEL_CRANKING "fuel: cranking" @@ -1090,6 +1090,7 @@ #define PACK_MULT_AFR 1000 #define PACK_MULT_AFR_CFG 10 #define PACK_MULT_ANGLE 50 +#define PACK_MULT_FUEL_MASS 100 #define PACK_MULT_MASS_FLOW 10 #define PACK_MULT_MS 300 #define PACK_MULT_PERCENT 100 @@ -1165,8 +1166,8 @@ #define showHumanReadableWarning_offset 976 #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD hellen_cypress -#define SIGNATURE_DATE 2020.09.29 -#define SIGNATURE_HASH 2132675403 +#define SIGNATURE_DATE 2020.10.01 +#define SIGNATURE_HASH 4111983924 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define solenoidPadding_offset 1198 @@ -1481,7 +1482,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2020.09.29.hellen_cypress.2132675403" +#define TS_SIGNATURE "rusEFI 2020.10.01.hellen_cypress.4111983924" #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 b12708af14..c9519ecb94 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Tue Sep 29 10:36:23 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Thu Oct 01 00:21:22 UTC 2020 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3728,4 +3728,4 @@ struct persistent_config_s { typedef struct persistent_config_s persistent_config_s; // end -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Tue Sep 29 10:36:23 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Thu Oct 01 00:21:22 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 f55d578654..7502dbf9fa 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -624,7 +624,7 @@ #define GAUGE_NAME_ETB_ERROR "ETB position error" #define GAUGE_NAME_ETB_TARGET "ETB position target" #define GAUGE_NAME_FUEL_BARO_CORR "fuel: Barometric pressure correction" -#define GAUGE_NAME_FUEL_BASE "fuel: base" +#define GAUGE_NAME_FUEL_BASE "fuel: base mass" #define GAUGE_NAME_FUEL_CHARGE_TEMP "fuel: Estimated charge temperature" #define GAUGE_NAME_FUEL_CLT_CORR "fuel: CLT correction" #define GAUGE_NAME_FUEL_CRANKING "fuel: cranking" @@ -1090,6 +1090,7 @@ #define PACK_MULT_AFR 1000 #define PACK_MULT_AFR_CFG 10 #define PACK_MULT_ANGLE 50 +#define PACK_MULT_FUEL_MASS 100 #define PACK_MULT_MASS_FLOW 10 #define PACK_MULT_MS 300 #define PACK_MULT_PERCENT 100 @@ -1165,8 +1166,8 @@ #define showHumanReadableWarning_offset 976 #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD kin -#define SIGNATURE_DATE 2020.09.29 -#define SIGNATURE_HASH 771895729 +#define SIGNATURE_DATE 2020.10.01 +#define SIGNATURE_HASH 2752241614 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define solenoidPadding_offset 1198 @@ -1481,7 +1482,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator true #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2020.09.29.kin.771895729" +#define TS_SIGNATURE "rusEFI 2020.10.01.kin.2752241614" #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 74b11d10bd..63fed48a18 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Sep 29 10:36:02 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Oct 01 00:21:02 UTC 2020 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3728,4 +3728,4 @@ struct persistent_config_s { typedef struct persistent_config_s persistent_config_s; // end -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Sep 29 10:36:02 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Oct 01 00:21:02 UTC 2020 diff --git a/firmware/controllers/generated/fsio_enums_generated.def b/firmware/controllers/generated/fsio_enums_generated.def index 5c7784fad9..631b11aa2f 100644 --- a/firmware/controllers/generated/fsio_enums_generated.def +++ b/firmware/controllers/generated/fsio_enums_generated.def @@ -1,4 +1,4 @@ -// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Sep 29 10:36:02 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Oct 01 00:21:02 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 7037ce933d..9f72a8e312 100644 --- a/firmware/controllers/generated/fsio_getters.def +++ b/firmware/controllers/generated/fsio_getters.def @@ -1,4 +1,4 @@ -// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Sep 29 10:36:02 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Oct 01 00:21:02 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 d6f69848a9..d8a5fcdd00 100644 --- a/firmware/controllers/generated/fsio_names.def +++ b/firmware/controllers/generated/fsio_names.def @@ -1,4 +1,4 @@ -// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Sep 29 10:36:02 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Oct 01 00:21:02 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 f8802d0112..bf18807653 100644 --- a/firmware/controllers/generated/fsio_strings.def +++ b/firmware/controllers/generated/fsio_strings.def @@ -1,4 +1,4 @@ -// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Sep 29 10:36:02 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Oct 01 00:21:02 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 33b384bd89..bea622bb0e 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -624,7 +624,7 @@ #define GAUGE_NAME_ETB_ERROR "ETB position error" #define GAUGE_NAME_ETB_TARGET "ETB position target" #define GAUGE_NAME_FUEL_BARO_CORR "fuel: Barometric pressure correction" -#define GAUGE_NAME_FUEL_BASE "fuel: base" +#define GAUGE_NAME_FUEL_BASE "fuel: base mass" #define GAUGE_NAME_FUEL_CHARGE_TEMP "fuel: Estimated charge temperature" #define GAUGE_NAME_FUEL_CLT_CORR "fuel: CLT correction" #define GAUGE_NAME_FUEL_CRANKING "fuel: cranking" @@ -1090,6 +1090,7 @@ #define PACK_MULT_AFR 1000 #define PACK_MULT_AFR_CFG 10 #define PACK_MULT_ANGLE 50 +#define PACK_MULT_FUEL_MASS 100 #define PACK_MULT_MASS_FLOW 10 #define PACK_MULT_MS 300 #define PACK_MULT_PERCENT 100 @@ -1165,8 +1166,8 @@ #define showHumanReadableWarning_offset 976 #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD all -#define SIGNATURE_DATE 2020.09.29 -#define SIGNATURE_HASH 3319335477 +#define SIGNATURE_DATE 2020.10.01 +#define SIGNATURE_HASH 1339089994 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define solenoidPadding_offset 1198 @@ -1481,7 +1482,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2020.09.29.all.3319335477" +#define TS_SIGNATURE "rusEFI 2020.10.01.all.1339089994" #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 f3055190c5..236b1db8a7 100644 --- a/firmware/controllers/generated/signature_all.h +++ b/firmware/controllers/generated/signature_all.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD all -#define SIGNATURE_DATE 2020.09.29 -#define SIGNATURE_HASH 3319335477 -#define TS_SIGNATURE "rusEFI 2020.09.29.all.3319335477" +#define SIGNATURE_DATE 2020.10.01 +#define SIGNATURE_HASH 1339089994 +#define TS_SIGNATURE "rusEFI 2020.10.01.all.1339089994" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index 92d4c6bf31..098c1b8bcc 100644 --- a/firmware/controllers/generated/signature_frankenso_na6.h +++ b/firmware/controllers/generated/signature_frankenso_na6.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD frankenso_na6 -#define SIGNATURE_DATE 2020.09.29 -#define SIGNATURE_HASH 1648520206 -#define TS_SIGNATURE "rusEFI 2020.09.29.frankenso_na6.1648520206" +#define SIGNATURE_DATE 2020.10.01 +#define SIGNATURE_HASH 3897262705 +#define TS_SIGNATURE "rusEFI 2020.10.01.frankenso_na6.3897262705" diff --git a/firmware/controllers/generated/signature_hellen_cypress.h b/firmware/controllers/generated/signature_hellen_cypress.h index 7d42fda0dd..8cc8013974 100644 --- a/firmware/controllers/generated/signature_hellen_cypress.h +++ b/firmware/controllers/generated/signature_hellen_cypress.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD hellen_cypress -#define SIGNATURE_DATE 2020.09.29 -#define SIGNATURE_HASH 2132675403 -#define TS_SIGNATURE "rusEFI 2020.09.29.hellen_cypress.2132675403" +#define SIGNATURE_DATE 2020.10.01 +#define SIGNATURE_HASH 4111983924 +#define TS_SIGNATURE "rusEFI 2020.10.01.hellen_cypress.4111983924" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index 5e3ad9b91b..842baa800b 100644 --- a/firmware/controllers/generated/signature_kin.h +++ b/firmware/controllers/generated/signature_kin.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD kin -#define SIGNATURE_DATE 2020.09.29 -#define SIGNATURE_HASH 771895729 -#define TS_SIGNATURE "rusEFI 2020.09.29.kin.771895729" +#define SIGNATURE_DATE 2020.10.01 +#define SIGNATURE_HASH 2752241614 +#define TS_SIGNATURE "rusEFI 2020.10.01.kin.2752241614" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index e3b7ec8c4a..61e0c6ad23 100644 --- a/firmware/controllers/generated/signature_mre_f4.h +++ b/firmware/controllers/generated/signature_mre_f4.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD mre_f4 -#define SIGNATURE_DATE 2020.09.29 -#define SIGNATURE_HASH 847443362 -#define TS_SIGNATURE "rusEFI 2020.09.29.mre_f4.847443362" +#define SIGNATURE_DATE 2020.10.01 +#define SIGNATURE_HASH 3096124381 +#define TS_SIGNATURE "rusEFI 2020.10.01.mre_f4.3096124381" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index 89d2ac6155..902bbf4c3e 100644 --- a/firmware/controllers/generated/signature_mre_f7.h +++ b/firmware/controllers/generated/signature_mre_f7.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD mre_f7 -#define SIGNATURE_DATE 2020.09.29 -#define SIGNATURE_HASH 847443362 -#define TS_SIGNATURE "rusEFI 2020.09.29.mre_f7.847443362" +#define SIGNATURE_DATE 2020.10.01 +#define SIGNATURE_HASH 3096124381 +#define TS_SIGNATURE "rusEFI 2020.10.01.mre_f7.3096124381" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index d262ac5e87..18ffc55773 100644 --- a/firmware/controllers/generated/signature_prometheus_405.h +++ b/firmware/controllers/generated/signature_prometheus_405.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD prometheus_405 -#define SIGNATURE_DATE 2020.09.29 -#define SIGNATURE_HASH 1895228230 -#define TS_SIGNATURE "rusEFI 2020.09.29.prometheus_405.1895228230" +#define SIGNATURE_DATE 2020.10.01 +#define SIGNATURE_HASH 4211019065 +#define TS_SIGNATURE "rusEFI 2020.10.01.prometheus_405.4211019065" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index b630bc1e33..9833b1df1c 100644 --- a/firmware/controllers/generated/signature_prometheus_469.h +++ b/firmware/controllers/generated/signature_prometheus_469.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD prometheus_469 -#define SIGNATURE_DATE 2020.09.29 -#define SIGNATURE_HASH 1895228230 -#define TS_SIGNATURE "rusEFI 2020.09.29.prometheus_469.1895228230" +#define SIGNATURE_DATE 2020.10.01 +#define SIGNATURE_HASH 4211019065 +#define TS_SIGNATURE "rusEFI 2020.10.01.prometheus_469.4211019065" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index 6a9d70d228..f9e26ae0e6 100644 --- a/firmware/controllers/generated/signature_proteus_f4.h +++ b/firmware/controllers/generated/signature_proteus_f4.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD proteus_f4 -#define SIGNATURE_DATE 2020.09.30 -#define SIGNATURE_HASH 2108457839 -#define TS_SIGNATURE "rusEFI 2020.09.30.proteus_f4.2108457839" +#define SIGNATURE_DATE 2020.10.01 +#define SIGNATURE_HASH 4154813712 +#define TS_SIGNATURE "rusEFI 2020.10.01.proteus_f4.4154813712" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index b69625ad83..62fc20098f 100644 --- a/firmware/controllers/generated/signature_proteus_f7.h +++ b/firmware/controllers/generated/signature_proteus_f7.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD proteus_f7 -#define SIGNATURE_DATE 2020.09.30 -#define SIGNATURE_HASH 2108457839 -#define TS_SIGNATURE "rusEFI 2020.09.30.proteus_f7.2108457839" +#define SIGNATURE_DATE 2020.10.01 +#define SIGNATURE_HASH 4154813712 +#define TS_SIGNATURE "rusEFI 2020.10.01.proteus_f7.4154813712" diff --git a/firmware/tunerstudio/generated/cache.zip b/firmware/tunerstudio/generated/cache.zip index 8574b8faf2..63be7a5e6e 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 60a730c5ff..0a49a766f6 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.09.29.all.3319335477" + signature = "rusEFI 2020.10.01.all.1339089994" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.09.29.all.3319335477" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.10.01.all.1339089994" ; 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 Tue Sep 29 10:36:02 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Oct 01 00:21:02 UTC 2020 pageSize = 20000 page = 1 @@ -1571,7 +1571,7 @@ page = 1 chargeAirMass = scalar, U16, 44, "g",0.001, 0 crankingFuelMs = scalar, U16, 46, "ms",{1/300}, 0.0 currentTargetAfr= scalar, U16, 48, "ratio",,{1/1000},, 0 - baseFuel = scalar, U16, 50, "ms",{1/300}, 0 + baseFuel = scalar, U16, 50, "mg",{1/100}, 0 fuelRunning = scalar, U16, 52, "ms",{1/300}, 0 actualLastInjection=scalar,U16, 54, "ms",{1/300}, 0.0 injectorDutyCycle=scalar, U08, 56, "%", 0.5, 0 @@ -2322,7 +2322,7 @@ gaugeCategory = Fueling injectorLagMsGauge = injectorLagMs, "fuel: injector lag", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 fuelRunningGauge = fuelRunning, "fuel: running", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 - baseFuelGauge = baseFuel, "fuel: base", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 + baseFuelGauge = baseFuel, "fuel: base mass", "mSec", 0, 100, 0, 0, 100, 100, 2, 0 fuelPidCorrectionGauge = fuelPidCorrection, "fuel: Short-term fuel trim", "%", -10, 10, -8, -5, 5, 8, 3, 1 fuelingLoadGauge = fuelingLoad, "fuel: load", "%", 0, 300, 0, 0, 300, 300, 1, 1 @@ -2483,7 +2483,7 @@ gaugeCategory = Knock entry = injectorLagMs, "fuel: injector lag", float, "%.3f" entry = fuelRunning, "fuel: running", float, "%.3f" entry = actualLastInjection, "fuel: Last injection", float, "%.3f" - entry = baseFuel, "fuel: base", float, "%.2f" + entry = baseFuel, "fuel: base mass", float, "%.2f" entry = fuelPidCorrection,"fuel: Short-term fuel trim", float, "%.2f" entry = veValue, "fuel: VE", float, "%.3f" entry = injectorDutyCycle,"fuel: injector duty cycle",float,"%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index 8233fb5605..9a4b2821bb 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.09.29.frankenso_na6.1648520206" + signature = "rusEFI 2020.10.01.frankenso_na6.3897262705" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.09.29.frankenso_na6.1648520206" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.10.01.frankenso_na6.3897262705" ; 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 Tue Sep 29 10:36:15 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Oct 01 00:21:14 UTC 2020 pageSize = 20000 page = 1 @@ -1571,7 +1571,7 @@ page = 1 chargeAirMass = scalar, U16, 44, "g",0.001, 0 crankingFuelMs = scalar, U16, 46, "ms",{1/300}, 0.0 currentTargetAfr= scalar, U16, 48, "ratio",,{1/1000},, 0 - baseFuel = scalar, U16, 50, "ms",{1/300}, 0 + baseFuel = scalar, U16, 50, "mg",{1/100}, 0 fuelRunning = scalar, U16, 52, "ms",{1/300}, 0 actualLastInjection=scalar,U16, 54, "ms",{1/300}, 0.0 injectorDutyCycle=scalar, U08, 56, "%", 0.5, 0 @@ -2322,7 +2322,7 @@ gaugeCategory = Fueling injectorLagMsGauge = injectorLagMs, "fuel: injector lag", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 fuelRunningGauge = fuelRunning, "fuel: running", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 - baseFuelGauge = baseFuel, "fuel: base", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 + baseFuelGauge = baseFuel, "fuel: base mass", "mSec", 0, 100, 0, 0, 100, 100, 2, 0 fuelPidCorrectionGauge = fuelPidCorrection, "fuel: Short-term fuel trim", "%", -10, 10, -8, -5, 5, 8, 3, 1 fuelingLoadGauge = fuelingLoad, "fuel: load", "%", 0, 300, 0, 0, 300, 300, 1, 1 @@ -2483,7 +2483,7 @@ gaugeCategory = Knock entry = injectorLagMs, "fuel: injector lag", float, "%.3f" entry = fuelRunning, "fuel: running", float, "%.3f" entry = actualLastInjection, "fuel: Last injection", float, "%.3f" - entry = baseFuel, "fuel: base", float, "%.2f" + entry = baseFuel, "fuel: base mass", float, "%.2f" entry = fuelPidCorrection,"fuel: Short-term fuel trim", float, "%.2f" entry = veValue, "fuel: VE", float, "%.3f" entry = injectorDutyCycle,"fuel: injector duty cycle",float,"%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini b/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini index 5221a2953c..5f5e686d69 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.09.29.hellen_cypress.2132675403" + signature = "rusEFI 2020.10.01.hellen_cypress.4111983924" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.09.29.hellen_cypress.2132675403" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.10.01.hellen_cypress.4111983924" ; 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 Tue Sep 29 10:36:25 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Thu Oct 01 00:21:23 UTC 2020 pageSize = 20000 page = 1 @@ -1571,7 +1571,7 @@ page = 1 chargeAirMass = scalar, U16, 44, "g",0.001, 0 crankingFuelMs = scalar, U16, 46, "ms",{1/300}, 0.0 currentTargetAfr= scalar, U16, 48, "ratio",,{1/1000},, 0 - baseFuel = scalar, U16, 50, "ms",{1/300}, 0 + baseFuel = scalar, U16, 50, "mg",{1/100}, 0 fuelRunning = scalar, U16, 52, "ms",{1/300}, 0 actualLastInjection=scalar,U16, 54, "ms",{1/300}, 0.0 injectorDutyCycle=scalar, U08, 56, "%", 0.5, 0 @@ -2322,7 +2322,7 @@ gaugeCategory = Fueling injectorLagMsGauge = injectorLagMs, "fuel: injector lag", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 fuelRunningGauge = fuelRunning, "fuel: running", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 - baseFuelGauge = baseFuel, "fuel: base", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 + baseFuelGauge = baseFuel, "fuel: base mass", "mSec", 0, 100, 0, 0, 100, 100, 2, 0 fuelPidCorrectionGauge = fuelPidCorrection, "fuel: Short-term fuel trim", "%", -10, 10, -8, -5, 5, 8, 3, 1 fuelingLoadGauge = fuelingLoad, "fuel: load", "%", 0, 300, 0, 0, 300, 300, 1, 1 @@ -2483,7 +2483,7 @@ gaugeCategory = Knock entry = injectorLagMs, "fuel: injector lag", float, "%.3f" entry = fuelRunning, "fuel: running", float, "%.3f" entry = actualLastInjection, "fuel: Last injection", float, "%.3f" - entry = baseFuel, "fuel: base", float, "%.2f" + entry = baseFuel, "fuel: base mass", float, "%.2f" entry = fuelPidCorrection,"fuel: Short-term fuel trim", float, "%.2f" entry = veValue, "fuel: VE", float, "%.3f" entry = injectorDutyCycle,"fuel: injector duty cycle",float,"%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_kinetis.ini b/firmware/tunerstudio/generated/rusefi_kinetis.ini index d4df8294f3..8c5f8dbc4b 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.09.29.kin.771895729" + signature = "rusEFI 2020.10.01.kin.2752241614" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.09.29.kin.771895729" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.10.01.kin.2752241614" ; 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 Tue Sep 29 10:36:23 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Thu Oct 01 00:21:22 UTC 2020 pageSize = 20000 page = 1 @@ -1571,7 +1571,7 @@ page = 1 chargeAirMass = scalar, U16, 44, "g",0.001, 0 crankingFuelMs = scalar, U16, 46, "ms",{1/300}, 0.0 currentTargetAfr= scalar, U16, 48, "ratio",,{1/1000},, 0 - baseFuel = scalar, U16, 50, "ms",{1/300}, 0 + baseFuel = scalar, U16, 50, "mg",{1/100}, 0 fuelRunning = scalar, U16, 52, "ms",{1/300}, 0 actualLastInjection=scalar,U16, 54, "ms",{1/300}, 0.0 injectorDutyCycle=scalar, U08, 56, "%", 0.5, 0 @@ -2322,7 +2322,7 @@ gaugeCategory = Fueling injectorLagMsGauge = injectorLagMs, "fuel: injector lag", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 fuelRunningGauge = fuelRunning, "fuel: running", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 - baseFuelGauge = baseFuel, "fuel: base", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 + baseFuelGauge = baseFuel, "fuel: base mass", "mSec", 0, 100, 0, 0, 100, 100, 2, 0 fuelPidCorrectionGauge = fuelPidCorrection, "fuel: Short-term fuel trim", "%", -10, 10, -8, -5, 5, 8, 3, 1 fuelingLoadGauge = fuelingLoad, "fuel: load", "%", 0, 300, 0, 0, 300, 300, 1, 1 @@ -2483,7 +2483,7 @@ gaugeCategory = Knock entry = injectorLagMs, "fuel: injector lag", float, "%.3f" entry = fuelRunning, "fuel: running", float, "%.3f" entry = actualLastInjection, "fuel: Last injection", float, "%.3f" - entry = baseFuel, "fuel: base", float, "%.2f" + entry = baseFuel, "fuel: base mass", float, "%.2f" entry = fuelPidCorrection,"fuel: Short-term fuel trim", float, "%.2f" entry = veValue, "fuel: VE", float, "%.3f" entry = injectorDutyCycle,"fuel: injector duty cycle",float,"%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index d0eb6f704f..47c761d1a6 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.09.29.mre_f4.847443362" + signature = "rusEFI 2020.10.01.mre_f4.3096124381" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.09.29.mre_f4.847443362" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.10.01.mre_f4.3096124381" ; 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 Tue Sep 29 10:36:13 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Oct 01 00:21:12 UTC 2020 pageSize = 20000 page = 1 @@ -1571,7 +1571,7 @@ page = 1 chargeAirMass = scalar, U16, 44, "g",0.001, 0 crankingFuelMs = scalar, U16, 46, "ms",{1/300}, 0.0 currentTargetAfr= scalar, U16, 48, "ratio",,{1/1000},, 0 - baseFuel = scalar, U16, 50, "ms",{1/300}, 0 + baseFuel = scalar, U16, 50, "mg",{1/100}, 0 fuelRunning = scalar, U16, 52, "ms",{1/300}, 0 actualLastInjection=scalar,U16, 54, "ms",{1/300}, 0.0 injectorDutyCycle=scalar, U08, 56, "%", 0.5, 0 @@ -2322,7 +2322,7 @@ gaugeCategory = Fueling injectorLagMsGauge = injectorLagMs, "fuel: injector lag", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 fuelRunningGauge = fuelRunning, "fuel: running", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 - baseFuelGauge = baseFuel, "fuel: base", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 + baseFuelGauge = baseFuel, "fuel: base mass", "mSec", 0, 100, 0, 0, 100, 100, 2, 0 fuelPidCorrectionGauge = fuelPidCorrection, "fuel: Short-term fuel trim", "%", -10, 10, -8, -5, 5, 8, 3, 1 fuelingLoadGauge = fuelingLoad, "fuel: load", "%", 0, 300, 0, 0, 300, 300, 1, 1 @@ -2483,7 +2483,7 @@ gaugeCategory = Knock entry = injectorLagMs, "fuel: injector lag", float, "%.3f" entry = fuelRunning, "fuel: running", float, "%.3f" entry = actualLastInjection, "fuel: Last injection", float, "%.3f" - entry = baseFuel, "fuel: base", float, "%.2f" + entry = baseFuel, "fuel: base mass", float, "%.2f" entry = fuelPidCorrection,"fuel: Short-term fuel trim", float, "%.2f" entry = veValue, "fuel: VE", float, "%.3f" entry = injectorDutyCycle,"fuel: injector duty cycle",float,"%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index 0765777a5d..88af5146dc 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.09.29.mre_f7.847443362" + signature = "rusEFI 2020.10.01.mre_f7.3096124381" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.09.29.mre_f7.847443362" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.10.01.mre_f7.3096124381" ; 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 Tue Sep 29 10:36:06 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Oct 01 00:21:10 UTC 2020 pageSize = 20000 page = 1 @@ -1571,7 +1571,7 @@ page = 1 chargeAirMass = scalar, U16, 44, "g",0.001, 0 crankingFuelMs = scalar, U16, 46, "ms",{1/300}, 0.0 currentTargetAfr= scalar, U16, 48, "ratio",,{1/1000},, 0 - baseFuel = scalar, U16, 50, "ms",{1/300}, 0 + baseFuel = scalar, U16, 50, "mg",{1/100}, 0 fuelRunning = scalar, U16, 52, "ms",{1/300}, 0 actualLastInjection=scalar,U16, 54, "ms",{1/300}, 0.0 injectorDutyCycle=scalar, U08, 56, "%", 0.5, 0 @@ -2322,7 +2322,7 @@ gaugeCategory = Fueling injectorLagMsGauge = injectorLagMs, "fuel: injector lag", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 fuelRunningGauge = fuelRunning, "fuel: running", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 - baseFuelGauge = baseFuel, "fuel: base", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 + baseFuelGauge = baseFuel, "fuel: base mass", "mSec", 0, 100, 0, 0, 100, 100, 2, 0 fuelPidCorrectionGauge = fuelPidCorrection, "fuel: Short-term fuel trim", "%", -10, 10, -8, -5, 5, 8, 3, 1 fuelingLoadGauge = fuelingLoad, "fuel: load", "%", 0, 300, 0, 0, 300, 300, 1, 1 @@ -2483,7 +2483,7 @@ gaugeCategory = Knock entry = injectorLagMs, "fuel: injector lag", float, "%.3f" entry = fuelRunning, "fuel: running", float, "%.3f" entry = actualLastInjection, "fuel: Last injection", float, "%.3f" - entry = baseFuel, "fuel: base", float, "%.2f" + entry = baseFuel, "fuel: base mass", float, "%.2f" entry = fuelPidCorrection,"fuel: Short-term fuel trim", float, "%.2f" entry = veValue, "fuel: VE", float, "%.3f" entry = injectorDutyCycle,"fuel: injector duty cycle",float,"%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index 788a6a0d2e..d35ac34160 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.09.29.prometheus_405.1895228230" + signature = "rusEFI 2020.10.01.prometheus_405.4211019065" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.09.29.prometheus_405.1895228230" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.10.01.prometheus_405.4211019065" ; 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 Tue Sep 29 10:36:18 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Oct 01 00:21:17 UTC 2020 pageSize = 20000 page = 1 @@ -1571,7 +1571,7 @@ page = 1 chargeAirMass = scalar, U16, 44, "g",0.001, 0 crankingFuelMs = scalar, U16, 46, "ms",{1/300}, 0.0 currentTargetAfr= scalar, U16, 48, "ratio",,{1/1000},, 0 - baseFuel = scalar, U16, 50, "ms",{1/300}, 0 + baseFuel = scalar, U16, 50, "mg",{1/100}, 0 fuelRunning = scalar, U16, 52, "ms",{1/300}, 0 actualLastInjection=scalar,U16, 54, "ms",{1/300}, 0.0 injectorDutyCycle=scalar, U08, 56, "%", 0.5, 0 @@ -2322,7 +2322,7 @@ gaugeCategory = Fueling injectorLagMsGauge = injectorLagMs, "fuel: injector lag", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 fuelRunningGauge = fuelRunning, "fuel: running", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 - baseFuelGauge = baseFuel, "fuel: base", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 + baseFuelGauge = baseFuel, "fuel: base mass", "mSec", 0, 100, 0, 0, 100, 100, 2, 0 fuelPidCorrectionGauge = fuelPidCorrection, "fuel: Short-term fuel trim", "%", -10, 10, -8, -5, 5, 8, 3, 1 fuelingLoadGauge = fuelingLoad, "fuel: load", "%", 0, 300, 0, 0, 300, 300, 1, 1 @@ -2483,7 +2483,7 @@ gaugeCategory = Knock entry = injectorLagMs, "fuel: injector lag", float, "%.3f" entry = fuelRunning, "fuel: running", float, "%.3f" entry = actualLastInjection, "fuel: Last injection", float, "%.3f" - entry = baseFuel, "fuel: base", float, "%.2f" + entry = baseFuel, "fuel: base mass", float, "%.2f" entry = fuelPidCorrection,"fuel: Short-term fuel trim", float, "%.2f" entry = veValue, "fuel: VE", float, "%.3f" entry = injectorDutyCycle,"fuel: injector duty cycle",float,"%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index e77c8f7647..0ac03c7ea0 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.09.29.prometheus_469.1895228230" + signature = "rusEFI 2020.10.01.prometheus_469.4211019065" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.09.29.prometheus_469.1895228230" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.10.01.prometheus_469.4211019065" ; 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 Tue Sep 29 10:36:17 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Oct 01 00:21:15 UTC 2020 pageSize = 20000 page = 1 @@ -1571,7 +1571,7 @@ page = 1 chargeAirMass = scalar, U16, 44, "g",0.001, 0 crankingFuelMs = scalar, U16, 46, "ms",{1/300}, 0.0 currentTargetAfr= scalar, U16, 48, "ratio",,{1/1000},, 0 - baseFuel = scalar, U16, 50, "ms",{1/300}, 0 + baseFuel = scalar, U16, 50, "mg",{1/100}, 0 fuelRunning = scalar, U16, 52, "ms",{1/300}, 0 actualLastInjection=scalar,U16, 54, "ms",{1/300}, 0.0 injectorDutyCycle=scalar, U08, 56, "%", 0.5, 0 @@ -2322,7 +2322,7 @@ gaugeCategory = Fueling injectorLagMsGauge = injectorLagMs, "fuel: injector lag", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 fuelRunningGauge = fuelRunning, "fuel: running", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 - baseFuelGauge = baseFuel, "fuel: base", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 + baseFuelGauge = baseFuel, "fuel: base mass", "mSec", 0, 100, 0, 0, 100, 100, 2, 0 fuelPidCorrectionGauge = fuelPidCorrection, "fuel: Short-term fuel trim", "%", -10, 10, -8, -5, 5, 8, 3, 1 fuelingLoadGauge = fuelingLoad, "fuel: load", "%", 0, 300, 0, 0, 300, 300, 1, 1 @@ -2483,7 +2483,7 @@ gaugeCategory = Knock entry = injectorLagMs, "fuel: injector lag", float, "%.3f" entry = fuelRunning, "fuel: running", float, "%.3f" entry = actualLastInjection, "fuel: Last injection", float, "%.3f" - entry = baseFuel, "fuel: base", float, "%.2f" + entry = baseFuel, "fuel: base mass", float, "%.2f" entry = fuelPidCorrection,"fuel: Short-term fuel trim", float, "%.2f" entry = veValue, "fuel: VE", float, "%.3f" entry = injectorDutyCycle,"fuel: injector duty cycle",float,"%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index 0cd3d03266..2c7a3008e8 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.09.30.proteus_f4.2108457839" + signature = "rusEFI 2020.10.01.proteus_f4.4154813712" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.09.30.proteus_f4.2108457839" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.10.01.proteus_f4.4154813712" ; 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 Wed Sep 30 23:20:03 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Oct 01 00:21:20 UTC 2020 pageSize = 20000 page = 1 @@ -1571,7 +1571,7 @@ page = 1 chargeAirMass = scalar, U16, 44, "g",0.001, 0 crankingFuelMs = scalar, U16, 46, "ms",{1/300}, 0.0 currentTargetAfr= scalar, U16, 48, "ratio",,{1/1000},, 0 - baseFuel = scalar, U16, 50, "ms",{1/300}, 0 + baseFuel = scalar, U16, 50, "mg",{1/100}, 0 fuelRunning = scalar, U16, 52, "ms",{1/300}, 0 actualLastInjection=scalar,U16, 54, "ms",{1/300}, 0.0 injectorDutyCycle=scalar, U08, 56, "%", 0.5, 0 @@ -2322,7 +2322,7 @@ gaugeCategory = Fueling injectorLagMsGauge = injectorLagMs, "fuel: injector lag", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 fuelRunningGauge = fuelRunning, "fuel: running", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 - baseFuelGauge = baseFuel, "fuel: base", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 + baseFuelGauge = baseFuel, "fuel: base mass", "mSec", 0, 100, 0, 0, 100, 100, 2, 0 fuelPidCorrectionGauge = fuelPidCorrection, "fuel: Short-term fuel trim", "%", -10, 10, -8, -5, 5, 8, 3, 1 fuelingLoadGauge = fuelingLoad, "fuel: load", "%", 0, 300, 0, 0, 300, 300, 1, 1 @@ -2483,7 +2483,7 @@ gaugeCategory = Knock entry = injectorLagMs, "fuel: injector lag", float, "%.3f" entry = fuelRunning, "fuel: running", float, "%.3f" entry = actualLastInjection, "fuel: Last injection", float, "%.3f" - entry = baseFuel, "fuel: base", float, "%.2f" + entry = baseFuel, "fuel: base mass", float, "%.2f" entry = fuelPidCorrection,"fuel: Short-term fuel trim", float, "%.2f" entry = veValue, "fuel: VE", float, "%.3f" entry = injectorDutyCycle,"fuel: injector duty cycle",float,"%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index 55e811607b..86a97d860b 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.09.30.proteus_f7.2108457839" + signature = "rusEFI 2020.10.01.proteus_f7.4154813712" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.09.30.proteus_f7.2108457839" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.10.01.proteus_f7.4154813712" ; 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 Wed Sep 30 23:20:00 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Oct 01 00:21:19 UTC 2020 pageSize = 20000 page = 1 @@ -1571,7 +1571,7 @@ page = 1 chargeAirMass = scalar, U16, 44, "g",0.001, 0 crankingFuelMs = scalar, U16, 46, "ms",{1/300}, 0.0 currentTargetAfr= scalar, U16, 48, "ratio",,{1/1000},, 0 - baseFuel = scalar, U16, 50, "ms",{1/300}, 0 + baseFuel = scalar, U16, 50, "mg",{1/100}, 0 fuelRunning = scalar, U16, 52, "ms",{1/300}, 0 actualLastInjection=scalar,U16, 54, "ms",{1/300}, 0.0 injectorDutyCycle=scalar, U08, 56, "%", 0.5, 0 @@ -2322,7 +2322,7 @@ gaugeCategory = Fueling injectorLagMsGauge = injectorLagMs, "fuel: injector lag", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 fuelRunningGauge = fuelRunning, "fuel: running", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 - baseFuelGauge = baseFuel, "fuel: base", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 + baseFuelGauge = baseFuel, "fuel: base mass", "mSec", 0, 100, 0, 0, 100, 100, 2, 0 fuelPidCorrectionGauge = fuelPidCorrection, "fuel: Short-term fuel trim", "%", -10, 10, -8, -5, 5, 8, 3, 1 fuelingLoadGauge = fuelingLoad, "fuel: load", "%", 0, 300, 0, 0, 300, 300, 1, 1 @@ -2483,7 +2483,7 @@ gaugeCategory = Knock entry = injectorLagMs, "fuel: injector lag", float, "%.3f" entry = fuelRunning, "fuel: running", float, "%.3f" entry = actualLastInjection, "fuel: Last injection", float, "%.3f" - entry = baseFuel, "fuel: base", float, "%.2f" + entry = baseFuel, "fuel: base mass", float, "%.2f" entry = fuelPidCorrection,"fuel: Short-term fuel trim", float, "%.2f" entry = veValue, "fuel: VE", float, "%.3f" entry = injectorDutyCycle,"fuel: injector duty cycle",float,"%.3f" 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 6b75afdd04..1062095f71 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Sep 29 10:36:02 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Oct 01 00:21:02 UTC 2020 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -606,7 +606,7 @@ public class Fields { public static final String GAUGE_NAME_ETB_ERROR = "ETB position error"; public static final String GAUGE_NAME_ETB_TARGET = "ETB position target"; public static final String GAUGE_NAME_FUEL_BARO_CORR = "fuel: Barometric pressure correction"; - public static final String GAUGE_NAME_FUEL_BASE = "fuel: base"; + public static final String GAUGE_NAME_FUEL_BASE = "fuel: base mass"; public static final String GAUGE_NAME_FUEL_CHARGE_TEMP = "fuel: Estimated charge temperature"; public static final String GAUGE_NAME_FUEL_CLT_CORR = "fuel: CLT correction"; public static final String GAUGE_NAME_FUEL_CRANKING = "fuel: cranking"; @@ -1060,6 +1060,7 @@ public class Fields { 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_FUEL_MASS = 100; public static final int PACK_MULT_MASS_FLOW = 10; public static final int PACK_MULT_MS = 300; public static final int PACK_MULT_PERCENT = 100; @@ -1123,6 +1124,7 @@ public class Fields { public static final int servoOutputPins8_offset = 3147; public static final int showHumanReadableWarning_offset = 976; public static final int showSdCardWarning_offset = 76; + public static final int SIGNATURE_HASH = 1339089994; public static final int silentTriggerError_offset = 1464; public static final int slowAdcAlpha_offset = 2088; public static final int solenoidPadding_offset = 1198; @@ -1387,7 +1389,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.09.29.all.3319335477"; + public static final String TS_SIGNATURE = "rusEFI 2020.10.01.all.1339089994"; 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 161b05efc9..872f4e2467 100644 --- a/java_console/rusefi.xml +++ b/java_console/rusefi.xml @@ -1,6 +1,6 @@ - +