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 1c816f1798..588bc59322 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Fri Jul 03 19:10:45 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sat Jul 04 03:06:54 UTC 2020 // by class com.rusefi.output.CHeaderConsumer // begin #ifndef CONFIG_BOARDS_KINETIS_CONFIG_CONTROLLERS_ALGO_ENGINE_CONFIGURATION_GENERATED_STRUCTURES_H @@ -3522,4 +3522,4 @@ typedef struct persistent_config_s persistent_config_s; #endif // end -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Fri Jul 03 19:10:45 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sat Jul 04 03:06:54 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 e62cb869ff..02cc400ceb 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -988,6 +988,7 @@ #define PACK_ADD_TEMPERATURE 40 #define PACK_MULT_AFR 1000 #define PACK_MULT_ANGLE 50 +#define PACK_MULT_MASS_FLOW 10 #define PACK_MULT_MS 300 #define PACK_MULT_PERCENT 100 #define PACK_MULT_PRESSURE 30 @@ -1056,8 +1057,8 @@ #define showHumanReadableWarning_offset 976 #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD kin -#define SIGNATURE_DATE 2020.07.03 -#define SIGNATURE_HASH 4098779590 +#define SIGNATURE_DATE 2020.07.04 +#define SIGNATURE_HASH 428657885 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1317,7 +1318,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator true #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2020.07.03.kin.4098779590" +#define TS_SIGNATURE "rusEFI 2020.07.04.kin.428657885" #define TS_SINGLE_WRITE_COMMAND 'W' #define tunerStudioSerialSpeed_offset 728 #define twoWireBatchIgnition_offset 1476 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures.h b/firmware/controllers/generated/engine_configuration_generated_structures.h index 1770156c0a..53c0972d66 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Jul 03 19:10:35 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jul 04 03:06:48 UTC 2020 // by class com.rusefi.output.CHeaderConsumer // begin #ifndef CONTROLLERS_GENERATED_ENGINE_CONFIGURATION_GENERATED_STRUCTURES_H @@ -3522,4 +3522,4 @@ typedef struct persistent_config_s persistent_config_s; #endif // end -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Jul 03 19:10:35 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jul 04 03:06:48 UTC 2020 diff --git a/firmware/controllers/generated/fsio_enums_generated.def b/firmware/controllers/generated/fsio_enums_generated.def index 41a2e7fc11..bdc3f27201 100644 --- a/firmware/controllers/generated/fsio_enums_generated.def +++ b/firmware/controllers/generated/fsio_enums_generated.def @@ -1,4 +1,4 @@ -// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Jul 03 19:10:35 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jul 04 03:06:48 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 9c994428f8..59ae1945aa 100644 --- a/firmware/controllers/generated/fsio_getters.def +++ b/firmware/controllers/generated/fsio_getters.def @@ -1,4 +1,4 @@ -// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Jul 03 19:10:35 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jul 04 03:06:48 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 b7d8645ad4..d03228238d 100644 --- a/firmware/controllers/generated/fsio_names.def +++ b/firmware/controllers/generated/fsio_names.def @@ -1,4 +1,4 @@ -// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Jul 03 19:10:35 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jul 04 03:06:48 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 d58070c839..5930498df2 100644 --- a/firmware/controllers/generated/fsio_strings.def +++ b/firmware/controllers/generated/fsio_strings.def @@ -1,4 +1,4 @@ -// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Jul 03 19:10:35 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jul 04 03:06:48 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 7878e5bae0..6e5021cd52 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -988,6 +988,7 @@ #define PACK_ADD_TEMPERATURE 40 #define PACK_MULT_AFR 1000 #define PACK_MULT_ANGLE 50 +#define PACK_MULT_MASS_FLOW 10 #define PACK_MULT_MS 300 #define PACK_MULT_PERCENT 100 #define PACK_MULT_PRESSURE 30 @@ -1056,8 +1057,8 @@ #define showHumanReadableWarning_offset 976 #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD all -#define SIGNATURE_DATE 2020.07.03 -#define SIGNATURE_HASH 963687772 +#define SIGNATURE_DATE 2020.07.04 +#define SIGNATURE_HASH 3568439367 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1317,7 +1318,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2020.07.03.all.963687772" +#define TS_SIGNATURE "rusEFI 2020.07.04.all.3568439367" #define TS_SINGLE_WRITE_COMMAND 'W' #define tunerStudioSerialSpeed_offset 728 #define twoWireBatchIgnition_offset 1476 diff --git a/firmware/controllers/generated/signature_all.h b/firmware/controllers/generated/signature_all.h index 831b850fef..925a358556 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.07.03 -#define SIGNATURE_HASH 963687772 -#define TS_SIGNATURE "rusEFI 2020.07.03.all.963687772" +#define SIGNATURE_DATE 2020.07.04 +#define SIGNATURE_HASH 3568439367 +#define TS_SIGNATURE "rusEFI 2020.07.04.all.3568439367" diff --git a/firmware/controllers/generated/signature_fra.h b/firmware/controllers/generated/signature_fra.h index 2df0fad890..3acd13f024 100644 --- a/firmware/controllers/generated/signature_fra.h +++ b/firmware/controllers/generated/signature_fra.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD fra -#define SIGNATURE_DATE 2020.07.03 -#define SIGNATURE_HASH 3891780031 -#define TS_SIGNATURE "rusEFI 2020.07.03.fra.3891780031" +#define SIGNATURE_DATE 2020.07.04 +#define SIGNATURE_HASH 171277476 +#define TS_SIGNATURE "rusEFI 2020.07.04.fra.171277476" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index c3217ee257..842eac4d32 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.07.03 -#define SIGNATURE_HASH 4098779590 -#define TS_SIGNATURE "rusEFI 2020.07.03.kin.4098779590" +#define SIGNATURE_DATE 2020.07.04 +#define SIGNATURE_HASH 428657885 +#define TS_SIGNATURE "rusEFI 2020.07.04.kin.428657885" diff --git a/firmware/controllers/generated/signature_mre.h b/firmware/controllers/generated/signature_mre.h index 2f942a5348..9071628ab3 100644 --- a/firmware/controllers/generated/signature_mre.h +++ b/firmware/controllers/generated/signature_mre.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD mre -#define SIGNATURE_DATE 2020.07.03 -#define SIGNATURE_HASH 2424584747 -#define TS_SIGNATURE "rusEFI 2020.07.03.mre.2424584747" +#define SIGNATURE_DATE 2020.07.04 +#define SIGNATURE_HASH 2101780272 +#define TS_SIGNATURE "rusEFI 2020.07.04.mre.2101780272" diff --git a/firmware/controllers/generated/signature_pro.h b/firmware/controllers/generated/signature_pro.h index 5096cb6d1f..89d22b3a09 100644 --- a/firmware/controllers/generated/signature_pro.h +++ b/firmware/controllers/generated/signature_pro.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD pro -#define SIGNATURE_DATE 2020.07.03 -#define SIGNATURE_HASH 3034694803 -#define TS_SIGNATURE "rusEFI 2020.07.03.pro.3034694803" +#define SIGNATURE_DATE 2020.07.04 +#define SIGNATURE_HASH 1495490952 +#define TS_SIGNATURE "rusEFI 2020.07.04.pro.1495490952" diff --git a/firmware/controllers/generated/signature_pth.h b/firmware/controllers/generated/signature_pth.h index 7ef6706cff..06a551cc85 100644 --- a/firmware/controllers/generated/signature_pth.h +++ b/firmware/controllers/generated/signature_pth.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD pth -#define SIGNATURE_DATE 2020.07.03 -#define SIGNATURE_HASH 3429658072 -#define TS_SIGNATURE "rusEFI 2020.07.03.pth.3429658072" +#define SIGNATURE_DATE 2020.07.04 +#define SIGNATURE_HASH 565102787 +#define TS_SIGNATURE "rusEFI 2020.07.04.pth.565102787" diff --git a/firmware/tunerstudio/cache.zip b/firmware/tunerstudio/cache.zip index aa4f7faed1..35fe32145a 100644 Binary files a/firmware/tunerstudio/cache.zip and b/firmware/tunerstudio/cache.zip differ diff --git a/firmware/tunerstudio/rusefi.ini b/firmware/tunerstudio/rusefi.ini index 571b757409..dca6e08728 100644 --- a/firmware/tunerstudio/rusefi.ini +++ b/firmware/tunerstudio/rusefi.ini @@ -45,12 +45,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.07.03.all.963687772" + signature = "rusEFI 2020.07.04.all.3568439367" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.07.03.all.963687772" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.07.04.all.3568439367" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -88,7 +88,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Jul 03 19:10:35 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jul 04 03:06:48 UTC 2020 pageSize = 20000 page = 1 @@ -1511,7 +1511,7 @@ page = 1 ; air flow/mass measurments MAFValue = scalar, U16, 26, "V",,{1/1000},, 0 - massAirFlowValue= scalar, U16, 28, "Kg/h", 0.01, 0 + 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 diff --git a/firmware/tunerstudio/rusefi_frankenso.ini b/firmware/tunerstudio/rusefi_frankenso.ini index fefc268153..685ca97851 100644 --- a/firmware/tunerstudio/rusefi_frankenso.ini +++ b/firmware/tunerstudio/rusefi_frankenso.ini @@ -45,12 +45,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.07.03.fra.3891780031" + signature = "rusEFI 2020.07.04.fra.171277476" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.07.03.fra.3891780031" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.07.04.fra.171277476" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -88,7 +88,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Jul 03 19:10:38 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jul 04 03:06:51 UTC 2020 pageSize = 20000 page = 1 @@ -1511,7 +1511,7 @@ page = 1 ; air flow/mass measurments MAFValue = scalar, U16, 26, "V",,{1/1000},, 0 - massAirFlowValue= scalar, U16, 28, "Kg/h", 0.01, 0 + 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 diff --git a/firmware/tunerstudio/rusefi_kinetis.ini b/firmware/tunerstudio/rusefi_kinetis.ini index f14a56c7e4..0158f104fb 100644 --- a/firmware/tunerstudio/rusefi_kinetis.ini +++ b/firmware/tunerstudio/rusefi_kinetis.ini @@ -45,12 +45,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.07.03.kin.4098779590" + signature = "rusEFI 2020.07.04.kin.428657885" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.07.03.kin.4098779590" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.07.04.kin.428657885" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -88,7 +88,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Fri Jul 03 19:10:45 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sat Jul 04 03:06:54 UTC 2020 pageSize = 20000 page = 1 @@ -1511,7 +1511,7 @@ page = 1 ; air flow/mass measurments MAFValue = scalar, U16, 26, "V",,{1/1000},, 0 - massAirFlowValue= scalar, U16, 28, "Kg/h", 0.01, 0 + 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 diff --git a/firmware/tunerstudio/rusefi_microrusefi.ini b/firmware/tunerstudio/rusefi_microrusefi.ini index 035d7e8ccc..a9f61e0fc6 100644 --- a/firmware/tunerstudio/rusefi_microrusefi.ini +++ b/firmware/tunerstudio/rusefi_microrusefi.ini @@ -45,12 +45,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.07.03.mre.2424584747" + signature = "rusEFI 2020.07.04.mre.2101780272" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.07.03.mre.2424584747" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.07.04.mre.2101780272" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -88,7 +88,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Jul 03 19:10:37 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jul 04 03:06:50 UTC 2020 pageSize = 20000 page = 1 @@ -1511,7 +1511,7 @@ page = 1 ; air flow/mass measurments MAFValue = scalar, U16, 26, "V",,{1/1000},, 0 - massAirFlowValue= scalar, U16, 28, "Kg/h", 0.01, 0 + 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 diff --git a/firmware/tunerstudio/rusefi_prometheus.ini b/firmware/tunerstudio/rusefi_prometheus.ini index 55157929ff..51a89ac1fa 100644 --- a/firmware/tunerstudio/rusefi_prometheus.ini +++ b/firmware/tunerstudio/rusefi_prometheus.ini @@ -45,12 +45,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.07.03.pth.3429658072" + signature = "rusEFI 2020.07.04.pth.565102787" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.07.03.pth.3429658072" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.07.04.pth.565102787" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -88,7 +88,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Jul 03 19:10:39 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jul 04 03:06:52 UTC 2020 pageSize = 20000 page = 1 @@ -1511,7 +1511,7 @@ page = 1 ; air flow/mass measurments MAFValue = scalar, U16, 26, "V",,{1/1000},, 0 - massAirFlowValue= scalar, U16, 28, "Kg/h", 0.01, 0 + 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 diff --git a/firmware/tunerstudio/rusefi_proteus.ini b/firmware/tunerstudio/rusefi_proteus.ini index adead6aaeb..0370780a99 100644 --- a/firmware/tunerstudio/rusefi_proteus.ini +++ b/firmware/tunerstudio/rusefi_proteus.ini @@ -45,12 +45,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.07.03.pro.3034694803" + signature = "rusEFI 2020.07.04.pro.1495490952" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.07.03.pro.3034694803" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.07.04.pro.1495490952" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -88,7 +88,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Jul 03 19:10:43 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jul 04 03:06:53 UTC 2020 pageSize = 20000 page = 1 @@ -1511,7 +1511,7 @@ page = 1 ; air flow/mass measurments MAFValue = scalar, U16, 26, "V",,{1/1000},, 0 - massAirFlowValue= scalar, U16, 28, "Kg/h", 0.01, 0 + 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 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 1cdb968038..8d38737958 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Jul 03 19:10:35 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jul 04 03:06:48 UTC 2020 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -978,6 +978,7 @@ public class Fields { public static final int PACK_ADD_TEMPERATURE = 40; public static final int PACK_MULT_AFR = 1000; public static final int PACK_MULT_ANGLE = 50; + public static final int PACK_MULT_MASS_FLOW = 10; public static final int PACK_MULT_MS = 300; public static final int PACK_MULT_PERCENT = 100; public static final int PACK_MULT_PRESSURE = 30; @@ -1038,7 +1039,6 @@ 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 = 963687772; public static final int silentTriggerError_offset = 1464; public static final int slowAdcAlpha_offset = 2088; public static final int sparkDwellRpmBins_offset = 332; @@ -1277,7 +1277,7 @@ public class Fields { public static final int TS_RESPONSE_COMMAND_OK = 7; public static final int TS_RESPONSE_OK = 0; public static final char TS_SET_LOGGER_SWITCH = 'l'; - public static final String TS_SIGNATURE = "rusEFI 2020.07.03.all.963687772"; + public static final String TS_SIGNATURE = "rusEFI 2020.07.04.all.3568439367"; public static final char TS_SINGLE_WRITE_COMMAND = 'W'; public static final int tunerStudioSerialSpeed_offset = 728; public static final int twoWireBatchIgnition_offset = 1476; diff --git a/java_console/rusefi.xml b/java_console/rusefi.xml index 3c9e2622ec..85ef6b5564 100644 --- a/java_console/rusefi.xml +++ b/java_console/rusefi.xml @@ -1,6 +1,6 @@ - +