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 39ca4f8d16..0c882ac61a 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 Nov 17 00:53:37 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Sun Nov 22 03:00:52 UTC 2020 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3769,4 +3769,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 Nov 17 00:53:37 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Sun Nov 22 03:00:52 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 129232ec4f..196f93e2f6 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 @@ -658,6 +658,8 @@ #define GAUGE_NAME_MAP "MAP" #define GAUGE_NAME_OIL_PRESSURE "Oil Pressure" #define GAUGE_NAME_OIL_PRESSURE_UNITS "kPa" +#define GAUGE_NAME_RAW_FUEL_PRESSURE_HIGH "Fuel pressure raw (high)" +#define GAUGE_NAME_RAW_FUEL_PRESSURE_LOW "Fuel pressure raw (low)" #define GAUGE_NAME_RPM "RPM" #define GAUGE_NAME_TARGET_AFR "fuel: target AFR" #define GAUGE_NAME_TARGET_LAMBDA "fuel: target lambda" @@ -1202,8 +1204,8 @@ #define showHumanReadableWarning_offset 976 #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD hellen_cypress -#define SIGNATURE_DATE 2020.11.17 -#define SIGNATURE_HASH 1751570025 +#define SIGNATURE_DATE 2020.11.22 +#define SIGNATURE_HASH 2052026216 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1533,7 +1535,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2020.11.17.hellen_cypress.1751570025" +#define TS_SIGNATURE "rusEFI 2020.11.22.hellen_cypress.2052026216" #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 c23fc462c1..818f087840 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 Nov 17 00:53:33 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sun Nov 22 03:00:50 UTC 2020 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3769,4 +3769,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 Nov 17 00:53:33 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sun Nov 22 03:00:50 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 a5ef1feb7e..a2d53f9a15 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -658,6 +658,8 @@ #define GAUGE_NAME_MAP "MAP" #define GAUGE_NAME_OIL_PRESSURE "Oil Pressure" #define GAUGE_NAME_OIL_PRESSURE_UNITS "kPa" +#define GAUGE_NAME_RAW_FUEL_PRESSURE_HIGH "Fuel pressure raw (high)" +#define GAUGE_NAME_RAW_FUEL_PRESSURE_LOW "Fuel pressure raw (low)" #define GAUGE_NAME_RPM "RPM" #define GAUGE_NAME_TARGET_AFR "fuel: target AFR" #define GAUGE_NAME_TARGET_LAMBDA "fuel: target lambda" @@ -1202,8 +1204,8 @@ #define showHumanReadableWarning_offset 976 #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD kin -#define SIGNATURE_DATE 2020.11.17 -#define SIGNATURE_HASH 964357267 +#define SIGNATURE_DATE 2020.11.22 +#define SIGNATURE_HASH 726881682 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1533,7 +1535,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator true #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2020.11.17.kin.964357267" +#define TS_SIGNATURE "rusEFI 2020.11.22.kin.726881682" #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 907cfd0b00..c63374e46c 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 Nov 17 00:53:17 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 22 03:00:33 UTC 2020 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3769,4 +3769,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 Nov 17 00:53:17 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 22 03:00:33 UTC 2020 diff --git a/firmware/controllers/generated/fsio_enums_generated.def b/firmware/controllers/generated/fsio_enums_generated.def index a3c51b1ae4..c18a9db5c5 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 Nov 17 00:53:17 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 22 03:00:33 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 fe54803611..3e6b4dd683 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 Nov 17 00:53:17 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 22 03:00:33 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 6733932e88..d9c76e78f1 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 Nov 17 00:53:17 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 22 03:00:33 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 ab57dcba4d..f715001de1 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 Nov 17 00:53:17 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 22 03:00:33 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 0485090721..af25dd2089 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -658,6 +658,8 @@ #define GAUGE_NAME_MAP "MAP" #define GAUGE_NAME_OIL_PRESSURE "Oil Pressure" #define GAUGE_NAME_OIL_PRESSURE_UNITS "kPa" +#define GAUGE_NAME_RAW_FUEL_PRESSURE_HIGH "Fuel pressure raw (high)" +#define GAUGE_NAME_RAW_FUEL_PRESSURE_LOW "Fuel pressure raw (low)" #define GAUGE_NAME_RPM "RPM" #define GAUGE_NAME_TARGET_AFR "fuel: target AFR" #define GAUGE_NAME_TARGET_LAMBDA "fuel: target lambda" @@ -1202,8 +1204,8 @@ #define showHumanReadableWarning_offset 976 #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD all -#define SIGNATURE_DATE 2020.11.17 -#define SIGNATURE_HASH 2711056554 +#define SIGNATURE_DATE 2020.11.22 +#define SIGNATURE_HASH 3015625131 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1533,7 +1535,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2020.11.17.all.2711056554" +#define TS_SIGNATURE "rusEFI 2020.11.22.all.3015625131" #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 0e6f7ac5ed..97ae5f8491 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.11.21 -#define SIGNATURE_HASH 642205502 -#define TS_SIGNATURE "rusEFI 2020.11.21.all.642205502" +#define SIGNATURE_DATE 2020.11.22 +#define SIGNATURE_HASH 3015625131 +#define TS_SIGNATURE "rusEFI 2020.11.22.all.3015625131" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index 98f8fac259..7ee402f114 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.11.21 -#define SIGNATURE_HASH 2956457669 -#define TS_SIGNATURE "rusEFI 2020.11.21.frankenso_na6.2956457669" +#define SIGNATURE_DATE 2020.11.22 +#define SIGNATURE_HASH 634288208 +#define TS_SIGNATURE "rusEFI 2020.11.22.frankenso_na6.634288208" diff --git a/firmware/controllers/generated/signature_hellen_cypress.h b/firmware/controllers/generated/signature_hellen_cypress.h index f7d5393aa7..0c21cdf885 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.11.21 -#define SIGNATURE_HASH 4021740029 -#define TS_SIGNATURE "rusEFI 2020.11.21.hellen_cypress.4021740029" +#define SIGNATURE_DATE 2020.11.22 +#define SIGNATURE_HASH 2052026216 +#define TS_SIGNATURE "rusEFI 2020.11.22.hellen_cypress.2052026216" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index 52d0836b7b..2bc81611f2 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.11.21 -#define SIGNATURE_HASH 3198868231 -#define TS_SIGNATURE "rusEFI 2020.11.21.kin.3198868231" +#define SIGNATURE_DATE 2020.11.22 +#define SIGNATURE_HASH 726881682 +#define TS_SIGNATURE "rusEFI 2020.11.22.kin.726881682" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index d3edb2e5bd..f07991204a 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.11.21 -#define SIGNATURE_HASH 832018759 -#define TS_SIGNATURE "rusEFI 2020.11.21.mre_f4.832018759" +#define SIGNATURE_DATE 2020.11.22 +#define SIGNATURE_HASH 2758678482 +#define TS_SIGNATURE "rusEFI 2020.11.22.mre_f4.2758678482" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index 0c7ebf18a8..a64b400f69 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.11.21 -#define SIGNATURE_HASH 832018759 -#define TS_SIGNATURE "rusEFI 2020.11.21.mre_f7.832018759" +#define SIGNATURE_DATE 2020.11.22 +#define SIGNATURE_HASH 2758678482 +#define TS_SIGNATURE "rusEFI 2020.11.22.mre_f7.2758678482" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index 0c170cf6a1..35f112ae5f 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.11.21 -#define SIGNATURE_HASH 1688158575 -#define TS_SIGNATURE "rusEFI 2020.11.21.prometheus_405.1688158575" +#define SIGNATURE_DATE 2020.11.22 +#define SIGNATURE_HASH 4050046970 +#define TS_SIGNATURE "rusEFI 2020.11.22.prometheus_405.4050046970" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index 2efca27466..7f3113b0dd 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.11.21 -#define SIGNATURE_HASH 1688158575 -#define TS_SIGNATURE "rusEFI 2020.11.21.prometheus_469.1688158575" +#define SIGNATURE_DATE 2020.11.22 +#define SIGNATURE_HASH 4050046970 +#define TS_SIGNATURE "rusEFI 2020.11.22.prometheus_469.4050046970" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index 17d8f691b0..f3b84631c1 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.11.21 -#define SIGNATURE_HASH 4025290208 -#define TS_SIGNATURE "rusEFI 2020.11.21.proteus_f4.4025290208" +#define SIGNATURE_DATE 2020.11.22 +#define SIGNATURE_HASH 2048164725 +#define TS_SIGNATURE "rusEFI 2020.11.22.proteus_f4.2048164725" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index 096e87c11d..78c8afe2bb 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.11.21 -#define SIGNATURE_HASH 4025290208 -#define TS_SIGNATURE "rusEFI 2020.11.21.proteus_f7.4025290208" +#define SIGNATURE_DATE 2020.11.22 +#define SIGNATURE_HASH 2048164725 +#define TS_SIGNATURE "rusEFI 2020.11.22.proteus_f7.2048164725" diff --git a/firmware/tunerstudio/generated/cache.zip b/firmware/tunerstudio/generated/cache.zip index 7dd3c562d8..84b39f4a6c 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 570815a118..459747194d 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.11.21.all.642205502" + signature = "rusEFI 2020.11.22.all.3015625131" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.11.21.all.642205502" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.11.22.all.3015625131" ; 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 Sat Nov 21 01:38:21 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 22 03:00:33 UTC 2020 pageSize = 20000 page = 1 @@ -2559,9 +2559,9 @@ gaugeCategory = Knock entry = totalTriggerErrorCounter, "trg err",int, "%d" entry = idleAirValvePosition, "Idle Air Valve", float, "%.3f" entry = lowFuelPressure, "Fuel pressure (low)", float, "%.3f" -; entry = rawLowFuelPressureGauge, "rawLowFuelPressureGauge", float, "%.3f" +; entry = rawLowFuelPressureGauge, "Fuel pressure raw (low)", float, "%.3f" entry = highFuelPressure, "Fuel pressure (high)", float, "%.3f" -; entry = rawHighFuelPressureGauge, "rawHighFuelPressureGauge", float, "%.3f" +; entry = rawHighFuelPressureGauge, "Fuel pressure raw (high)", float, "%.3f" entry = injectorLagMs, "fuel: injector lag", float, "%.3f" entry = fuelRunning, "fuel: running", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index 631c45bc4c..fdad2e4a08 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.11.21.frankenso_na6.2956457669" + signature = "rusEFI 2020.11.22.frankenso_na6.634288208" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.11.21.frankenso_na6.2956457669" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.11.22.frankenso_na6.634288208" ; 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 Sat Nov 21 01:38:27 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 22 03:00:42 UTC 2020 pageSize = 20000 page = 1 @@ -2559,9 +2559,9 @@ gaugeCategory = Knock entry = totalTriggerErrorCounter, "trg err",int, "%d" entry = idleAirValvePosition, "Idle Air Valve", float, "%.3f" entry = lowFuelPressure, "Fuel pressure (low)", float, "%.3f" -; entry = rawLowFuelPressureGauge, "rawLowFuelPressureGauge", float, "%.3f" +; entry = rawLowFuelPressureGauge, "Fuel pressure raw (low)", float, "%.3f" entry = highFuelPressure, "Fuel pressure (high)", float, "%.3f" -; entry = rawHighFuelPressureGauge, "rawHighFuelPressureGauge", float, "%.3f" +; entry = rawHighFuelPressureGauge, "Fuel pressure raw (high)", float, "%.3f" entry = injectorLagMs, "fuel: injector lag", float, "%.3f" entry = fuelRunning, "fuel: running", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini b/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini index e78e797c30..efb0ee9efe 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.11.21.hellen_cypress.4021740029" + signature = "rusEFI 2020.11.22.hellen_cypress.2052026216" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.11.21.hellen_cypress.4021740029" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.11.22.hellen_cypress.2052026216" ; 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 Sat Nov 21 01:38:38 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Sun Nov 22 03:00:52 UTC 2020 pageSize = 20000 page = 1 @@ -2559,9 +2559,9 @@ gaugeCategory = Knock entry = totalTriggerErrorCounter, "trg err",int, "%d" entry = idleAirValvePosition, "Idle Air Valve", float, "%.3f" entry = lowFuelPressure, "Fuel pressure (low)", float, "%.3f" -; entry = rawLowFuelPressureGauge, "rawLowFuelPressureGauge", float, "%.3f" +; entry = rawLowFuelPressureGauge, "Fuel pressure raw (low)", float, "%.3f" entry = highFuelPressure, "Fuel pressure (high)", float, "%.3f" -; entry = rawHighFuelPressureGauge, "rawHighFuelPressureGauge", float, "%.3f" +; entry = rawHighFuelPressureGauge, "Fuel pressure raw (high)", float, "%.3f" entry = injectorLagMs, "fuel: injector lag", float, "%.3f" entry = fuelRunning, "fuel: running", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_kinetis.ini b/firmware/tunerstudio/generated/rusefi_kinetis.ini index cd74dbd1fe..61aafb564e 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.11.21.kin.3198868231" + signature = "rusEFI 2020.11.22.kin.726881682" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.11.21.kin.3198868231" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.11.22.kin.726881682" ; 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 Sat Nov 21 01:38:36 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sun Nov 22 03:00:50 UTC 2020 pageSize = 20000 page = 1 @@ -2559,9 +2559,9 @@ gaugeCategory = Knock entry = totalTriggerErrorCounter, "trg err",int, "%d" entry = idleAirValvePosition, "Idle Air Valve", float, "%.3f" entry = lowFuelPressure, "Fuel pressure (low)", float, "%.3f" -; entry = rawLowFuelPressureGauge, "rawLowFuelPressureGauge", float, "%.3f" +; entry = rawLowFuelPressureGauge, "Fuel pressure raw (low)", float, "%.3f" entry = highFuelPressure, "Fuel pressure (high)", float, "%.3f" -; entry = rawHighFuelPressureGauge, "rawHighFuelPressureGauge", float, "%.3f" +; entry = rawHighFuelPressureGauge, "Fuel pressure raw (high)", float, "%.3f" entry = injectorLagMs, "fuel: injector lag", float, "%.3f" entry = fuelRunning, "fuel: running", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index 13a9b5ddc1..598f944e9d 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.11.21.mre_f4.832018759" + signature = "rusEFI 2020.11.22.mre_f4.2758678482" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.11.21.mre_f4.832018759" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.11.22.mre_f4.2758678482" ; 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 Sat Nov 21 01:38:25 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 22 03:00:40 UTC 2020 pageSize = 20000 page = 1 @@ -2559,9 +2559,9 @@ gaugeCategory = Knock entry = totalTriggerErrorCounter, "trg err",int, "%d" entry = idleAirValvePosition, "Idle Air Valve", float, "%.3f" entry = lowFuelPressure, "Fuel pressure (low)", float, "%.3f" -; entry = rawLowFuelPressureGauge, "rawLowFuelPressureGauge", float, "%.3f" +; entry = rawLowFuelPressureGauge, "Fuel pressure raw (low)", float, "%.3f" entry = highFuelPressure, "Fuel pressure (high)", float, "%.3f" -; entry = rawHighFuelPressureGauge, "rawHighFuelPressureGauge", float, "%.3f" +; entry = rawHighFuelPressureGauge, "Fuel pressure raw (high)", float, "%.3f" entry = injectorLagMs, "fuel: injector lag", float, "%.3f" entry = fuelRunning, "fuel: running", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index 3c32dfea5b..0bd81dd546 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.11.21.mre_f7.832018759" + signature = "rusEFI 2020.11.22.mre_f7.2758678482" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.11.21.mre_f7.832018759" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.11.22.mre_f7.2758678482" ; 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 Sat Nov 21 01:38:23 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 22 03:00:39 UTC 2020 pageSize = 20000 page = 1 @@ -2559,9 +2559,9 @@ gaugeCategory = Knock entry = totalTriggerErrorCounter, "trg err",int, "%d" entry = idleAirValvePosition, "Idle Air Valve", float, "%.3f" entry = lowFuelPressure, "Fuel pressure (low)", float, "%.3f" -; entry = rawLowFuelPressureGauge, "rawLowFuelPressureGauge", float, "%.3f" +; entry = rawLowFuelPressureGauge, "Fuel pressure raw (low)", float, "%.3f" entry = highFuelPressure, "Fuel pressure (high)", float, "%.3f" -; entry = rawHighFuelPressureGauge, "rawHighFuelPressureGauge", float, "%.3f" +; entry = rawHighFuelPressureGauge, "Fuel pressure raw (high)", float, "%.3f" entry = injectorLagMs, "fuel: injector lag", float, "%.3f" entry = fuelRunning, "fuel: running", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index 33b63f31c4..d2108fc1b9 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.11.21.prometheus_405.1688158575" + signature = "rusEFI 2020.11.22.prometheus_405.4050046970" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.11.21.prometheus_405.1688158575" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.11.22.prometheus_405.4050046970" ; 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 Sat Nov 21 01:38:30 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 22 03:00:45 UTC 2020 pageSize = 20000 page = 1 @@ -2559,9 +2559,9 @@ gaugeCategory = Knock entry = totalTriggerErrorCounter, "trg err",int, "%d" entry = idleAirValvePosition, "Idle Air Valve", float, "%.3f" entry = lowFuelPressure, "Fuel pressure (low)", float, "%.3f" -; entry = rawLowFuelPressureGauge, "rawLowFuelPressureGauge", float, "%.3f" +; entry = rawLowFuelPressureGauge, "Fuel pressure raw (low)", float, "%.3f" entry = highFuelPressure, "Fuel pressure (high)", float, "%.3f" -; entry = rawHighFuelPressureGauge, "rawHighFuelPressureGauge", float, "%.3f" +; entry = rawHighFuelPressureGauge, "Fuel pressure raw (high)", float, "%.3f" entry = injectorLagMs, "fuel: injector lag", float, "%.3f" entry = fuelRunning, "fuel: running", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index ae55ba1c76..68d01dbac3 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.11.21.prometheus_469.1688158575" + signature = "rusEFI 2020.11.22.prometheus_469.4050046970" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.11.21.prometheus_469.1688158575" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.11.22.prometheus_469.4050046970" ; 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 Sat Nov 21 01:38:29 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 22 03:00:44 UTC 2020 pageSize = 20000 page = 1 @@ -2559,9 +2559,9 @@ gaugeCategory = Knock entry = totalTriggerErrorCounter, "trg err",int, "%d" entry = idleAirValvePosition, "Idle Air Valve", float, "%.3f" entry = lowFuelPressure, "Fuel pressure (low)", float, "%.3f" -; entry = rawLowFuelPressureGauge, "rawLowFuelPressureGauge", float, "%.3f" +; entry = rawLowFuelPressureGauge, "Fuel pressure raw (low)", float, "%.3f" entry = highFuelPressure, "Fuel pressure (high)", float, "%.3f" -; entry = rawHighFuelPressureGauge, "rawHighFuelPressureGauge", float, "%.3f" +; entry = rawHighFuelPressureGauge, "Fuel pressure raw (high)", float, "%.3f" entry = injectorLagMs, "fuel: injector lag", float, "%.3f" entry = fuelRunning, "fuel: running", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index 8ce8b83d51..86e562fe0d 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.11.21.proteus_f4.4025290208" + signature = "rusEFI 2020.11.22.proteus_f4.2048164725" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.11.21.proteus_f4.4025290208" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.11.22.proteus_f4.2048164725" ; 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 Sat Nov 21 01:38:34 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 22 03:00:48 UTC 2020 pageSize = 20000 page = 1 @@ -2559,9 +2559,9 @@ gaugeCategory = Knock entry = totalTriggerErrorCounter, "trg err",int, "%d" entry = idleAirValvePosition, "Idle Air Valve", float, "%.3f" entry = lowFuelPressure, "Fuel pressure (low)", float, "%.3f" -; entry = rawLowFuelPressureGauge, "rawLowFuelPressureGauge", float, "%.3f" +; entry = rawLowFuelPressureGauge, "Fuel pressure raw (low)", float, "%.3f" entry = highFuelPressure, "Fuel pressure (high)", float, "%.3f" -; entry = rawHighFuelPressureGauge, "rawHighFuelPressureGauge", float, "%.3f" +; entry = rawHighFuelPressureGauge, "Fuel pressure raw (high)", float, "%.3f" entry = injectorLagMs, "fuel: injector lag", float, "%.3f" entry = fuelRunning, "fuel: running", float, "%.3f" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index 836670ce63..57bc4bb4b1 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.11.21.proteus_f7.4025290208" + signature = "rusEFI 2020.11.22.proteus_f7.2048164725" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.11.21.proteus_f7.4025290208" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.11.22.proteus_f7.2048164725" ; 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 Sat Nov 21 01:38:32 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 22 03:00:47 UTC 2020 pageSize = 20000 page = 1 @@ -2559,9 +2559,9 @@ gaugeCategory = Knock entry = totalTriggerErrorCounter, "trg err",int, "%d" entry = idleAirValvePosition, "Idle Air Valve", float, "%.3f" entry = lowFuelPressure, "Fuel pressure (low)", float, "%.3f" -; entry = rawLowFuelPressureGauge, "rawLowFuelPressureGauge", float, "%.3f" +; entry = rawLowFuelPressureGauge, "Fuel pressure raw (low)", float, "%.3f" entry = highFuelPressure, "Fuel pressure (high)", float, "%.3f" -; entry = rawHighFuelPressureGauge, "rawHighFuelPressureGauge", float, "%.3f" +; entry = rawHighFuelPressureGauge, "Fuel pressure raw (high)", float, "%.3f" entry = injectorLagMs, "fuel: injector lag", float, "%.3f" entry = fuelRunning, "fuel: running", 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 1b13b9b49e..a1d471a3e7 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 Nov 17 00:53:17 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 22 03:00:33 UTC 2020 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -639,6 +639,8 @@ public class Fields { 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_RAW_FUEL_PRESSURE_HIGH = "Fuel pressure raw (high)"; + public static final String GAUGE_NAME_RAW_FUEL_PRESSURE_LOW = "Fuel pressure raw (low)"; 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_TARGET_LAMBDA = "fuel: target lambda"; @@ -1436,7 +1438,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.11.17.all.2711056554"; + public static final String TS_SIGNATURE = "rusEFI 2020.11.22.all.3015625131"; 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 a243a0f68c..d56e1391d1 100644 --- a/java_console/rusefi.xml +++ b/java_console/rusefi.xml @@ -1,6 +1,6 @@ - +