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 86202d893e..6d851a3fb5 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 Oct 27 12:24:22 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Wed Oct 28 04:17:44 UTC 2020 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -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 Tue Oct 27 12:24:22 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Wed Oct 28 04:17:44 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 b0dd944c79..04b4a4724c 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 @@ -644,7 +644,9 @@ #define GAUGE_NAME_FUEL_LOAD "fuel: load" #define GAUGE_NAME_FUEL_PID_CORR "fuel: Short-term fuel trim" #define GAUGE_NAME_FUEL_PRESSURE_HIGH "Fuel pressure (high)" +#define GAUGE_NAME_FUEL_PRESSURE_HIGH_UNITS "bar" #define GAUGE_NAME_FUEL_PRESSURE_LOW "Fuel pressure (low)" +#define GAUGE_NAME_FUEL_PRESSURE_LOW_UNITS "kPa" #define GAUGE_NAME_FUEL_RUNNING "fuel: running" #define GAUGE_NAME_FUEL_TPS_EXTRA "fuel: TPS acceleration extra fuel ms" #define GAUGE_NAME_FUEL_TPS_ROC "fuel: TPS change" @@ -660,6 +662,8 @@ #define GAUGE_NAME_LAMBDA "Lambda" #define GAUGE_NAME_MAF "MAF" #define GAUGE_NAME_MAP "MAP" +#define GAUGE_NAME_OIL_PRESSURE "Oil Pressure" +#define GAUGE_NAME_OIL_PRESSURE_UNITS "kPa" #define GAUGE_NAME_RPM "RPM" #define GAUGE_NAME_TARGET_AFR "fuel: target AFR" #define GAUGE_NAME_TCHARGE "fuel: SD tCharge" @@ -1199,8 +1203,8 @@ #define showHumanReadableWarning_offset 976 #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD hellen_cypress -#define SIGNATURE_DATE 2020.10.27 -#define SIGNATURE_HASH 248405782 +#define SIGNATURE_DATE 2020.10.28 +#define SIGNATURE_HASH 1649556548 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1519,7 +1523,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2020.10.27.hellen_cypress.248405782" +#define TS_SIGNATURE "rusEFI 2020.10.28.hellen_cypress.1649556548" #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 e69e93daff..77b04f03df 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 Oct 27 12:24:20 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Wed Oct 28 04:17:42 UTC 2020 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -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 Tue Oct 27 12:24:20 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Wed Oct 28 04:17:42 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 0bbe040d9e..8aad6f251d 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -644,7 +644,9 @@ #define GAUGE_NAME_FUEL_LOAD "fuel: load" #define GAUGE_NAME_FUEL_PID_CORR "fuel: Short-term fuel trim" #define GAUGE_NAME_FUEL_PRESSURE_HIGH "Fuel pressure (high)" +#define GAUGE_NAME_FUEL_PRESSURE_HIGH_UNITS "bar" #define GAUGE_NAME_FUEL_PRESSURE_LOW "Fuel pressure (low)" +#define GAUGE_NAME_FUEL_PRESSURE_LOW_UNITS "kPa" #define GAUGE_NAME_FUEL_RUNNING "fuel: running" #define GAUGE_NAME_FUEL_TPS_EXTRA "fuel: TPS acceleration extra fuel ms" #define GAUGE_NAME_FUEL_TPS_ROC "fuel: TPS change" @@ -660,6 +662,8 @@ #define GAUGE_NAME_LAMBDA "Lambda" #define GAUGE_NAME_MAF "MAF" #define GAUGE_NAME_MAP "MAP" +#define GAUGE_NAME_OIL_PRESSURE "Oil Pressure" +#define GAUGE_NAME_OIL_PRESSURE_UNITS "kPa" #define GAUGE_NAME_RPM "RPM" #define GAUGE_NAME_TARGET_AFR "fuel: target AFR" #define GAUGE_NAME_TCHARGE "fuel: SD tCharge" @@ -1199,8 +1203,8 @@ #define showHumanReadableWarning_offset 976 #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD kin -#define SIGNATURE_DATE 2020.10.27 -#define SIGNATURE_HASH 1607624172 +#define SIGNATURE_DATE 2020.10.28 +#define SIGNATURE_HASH 860751550 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1519,7 +1523,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator true #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2020.10.27.kin.1607624172" +#define TS_SIGNATURE "rusEFI 2020.10.28.kin.860751550" #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 6485e67ee2..0549be2ed6 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 Oct 27 12:24:01 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Oct 28 04:17:22 UTC 2020 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -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 Tue Oct 27 12:24:01 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Oct 28 04:17:22 UTC 2020 diff --git a/firmware/controllers/generated/fsio_enums_generated.def b/firmware/controllers/generated/fsio_enums_generated.def index 4dff1c3842..96ce3da233 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 Oct 27 12:24:01 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Oct 28 04:17:22 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 c1da06db15..ac4013c8d8 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 Oct 27 12:24:01 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Oct 28 04:17:22 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 f2270d866e..e2459c3988 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 Oct 27 12:24:01 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Oct 28 04:17:22 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 26a920aa7b..53801e47c4 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 Oct 27 12:24:01 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Oct 28 04:17:22 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 1e3ee33059..1a84631bdc 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -644,7 +644,9 @@ #define GAUGE_NAME_FUEL_LOAD "fuel: load" #define GAUGE_NAME_FUEL_PID_CORR "fuel: Short-term fuel trim" #define GAUGE_NAME_FUEL_PRESSURE_HIGH "Fuel pressure (high)" +#define GAUGE_NAME_FUEL_PRESSURE_HIGH_UNITS "bar" #define GAUGE_NAME_FUEL_PRESSURE_LOW "Fuel pressure (low)" +#define GAUGE_NAME_FUEL_PRESSURE_LOW_UNITS "kPa" #define GAUGE_NAME_FUEL_RUNNING "fuel: running" #define GAUGE_NAME_FUEL_TPS_EXTRA "fuel: TPS acceleration extra fuel ms" #define GAUGE_NAME_FUEL_TPS_ROC "fuel: TPS change" @@ -660,6 +662,8 @@ #define GAUGE_NAME_LAMBDA "Lambda" #define GAUGE_NAME_MAF "MAF" #define GAUGE_NAME_MAP "MAP" +#define GAUGE_NAME_OIL_PRESSURE "Oil Pressure" +#define GAUGE_NAME_OIL_PRESSURE_UNITS "kPa" #define GAUGE_NAME_RPM "RPM" #define GAUGE_NAME_TARGET_AFR "fuel: target AFR" #define GAUGE_NAME_TCHARGE "fuel: SD tCharge" @@ -1199,8 +1203,8 @@ #define showHumanReadableWarning_offset 976 #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD all -#define SIGNATURE_DATE 2020.10.27 -#define SIGNATURE_HASH 3342858709 +#define SIGNATURE_DATE 2020.10.28 +#define SIGNATURE_HASH 2879625863 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1519,7 +1523,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2020.10.27.all.3342858709" +#define TS_SIGNATURE "rusEFI 2020.10.28.all.2879625863" #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 91935192fb..2a75b68fb5 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.10.27 -#define SIGNATURE_HASH 3342858709 -#define TS_SIGNATURE "rusEFI 2020.10.27.all.3342858709" +#define SIGNATURE_DATE 2020.10.28 +#define SIGNATURE_HASH 2879625863 +#define TS_SIGNATURE "rusEFI 2020.10.28.all.2879625863" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index b7f31520f6..27208c4828 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.10.27 -#define SIGNATURE_HASH 1489747618 -#define TS_SIGNATURE "rusEFI 2020.10.27.frankenso_na6.1489747618" +#define SIGNATURE_DATE 2020.10.28 +#define SIGNATURE_HASH 878173680 +#define TS_SIGNATURE "rusEFI 2020.10.28.frankenso_na6.878173680" diff --git a/firmware/controllers/generated/signature_hellen_cypress.h b/firmware/controllers/generated/signature_hellen_cypress.h index 0f9047e884..e19bb13355 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.10.27 -#define SIGNATURE_HASH 248405782 -#define TS_SIGNATURE "rusEFI 2020.10.27.hellen_cypress.248405782" +#define SIGNATURE_DATE 2020.10.28 +#define SIGNATURE_HASH 1649556548 +#define TS_SIGNATURE "rusEFI 2020.10.28.hellen_cypress.1649556548" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index f220b2661e..8b0367c2f6 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.10.27 -#define SIGNATURE_HASH 1607624172 -#define TS_SIGNATURE "rusEFI 2020.10.27.kin.1607624172" +#define SIGNATURE_DATE 2020.10.28 +#define SIGNATURE_HASH 860751550 +#define TS_SIGNATURE "rusEFI 2020.10.28.kin.860751550" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index 529d18ca21..da75c0aae3 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.10.27 -#define SIGNATURE_HASH 2753249329 -#define TS_SIGNATURE "rusEFI 2020.10.27.mre_f4.2753249329" +#define SIGNATURE_DATE 2020.10.28 +#define SIGNATURE_HASH 3364299619 +#define TS_SIGNATURE "rusEFI 2020.10.28.mre_f4.3364299619" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index beaa385871..b978688c2e 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.10.27 -#define SIGNATURE_HASH 2753249329 -#define TS_SIGNATURE "rusEFI 2020.10.27.mre_f7.2753249329" +#define SIGNATURE_DATE 2020.10.28 +#define SIGNATURE_HASH 3364299619 +#define TS_SIGNATURE "rusEFI 2020.10.28.mre_f7.3364299619" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index 05d2219dac..ce181de3c4 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.10.27 -#define SIGNATURE_HASH 1509309304 -#define TS_SIGNATURE "rusEFI 2020.10.27.prometheus_405.1509309304" +#define SIGNATURE_DATE 2020.10.28 +#define SIGNATURE_HASH 896161834 +#define TS_SIGNATURE "rusEFI 2020.10.28.prometheus_405.896161834" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index f65b4b2fd3..72041ec225 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.10.27 -#define SIGNATURE_HASH 1509309304 -#define TS_SIGNATURE "rusEFI 2020.10.27.prometheus_469.1509309304" +#define SIGNATURE_DATE 2020.10.28 +#define SIGNATURE_HASH 896161834 +#define TS_SIGNATURE "rusEFI 2020.10.28.prometheus_469.896161834" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index 80b8c9339a..9d0ef99e08 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.10.27 -#define SIGNATURE_HASH 1111364971 -#define TS_SIGNATURE "rusEFI 2020.10.27.proteus_f4.1111364971" +#define SIGNATURE_DATE 2020.10.28 +#define SIGNATURE_HASH 782399033 +#define TS_SIGNATURE "rusEFI 2020.10.28.proteus_f4.782399033" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index 226d75e76d..9117bd1d1e 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.10.27 -#define SIGNATURE_HASH 1111364971 -#define TS_SIGNATURE "rusEFI 2020.10.27.proteus_f7.1111364971" +#define SIGNATURE_DATE 2020.10.28 +#define SIGNATURE_HASH 782399033 +#define TS_SIGNATURE "rusEFI 2020.10.28.proteus_f7.782399033" diff --git a/firmware/tunerstudio/generated/cache.zip b/firmware/tunerstudio/generated/cache.zip index 2719a4278c..e64076a1e4 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 5077dd75af..10dd460a60 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.27.all.3342858709" + signature = "rusEFI 2020.10.28.all.2879625863" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.10.27.all.3342858709" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.10.28.all.2879625863" ; 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 Oct 27 12:24:01 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Oct 28 04:17:22 UTC 2020 pageSize = 20000 page = 1 diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index 91f839faf1..6532d85fa8 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.27.frankenso_na6.1489747618" + signature = "rusEFI 2020.10.28.frankenso_na6.878173680" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.10.27.frankenso_na6.1489747618" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.10.28.frankenso_na6.878173680" ; 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 Oct 27 12:24:12 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Oct 28 04:17:34 UTC 2020 pageSize = 20000 page = 1 diff --git a/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini b/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini index 77316a2f5a..3ff86fd29b 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.27.hellen_cypress.248405782" + signature = "rusEFI 2020.10.28.hellen_cypress.1649556548" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.10.27.hellen_cypress.248405782" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.10.28.hellen_cypress.1649556548" ; 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 Oct 27 12:24:22 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Wed Oct 28 04:17:44 UTC 2020 pageSize = 20000 page = 1 diff --git a/firmware/tunerstudio/generated/rusefi_kinetis.ini b/firmware/tunerstudio/generated/rusefi_kinetis.ini index 3acdc2150c..15d4e478bd 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.27.kin.1607624172" + signature = "rusEFI 2020.10.28.kin.860751550" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.10.27.kin.1607624172" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.10.28.kin.860751550" ; 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 Oct 27 12:24:20 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Wed Oct 28 04:17:42 UTC 2020 pageSize = 20000 page = 1 diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index 9181845b5f..1374f606e6 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.27.mre_f4.2753249329" + signature = "rusEFI 2020.10.28.mre_f4.3364299619" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.10.27.mre_f4.2753249329" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.10.28.mre_f4.3364299619" ; 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 Oct 27 12:24:11 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Oct 28 04:17:27 UTC 2020 pageSize = 20000 page = 1 diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index b5978b1cfc..4fbc173e4c 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.27.mre_f7.2753249329" + signature = "rusEFI 2020.10.28.mre_f7.3364299619" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.10.27.mre_f7.2753249329" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.10.28.mre_f7.3364299619" ; 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 Oct 27 12:24:07 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Oct 28 04:17:24 UTC 2020 pageSize = 20000 page = 1 diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index ff31165d81..c7aaa50e22 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.27.prometheus_405.1509309304" + signature = "rusEFI 2020.10.28.prometheus_405.896161834" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.10.27.prometheus_405.1509309304" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.10.28.prometheus_405.896161834" ; 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 Oct 27 12:24:15 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Oct 28 04:17:37 UTC 2020 pageSize = 20000 page = 1 diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index cb790e8b76..3138f1b43e 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.27.prometheus_469.1509309304" + signature = "rusEFI 2020.10.28.prometheus_469.896161834" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.10.27.prometheus_469.1509309304" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.10.28.prometheus_469.896161834" ; 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 Oct 27 12:24:14 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Oct 28 04:17:36 UTC 2020 pageSize = 20000 page = 1 diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index b4d858e908..92ac557980 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.27.proteus_f4.1111364971" + signature = "rusEFI 2020.10.28.proteus_f4.782399033" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.10.27.proteus_f4.1111364971" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.10.28.proteus_f4.782399033" ; 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 Oct 27 12:24:19 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Oct 28 04:17:41 UTC 2020 pageSize = 20000 page = 1 diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index 7d88f0fe29..8696ade9a0 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.27.proteus_f7.1111364971" + signature = "rusEFI 2020.10.28.proteus_f7.782399033" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.10.27.proteus_f7.1111364971" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.10.28.proteus_f7.782399033" ; 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 Oct 27 12:24:17 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Oct 28 04:17:39 UTC 2020 pageSize = 20000 page = 1 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 8c7dc01ac2..cf3383699c 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 Oct 27 12:24:01 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Oct 28 04:17:22 UTC 2020 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -625,7 +625,9 @@ public class Fields { public static final String GAUGE_NAME_FUEL_LOAD = "fuel: load"; public static final String GAUGE_NAME_FUEL_PID_CORR = "fuel: Short-term fuel trim"; public static final String GAUGE_NAME_FUEL_PRESSURE_HIGH = "Fuel pressure (high)"; + public static final String GAUGE_NAME_FUEL_PRESSURE_HIGH_UNITS = "bar"; public static final String GAUGE_NAME_FUEL_PRESSURE_LOW = "Fuel pressure (low)"; + public static final String GAUGE_NAME_FUEL_PRESSURE_LOW_UNITS = "kPa"; public static final String GAUGE_NAME_FUEL_RUNNING = "fuel: running"; public static final String GAUGE_NAME_FUEL_TPS_EXTRA = "fuel: TPS acceleration extra fuel ms"; public static final String GAUGE_NAME_FUEL_TPS_ROC = "fuel: TPS change"; @@ -641,6 +643,8 @@ public class Fields { public static final String GAUGE_NAME_LAMBDA = "Lambda"; public static final String GAUGE_NAME_MAF = "MAF"; public static final String GAUGE_NAME_MAP = "MAP"; + public static final String GAUGE_NAME_OIL_PRESSURE = "Oil Pressure"; + public static final String GAUGE_NAME_OIL_PRESSURE_UNITS = "kPa"; public static final String GAUGE_NAME_RPM = "RPM"; public static final String GAUGE_NAME_TARGET_AFR = "fuel: target AFR"; public static final String GAUGE_NAME_TCHARGE = "fuel: SD tCharge"; @@ -1423,7 +1427,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.27.all.3342858709"; + public static final String TS_SIGNATURE = "rusEFI 2020.10.28.all.2879625863"; 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 53367bf1e7..7ca6b913f1 100644 --- a/java_console/rusefi.xml +++ b/java_console/rusefi.xml @@ -1,6 +1,6 @@ - +