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 a5eb78136c..b735a7b85d 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 Thu Oct 29 19:27:48 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Fri Oct 30 21:44:14 UTC 2020 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3751,4 +3751,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 Thu Oct 29 19:27:48 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Fri Oct 30 21:44:14 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 7ff31bac43..80a3dddc92 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 @@ -666,6 +666,7 @@ #define GAUGE_NAME_OIL_PRESSURE_UNITS "kPa" #define GAUGE_NAME_RPM "RPM" #define GAUGE_NAME_TARGET_AFR "fuel: target AFR" +#define GAUGE_NAME_TARGET_LAMBDA "fuel: target lambda" #define GAUGE_NAME_TCHARGE "fuel: SD tCharge" #define GAUGE_NAME_THROTTLE_PEDAL "Throttle pedal position" #define GAUGE_NAME_TIME "Time" @@ -1203,8 +1204,8 @@ #define showHumanReadableWarning_offset 976 #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD hellen_cypress -#define SIGNATURE_DATE 2020.10.29 -#define SIGNATURE_HASH 2861233248 +#define SIGNATURE_DATE 2020.10.30 +#define SIGNATURE_HASH 4229790604 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1522,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.29.hellen_cypress.2861233248" +#define TS_SIGNATURE "rusEFI 2020.10.30.hellen_cypress.4229790604" #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 18ff6052c6..0c0a4be0b5 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 Thu Oct 29 19:27:46 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Fri Oct 30 21:44:13 UTC 2020 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3751,4 +3751,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 Thu Oct 29 19:27:46 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Fri Oct 30 21:44:13 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 3c47f953b7..a3fa54bcf9 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -666,6 +666,7 @@ #define GAUGE_NAME_OIL_PRESSURE_UNITS "kPa" #define GAUGE_NAME_RPM "RPM" #define GAUGE_NAME_TARGET_AFR "fuel: target AFR" +#define GAUGE_NAME_TARGET_LAMBDA "fuel: target lambda" #define GAUGE_NAME_TCHARGE "fuel: SD tCharge" #define GAUGE_NAME_THROTTLE_PEDAL "Throttle pedal position" #define GAUGE_NAME_TIME "Time" @@ -1203,8 +1204,8 @@ #define showHumanReadableWarning_offset 976 #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD kin -#define SIGNATURE_DATE 2020.10.29 -#define SIGNATURE_HASH 4220964506 +#define SIGNATURE_DATE 2020.10.30 +#define SIGNATURE_HASH 2902540662 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1522,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.29.kin.4220964506" +#define TS_SIGNATURE "rusEFI 2020.10.30.kin.2902540662" #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 58c1eb4c45..27a2870a82 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 Thu Oct 29 19:27:26 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Oct 30 21:43:59 UTC 2020 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3751,4 +3751,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 Thu Oct 29 19:27:26 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Oct 30 21:43:59 UTC 2020 diff --git a/firmware/controllers/generated/fsio_enums_generated.def b/firmware/controllers/generated/fsio_enums_generated.def index d549113e32..95619eb32e 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 Thu Oct 29 19:27:26 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Oct 30 21:43:59 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 eddd4ce645..656e4ccda8 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 Thu Oct 29 19:27:26 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Oct 30 21:43:59 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 ea133b0771..2780945509 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 Thu Oct 29 19:27:26 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Oct 30 21:43:59 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 40caa239cb..48a98b5d75 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 Thu Oct 29 19:27:26 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Oct 30 21:43:59 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 02a036fe7c..4f31ca7978 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -666,6 +666,7 @@ #define GAUGE_NAME_OIL_PRESSURE_UNITS "kPa" #define GAUGE_NAME_RPM "RPM" #define GAUGE_NAME_TARGET_AFR "fuel: target AFR" +#define GAUGE_NAME_TARGET_LAMBDA "fuel: target lambda" #define GAUGE_NAME_TCHARGE "fuel: SD tCharge" #define GAUGE_NAME_THROTTLE_PEDAL "Throttle pedal position" #define GAUGE_NAME_TIME "Time" @@ -1203,8 +1204,8 @@ #define showHumanReadableWarning_offset 976 #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD all -#define SIGNATURE_DATE 2020.10.29 -#define SIGNATURE_HASH 1669026467 +#define SIGNATURE_DATE 2020.10.30 +#define SIGNATURE_HASH 904715599 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1522,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.29.all.1669026467" +#define TS_SIGNATURE "rusEFI 2020.10.30.all.904715599" #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 6b22eb0ec2..47315911ef 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.29 -#define SIGNATURE_HASH 1669026467 -#define TS_SIGNATURE "rusEFI 2020.10.29.all.1669026467" +#define SIGNATURE_DATE 2020.10.30 +#define SIGNATURE_HASH 904715599 +#define TS_SIGNATURE "rusEFI 2020.10.30.all.904715599" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index 2c6d70854f..d025024d59 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.29 -#define SIGNATURE_HASH 4237235668 -#define TS_SIGNATURE "rusEFI 2020.10.29.frankenso_na6.4237235668" +#define SIGNATURE_DATE 2020.10.30 +#define SIGNATURE_HASH 2853739064 +#define TS_SIGNATURE "rusEFI 2020.10.30.frankenso_na6.2853739064" diff --git a/firmware/controllers/generated/signature_hellen_cypress.h b/firmware/controllers/generated/signature_hellen_cypress.h index 13e6c6448e..66546fb50c 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.29 -#define SIGNATURE_HASH 2861233248 -#define TS_SIGNATURE "rusEFI 2020.10.29.hellen_cypress.2861233248" +#define SIGNATURE_DATE 2020.10.30 +#define SIGNATURE_HASH 4229790604 +#define TS_SIGNATURE "rusEFI 2020.10.30.hellen_cypress.4229790604" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index 76022d05ee..0152524090 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.29 -#define SIGNATURE_HASH 4220964506 -#define TS_SIGNATURE "rusEFI 2020.10.29.kin.4220964506" +#define SIGNATURE_DATE 2020.10.30 +#define SIGNATURE_HASH 2902540662 +#define TS_SIGNATURE "rusEFI 2020.10.30.kin.2902540662" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index eafc3eaec5..2c268b6a57 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.29 -#define SIGNATURE_HASH 6286151 -#define TS_SIGNATURE "rusEFI 2020.10.29.mre_f4.6286151" +#define SIGNATURE_DATE 2020.10.30 +#define SIGNATURE_HASH 1455973547 +#define TS_SIGNATURE "rusEFI 2020.10.30.mre_f4.1455973547" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index 4689b8404d..025ba2b6e5 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.29 -#define SIGNATURE_HASH 6286151 -#define TS_SIGNATURE "rusEFI 2020.10.29.mre_f7.6286151" +#define SIGNATURE_DATE 2020.10.30 +#define SIGNATURE_HASH 1455973547 +#define TS_SIGNATURE "rusEFI 2020.10.30.mre_f7.1455973547" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index c006bdb6ac..271d2086e3 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.29 -#define SIGNATURE_HASH 4256337934 -#define TS_SIGNATURE "rusEFI 2020.10.29.prometheus_405.4256337934" +#define SIGNATURE_DATE 2020.10.30 +#define SIGNATURE_HASH 2871336930 +#define TS_SIGNATURE "rusEFI 2020.10.30.prometheus_405.2871336930" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index 9117bc08ad..17c60a6630 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.29 -#define SIGNATURE_HASH 4256337934 -#define TS_SIGNATURE "rusEFI 2020.10.29.prometheus_469.4256337934" +#define SIGNATURE_DATE 2020.10.30 +#define SIGNATURE_HASH 2871336930 +#define TS_SIGNATURE "rusEFI 2020.10.30.prometheus_469.2871336930" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index 87f1b14871..36bf605ee1 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.29 -#define SIGNATURE_HASH 3866803741 -#define TS_SIGNATURE "rusEFI 2020.10.29.proteus_f4.3866803741" +#define SIGNATURE_DATE 2020.10.30 +#define SIGNATURE_HASH 2968334833 +#define TS_SIGNATURE "rusEFI 2020.10.30.proteus_f4.2968334833" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index 008d6fb527..bbccdb31d0 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.29 -#define SIGNATURE_HASH 3866803741 -#define TS_SIGNATURE "rusEFI 2020.10.29.proteus_f7.3866803741" +#define SIGNATURE_DATE 2020.10.30 +#define SIGNATURE_HASH 2968334833 +#define TS_SIGNATURE "rusEFI 2020.10.30.proteus_f7.2968334833" diff --git a/firmware/tunerstudio/generated/cache.zip b/firmware/tunerstudio/generated/cache.zip index 530fab9b75..db134cedb6 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 614250568e..3282778446 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.29.all.1669026467" + signature = "rusEFI 2020.10.30.all.904715599" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.10.29.all.1669026467" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.10.30.all.904715599" ; 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 Thu Oct 29 19:27:26 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Oct 30 21:43:59 UTC 2020 pageSize = 20000 page = 1 @@ -1735,6 +1735,7 @@ page = 1 rawHighFuelPressure = scalar, U16, 274, "V",{1/1000}, 0 lowFuelPressure = scalar, S16, 276, "kpa", {1/30}, 0 highFuelPressure = scalar, S16, 278, "bar", {1/10}, 0 + targetLambda = scalar, U16, 280, "",{1/10000}, 0.0 ; ; see TunerStudioOutputChannels struct @@ -2522,6 +2523,7 @@ gaugeCategory = Knock entry = injectorDutyCycle,"fuel: injector duty cycle",float,"%.3f" entry = coilDutyCycle, "dwell: coil duty cycle", float,"%.3f" entry = currentTargetAfr,"fuel: target AFR", float,"%.3f" + entry = targetLambda, "fuel: target lambda", float,"%.4f" entry = accelerationX, "Acceleration: X", float,"%.2f", { LIS302DLCsPin != 0 } entry = accelerationY, "Acceleration: Y", float,"%.2f", { LIS302DLCsPin != 0 } diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index cdfd3ff9fd..c76d3d8485 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.29.frankenso_na6.4237235668" + signature = "rusEFI 2020.10.30.frankenso_na6.2853739064" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.10.29.frankenso_na6.4237235668" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.10.30.frankenso_na6.2853739064" ; 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 Thu Oct 29 19:27:38 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Oct 30 21:44:05 UTC 2020 pageSize = 20000 page = 1 @@ -1735,6 +1735,7 @@ page = 1 rawHighFuelPressure = scalar, U16, 274, "V",{1/1000}, 0 lowFuelPressure = scalar, S16, 276, "kpa", {1/30}, 0 highFuelPressure = scalar, S16, 278, "bar", {1/10}, 0 + targetLambda = scalar, U16, 280, "",{1/10000}, 0.0 ; ; see TunerStudioOutputChannels struct @@ -2522,6 +2523,7 @@ gaugeCategory = Knock entry = injectorDutyCycle,"fuel: injector duty cycle",float,"%.3f" entry = coilDutyCycle, "dwell: coil duty cycle", float,"%.3f" entry = currentTargetAfr,"fuel: target AFR", float,"%.3f" + entry = targetLambda, "fuel: target lambda", float,"%.4f" entry = accelerationX, "Acceleration: X", float,"%.2f", { LIS302DLCsPin != 0 } entry = accelerationY, "Acceleration: Y", float,"%.2f", { LIS302DLCsPin != 0 } diff --git a/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini b/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini index 38b30f4ff7..e1776c2b0f 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.29.hellen_cypress.2861233248" + signature = "rusEFI 2020.10.30.hellen_cypress.4229790604" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.10.29.hellen_cypress.2861233248" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.10.30.hellen_cypress.4229790604" ; 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 Thu Oct 29 19:27:48 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Fri Oct 30 21:44:14 UTC 2020 pageSize = 20000 page = 1 @@ -1735,6 +1735,7 @@ page = 1 rawHighFuelPressure = scalar, U16, 274, "V",{1/1000}, 0 lowFuelPressure = scalar, S16, 276, "kpa", {1/30}, 0 highFuelPressure = scalar, S16, 278, "bar", {1/10}, 0 + targetLambda = scalar, U16, 280, "",{1/10000}, 0.0 ; ; see TunerStudioOutputChannels struct @@ -2522,6 +2523,7 @@ gaugeCategory = Knock entry = injectorDutyCycle,"fuel: injector duty cycle",float,"%.3f" entry = coilDutyCycle, "dwell: coil duty cycle", float,"%.3f" entry = currentTargetAfr,"fuel: target AFR", float,"%.3f" + entry = targetLambda, "fuel: target lambda", float,"%.4f" entry = accelerationX, "Acceleration: X", float,"%.2f", { LIS302DLCsPin != 0 } entry = accelerationY, "Acceleration: Y", float,"%.2f", { LIS302DLCsPin != 0 } diff --git a/firmware/tunerstudio/generated/rusefi_kinetis.ini b/firmware/tunerstudio/generated/rusefi_kinetis.ini index d832e040d0..190beea13b 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.29.kin.4220964506" + signature = "rusEFI 2020.10.30.kin.2902540662" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.10.29.kin.4220964506" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.10.30.kin.2902540662" ; 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 Thu Oct 29 19:27:46 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Fri Oct 30 21:44:13 UTC 2020 pageSize = 20000 page = 1 @@ -1735,6 +1735,7 @@ page = 1 rawHighFuelPressure = scalar, U16, 274, "V",{1/1000}, 0 lowFuelPressure = scalar, S16, 276, "kpa", {1/30}, 0 highFuelPressure = scalar, S16, 278, "bar", {1/10}, 0 + targetLambda = scalar, U16, 280, "",{1/10000}, 0.0 ; ; see TunerStudioOutputChannels struct @@ -2522,6 +2523,7 @@ gaugeCategory = Knock entry = injectorDutyCycle,"fuel: injector duty cycle",float,"%.3f" entry = coilDutyCycle, "dwell: coil duty cycle", float,"%.3f" entry = currentTargetAfr,"fuel: target AFR", float,"%.3f" + entry = targetLambda, "fuel: target lambda", float,"%.4f" entry = accelerationX, "Acceleration: X", float,"%.2f", { LIS302DLCsPin != 0 } entry = accelerationY, "Acceleration: Y", float,"%.2f", { LIS302DLCsPin != 0 } diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index 32aa6f5829..eef41020f5 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.29.mre_f4.6286151" + signature = "rusEFI 2020.10.30.mre_f4.1455973547" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.10.29.mre_f4.6286151" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.10.30.mre_f4.1455973547" ; 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 Thu Oct 29 19:27:36 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Oct 30 21:44:03 UTC 2020 pageSize = 20000 page = 1 @@ -1735,6 +1735,7 @@ page = 1 rawHighFuelPressure = scalar, U16, 274, "V",{1/1000}, 0 lowFuelPressure = scalar, S16, 276, "kpa", {1/30}, 0 highFuelPressure = scalar, S16, 278, "bar", {1/10}, 0 + targetLambda = scalar, U16, 280, "",{1/10000}, 0.0 ; ; see TunerStudioOutputChannels struct @@ -2522,6 +2523,7 @@ gaugeCategory = Knock entry = injectorDutyCycle,"fuel: injector duty cycle",float,"%.3f" entry = coilDutyCycle, "dwell: coil duty cycle", float,"%.3f" entry = currentTargetAfr,"fuel: target AFR", float,"%.3f" + entry = targetLambda, "fuel: target lambda", float,"%.4f" entry = accelerationX, "Acceleration: X", float,"%.2f", { LIS302DLCsPin != 0 } entry = accelerationY, "Acceleration: Y", float,"%.2f", { LIS302DLCsPin != 0 } diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index cc8ff49ab8..1791472720 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.29.mre_f7.6286151" + signature = "rusEFI 2020.10.30.mre_f7.1455973547" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.10.29.mre_f7.6286151" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.10.30.mre_f7.1455973547" ; 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 Thu Oct 29 19:27:35 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Oct 30 21:44:02 UTC 2020 pageSize = 20000 page = 1 @@ -1735,6 +1735,7 @@ page = 1 rawHighFuelPressure = scalar, U16, 274, "V",{1/1000}, 0 lowFuelPressure = scalar, S16, 276, "kpa", {1/30}, 0 highFuelPressure = scalar, S16, 278, "bar", {1/10}, 0 + targetLambda = scalar, U16, 280, "",{1/10000}, 0.0 ; ; see TunerStudioOutputChannels struct @@ -2522,6 +2523,7 @@ gaugeCategory = Knock entry = injectorDutyCycle,"fuel: injector duty cycle",float,"%.3f" entry = coilDutyCycle, "dwell: coil duty cycle", float,"%.3f" entry = currentTargetAfr,"fuel: target AFR", float,"%.3f" + entry = targetLambda, "fuel: target lambda", float,"%.4f" entry = accelerationX, "Acceleration: X", float,"%.2f", { LIS302DLCsPin != 0 } entry = accelerationY, "Acceleration: Y", float,"%.2f", { LIS302DLCsPin != 0 } diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index e18b9c5644..4201dd7978 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.29.prometheus_405.4256337934" + signature = "rusEFI 2020.10.30.prometheus_405.2871336930" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.10.29.prometheus_405.4256337934" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.10.30.prometheus_405.2871336930" ; 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 Thu Oct 29 19:27:41 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Oct 30 21:44:08 UTC 2020 pageSize = 20000 page = 1 @@ -1735,6 +1735,7 @@ page = 1 rawHighFuelPressure = scalar, U16, 274, "V",{1/1000}, 0 lowFuelPressure = scalar, S16, 276, "kpa", {1/30}, 0 highFuelPressure = scalar, S16, 278, "bar", {1/10}, 0 + targetLambda = scalar, U16, 280, "",{1/10000}, 0.0 ; ; see TunerStudioOutputChannels struct @@ -2522,6 +2523,7 @@ gaugeCategory = Knock entry = injectorDutyCycle,"fuel: injector duty cycle",float,"%.3f" entry = coilDutyCycle, "dwell: coil duty cycle", float,"%.3f" entry = currentTargetAfr,"fuel: target AFR", float,"%.3f" + entry = targetLambda, "fuel: target lambda", float,"%.4f" entry = accelerationX, "Acceleration: X", float,"%.2f", { LIS302DLCsPin != 0 } entry = accelerationY, "Acceleration: Y", float,"%.2f", { LIS302DLCsPin != 0 } diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index 4040be0053..4c80ae4491 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.29.prometheus_469.4256337934" + signature = "rusEFI 2020.10.30.prometheus_469.2871336930" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.10.29.prometheus_469.4256337934" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.10.30.prometheus_469.2871336930" ; 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 Thu Oct 29 19:27:40 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Oct 30 21:44:07 UTC 2020 pageSize = 20000 page = 1 @@ -1735,6 +1735,7 @@ page = 1 rawHighFuelPressure = scalar, U16, 274, "V",{1/1000}, 0 lowFuelPressure = scalar, S16, 276, "kpa", {1/30}, 0 highFuelPressure = scalar, S16, 278, "bar", {1/10}, 0 + targetLambda = scalar, U16, 280, "",{1/10000}, 0.0 ; ; see TunerStudioOutputChannels struct @@ -2522,6 +2523,7 @@ gaugeCategory = Knock entry = injectorDutyCycle,"fuel: injector duty cycle",float,"%.3f" entry = coilDutyCycle, "dwell: coil duty cycle", float,"%.3f" entry = currentTargetAfr,"fuel: target AFR", float,"%.3f" + entry = targetLambda, "fuel: target lambda", float,"%.4f" entry = accelerationX, "Acceleration: X", float,"%.2f", { LIS302DLCsPin != 0 } entry = accelerationY, "Acceleration: Y", float,"%.2f", { LIS302DLCsPin != 0 } diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index d68ab6aa25..81502664e2 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.29.proteus_f4.3866803741" + signature = "rusEFI 2020.10.30.proteus_f4.2968334833" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.10.29.proteus_f4.3866803741" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.10.30.proteus_f4.2968334833" ; 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 Thu Oct 29 19:27:45 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Oct 30 21:44:11 UTC 2020 pageSize = 20000 page = 1 @@ -1735,6 +1735,7 @@ page = 1 rawHighFuelPressure = scalar, U16, 274, "V",{1/1000}, 0 lowFuelPressure = scalar, S16, 276, "kpa", {1/30}, 0 highFuelPressure = scalar, S16, 278, "bar", {1/10}, 0 + targetLambda = scalar, U16, 280, "",{1/10000}, 0.0 ; ; see TunerStudioOutputChannels struct @@ -2522,6 +2523,7 @@ gaugeCategory = Knock entry = injectorDutyCycle,"fuel: injector duty cycle",float,"%.3f" entry = coilDutyCycle, "dwell: coil duty cycle", float,"%.3f" entry = currentTargetAfr,"fuel: target AFR", float,"%.3f" + entry = targetLambda, "fuel: target lambda", float,"%.4f" entry = accelerationX, "Acceleration: X", float,"%.2f", { LIS302DLCsPin != 0 } entry = accelerationY, "Acceleration: Y", float,"%.2f", { LIS302DLCsPin != 0 } diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index b387634fe9..e8265a0925 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.29.proteus_f7.3866803741" + signature = "rusEFI 2020.10.30.proteus_f7.2968334833" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.10.29.proteus_f7.3866803741" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.10.30.proteus_f7.2968334833" ; 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 Thu Oct 29 19:27:43 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Oct 30 21:44:10 UTC 2020 pageSize = 20000 page = 1 @@ -1735,6 +1735,7 @@ page = 1 rawHighFuelPressure = scalar, U16, 274, "V",{1/1000}, 0 lowFuelPressure = scalar, S16, 276, "kpa", {1/30}, 0 highFuelPressure = scalar, S16, 278, "bar", {1/10}, 0 + targetLambda = scalar, U16, 280, "",{1/10000}, 0.0 ; ; see TunerStudioOutputChannels struct @@ -2522,6 +2523,7 @@ gaugeCategory = Knock entry = injectorDutyCycle,"fuel: injector duty cycle",float,"%.3f" entry = coilDutyCycle, "dwell: coil duty cycle", float,"%.3f" entry = currentTargetAfr,"fuel: target AFR", float,"%.3f" + entry = targetLambda, "fuel: target lambda", float,"%.4f" entry = accelerationX, "Acceleration: X", float,"%.2f", { LIS302DLCsPin != 0 } entry = accelerationY, "Acceleration: Y", float,"%.2f", { LIS302DLCsPin != 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 5b510ccb77..66d5d776ef 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 Thu Oct 29 19:27:26 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Oct 30 21:43:59 UTC 2020 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -647,6 +647,7 @@ public class Fields { 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_TARGET_LAMBDA = "fuel: target lambda"; public static final String GAUGE_NAME_TCHARGE = "fuel: SD tCharge"; public static final String GAUGE_NAME_THROTTLE_PEDAL = "Throttle pedal position"; public static final String GAUGE_NAME_TIME = "Time"; @@ -1159,7 +1160,7 @@ public class Fields { public static final int servoOutputPins8_offset = 3147; public static final int showHumanReadableWarning_offset = 976; public static final int showSdCardWarning_offset = 76; - public static final int SIGNATURE_HASH = 1669026467; + public static final int SIGNATURE_HASH = 904715599; public static final int silentTriggerError_offset = 1464; public static final int slowAdcAlpha_offset = 2088; public static final int sparkDwellRpmBins_offset = 332; @@ -1427,7 +1428,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.29.all.1669026467"; + public static final String TS_SIGNATURE = "rusEFI 2020.10.30.all.904715599"; 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 2df08661c3..73dfd6036f 100644 --- a/java_console/rusefi.xml +++ b/java_console/rusefi.xml @@ -1,6 +1,6 @@ - +