From 9b5a8e85603f692507a631ae2378bafa7e734257 Mon Sep 17 00:00:00 2001 From: GitHub build-firmware Action Date: Sat, 1 Jan 2022 22:24:48 +0000 Subject: [PATCH] Auto-generated configs and docs --- .../controllers/algo/rusefi_generated.h | 4 +- .../controllers/algo/rusefi_generated.h | 4 +- .../controllers/algo/rusefi_generated.h | 4 +- .../controllers/generated/rusefi_generated.h | 4 +- .../controllers/generated/signature_all.h | 4 +- .../controllers/generated/signature_atlas.h | 4 +- .../generated/signature_f429-discovery.h | 4 +- .../generated/signature_frankenso_na6.h | 4 +- .../generated/signature_hellen-nb1.h | 4 +- .../generated/signature_hellen121nissan.h | 4 +- .../generated/signature_hellen121vag.h | 4 +- .../generated/signature_hellen128.h | 4 +- .../generated/signature_hellen154hyundai.h | 4 +- .../generated/signature_hellen72.h | 4 +- .../generated/signature_hellen81.h | 4 +- .../generated/signature_hellen88bmw.h | 4 +- .../generated/signature_hellenNA6.h | 4 +- .../generated/signature_hellenNA8_96.h | 4 +- .../generated/signature_hellen_cypress.h | 4 +- .../controllers/generated/signature_kin.h | 4 +- .../controllers/generated/signature_mre_f4.h | 4 +- .../controllers/generated/signature_mre_f7.h | 4 +- .../generated/signature_prometheus_405.h | 4 +- .../generated/signature_prometheus_469.h | 4 +- .../generated/signature_proteus_f4.h | 4 +- .../generated/signature_proteus_f7.h | 4 +- .../generated/signature_subaru_eg33_f7.h | 4 +- firmware/tunerstudio/generated/rusefi.ini | 256 ++++++------------ .../tunerstudio/generated/rusefi_atlas.ini | 256 ++++++------------ .../generated/rusefi_f429-discovery.ini | 256 ++++++------------ .../generated/rusefi_frankenso_na6.ini | 256 ++++++------------ .../generated/rusefi_hellen-nb1.ini | 256 ++++++------------ .../generated/rusefi_hellen121nissan.ini | 256 ++++++------------ .../generated/rusefi_hellen121vag.ini | 256 ++++++------------ .../generated/rusefi_hellen128mercedes.ini | 256 ++++++------------ .../generated/rusefi_hellen154hyundai.ini | 256 ++++++------------ .../tunerstudio/generated/rusefi_hellen72.ini | 256 ++++++------------ .../tunerstudio/generated/rusefi_hellen81.ini | 256 ++++++------------ .../generated/rusefi_hellen88bmw.ini | 256 ++++++------------ .../generated/rusefi_hellenNA6.ini | 256 ++++++------------ .../generated/rusefi_hellenNA8_96.ini | 256 ++++++------------ .../generated/rusefi_hellen_cypress.ini | 256 ++++++------------ .../tunerstudio/generated/rusefi_kinetis.ini | 256 ++++++------------ .../tunerstudio/generated/rusefi_mre_f4.ini | 256 ++++++------------ .../tunerstudio/generated/rusefi_mre_f7.ini | 256 ++++++------------ .../generated/rusefi_prometheus_405.ini | 256 ++++++------------ .../generated/rusefi_prometheus_469.ini | 256 ++++++------------ .../generated/rusefi_proteus_f4.ini | 256 ++++++------------ .../generated/rusefi_proteus_f7.ini | 256 ++++++------------ .../generated/rusefi_subaru_eg33_f7.ini | 256 ++++++------------ .../com/rusefi/config/generated/Fields.java | 5 +- 51 files changed, 1965 insertions(+), 4036 deletions(-) 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 2b7255c34b..8c4d45010e 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 @@ -1870,7 +1870,7 @@ #define show_test_presets true #define showHumanReadableWarning_offset 896 #define showSdCardWarning_offset 164 -#define SIGNATURE_HASH 1021528315 +#define SIGNATURE_HASH 2710205830 #define silentTriggerError_offset 1260 #define slowAdcAlpha_offset 1712 #define sparkDwellRpmBins_offset 54 @@ -2390,7 +2390,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2022.01.01.hellen_cypress.1021528315" +#define TS_SIGNATURE "rusEFI 2022.01.01.hellen_cypress.2710205830" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' 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 9de43c1e9e..4a2a29cc69 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -1855,7 +1855,7 @@ #define show_test_presets true #define showHumanReadableWarning_offset 896 #define showSdCardWarning_offset 164 -#define SIGNATURE_HASH 3276178439 +#define SIGNATURE_HASH 1580185978 #define silentTriggerError_offset 1260 #define slowAdcAlpha_offset 1712 #define sparkDwellRpmBins_offset 54 @@ -2375,7 +2375,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator true #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2022.01.01.kin.3276178439" +#define TS_SIGNATURE "rusEFI 2022.01.01.kin.1580185978" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' diff --git a/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h index 24aaf953b7..0620aafbe7 100644 --- a/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h @@ -1883,7 +1883,7 @@ #define show_test_presets false #define showHumanReadableWarning_offset 896 #define showSdCardWarning_offset 164 -#define SIGNATURE_HASH 3316431127 +#define SIGNATURE_HASH 1489339498 #define silentTriggerError_offset 1260 #define slowAdcAlpha_offset 1712 #define sparkDwellRpmBins_offset 54 @@ -2403,7 +2403,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port false -#define TS_SIGNATURE "rusEFI 2022.01.01.subaru_eg33_f7.3316431127" +#define TS_SIGNATURE "rusEFI 2022.01.01.subaru_eg33_f7.1489339498" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h index 43f7415333..c3d6d35c31 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -1870,7 +1870,7 @@ #define show_test_presets true #define showHumanReadableWarning_offset 896 #define showSdCardWarning_offset 164 -#define SIGNATURE_HASH 102149959 +#define SIGNATURE_HASH 2608828986 #define silentTriggerError_offset 1260 #define slowAdcAlpha_offset 1712 #define sparkDwellRpmBins_offset 54 @@ -2390,7 +2390,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2022.01.01.all.102149959" +#define TS_SIGNATURE "rusEFI 2022.01.01.all.2608828986" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' diff --git a/firmware/controllers/generated/signature_all.h b/firmware/controllers/generated/signature_all.h index f0f68492b8..da81a79bd6 100644 --- a/firmware/controllers/generated/signature_all.h +++ b/firmware/controllers/generated/signature_all.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 102149959 -#define TS_SIGNATURE "rusEFI 2022.01.01.all.102149959" +#define SIGNATURE_HASH 2608828986 +#define TS_SIGNATURE "rusEFI 2022.01.01.all.2608828986" diff --git a/firmware/controllers/generated/signature_atlas.h b/firmware/controllers/generated/signature_atlas.h index aae8006d3c..6c0e2480bd 100644 --- a/firmware/controllers/generated/signature_atlas.h +++ b/firmware/controllers/generated/signature_atlas.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 450648672 -#define TS_SIGNATURE "rusEFI 2022.01.01.atlas.450648672" +#define SIGNATURE_HASH 2276812573 +#define TS_SIGNATURE "rusEFI 2022.01.01.atlas.2276812573" diff --git a/firmware/controllers/generated/signature_f429-discovery.h b/firmware/controllers/generated/signature_f429-discovery.h index 4f5e85ee85..5805badc06 100644 --- a/firmware/controllers/generated/signature_f429-discovery.h +++ b/firmware/controllers/generated/signature_f429-discovery.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 102149959 -#define TS_SIGNATURE "rusEFI 2022.01.01.f429-discovery.102149959" +#define SIGNATURE_HASH 2608828986 +#define TS_SIGNATURE "rusEFI 2022.01.01.f429-discovery.2608828986" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index 5f6a16b97e..5ef2aacccd 100644 --- a/firmware/controllers/generated/signature_frankenso_na6.h +++ b/firmware/controllers/generated/signature_frankenso_na6.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 2082798254 -#define TS_SIGNATURE "rusEFI 2022.01.01.frankenso_na6.2082798254" +#define SIGNATURE_HASH 3779971027 +#define TS_SIGNATURE "rusEFI 2022.01.01.frankenso_na6.3779971027" diff --git a/firmware/controllers/generated/signature_hellen-nb1.h b/firmware/controllers/generated/signature_hellen-nb1.h index 47228a2010..e0809a109b 100644 --- a/firmware/controllers/generated/signature_hellen-nb1.h +++ b/firmware/controllers/generated/signature_hellen-nb1.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 4208939422 -#define TS_SIGNATURE "rusEFI 2022.01.01.hellen-nb1.4208939422" +#define SIGNATURE_HASH 1740008675 +#define TS_SIGNATURE "rusEFI 2022.01.01.hellen-nb1.1740008675" diff --git a/firmware/controllers/generated/signature_hellen121nissan.h b/firmware/controllers/generated/signature_hellen121nissan.h index 64b465e90c..c8973bbf4b 100644 --- a/firmware/controllers/generated/signature_hellen121nissan.h +++ b/firmware/controllers/generated/signature_hellen121nissan.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 3180514790 -#define TS_SIGNATURE "rusEFI 2022.01.01.hellen121nissan.3180514790" +#define SIGNATURE_HASH 553382043 +#define TS_SIGNATURE "rusEFI 2022.01.01.hellen121nissan.553382043" diff --git a/firmware/controllers/generated/signature_hellen121vag.h b/firmware/controllers/generated/signature_hellen121vag.h index 3b6c9aeb44..b5f7692f2c 100644 --- a/firmware/controllers/generated/signature_hellen121vag.h +++ b/firmware/controllers/generated/signature_hellen121vag.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 1505069901 -#define TS_SIGNATURE "rusEFI 2022.01.01.hellen121vag.1505069901" +#define SIGNATURE_HASH 3302798896 +#define TS_SIGNATURE "rusEFI 2022.01.01.hellen121vag.3302798896" diff --git a/firmware/controllers/generated/signature_hellen128.h b/firmware/controllers/generated/signature_hellen128.h index aae1e857bf..d37813936d 100644 --- a/firmware/controllers/generated/signature_hellen128.h +++ b/firmware/controllers/generated/signature_hellen128.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 737016656 -#define TS_SIGNATURE "rusEFI 2022.01.01.hellen128.737016656" +#define SIGNATURE_HASH 3062154797 +#define TS_SIGNATURE "rusEFI 2022.01.01.hellen128.3062154797" diff --git a/firmware/controllers/generated/signature_hellen154hyundai.h b/firmware/controllers/generated/signature_hellen154hyundai.h index 2a0842737f..d04d57dac9 100644 --- a/firmware/controllers/generated/signature_hellen154hyundai.h +++ b/firmware/controllers/generated/signature_hellen154hyundai.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 3389699051 -#define TS_SIGNATURE "rusEFI 2022.01.01.hellen154hyundai.3389699051" +#define SIGNATURE_HASH 1466142358 +#define TS_SIGNATURE "rusEFI 2022.01.01.hellen154hyundai.1466142358" diff --git a/firmware/controllers/generated/signature_hellen72.h b/firmware/controllers/generated/signature_hellen72.h index 545648df26..6c325111c0 100644 --- a/firmware/controllers/generated/signature_hellen72.h +++ b/firmware/controllers/generated/signature_hellen72.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 4071303415 -#define TS_SIGNATURE "rusEFI 2022.01.01.hellen72.4071303415" +#define SIGNATURE_HASH 1874990474 +#define TS_SIGNATURE "rusEFI 2022.01.01.hellen72.1874990474" diff --git a/firmware/controllers/generated/signature_hellen81.h b/firmware/controllers/generated/signature_hellen81.h index 88440503ff..e0817b55a6 100644 --- a/firmware/controllers/generated/signature_hellen81.h +++ b/firmware/controllers/generated/signature_hellen81.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 1185330436 -#define TS_SIGNATURE "rusEFI 2022.01.01.hellen81.1185330436" +#define SIGNATURE_HASH 3687811193 +#define TS_SIGNATURE "rusEFI 2022.01.01.hellen81.3687811193" diff --git a/firmware/controllers/generated/signature_hellen88bmw.h b/firmware/controllers/generated/signature_hellen88bmw.h index 502b8c5a70..3f2195f8bb 100644 --- a/firmware/controllers/generated/signature_hellen88bmw.h +++ b/firmware/controllers/generated/signature_hellen88bmw.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 2815835672 -#define TS_SIGNATURE "rusEFI 2022.01.01.hellen88bmw.2815835672" +#define SIGNATURE_HASH 985596773 +#define TS_SIGNATURE "rusEFI 2022.01.01.hellen88bmw.985596773" diff --git a/firmware/controllers/generated/signature_hellenNA6.h b/firmware/controllers/generated/signature_hellenNA6.h index 607ca9cc4b..5bff88c767 100644 --- a/firmware/controllers/generated/signature_hellenNA6.h +++ b/firmware/controllers/generated/signature_hellenNA6.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 1881926127 -#define TS_SIGNATURE "rusEFI 2022.01.01.hellenNA6.1881926127" +#define SIGNATURE_HASH 3980579986 +#define TS_SIGNATURE "rusEFI 2022.01.01.hellenNA6.3980579986" diff --git a/firmware/controllers/generated/signature_hellenNA8_96.h b/firmware/controllers/generated/signature_hellenNA8_96.h index 847bb7b8fc..e146a69709 100644 --- a/firmware/controllers/generated/signature_hellenNA8_96.h +++ b/firmware/controllers/generated/signature_hellenNA8_96.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 3526910736 -#define TS_SIGNATURE "rusEFI 2022.01.01.hellenNA8_96.3526910736" +#define SIGNATURE_HASH 1330732653 +#define TS_SIGNATURE "rusEFI 2022.01.01.hellenNA8_96.1330732653" diff --git a/firmware/controllers/generated/signature_hellen_cypress.h b/firmware/controllers/generated/signature_hellen_cypress.h index 7b65b1d60b..fa7762d1b4 100644 --- a/firmware/controllers/generated/signature_hellen_cypress.h +++ b/firmware/controllers/generated/signature_hellen_cypress.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt // -#define SIGNATURE_HASH 1021528315 -#define TS_SIGNATURE "rusEFI 2022.01.01.hellen_cypress.1021528315" +#define SIGNATURE_HASH 2710205830 +#define TS_SIGNATURE "rusEFI 2022.01.01.hellen_cypress.2710205830" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index b897c56e43..b829cadecf 100644 --- a/firmware/controllers/generated/signature_kin.h +++ b/firmware/controllers/generated/signature_kin.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt // -#define SIGNATURE_HASH 3276178439 -#define TS_SIGNATURE "rusEFI 2022.01.01.kin.3276178439" +#define SIGNATURE_HASH 1580185978 +#define TS_SIGNATURE "rusEFI 2022.01.01.kin.1580185978" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index 0ca3f60d59..3ba385aa82 100644 --- a/firmware/controllers/generated/signature_mre_f4.h +++ b/firmware/controllers/generated/signature_mre_f4.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 3039942131 -#define TS_SIGNATURE "rusEFI 2022.01.01.mre_f4.3039942131" +#define SIGNATURE_HASH 676915342 +#define TS_SIGNATURE "rusEFI 2022.01.01.mre_f4.676915342" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index bfbca6c0a1..ea085a7605 100644 --- a/firmware/controllers/generated/signature_mre_f7.h +++ b/firmware/controllers/generated/signature_mre_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 3039942131 -#define TS_SIGNATURE "rusEFI 2022.01.01.mre_f7.3039942131" +#define SIGNATURE_HASH 676915342 +#define TS_SIGNATURE "rusEFI 2022.01.01.mre_f7.676915342" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index c386d8bc27..75df114c19 100644 --- a/firmware/controllers/generated/signature_prometheus_405.h +++ b/firmware/controllers/generated/signature_prometheus_405.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 1459386017 -#define TS_SIGNATURE "rusEFI 2022.01.01.prometheus_405.1459386017" +#define SIGNATURE_HASH 3415559132 +#define TS_SIGNATURE "rusEFI 2022.01.01.prometheus_405.3415559132" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index 2ba7ae0ba6..1f14084395 100644 --- a/firmware/controllers/generated/signature_prometheus_469.h +++ b/firmware/controllers/generated/signature_prometheus_469.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 1459386017 -#define TS_SIGNATURE "rusEFI 2022.01.01.prometheus_469.1459386017" +#define SIGNATURE_HASH 3415559132 +#define TS_SIGNATURE "rusEFI 2022.01.01.prometheus_469.3415559132" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index ea5d5ad128..382254955a 100644 --- a/firmware/controllers/generated/signature_proteus_f4.h +++ b/firmware/controllers/generated/signature_proteus_f4.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 3303754139 -#define TS_SIGNATURE "rusEFI 2022.01.01.proteus_f4.3303754139" +#define SIGNATURE_HASH 1501721830 +#define TS_SIGNATURE "rusEFI 2022.01.01.proteus_f4.1501721830" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index bd808cadce..7e767673ca 100644 --- a/firmware/controllers/generated/signature_proteus_f7.h +++ b/firmware/controllers/generated/signature_proteus_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 3303754139 -#define TS_SIGNATURE "rusEFI 2022.01.01.proteus_f7.3303754139" +#define SIGNATURE_HASH 1501721830 +#define TS_SIGNATURE "rusEFI 2022.01.01.proteus_f7.1501721830" diff --git a/firmware/controllers/generated/signature_subaru_eg33_f7.h b/firmware/controllers/generated/signature_subaru_eg33_f7.h index 5ae8a7c89b..9ab3e28f9f 100644 --- a/firmware/controllers/generated/signature_subaru_eg33_f7.h +++ b/firmware/controllers/generated/signature_subaru_eg33_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 3316431127 -#define TS_SIGNATURE "rusEFI 2022.01.01.subaru_eg33_f7.3316431127" +#define SIGNATURE_HASH 1489339498 +#define TS_SIGNATURE "rusEFI 2022.01.01.subaru_eg33_f7.1489339498" diff --git a/firmware/tunerstudio/generated/rusefi.ini b/firmware/tunerstudio/generated/rusefi.ini index 13abe37b3d..d8dfb3aa27 100644 --- a/firmware/tunerstudio/generated/rusefi.ini +++ b/firmware/tunerstudio/generated/rusefi.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.01.01.all.102149959" + signature = "rusEFI 2022.01.01.all.2608828986" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.01.01.all.102149959" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.01.01.all.2608828986" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jan 01 21:09:32 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jan 01 22:23:08 UTC 2022 pageSize = 20996 page = 1 @@ -2097,174 +2097,76 @@ tps12Split = scalar, S16, 330, "%", 0.01, 0 accPedalSplit = scalar, S16, 332, "%", 0.01, 0 m_requested_pump = scalar, S16, 334, "deg", 0.02, 0 unused16 = scalar, S16, 336, "deg", 0.02, 0 -unusedAtTheEnd1 = scalar, U08, 338, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 339, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 340, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 341, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 342, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 343, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 344, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 345, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 346, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 347, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 348, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 349, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 350, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 351, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 352, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 353, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 354, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 355, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 356, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 357, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 358, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 359, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 360, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 361, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 362, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 363, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 364, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 365, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 366, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 367, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 368, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 369, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 370, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 371, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 372, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 373, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 374, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 375, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 376, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 377, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 378, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 379, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 380, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 381, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 382, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 383, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 384, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 385, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 386, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 387, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 388, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 389, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 390, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 391, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 392, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 393, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 394, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 395, "", 1, 0 -unusedAtTheEnd59 = scalar, U08, 396, "", 1, 0 -unusedAtTheEnd60 = scalar, U08, 397, "", 1, 0 -unusedAtTheEnd61 = scalar, U08, 398, "", 1, 0 -unusedAtTheEnd62 = scalar, U08, 399, "", 1, 0 -unusedAtTheEnd63 = scalar, U08, 400, "", 1, 0 -unusedAtTheEnd64 = scalar, U08, 401, "", 1, 0 -unusedAtTheEnd65 = scalar, U08, 402, "", 1, 0 -unusedAtTheEnd66 = scalar, U08, 403, "", 1, 0 -unusedAtTheEnd67 = scalar, U08, 404, "", 1, 0 -unusedAtTheEnd68 = scalar, U08, 405, "", 1, 0 -unusedAtTheEnd69 = scalar, U08, 406, "", 1, 0 -unusedAtTheEnd70 = scalar, U08, 407, "", 1, 0 -unusedAtTheEnd71 = scalar, U08, 408, "", 1, 0 -unusedAtTheEnd72 = scalar, U08, 409, "", 1, 0 -unusedAtTheEnd73 = scalar, U08, 410, "", 1, 0 -unusedAtTheEnd74 = scalar, U08, 411, "", 1, 0 -unusedAtTheEnd75 = scalar, U08, 412, "", 1, 0 -unusedAtTheEnd76 = scalar, U08, 413, "", 1, 0 -unusedAtTheEnd77 = scalar, U08, 414, "", 1, 0 -unusedAtTheEnd78 = scalar, U08, 415, "", 1, 0 -unusedAtTheEnd79 = scalar, U08, 416, "", 1, 0 -unusedAtTheEnd80 = scalar, U08, 417, "", 1, 0 -unusedAtTheEnd81 = scalar, U08, 418, "", 1, 0 -unusedAtTheEnd82 = scalar, U08, 419, "", 1, 0 -unusedAtTheEnd83 = scalar, U08, 420, "", 1, 0 -unusedAtTheEnd84 = scalar, U08, 421, "", 1, 0 -unusedAtTheEnd85 = scalar, U08, 422, "", 1, 0 -unusedAtTheEnd86 = scalar, U08, 423, "", 1, 0 -unusedAtTheEnd87 = scalar, U08, 424, "", 1, 0 -unusedAtTheEnd88 = scalar, U08, 425, "", 1, 0 -unusedAtTheEnd89 = scalar, U08, 426, "", 1, 0 -unusedAtTheEnd90 = scalar, U08, 427, "", 1, 0 -unusedAtTheEnd91 = scalar, U08, 428, "", 1, 0 -unusedAtTheEnd92 = scalar, U08, 429, "", 1, 0 -unusedAtTheEnd93 = scalar, U08, 430, "", 1, 0 -unusedAtTheEnd94 = scalar, U08, 431, "", 1, 0 -unusedAtTheEnd95 = scalar, U08, 432, "", 1, 0 -unusedAtTheEnd96 = scalar, U08, 433, "", 1, 0 -unusedAtTheEnd97 = scalar, U08, 434, "", 1, 0 -unusedAtTheEnd98 = scalar, U08, 435, "", 1, 0 -unusedAtTheEnd99 = scalar, U08, 436, "", 1, 0 -unusedAtTheEnd100 = scalar, U08, 437, "", 1, 0 -unusedAtTheEnd101 = scalar, U08, 438, "", 1, 0 -unusedAtTheEnd102 = scalar, U08, 439, "", 1, 0 -unusedAtTheEnd103 = scalar, U08, 440, "", 1, 0 -unusedAtTheEnd104 = scalar, U08, 441, "", 1, 0 -unusedAtTheEnd105 = scalar, U08, 442, "", 1, 0 -unusedAtTheEnd106 = scalar, U08, 443, "", 1, 0 -unusedAtTheEnd107 = scalar, U08, 444, "", 1, 0 -unusedAtTheEnd108 = scalar, U08, 445, "", 1, 0 -unusedAtTheEnd109 = scalar, U08, 446, "", 1, 0 -unusedAtTheEnd110 = scalar, U08, 447, "", 1, 0 -unusedAtTheEnd111 = scalar, U08, 448, "", 1, 0 -unusedAtTheEnd112 = scalar, U08, 449, "", 1, 0 -unusedAtTheEnd113 = scalar, U08, 450, "", 1, 0 -unusedAtTheEnd114 = scalar, U08, 451, "", 1, 0 -unusedAtTheEnd115 = scalar, U08, 452, "", 1, 0 -unusedAtTheEnd116 = scalar, U08, 453, "", 1, 0 -unusedAtTheEnd117 = scalar, U08, 454, "", 1, 0 -unusedAtTheEnd118 = scalar, U08, 455, "", 1, 0 -unusedAtTheEnd119 = scalar, U08, 456, "", 1, 0 -unusedAtTheEnd120 = scalar, U08, 457, "", 1, 0 -unusedAtTheEnd121 = scalar, U08, 458, "", 1, 0 -unusedAtTheEnd122 = scalar, U08, 459, "", 1, 0 -unusedAtTheEnd123 = scalar, U08, 460, "", 1, 0 -unusedAtTheEnd124 = scalar, U08, 461, "", 1, 0 -unusedAtTheEnd125 = scalar, U08, 462, "", 1, 0 -unusedAtTheEnd126 = scalar, U08, 463, "", 1, 0 -unusedAtTheEnd127 = scalar, U08, 464, "", 1, 0 -unusedAtTheEnd128 = scalar, U08, 465, "", 1, 0 -unusedAtTheEnd129 = scalar, U08, 466, "", 1, 0 -unusedAtTheEnd130 = scalar, U08, 467, "", 1, 0 -unusedAtTheEnd131 = scalar, U08, 468, "", 1, 0 -unusedAtTheEnd132 = scalar, U08, 469, "", 1, 0 -launchSpeedCondition = bits, U32, 470, [0:0] -launchRpmCondition = bits, U32, 470, [1:1] -launchTpsCondition = bits, U32, 470, [2:2] -launchActivateSwitchCondition = bits, U32, 470, [3:3] -launchIsLaunchCondition = bits, U32, 470, [4:4] -launchCombinedConditions = bits, U32, 470, [5:5] -launchActivatePinState = bits, U32, 470, [6:6] -unusedBit_173_7 = bits, U32, 470, [7:7] -unusedBit_173_8 = bits, U32, 470, [8:8] -unusedBit_173_9 = bits, U32, 470, [9:9] -unusedBit_173_10 = bits, U32, 470, [10:10] -unusedBit_173_11 = bits, U32, 470, [11:11] -unusedBit_173_12 = bits, U32, 470, [12:12] -unusedBit_173_13 = bits, U32, 470, [13:13] -unusedBit_173_14 = bits, U32, 470, [14:14] -unusedBit_173_15 = bits, U32, 470, [15:15] -unusedBit_173_16 = bits, U32, 470, [16:16] -unusedBit_173_17 = bits, U32, 470, [17:17] -unusedBit_173_18 = bits, U32, 470, [18:18] -unusedBit_173_19 = bits, U32, 470, [19:19] -unusedBit_173_20 = bits, U32, 470, [20:20] -unusedBit_173_21 = bits, U32, 470, [21:21] -unusedBit_173_22 = bits, U32, 470, [22:22] -unusedBit_173_23 = bits, U32, 470, [23:23] -unusedBit_173_24 = bits, U32, 470, [24:24] -unusedBit_173_25 = bits, U32, 470, [25:25] -unusedBit_173_26 = bits, U32, 470, [26:26] -unusedBit_173_27 = bits, U32, 470, [27:27] -unusedBit_173_28 = bits, U32, 470, [28:28] -unusedBit_173_29 = bits, U32, 470, [29:29] -unusedBit_173_30 = bits, U32, 470, [30:30] -unusedBit_173_31 = bits, U32, 470, [31:31] -TEMPLOG_MAP_AT_CYCLE_COUNT = scalar, U08, 474, "", 1, 0 -unused11 = scalar, U08, 475, "", 1, 0 -unused11 = scalar, U08, 475, "", 1, 0 -unused11 = scalar, U08, 475, "", 1, 0 +alignmentFill_at_338 = array, U08, 338, [2], "units", 1, 0 +fuel_requested_percent = scalar, F32, 340, "v", 1, 0 +fuel_requested_percent_pi = scalar, F32, 344, "v", 1, 0 +m_I_sum_percent = scalar, F32, 348, "v", 1, 0 +m_pressureTarget_kPa = scalar, F32, 352, "v", 1, 0 +unusedAtTheEnd1 = scalar, S32, 356, "", 1, 0 +unusedAtTheEnd2 = scalar, S32, 360, "", 1, 0 +unusedAtTheEnd3 = scalar, S32, 364, "", 1, 0 +unusedAtTheEnd4 = scalar, S32, 368, "", 1, 0 +unusedAtTheEnd5 = scalar, S32, 372, "", 1, 0 +unusedAtTheEnd6 = scalar, S32, 376, "", 1, 0 +unusedAtTheEnd7 = scalar, S32, 380, "", 1, 0 +unusedAtTheEnd8 = scalar, S32, 384, "", 1, 0 +unusedAtTheEnd9 = scalar, S32, 388, "", 1, 0 +unusedAtTheEnd10 = scalar, S32, 392, "", 1, 0 +unusedAtTheEnd11 = scalar, S32, 396, "", 1, 0 +unusedAtTheEnd12 = scalar, S32, 400, "", 1, 0 +unusedAtTheEnd13 = scalar, S32, 404, "", 1, 0 +unusedAtTheEnd14 = scalar, S32, 408, "", 1, 0 +unusedAtTheEnd15 = scalar, S32, 412, "", 1, 0 +unusedAtTheEnd16 = scalar, S32, 416, "", 1, 0 +unusedAtTheEnd17 = scalar, S32, 420, "", 1, 0 +unusedAtTheEnd18 = scalar, S32, 424, "", 1, 0 +unusedAtTheEnd19 = scalar, S32, 428, "", 1, 0 +unusedAtTheEnd20 = scalar, S32, 432, "", 1, 0 +unusedAtTheEnd21 = scalar, S32, 436, "", 1, 0 +unusedAtTheEnd22 = scalar, S32, 440, "", 1, 0 +unusedAtTheEnd23 = scalar, S32, 444, "", 1, 0 +unusedAtTheEnd24 = scalar, S32, 448, "", 1, 0 +unusedAtTheEnd25 = scalar, S32, 452, "", 1, 0 +unusedAtTheEnd26 = scalar, S32, 456, "", 1, 0 +unusedAtTheEnd27 = scalar, S32, 460, "", 1, 0 +unusedAtTheEnd28 = scalar, S32, 464, "", 1, 0 +launchSpeedCondition = bits, U32, 468, [0:0] +launchRpmCondition = bits, U32, 468, [1:1] +launchTpsCondition = bits, U32, 468, [2:2] +launchActivateSwitchCondition = bits, U32, 468, [3:3] +launchIsLaunchCondition = bits, U32, 468, [4:4] +launchCombinedConditions = bits, U32, 468, [5:5] +launchActivatePinState = bits, U32, 468, [6:6] +unusedBit_178_7 = bits, U32, 468, [7:7] +unusedBit_178_8 = bits, U32, 468, [8:8] +unusedBit_178_9 = bits, U32, 468, [9:9] +unusedBit_178_10 = bits, U32, 468, [10:10] +unusedBit_178_11 = bits, U32, 468, [11:11] +unusedBit_178_12 = bits, U32, 468, [12:12] +unusedBit_178_13 = bits, U32, 468, [13:13] +unusedBit_178_14 = bits, U32, 468, [14:14] +unusedBit_178_15 = bits, U32, 468, [15:15] +unusedBit_178_16 = bits, U32, 468, [16:16] +unusedBit_178_17 = bits, U32, 468, [17:17] +unusedBit_178_18 = bits, U32, 468, [18:18] +unusedBit_178_19 = bits, U32, 468, [19:19] +unusedBit_178_20 = bits, U32, 468, [20:20] +unusedBit_178_21 = bits, U32, 468, [21:21] +unusedBit_178_22 = bits, U32, 468, [22:22] +unusedBit_178_23 = bits, U32, 468, [23:23] +unusedBit_178_24 = bits, U32, 468, [24:24] +unusedBit_178_25 = bits, U32, 468, [25:25] +unusedBit_178_26 = bits, U32, 468, [26:26] +unusedBit_178_27 = bits, U32, 468, [27:27] +unusedBit_178_28 = bits, U32, 468, [28:28] +unusedBit_178_29 = bits, U32, 468, [29:29] +unusedBit_178_30 = bits, U32, 468, [30:30] +unusedBit_178_31 = bits, U32, 468, [31:31] +TEMPLOG_MAP_AT_CYCLE_COUNT = scalar, U08, 472, "", 1, 0 +unused11 = scalar, U08, 473, "", 1, 0 +unused11 = scalar, U08, 473, "", 1, 0 +unused11 = scalar, U08, 473, "", 1, 0 +alignmentFill_at_474 = array, U08, 474, [2], "units", 1, 0 TEMPLOG_MAP_AT_SPECIAL_POINT = scalar, F32, 476, "", 1, 0 TEMPLOG_MAP_AT_DIFF = scalar, F32, 480, "", 1, 0 vvtSyncGapRatio = scalar, F32, 484, "", 1, 0 @@ -3102,7 +3004,11 @@ TEMPLOG_MAP_AT_DIFFGauge = TEMPLOG_MAP_AT_DIFF,"TEMPLOG_MAP_AT_DIFF", "", -10000 TEMPLOG_MAP_AT_CYCLE_COUNTGauge = TEMPLOG_MAP_AT_CYCLE_COUNT,"TEMPLOG_MAP_AT_CYCLE_COUNT", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 gaugeCategory = GDI -m_requested_pumpGauge = m_requested_pump,"Pump Angle", "deg", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +m_requested_pumpGauge = m_requested_pump,"DI: Pump Angle", "deg", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +fuel_requested_percentGauge = fuel_requested_percent,"DI: fuel_requested_percent", "v", 0.0,100.0, 0.0,100.0, 0.0,100.0, 0,0 +fuel_requested_percent_piGauge = fuel_requested_percent_pi,"DI: fuel_requested_percent_pi", "v", 0.0,100.0, 0.0,100.0, 0.0,100.0, 0,0 +m_I_sum_percentGauge = m_I_sum_percent,"DI: m_I_sum_percent", "v", 0.0,100.0, 0.0,100.0, 0.0,100.0, 0,0 +m_pressureTarget_kPaGauge = m_pressureTarget_kPa,"DI: m_pressureTarget_kPa", "v", 0.0,100.0, 0.0,100.0, 0.0,100.0, 0,0 highFuelPressureGauge = highFuelPressure, "Fuel pressure (high)", "bar", 0, 200, 0, 0, 200, 200, 1, 0 gaugeCategory = Sensors - Extra 2 @@ -3581,7 +3487,11 @@ entry = tps1Split, "tps1Split", float, "%.3f" entry = tps2Split, "tps2Split", float, "%.3f" entry = tps12Split, "tps12Split", float, "%.3f" entry = accPedalSplit, "accPedalSplit", float, "%.3f" -entry = m_requested_pump, "Pump Angle", float, "%.3f" +entry = m_requested_pump, "DI: Pump Angle", float, "%.3f" +entry = fuel_requested_percent, "DI: fuel_requested_percent", float, "%.3f" +entry = fuel_requested_percent_pi, "DI: fuel_requested_percent_pi", float, "%.3f" +entry = m_I_sum_percent, "DI: m_I_sum_percent", float, "%.3f" +entry = m_pressureTarget_kPa, "DI: m_pressureTarget_kPa", float, "%.3f" entry = launchSpeedCondition, "launchSpeedCondition", int, "%d" entry = launchRpmCondition, "launchRpmCondition", int, "%d" entry = launchTpsCondition, "launchTpsCondition", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_atlas.ini b/firmware/tunerstudio/generated/rusefi_atlas.ini index 9181ac8438..53d9603c62 100644 --- a/firmware/tunerstudio/generated/rusefi_atlas.ini +++ b/firmware/tunerstudio/generated/rusefi_atlas.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.01.01.atlas.450648672" + signature = "rusEFI 2022.01.01.atlas.2276812573" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.01.01.atlas.450648672" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.01.01.atlas.2276812573" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jan 01 21:09:29 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jan 01 22:23:05 UTC 2022 pageSize = 20996 page = 1 @@ -2097,174 +2097,76 @@ tps12Split = scalar, S16, 330, "%", 0.01, 0 accPedalSplit = scalar, S16, 332, "%", 0.01, 0 m_requested_pump = scalar, S16, 334, "deg", 0.02, 0 unused16 = scalar, S16, 336, "deg", 0.02, 0 -unusedAtTheEnd1 = scalar, U08, 338, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 339, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 340, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 341, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 342, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 343, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 344, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 345, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 346, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 347, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 348, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 349, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 350, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 351, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 352, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 353, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 354, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 355, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 356, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 357, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 358, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 359, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 360, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 361, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 362, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 363, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 364, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 365, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 366, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 367, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 368, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 369, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 370, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 371, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 372, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 373, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 374, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 375, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 376, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 377, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 378, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 379, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 380, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 381, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 382, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 383, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 384, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 385, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 386, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 387, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 388, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 389, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 390, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 391, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 392, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 393, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 394, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 395, "", 1, 0 -unusedAtTheEnd59 = scalar, U08, 396, "", 1, 0 -unusedAtTheEnd60 = scalar, U08, 397, "", 1, 0 -unusedAtTheEnd61 = scalar, U08, 398, "", 1, 0 -unusedAtTheEnd62 = scalar, U08, 399, "", 1, 0 -unusedAtTheEnd63 = scalar, U08, 400, "", 1, 0 -unusedAtTheEnd64 = scalar, U08, 401, "", 1, 0 -unusedAtTheEnd65 = scalar, U08, 402, "", 1, 0 -unusedAtTheEnd66 = scalar, U08, 403, "", 1, 0 -unusedAtTheEnd67 = scalar, U08, 404, "", 1, 0 -unusedAtTheEnd68 = scalar, U08, 405, "", 1, 0 -unusedAtTheEnd69 = scalar, U08, 406, "", 1, 0 -unusedAtTheEnd70 = scalar, U08, 407, "", 1, 0 -unusedAtTheEnd71 = scalar, U08, 408, "", 1, 0 -unusedAtTheEnd72 = scalar, U08, 409, "", 1, 0 -unusedAtTheEnd73 = scalar, U08, 410, "", 1, 0 -unusedAtTheEnd74 = scalar, U08, 411, "", 1, 0 -unusedAtTheEnd75 = scalar, U08, 412, "", 1, 0 -unusedAtTheEnd76 = scalar, U08, 413, "", 1, 0 -unusedAtTheEnd77 = scalar, U08, 414, "", 1, 0 -unusedAtTheEnd78 = scalar, U08, 415, "", 1, 0 -unusedAtTheEnd79 = scalar, U08, 416, "", 1, 0 -unusedAtTheEnd80 = scalar, U08, 417, "", 1, 0 -unusedAtTheEnd81 = scalar, U08, 418, "", 1, 0 -unusedAtTheEnd82 = scalar, U08, 419, "", 1, 0 -unusedAtTheEnd83 = scalar, U08, 420, "", 1, 0 -unusedAtTheEnd84 = scalar, U08, 421, "", 1, 0 -unusedAtTheEnd85 = scalar, U08, 422, "", 1, 0 -unusedAtTheEnd86 = scalar, U08, 423, "", 1, 0 -unusedAtTheEnd87 = scalar, U08, 424, "", 1, 0 -unusedAtTheEnd88 = scalar, U08, 425, "", 1, 0 -unusedAtTheEnd89 = scalar, U08, 426, "", 1, 0 -unusedAtTheEnd90 = scalar, U08, 427, "", 1, 0 -unusedAtTheEnd91 = scalar, U08, 428, "", 1, 0 -unusedAtTheEnd92 = scalar, U08, 429, "", 1, 0 -unusedAtTheEnd93 = scalar, U08, 430, "", 1, 0 -unusedAtTheEnd94 = scalar, U08, 431, "", 1, 0 -unusedAtTheEnd95 = scalar, U08, 432, "", 1, 0 -unusedAtTheEnd96 = scalar, U08, 433, "", 1, 0 -unusedAtTheEnd97 = scalar, U08, 434, "", 1, 0 -unusedAtTheEnd98 = scalar, U08, 435, "", 1, 0 -unusedAtTheEnd99 = scalar, U08, 436, "", 1, 0 -unusedAtTheEnd100 = scalar, U08, 437, "", 1, 0 -unusedAtTheEnd101 = scalar, U08, 438, "", 1, 0 -unusedAtTheEnd102 = scalar, U08, 439, "", 1, 0 -unusedAtTheEnd103 = scalar, U08, 440, "", 1, 0 -unusedAtTheEnd104 = scalar, U08, 441, "", 1, 0 -unusedAtTheEnd105 = scalar, U08, 442, "", 1, 0 -unusedAtTheEnd106 = scalar, U08, 443, "", 1, 0 -unusedAtTheEnd107 = scalar, U08, 444, "", 1, 0 -unusedAtTheEnd108 = scalar, U08, 445, "", 1, 0 -unusedAtTheEnd109 = scalar, U08, 446, "", 1, 0 -unusedAtTheEnd110 = scalar, U08, 447, "", 1, 0 -unusedAtTheEnd111 = scalar, U08, 448, "", 1, 0 -unusedAtTheEnd112 = scalar, U08, 449, "", 1, 0 -unusedAtTheEnd113 = scalar, U08, 450, "", 1, 0 -unusedAtTheEnd114 = scalar, U08, 451, "", 1, 0 -unusedAtTheEnd115 = scalar, U08, 452, "", 1, 0 -unusedAtTheEnd116 = scalar, U08, 453, "", 1, 0 -unusedAtTheEnd117 = scalar, U08, 454, "", 1, 0 -unusedAtTheEnd118 = scalar, U08, 455, "", 1, 0 -unusedAtTheEnd119 = scalar, U08, 456, "", 1, 0 -unusedAtTheEnd120 = scalar, U08, 457, "", 1, 0 -unusedAtTheEnd121 = scalar, U08, 458, "", 1, 0 -unusedAtTheEnd122 = scalar, U08, 459, "", 1, 0 -unusedAtTheEnd123 = scalar, U08, 460, "", 1, 0 -unusedAtTheEnd124 = scalar, U08, 461, "", 1, 0 -unusedAtTheEnd125 = scalar, U08, 462, "", 1, 0 -unusedAtTheEnd126 = scalar, U08, 463, "", 1, 0 -unusedAtTheEnd127 = scalar, U08, 464, "", 1, 0 -unusedAtTheEnd128 = scalar, U08, 465, "", 1, 0 -unusedAtTheEnd129 = scalar, U08, 466, "", 1, 0 -unusedAtTheEnd130 = scalar, U08, 467, "", 1, 0 -unusedAtTheEnd131 = scalar, U08, 468, "", 1, 0 -unusedAtTheEnd132 = scalar, U08, 469, "", 1, 0 -launchSpeedCondition = bits, U32, 470, [0:0] -launchRpmCondition = bits, U32, 470, [1:1] -launchTpsCondition = bits, U32, 470, [2:2] -launchActivateSwitchCondition = bits, U32, 470, [3:3] -launchIsLaunchCondition = bits, U32, 470, [4:4] -launchCombinedConditions = bits, U32, 470, [5:5] -launchActivatePinState = bits, U32, 470, [6:6] -unusedBit_173_7 = bits, U32, 470, [7:7] -unusedBit_173_8 = bits, U32, 470, [8:8] -unusedBit_173_9 = bits, U32, 470, [9:9] -unusedBit_173_10 = bits, U32, 470, [10:10] -unusedBit_173_11 = bits, U32, 470, [11:11] -unusedBit_173_12 = bits, U32, 470, [12:12] -unusedBit_173_13 = bits, U32, 470, [13:13] -unusedBit_173_14 = bits, U32, 470, [14:14] -unusedBit_173_15 = bits, U32, 470, [15:15] -unusedBit_173_16 = bits, U32, 470, [16:16] -unusedBit_173_17 = bits, U32, 470, [17:17] -unusedBit_173_18 = bits, U32, 470, [18:18] -unusedBit_173_19 = bits, U32, 470, [19:19] -unusedBit_173_20 = bits, U32, 470, [20:20] -unusedBit_173_21 = bits, U32, 470, [21:21] -unusedBit_173_22 = bits, U32, 470, [22:22] -unusedBit_173_23 = bits, U32, 470, [23:23] -unusedBit_173_24 = bits, U32, 470, [24:24] -unusedBit_173_25 = bits, U32, 470, [25:25] -unusedBit_173_26 = bits, U32, 470, [26:26] -unusedBit_173_27 = bits, U32, 470, [27:27] -unusedBit_173_28 = bits, U32, 470, [28:28] -unusedBit_173_29 = bits, U32, 470, [29:29] -unusedBit_173_30 = bits, U32, 470, [30:30] -unusedBit_173_31 = bits, U32, 470, [31:31] -TEMPLOG_MAP_AT_CYCLE_COUNT = scalar, U08, 474, "", 1, 0 -unused11 = scalar, U08, 475, "", 1, 0 -unused11 = scalar, U08, 475, "", 1, 0 -unused11 = scalar, U08, 475, "", 1, 0 +alignmentFill_at_338 = array, U08, 338, [2], "units", 1, 0 +fuel_requested_percent = scalar, F32, 340, "v", 1, 0 +fuel_requested_percent_pi = scalar, F32, 344, "v", 1, 0 +m_I_sum_percent = scalar, F32, 348, "v", 1, 0 +m_pressureTarget_kPa = scalar, F32, 352, "v", 1, 0 +unusedAtTheEnd1 = scalar, S32, 356, "", 1, 0 +unusedAtTheEnd2 = scalar, S32, 360, "", 1, 0 +unusedAtTheEnd3 = scalar, S32, 364, "", 1, 0 +unusedAtTheEnd4 = scalar, S32, 368, "", 1, 0 +unusedAtTheEnd5 = scalar, S32, 372, "", 1, 0 +unusedAtTheEnd6 = scalar, S32, 376, "", 1, 0 +unusedAtTheEnd7 = scalar, S32, 380, "", 1, 0 +unusedAtTheEnd8 = scalar, S32, 384, "", 1, 0 +unusedAtTheEnd9 = scalar, S32, 388, "", 1, 0 +unusedAtTheEnd10 = scalar, S32, 392, "", 1, 0 +unusedAtTheEnd11 = scalar, S32, 396, "", 1, 0 +unusedAtTheEnd12 = scalar, S32, 400, "", 1, 0 +unusedAtTheEnd13 = scalar, S32, 404, "", 1, 0 +unusedAtTheEnd14 = scalar, S32, 408, "", 1, 0 +unusedAtTheEnd15 = scalar, S32, 412, "", 1, 0 +unusedAtTheEnd16 = scalar, S32, 416, "", 1, 0 +unusedAtTheEnd17 = scalar, S32, 420, "", 1, 0 +unusedAtTheEnd18 = scalar, S32, 424, "", 1, 0 +unusedAtTheEnd19 = scalar, S32, 428, "", 1, 0 +unusedAtTheEnd20 = scalar, S32, 432, "", 1, 0 +unusedAtTheEnd21 = scalar, S32, 436, "", 1, 0 +unusedAtTheEnd22 = scalar, S32, 440, "", 1, 0 +unusedAtTheEnd23 = scalar, S32, 444, "", 1, 0 +unusedAtTheEnd24 = scalar, S32, 448, "", 1, 0 +unusedAtTheEnd25 = scalar, S32, 452, "", 1, 0 +unusedAtTheEnd26 = scalar, S32, 456, "", 1, 0 +unusedAtTheEnd27 = scalar, S32, 460, "", 1, 0 +unusedAtTheEnd28 = scalar, S32, 464, "", 1, 0 +launchSpeedCondition = bits, U32, 468, [0:0] +launchRpmCondition = bits, U32, 468, [1:1] +launchTpsCondition = bits, U32, 468, [2:2] +launchActivateSwitchCondition = bits, U32, 468, [3:3] +launchIsLaunchCondition = bits, U32, 468, [4:4] +launchCombinedConditions = bits, U32, 468, [5:5] +launchActivatePinState = bits, U32, 468, [6:6] +unusedBit_178_7 = bits, U32, 468, [7:7] +unusedBit_178_8 = bits, U32, 468, [8:8] +unusedBit_178_9 = bits, U32, 468, [9:9] +unusedBit_178_10 = bits, U32, 468, [10:10] +unusedBit_178_11 = bits, U32, 468, [11:11] +unusedBit_178_12 = bits, U32, 468, [12:12] +unusedBit_178_13 = bits, U32, 468, [13:13] +unusedBit_178_14 = bits, U32, 468, [14:14] +unusedBit_178_15 = bits, U32, 468, [15:15] +unusedBit_178_16 = bits, U32, 468, [16:16] +unusedBit_178_17 = bits, U32, 468, [17:17] +unusedBit_178_18 = bits, U32, 468, [18:18] +unusedBit_178_19 = bits, U32, 468, [19:19] +unusedBit_178_20 = bits, U32, 468, [20:20] +unusedBit_178_21 = bits, U32, 468, [21:21] +unusedBit_178_22 = bits, U32, 468, [22:22] +unusedBit_178_23 = bits, U32, 468, [23:23] +unusedBit_178_24 = bits, U32, 468, [24:24] +unusedBit_178_25 = bits, U32, 468, [25:25] +unusedBit_178_26 = bits, U32, 468, [26:26] +unusedBit_178_27 = bits, U32, 468, [27:27] +unusedBit_178_28 = bits, U32, 468, [28:28] +unusedBit_178_29 = bits, U32, 468, [29:29] +unusedBit_178_30 = bits, U32, 468, [30:30] +unusedBit_178_31 = bits, U32, 468, [31:31] +TEMPLOG_MAP_AT_CYCLE_COUNT = scalar, U08, 472, "", 1, 0 +unused11 = scalar, U08, 473, "", 1, 0 +unused11 = scalar, U08, 473, "", 1, 0 +unused11 = scalar, U08, 473, "", 1, 0 +alignmentFill_at_474 = array, U08, 474, [2], "units", 1, 0 TEMPLOG_MAP_AT_SPECIAL_POINT = scalar, F32, 476, "", 1, 0 TEMPLOG_MAP_AT_DIFF = scalar, F32, 480, "", 1, 0 vvtSyncGapRatio = scalar, F32, 484, "", 1, 0 @@ -3102,7 +3004,11 @@ TEMPLOG_MAP_AT_DIFFGauge = TEMPLOG_MAP_AT_DIFF,"TEMPLOG_MAP_AT_DIFF", "", -10000 TEMPLOG_MAP_AT_CYCLE_COUNTGauge = TEMPLOG_MAP_AT_CYCLE_COUNT,"TEMPLOG_MAP_AT_CYCLE_COUNT", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 gaugeCategory = GDI -m_requested_pumpGauge = m_requested_pump,"Pump Angle", "deg", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +m_requested_pumpGauge = m_requested_pump,"DI: Pump Angle", "deg", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +fuel_requested_percentGauge = fuel_requested_percent,"DI: fuel_requested_percent", "v", 0.0,100.0, 0.0,100.0, 0.0,100.0, 0,0 +fuel_requested_percent_piGauge = fuel_requested_percent_pi,"DI: fuel_requested_percent_pi", "v", 0.0,100.0, 0.0,100.0, 0.0,100.0, 0,0 +m_I_sum_percentGauge = m_I_sum_percent,"DI: m_I_sum_percent", "v", 0.0,100.0, 0.0,100.0, 0.0,100.0, 0,0 +m_pressureTarget_kPaGauge = m_pressureTarget_kPa,"DI: m_pressureTarget_kPa", "v", 0.0,100.0, 0.0,100.0, 0.0,100.0, 0,0 highFuelPressureGauge = highFuelPressure, "Fuel pressure (high)", "bar", 0, 200, 0, 0, 200, 200, 1, 0 gaugeCategory = Sensors - Extra 2 @@ -3581,7 +3487,11 @@ entry = tps1Split, "tps1Split", float, "%.3f" entry = tps2Split, "tps2Split", float, "%.3f" entry = tps12Split, "tps12Split", float, "%.3f" entry = accPedalSplit, "accPedalSplit", float, "%.3f" -entry = m_requested_pump, "Pump Angle", float, "%.3f" +entry = m_requested_pump, "DI: Pump Angle", float, "%.3f" +entry = fuel_requested_percent, "DI: fuel_requested_percent", float, "%.3f" +entry = fuel_requested_percent_pi, "DI: fuel_requested_percent_pi", float, "%.3f" +entry = m_I_sum_percent, "DI: m_I_sum_percent", float, "%.3f" +entry = m_pressureTarget_kPa, "DI: m_pressureTarget_kPa", float, "%.3f" entry = launchSpeedCondition, "launchSpeedCondition", int, "%d" entry = launchRpmCondition, "launchRpmCondition", int, "%d" entry = launchTpsCondition, "launchTpsCondition", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini index 1f0abefe20..2c15b04cec 100644 --- a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini +++ b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.01.01.f429-discovery.102149959" + signature = "rusEFI 2022.01.01.f429-discovery.2608828986" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.01.01.f429-discovery.102149959" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.01.01.f429-discovery.2608828986" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jan 01 21:08:31 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jan 01 22:22:20 UTC 2022 pageSize = 20996 page = 1 @@ -2097,174 +2097,76 @@ tps12Split = scalar, S16, 330, "%", 0.01, 0 accPedalSplit = scalar, S16, 332, "%", 0.01, 0 m_requested_pump = scalar, S16, 334, "deg", 0.02, 0 unused16 = scalar, S16, 336, "deg", 0.02, 0 -unusedAtTheEnd1 = scalar, U08, 338, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 339, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 340, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 341, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 342, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 343, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 344, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 345, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 346, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 347, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 348, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 349, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 350, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 351, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 352, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 353, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 354, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 355, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 356, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 357, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 358, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 359, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 360, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 361, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 362, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 363, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 364, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 365, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 366, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 367, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 368, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 369, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 370, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 371, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 372, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 373, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 374, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 375, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 376, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 377, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 378, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 379, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 380, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 381, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 382, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 383, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 384, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 385, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 386, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 387, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 388, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 389, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 390, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 391, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 392, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 393, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 394, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 395, "", 1, 0 -unusedAtTheEnd59 = scalar, U08, 396, "", 1, 0 -unusedAtTheEnd60 = scalar, U08, 397, "", 1, 0 -unusedAtTheEnd61 = scalar, U08, 398, "", 1, 0 -unusedAtTheEnd62 = scalar, U08, 399, "", 1, 0 -unusedAtTheEnd63 = scalar, U08, 400, "", 1, 0 -unusedAtTheEnd64 = scalar, U08, 401, "", 1, 0 -unusedAtTheEnd65 = scalar, U08, 402, "", 1, 0 -unusedAtTheEnd66 = scalar, U08, 403, "", 1, 0 -unusedAtTheEnd67 = scalar, U08, 404, "", 1, 0 -unusedAtTheEnd68 = scalar, U08, 405, "", 1, 0 -unusedAtTheEnd69 = scalar, U08, 406, "", 1, 0 -unusedAtTheEnd70 = scalar, U08, 407, "", 1, 0 -unusedAtTheEnd71 = scalar, U08, 408, "", 1, 0 -unusedAtTheEnd72 = scalar, U08, 409, "", 1, 0 -unusedAtTheEnd73 = scalar, U08, 410, "", 1, 0 -unusedAtTheEnd74 = scalar, U08, 411, "", 1, 0 -unusedAtTheEnd75 = scalar, U08, 412, "", 1, 0 -unusedAtTheEnd76 = scalar, U08, 413, "", 1, 0 -unusedAtTheEnd77 = scalar, U08, 414, "", 1, 0 -unusedAtTheEnd78 = scalar, U08, 415, "", 1, 0 -unusedAtTheEnd79 = scalar, U08, 416, "", 1, 0 -unusedAtTheEnd80 = scalar, U08, 417, "", 1, 0 -unusedAtTheEnd81 = scalar, U08, 418, "", 1, 0 -unusedAtTheEnd82 = scalar, U08, 419, "", 1, 0 -unusedAtTheEnd83 = scalar, U08, 420, "", 1, 0 -unusedAtTheEnd84 = scalar, U08, 421, "", 1, 0 -unusedAtTheEnd85 = scalar, U08, 422, "", 1, 0 -unusedAtTheEnd86 = scalar, U08, 423, "", 1, 0 -unusedAtTheEnd87 = scalar, U08, 424, "", 1, 0 -unusedAtTheEnd88 = scalar, U08, 425, "", 1, 0 -unusedAtTheEnd89 = scalar, U08, 426, "", 1, 0 -unusedAtTheEnd90 = scalar, U08, 427, "", 1, 0 -unusedAtTheEnd91 = scalar, U08, 428, "", 1, 0 -unusedAtTheEnd92 = scalar, U08, 429, "", 1, 0 -unusedAtTheEnd93 = scalar, U08, 430, "", 1, 0 -unusedAtTheEnd94 = scalar, U08, 431, "", 1, 0 -unusedAtTheEnd95 = scalar, U08, 432, "", 1, 0 -unusedAtTheEnd96 = scalar, U08, 433, "", 1, 0 -unusedAtTheEnd97 = scalar, U08, 434, "", 1, 0 -unusedAtTheEnd98 = scalar, U08, 435, "", 1, 0 -unusedAtTheEnd99 = scalar, U08, 436, "", 1, 0 -unusedAtTheEnd100 = scalar, U08, 437, "", 1, 0 -unusedAtTheEnd101 = scalar, U08, 438, "", 1, 0 -unusedAtTheEnd102 = scalar, U08, 439, "", 1, 0 -unusedAtTheEnd103 = scalar, U08, 440, "", 1, 0 -unusedAtTheEnd104 = scalar, U08, 441, "", 1, 0 -unusedAtTheEnd105 = scalar, U08, 442, "", 1, 0 -unusedAtTheEnd106 = scalar, U08, 443, "", 1, 0 -unusedAtTheEnd107 = scalar, U08, 444, "", 1, 0 -unusedAtTheEnd108 = scalar, U08, 445, "", 1, 0 -unusedAtTheEnd109 = scalar, U08, 446, "", 1, 0 -unusedAtTheEnd110 = scalar, U08, 447, "", 1, 0 -unusedAtTheEnd111 = scalar, U08, 448, "", 1, 0 -unusedAtTheEnd112 = scalar, U08, 449, "", 1, 0 -unusedAtTheEnd113 = scalar, U08, 450, "", 1, 0 -unusedAtTheEnd114 = scalar, U08, 451, "", 1, 0 -unusedAtTheEnd115 = scalar, U08, 452, "", 1, 0 -unusedAtTheEnd116 = scalar, U08, 453, "", 1, 0 -unusedAtTheEnd117 = scalar, U08, 454, "", 1, 0 -unusedAtTheEnd118 = scalar, U08, 455, "", 1, 0 -unusedAtTheEnd119 = scalar, U08, 456, "", 1, 0 -unusedAtTheEnd120 = scalar, U08, 457, "", 1, 0 -unusedAtTheEnd121 = scalar, U08, 458, "", 1, 0 -unusedAtTheEnd122 = scalar, U08, 459, "", 1, 0 -unusedAtTheEnd123 = scalar, U08, 460, "", 1, 0 -unusedAtTheEnd124 = scalar, U08, 461, "", 1, 0 -unusedAtTheEnd125 = scalar, U08, 462, "", 1, 0 -unusedAtTheEnd126 = scalar, U08, 463, "", 1, 0 -unusedAtTheEnd127 = scalar, U08, 464, "", 1, 0 -unusedAtTheEnd128 = scalar, U08, 465, "", 1, 0 -unusedAtTheEnd129 = scalar, U08, 466, "", 1, 0 -unusedAtTheEnd130 = scalar, U08, 467, "", 1, 0 -unusedAtTheEnd131 = scalar, U08, 468, "", 1, 0 -unusedAtTheEnd132 = scalar, U08, 469, "", 1, 0 -launchSpeedCondition = bits, U32, 470, [0:0] -launchRpmCondition = bits, U32, 470, [1:1] -launchTpsCondition = bits, U32, 470, [2:2] -launchActivateSwitchCondition = bits, U32, 470, [3:3] -launchIsLaunchCondition = bits, U32, 470, [4:4] -launchCombinedConditions = bits, U32, 470, [5:5] -launchActivatePinState = bits, U32, 470, [6:6] -unusedBit_173_7 = bits, U32, 470, [7:7] -unusedBit_173_8 = bits, U32, 470, [8:8] -unusedBit_173_9 = bits, U32, 470, [9:9] -unusedBit_173_10 = bits, U32, 470, [10:10] -unusedBit_173_11 = bits, U32, 470, [11:11] -unusedBit_173_12 = bits, U32, 470, [12:12] -unusedBit_173_13 = bits, U32, 470, [13:13] -unusedBit_173_14 = bits, U32, 470, [14:14] -unusedBit_173_15 = bits, U32, 470, [15:15] -unusedBit_173_16 = bits, U32, 470, [16:16] -unusedBit_173_17 = bits, U32, 470, [17:17] -unusedBit_173_18 = bits, U32, 470, [18:18] -unusedBit_173_19 = bits, U32, 470, [19:19] -unusedBit_173_20 = bits, U32, 470, [20:20] -unusedBit_173_21 = bits, U32, 470, [21:21] -unusedBit_173_22 = bits, U32, 470, [22:22] -unusedBit_173_23 = bits, U32, 470, [23:23] -unusedBit_173_24 = bits, U32, 470, [24:24] -unusedBit_173_25 = bits, U32, 470, [25:25] -unusedBit_173_26 = bits, U32, 470, [26:26] -unusedBit_173_27 = bits, U32, 470, [27:27] -unusedBit_173_28 = bits, U32, 470, [28:28] -unusedBit_173_29 = bits, U32, 470, [29:29] -unusedBit_173_30 = bits, U32, 470, [30:30] -unusedBit_173_31 = bits, U32, 470, [31:31] -TEMPLOG_MAP_AT_CYCLE_COUNT = scalar, U08, 474, "", 1, 0 -unused11 = scalar, U08, 475, "", 1, 0 -unused11 = scalar, U08, 475, "", 1, 0 -unused11 = scalar, U08, 475, "", 1, 0 +alignmentFill_at_338 = array, U08, 338, [2], "units", 1, 0 +fuel_requested_percent = scalar, F32, 340, "v", 1, 0 +fuel_requested_percent_pi = scalar, F32, 344, "v", 1, 0 +m_I_sum_percent = scalar, F32, 348, "v", 1, 0 +m_pressureTarget_kPa = scalar, F32, 352, "v", 1, 0 +unusedAtTheEnd1 = scalar, S32, 356, "", 1, 0 +unusedAtTheEnd2 = scalar, S32, 360, "", 1, 0 +unusedAtTheEnd3 = scalar, S32, 364, "", 1, 0 +unusedAtTheEnd4 = scalar, S32, 368, "", 1, 0 +unusedAtTheEnd5 = scalar, S32, 372, "", 1, 0 +unusedAtTheEnd6 = scalar, S32, 376, "", 1, 0 +unusedAtTheEnd7 = scalar, S32, 380, "", 1, 0 +unusedAtTheEnd8 = scalar, S32, 384, "", 1, 0 +unusedAtTheEnd9 = scalar, S32, 388, "", 1, 0 +unusedAtTheEnd10 = scalar, S32, 392, "", 1, 0 +unusedAtTheEnd11 = scalar, S32, 396, "", 1, 0 +unusedAtTheEnd12 = scalar, S32, 400, "", 1, 0 +unusedAtTheEnd13 = scalar, S32, 404, "", 1, 0 +unusedAtTheEnd14 = scalar, S32, 408, "", 1, 0 +unusedAtTheEnd15 = scalar, S32, 412, "", 1, 0 +unusedAtTheEnd16 = scalar, S32, 416, "", 1, 0 +unusedAtTheEnd17 = scalar, S32, 420, "", 1, 0 +unusedAtTheEnd18 = scalar, S32, 424, "", 1, 0 +unusedAtTheEnd19 = scalar, S32, 428, "", 1, 0 +unusedAtTheEnd20 = scalar, S32, 432, "", 1, 0 +unusedAtTheEnd21 = scalar, S32, 436, "", 1, 0 +unusedAtTheEnd22 = scalar, S32, 440, "", 1, 0 +unusedAtTheEnd23 = scalar, S32, 444, "", 1, 0 +unusedAtTheEnd24 = scalar, S32, 448, "", 1, 0 +unusedAtTheEnd25 = scalar, S32, 452, "", 1, 0 +unusedAtTheEnd26 = scalar, S32, 456, "", 1, 0 +unusedAtTheEnd27 = scalar, S32, 460, "", 1, 0 +unusedAtTheEnd28 = scalar, S32, 464, "", 1, 0 +launchSpeedCondition = bits, U32, 468, [0:0] +launchRpmCondition = bits, U32, 468, [1:1] +launchTpsCondition = bits, U32, 468, [2:2] +launchActivateSwitchCondition = bits, U32, 468, [3:3] +launchIsLaunchCondition = bits, U32, 468, [4:4] +launchCombinedConditions = bits, U32, 468, [5:5] +launchActivatePinState = bits, U32, 468, [6:6] +unusedBit_178_7 = bits, U32, 468, [7:7] +unusedBit_178_8 = bits, U32, 468, [8:8] +unusedBit_178_9 = bits, U32, 468, [9:9] +unusedBit_178_10 = bits, U32, 468, [10:10] +unusedBit_178_11 = bits, U32, 468, [11:11] +unusedBit_178_12 = bits, U32, 468, [12:12] +unusedBit_178_13 = bits, U32, 468, [13:13] +unusedBit_178_14 = bits, U32, 468, [14:14] +unusedBit_178_15 = bits, U32, 468, [15:15] +unusedBit_178_16 = bits, U32, 468, [16:16] +unusedBit_178_17 = bits, U32, 468, [17:17] +unusedBit_178_18 = bits, U32, 468, [18:18] +unusedBit_178_19 = bits, U32, 468, [19:19] +unusedBit_178_20 = bits, U32, 468, [20:20] +unusedBit_178_21 = bits, U32, 468, [21:21] +unusedBit_178_22 = bits, U32, 468, [22:22] +unusedBit_178_23 = bits, U32, 468, [23:23] +unusedBit_178_24 = bits, U32, 468, [24:24] +unusedBit_178_25 = bits, U32, 468, [25:25] +unusedBit_178_26 = bits, U32, 468, [26:26] +unusedBit_178_27 = bits, U32, 468, [27:27] +unusedBit_178_28 = bits, U32, 468, [28:28] +unusedBit_178_29 = bits, U32, 468, [29:29] +unusedBit_178_30 = bits, U32, 468, [30:30] +unusedBit_178_31 = bits, U32, 468, [31:31] +TEMPLOG_MAP_AT_CYCLE_COUNT = scalar, U08, 472, "", 1, 0 +unused11 = scalar, U08, 473, "", 1, 0 +unused11 = scalar, U08, 473, "", 1, 0 +unused11 = scalar, U08, 473, "", 1, 0 +alignmentFill_at_474 = array, U08, 474, [2], "units", 1, 0 TEMPLOG_MAP_AT_SPECIAL_POINT = scalar, F32, 476, "", 1, 0 TEMPLOG_MAP_AT_DIFF = scalar, F32, 480, "", 1, 0 vvtSyncGapRatio = scalar, F32, 484, "", 1, 0 @@ -3102,7 +3004,11 @@ TEMPLOG_MAP_AT_DIFFGauge = TEMPLOG_MAP_AT_DIFF,"TEMPLOG_MAP_AT_DIFF", "", -10000 TEMPLOG_MAP_AT_CYCLE_COUNTGauge = TEMPLOG_MAP_AT_CYCLE_COUNT,"TEMPLOG_MAP_AT_CYCLE_COUNT", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 gaugeCategory = GDI -m_requested_pumpGauge = m_requested_pump,"Pump Angle", "deg", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +m_requested_pumpGauge = m_requested_pump,"DI: Pump Angle", "deg", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +fuel_requested_percentGauge = fuel_requested_percent,"DI: fuel_requested_percent", "v", 0.0,100.0, 0.0,100.0, 0.0,100.0, 0,0 +fuel_requested_percent_piGauge = fuel_requested_percent_pi,"DI: fuel_requested_percent_pi", "v", 0.0,100.0, 0.0,100.0, 0.0,100.0, 0,0 +m_I_sum_percentGauge = m_I_sum_percent,"DI: m_I_sum_percent", "v", 0.0,100.0, 0.0,100.0, 0.0,100.0, 0,0 +m_pressureTarget_kPaGauge = m_pressureTarget_kPa,"DI: m_pressureTarget_kPa", "v", 0.0,100.0, 0.0,100.0, 0.0,100.0, 0,0 highFuelPressureGauge = highFuelPressure, "Fuel pressure (high)", "bar", 0, 200, 0, 0, 200, 200, 1, 0 gaugeCategory = Sensors - Extra 2 @@ -3581,7 +3487,11 @@ entry = tps1Split, "tps1Split", float, "%.3f" entry = tps2Split, "tps2Split", float, "%.3f" entry = tps12Split, "tps12Split", float, "%.3f" entry = accPedalSplit, "accPedalSplit", float, "%.3f" -entry = m_requested_pump, "Pump Angle", float, "%.3f" +entry = m_requested_pump, "DI: Pump Angle", float, "%.3f" +entry = fuel_requested_percent, "DI: fuel_requested_percent", float, "%.3f" +entry = fuel_requested_percent_pi, "DI: fuel_requested_percent_pi", float, "%.3f" +entry = m_I_sum_percent, "DI: m_I_sum_percent", float, "%.3f" +entry = m_pressureTarget_kPa, "DI: m_pressureTarget_kPa", float, "%.3f" entry = launchSpeedCondition, "launchSpeedCondition", int, "%d" entry = launchRpmCondition, "launchRpmCondition", int, "%d" entry = launchTpsCondition, "launchTpsCondition", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index b0df734939..2973e9f375 100644 --- a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini +++ b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.01.01.frankenso_na6.2082798254" + signature = "rusEFI 2022.01.01.frankenso_na6.3779971027" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.01.01.frankenso_na6.2082798254" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.01.01.frankenso_na6.3779971027" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jan 01 21:09:14 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jan 01 22:22:53 UTC 2022 pageSize = 20996 page = 1 @@ -2097,174 +2097,76 @@ tps12Split = scalar, S16, 330, "%", 0.01, 0 accPedalSplit = scalar, S16, 332, "%", 0.01, 0 m_requested_pump = scalar, S16, 334, "deg", 0.02, 0 unused16 = scalar, S16, 336, "deg", 0.02, 0 -unusedAtTheEnd1 = scalar, U08, 338, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 339, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 340, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 341, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 342, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 343, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 344, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 345, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 346, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 347, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 348, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 349, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 350, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 351, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 352, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 353, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 354, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 355, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 356, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 357, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 358, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 359, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 360, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 361, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 362, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 363, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 364, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 365, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 366, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 367, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 368, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 369, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 370, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 371, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 372, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 373, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 374, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 375, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 376, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 377, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 378, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 379, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 380, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 381, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 382, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 383, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 384, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 385, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 386, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 387, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 388, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 389, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 390, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 391, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 392, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 393, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 394, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 395, "", 1, 0 -unusedAtTheEnd59 = scalar, U08, 396, "", 1, 0 -unusedAtTheEnd60 = scalar, U08, 397, "", 1, 0 -unusedAtTheEnd61 = scalar, U08, 398, "", 1, 0 -unusedAtTheEnd62 = scalar, U08, 399, "", 1, 0 -unusedAtTheEnd63 = scalar, U08, 400, "", 1, 0 -unusedAtTheEnd64 = scalar, U08, 401, "", 1, 0 -unusedAtTheEnd65 = scalar, U08, 402, "", 1, 0 -unusedAtTheEnd66 = scalar, U08, 403, "", 1, 0 -unusedAtTheEnd67 = scalar, U08, 404, "", 1, 0 -unusedAtTheEnd68 = scalar, U08, 405, "", 1, 0 -unusedAtTheEnd69 = scalar, U08, 406, "", 1, 0 -unusedAtTheEnd70 = scalar, U08, 407, "", 1, 0 -unusedAtTheEnd71 = scalar, U08, 408, "", 1, 0 -unusedAtTheEnd72 = scalar, U08, 409, "", 1, 0 -unusedAtTheEnd73 = scalar, U08, 410, "", 1, 0 -unusedAtTheEnd74 = scalar, U08, 411, "", 1, 0 -unusedAtTheEnd75 = scalar, U08, 412, "", 1, 0 -unusedAtTheEnd76 = scalar, U08, 413, "", 1, 0 -unusedAtTheEnd77 = scalar, U08, 414, "", 1, 0 -unusedAtTheEnd78 = scalar, U08, 415, "", 1, 0 -unusedAtTheEnd79 = scalar, U08, 416, "", 1, 0 -unusedAtTheEnd80 = scalar, U08, 417, "", 1, 0 -unusedAtTheEnd81 = scalar, U08, 418, "", 1, 0 -unusedAtTheEnd82 = scalar, U08, 419, "", 1, 0 -unusedAtTheEnd83 = scalar, U08, 420, "", 1, 0 -unusedAtTheEnd84 = scalar, U08, 421, "", 1, 0 -unusedAtTheEnd85 = scalar, U08, 422, "", 1, 0 -unusedAtTheEnd86 = scalar, U08, 423, "", 1, 0 -unusedAtTheEnd87 = scalar, U08, 424, "", 1, 0 -unusedAtTheEnd88 = scalar, U08, 425, "", 1, 0 -unusedAtTheEnd89 = scalar, U08, 426, "", 1, 0 -unusedAtTheEnd90 = scalar, U08, 427, "", 1, 0 -unusedAtTheEnd91 = scalar, U08, 428, "", 1, 0 -unusedAtTheEnd92 = scalar, U08, 429, "", 1, 0 -unusedAtTheEnd93 = scalar, U08, 430, "", 1, 0 -unusedAtTheEnd94 = scalar, U08, 431, "", 1, 0 -unusedAtTheEnd95 = scalar, U08, 432, "", 1, 0 -unusedAtTheEnd96 = scalar, U08, 433, "", 1, 0 -unusedAtTheEnd97 = scalar, U08, 434, "", 1, 0 -unusedAtTheEnd98 = scalar, U08, 435, "", 1, 0 -unusedAtTheEnd99 = scalar, U08, 436, "", 1, 0 -unusedAtTheEnd100 = scalar, U08, 437, "", 1, 0 -unusedAtTheEnd101 = scalar, U08, 438, "", 1, 0 -unusedAtTheEnd102 = scalar, U08, 439, "", 1, 0 -unusedAtTheEnd103 = scalar, U08, 440, "", 1, 0 -unusedAtTheEnd104 = scalar, U08, 441, "", 1, 0 -unusedAtTheEnd105 = scalar, U08, 442, "", 1, 0 -unusedAtTheEnd106 = scalar, U08, 443, "", 1, 0 -unusedAtTheEnd107 = scalar, U08, 444, "", 1, 0 -unusedAtTheEnd108 = scalar, U08, 445, "", 1, 0 -unusedAtTheEnd109 = scalar, U08, 446, "", 1, 0 -unusedAtTheEnd110 = scalar, U08, 447, "", 1, 0 -unusedAtTheEnd111 = scalar, U08, 448, "", 1, 0 -unusedAtTheEnd112 = scalar, U08, 449, "", 1, 0 -unusedAtTheEnd113 = scalar, U08, 450, "", 1, 0 -unusedAtTheEnd114 = scalar, U08, 451, "", 1, 0 -unusedAtTheEnd115 = scalar, U08, 452, "", 1, 0 -unusedAtTheEnd116 = scalar, U08, 453, "", 1, 0 -unusedAtTheEnd117 = scalar, U08, 454, "", 1, 0 -unusedAtTheEnd118 = scalar, U08, 455, "", 1, 0 -unusedAtTheEnd119 = scalar, U08, 456, "", 1, 0 -unusedAtTheEnd120 = scalar, U08, 457, "", 1, 0 -unusedAtTheEnd121 = scalar, U08, 458, "", 1, 0 -unusedAtTheEnd122 = scalar, U08, 459, "", 1, 0 -unusedAtTheEnd123 = scalar, U08, 460, "", 1, 0 -unusedAtTheEnd124 = scalar, U08, 461, "", 1, 0 -unusedAtTheEnd125 = scalar, U08, 462, "", 1, 0 -unusedAtTheEnd126 = scalar, U08, 463, "", 1, 0 -unusedAtTheEnd127 = scalar, U08, 464, "", 1, 0 -unusedAtTheEnd128 = scalar, U08, 465, "", 1, 0 -unusedAtTheEnd129 = scalar, U08, 466, "", 1, 0 -unusedAtTheEnd130 = scalar, U08, 467, "", 1, 0 -unusedAtTheEnd131 = scalar, U08, 468, "", 1, 0 -unusedAtTheEnd132 = scalar, U08, 469, "", 1, 0 -launchSpeedCondition = bits, U32, 470, [0:0] -launchRpmCondition = bits, U32, 470, [1:1] -launchTpsCondition = bits, U32, 470, [2:2] -launchActivateSwitchCondition = bits, U32, 470, [3:3] -launchIsLaunchCondition = bits, U32, 470, [4:4] -launchCombinedConditions = bits, U32, 470, [5:5] -launchActivatePinState = bits, U32, 470, [6:6] -unusedBit_173_7 = bits, U32, 470, [7:7] -unusedBit_173_8 = bits, U32, 470, [8:8] -unusedBit_173_9 = bits, U32, 470, [9:9] -unusedBit_173_10 = bits, U32, 470, [10:10] -unusedBit_173_11 = bits, U32, 470, [11:11] -unusedBit_173_12 = bits, U32, 470, [12:12] -unusedBit_173_13 = bits, U32, 470, [13:13] -unusedBit_173_14 = bits, U32, 470, [14:14] -unusedBit_173_15 = bits, U32, 470, [15:15] -unusedBit_173_16 = bits, U32, 470, [16:16] -unusedBit_173_17 = bits, U32, 470, [17:17] -unusedBit_173_18 = bits, U32, 470, [18:18] -unusedBit_173_19 = bits, U32, 470, [19:19] -unusedBit_173_20 = bits, U32, 470, [20:20] -unusedBit_173_21 = bits, U32, 470, [21:21] -unusedBit_173_22 = bits, U32, 470, [22:22] -unusedBit_173_23 = bits, U32, 470, [23:23] -unusedBit_173_24 = bits, U32, 470, [24:24] -unusedBit_173_25 = bits, U32, 470, [25:25] -unusedBit_173_26 = bits, U32, 470, [26:26] -unusedBit_173_27 = bits, U32, 470, [27:27] -unusedBit_173_28 = bits, U32, 470, [28:28] -unusedBit_173_29 = bits, U32, 470, [29:29] -unusedBit_173_30 = bits, U32, 470, [30:30] -unusedBit_173_31 = bits, U32, 470, [31:31] -TEMPLOG_MAP_AT_CYCLE_COUNT = scalar, U08, 474, "", 1, 0 -unused11 = scalar, U08, 475, "", 1, 0 -unused11 = scalar, U08, 475, "", 1, 0 -unused11 = scalar, U08, 475, "", 1, 0 +alignmentFill_at_338 = array, U08, 338, [2], "units", 1, 0 +fuel_requested_percent = scalar, F32, 340, "v", 1, 0 +fuel_requested_percent_pi = scalar, F32, 344, "v", 1, 0 +m_I_sum_percent = scalar, F32, 348, "v", 1, 0 +m_pressureTarget_kPa = scalar, F32, 352, "v", 1, 0 +unusedAtTheEnd1 = scalar, S32, 356, "", 1, 0 +unusedAtTheEnd2 = scalar, S32, 360, "", 1, 0 +unusedAtTheEnd3 = scalar, S32, 364, "", 1, 0 +unusedAtTheEnd4 = scalar, S32, 368, "", 1, 0 +unusedAtTheEnd5 = scalar, S32, 372, "", 1, 0 +unusedAtTheEnd6 = scalar, S32, 376, "", 1, 0 +unusedAtTheEnd7 = scalar, S32, 380, "", 1, 0 +unusedAtTheEnd8 = scalar, S32, 384, "", 1, 0 +unusedAtTheEnd9 = scalar, S32, 388, "", 1, 0 +unusedAtTheEnd10 = scalar, S32, 392, "", 1, 0 +unusedAtTheEnd11 = scalar, S32, 396, "", 1, 0 +unusedAtTheEnd12 = scalar, S32, 400, "", 1, 0 +unusedAtTheEnd13 = scalar, S32, 404, "", 1, 0 +unusedAtTheEnd14 = scalar, S32, 408, "", 1, 0 +unusedAtTheEnd15 = scalar, S32, 412, "", 1, 0 +unusedAtTheEnd16 = scalar, S32, 416, "", 1, 0 +unusedAtTheEnd17 = scalar, S32, 420, "", 1, 0 +unusedAtTheEnd18 = scalar, S32, 424, "", 1, 0 +unusedAtTheEnd19 = scalar, S32, 428, "", 1, 0 +unusedAtTheEnd20 = scalar, S32, 432, "", 1, 0 +unusedAtTheEnd21 = scalar, S32, 436, "", 1, 0 +unusedAtTheEnd22 = scalar, S32, 440, "", 1, 0 +unusedAtTheEnd23 = scalar, S32, 444, "", 1, 0 +unusedAtTheEnd24 = scalar, S32, 448, "", 1, 0 +unusedAtTheEnd25 = scalar, S32, 452, "", 1, 0 +unusedAtTheEnd26 = scalar, S32, 456, "", 1, 0 +unusedAtTheEnd27 = scalar, S32, 460, "", 1, 0 +unusedAtTheEnd28 = scalar, S32, 464, "", 1, 0 +launchSpeedCondition = bits, U32, 468, [0:0] +launchRpmCondition = bits, U32, 468, [1:1] +launchTpsCondition = bits, U32, 468, [2:2] +launchActivateSwitchCondition = bits, U32, 468, [3:3] +launchIsLaunchCondition = bits, U32, 468, [4:4] +launchCombinedConditions = bits, U32, 468, [5:5] +launchActivatePinState = bits, U32, 468, [6:6] +unusedBit_178_7 = bits, U32, 468, [7:7] +unusedBit_178_8 = bits, U32, 468, [8:8] +unusedBit_178_9 = bits, U32, 468, [9:9] +unusedBit_178_10 = bits, U32, 468, [10:10] +unusedBit_178_11 = bits, U32, 468, [11:11] +unusedBit_178_12 = bits, U32, 468, [12:12] +unusedBit_178_13 = bits, U32, 468, [13:13] +unusedBit_178_14 = bits, U32, 468, [14:14] +unusedBit_178_15 = bits, U32, 468, [15:15] +unusedBit_178_16 = bits, U32, 468, [16:16] +unusedBit_178_17 = bits, U32, 468, [17:17] +unusedBit_178_18 = bits, U32, 468, [18:18] +unusedBit_178_19 = bits, U32, 468, [19:19] +unusedBit_178_20 = bits, U32, 468, [20:20] +unusedBit_178_21 = bits, U32, 468, [21:21] +unusedBit_178_22 = bits, U32, 468, [22:22] +unusedBit_178_23 = bits, U32, 468, [23:23] +unusedBit_178_24 = bits, U32, 468, [24:24] +unusedBit_178_25 = bits, U32, 468, [25:25] +unusedBit_178_26 = bits, U32, 468, [26:26] +unusedBit_178_27 = bits, U32, 468, [27:27] +unusedBit_178_28 = bits, U32, 468, [28:28] +unusedBit_178_29 = bits, U32, 468, [29:29] +unusedBit_178_30 = bits, U32, 468, [30:30] +unusedBit_178_31 = bits, U32, 468, [31:31] +TEMPLOG_MAP_AT_CYCLE_COUNT = scalar, U08, 472, "", 1, 0 +unused11 = scalar, U08, 473, "", 1, 0 +unused11 = scalar, U08, 473, "", 1, 0 +unused11 = scalar, U08, 473, "", 1, 0 +alignmentFill_at_474 = array, U08, 474, [2], "units", 1, 0 TEMPLOG_MAP_AT_SPECIAL_POINT = scalar, F32, 476, "", 1, 0 TEMPLOG_MAP_AT_DIFF = scalar, F32, 480, "", 1, 0 vvtSyncGapRatio = scalar, F32, 484, "", 1, 0 @@ -3102,7 +3004,11 @@ TEMPLOG_MAP_AT_DIFFGauge = TEMPLOG_MAP_AT_DIFF,"TEMPLOG_MAP_AT_DIFF", "", -10000 TEMPLOG_MAP_AT_CYCLE_COUNTGauge = TEMPLOG_MAP_AT_CYCLE_COUNT,"TEMPLOG_MAP_AT_CYCLE_COUNT", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 gaugeCategory = GDI -m_requested_pumpGauge = m_requested_pump,"Pump Angle", "deg", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +m_requested_pumpGauge = m_requested_pump,"DI: Pump Angle", "deg", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +fuel_requested_percentGauge = fuel_requested_percent,"DI: fuel_requested_percent", "v", 0.0,100.0, 0.0,100.0, 0.0,100.0, 0,0 +fuel_requested_percent_piGauge = fuel_requested_percent_pi,"DI: fuel_requested_percent_pi", "v", 0.0,100.0, 0.0,100.0, 0.0,100.0, 0,0 +m_I_sum_percentGauge = m_I_sum_percent,"DI: m_I_sum_percent", "v", 0.0,100.0, 0.0,100.0, 0.0,100.0, 0,0 +m_pressureTarget_kPaGauge = m_pressureTarget_kPa,"DI: m_pressureTarget_kPa", "v", 0.0,100.0, 0.0,100.0, 0.0,100.0, 0,0 highFuelPressureGauge = highFuelPressure, "Fuel pressure (high)", "bar", 0, 200, 0, 0, 200, 200, 1, 0 gaugeCategory = Sensors - Extra 2 @@ -3581,7 +3487,11 @@ entry = tps1Split, "tps1Split", float, "%.3f" entry = tps2Split, "tps2Split", float, "%.3f" entry = tps12Split, "tps12Split", float, "%.3f" entry = accPedalSplit, "accPedalSplit", float, "%.3f" -entry = m_requested_pump, "Pump Angle", float, "%.3f" +entry = m_requested_pump, "DI: Pump Angle", float, "%.3f" +entry = fuel_requested_percent, "DI: fuel_requested_percent", float, "%.3f" +entry = fuel_requested_percent_pi, "DI: fuel_requested_percent_pi", float, "%.3f" +entry = m_I_sum_percent, "DI: m_I_sum_percent", float, "%.3f" +entry = m_pressureTarget_kPa, "DI: m_pressureTarget_kPa", float, "%.3f" entry = launchSpeedCondition, "launchSpeedCondition", int, "%d" entry = launchRpmCondition, "launchRpmCondition", int, "%d" entry = launchTpsCondition, "launchTpsCondition", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini index 75bde6e7cc..fe04558901 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.01.01.hellen-nb1.4208939422" + signature = "rusEFI 2022.01.01.hellen-nb1.1740008675" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.01.01.hellen-nb1.4208939422" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.01.01.hellen-nb1.1740008675" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jan 01 21:08:57 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jan 01 22:22:40 UTC 2022 pageSize = 20996 page = 1 @@ -2097,174 +2097,76 @@ tps12Split = scalar, S16, 330, "%", 0.01, 0 accPedalSplit = scalar, S16, 332, "%", 0.01, 0 m_requested_pump = scalar, S16, 334, "deg", 0.02, 0 unused16 = scalar, S16, 336, "deg", 0.02, 0 -unusedAtTheEnd1 = scalar, U08, 338, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 339, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 340, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 341, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 342, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 343, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 344, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 345, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 346, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 347, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 348, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 349, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 350, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 351, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 352, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 353, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 354, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 355, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 356, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 357, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 358, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 359, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 360, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 361, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 362, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 363, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 364, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 365, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 366, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 367, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 368, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 369, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 370, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 371, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 372, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 373, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 374, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 375, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 376, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 377, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 378, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 379, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 380, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 381, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 382, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 383, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 384, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 385, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 386, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 387, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 388, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 389, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 390, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 391, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 392, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 393, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 394, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 395, "", 1, 0 -unusedAtTheEnd59 = scalar, U08, 396, "", 1, 0 -unusedAtTheEnd60 = scalar, U08, 397, "", 1, 0 -unusedAtTheEnd61 = scalar, U08, 398, "", 1, 0 -unusedAtTheEnd62 = scalar, U08, 399, "", 1, 0 -unusedAtTheEnd63 = scalar, U08, 400, "", 1, 0 -unusedAtTheEnd64 = scalar, U08, 401, "", 1, 0 -unusedAtTheEnd65 = scalar, U08, 402, "", 1, 0 -unusedAtTheEnd66 = scalar, U08, 403, "", 1, 0 -unusedAtTheEnd67 = scalar, U08, 404, "", 1, 0 -unusedAtTheEnd68 = scalar, U08, 405, "", 1, 0 -unusedAtTheEnd69 = scalar, U08, 406, "", 1, 0 -unusedAtTheEnd70 = scalar, U08, 407, "", 1, 0 -unusedAtTheEnd71 = scalar, U08, 408, "", 1, 0 -unusedAtTheEnd72 = scalar, U08, 409, "", 1, 0 -unusedAtTheEnd73 = scalar, U08, 410, "", 1, 0 -unusedAtTheEnd74 = scalar, U08, 411, "", 1, 0 -unusedAtTheEnd75 = scalar, U08, 412, "", 1, 0 -unusedAtTheEnd76 = scalar, U08, 413, "", 1, 0 -unusedAtTheEnd77 = scalar, U08, 414, "", 1, 0 -unusedAtTheEnd78 = scalar, U08, 415, "", 1, 0 -unusedAtTheEnd79 = scalar, U08, 416, "", 1, 0 -unusedAtTheEnd80 = scalar, U08, 417, "", 1, 0 -unusedAtTheEnd81 = scalar, U08, 418, "", 1, 0 -unusedAtTheEnd82 = scalar, U08, 419, "", 1, 0 -unusedAtTheEnd83 = scalar, U08, 420, "", 1, 0 -unusedAtTheEnd84 = scalar, U08, 421, "", 1, 0 -unusedAtTheEnd85 = scalar, U08, 422, "", 1, 0 -unusedAtTheEnd86 = scalar, U08, 423, "", 1, 0 -unusedAtTheEnd87 = scalar, U08, 424, "", 1, 0 -unusedAtTheEnd88 = scalar, U08, 425, "", 1, 0 -unusedAtTheEnd89 = scalar, U08, 426, "", 1, 0 -unusedAtTheEnd90 = scalar, U08, 427, "", 1, 0 -unusedAtTheEnd91 = scalar, U08, 428, "", 1, 0 -unusedAtTheEnd92 = scalar, U08, 429, "", 1, 0 -unusedAtTheEnd93 = scalar, U08, 430, "", 1, 0 -unusedAtTheEnd94 = scalar, U08, 431, "", 1, 0 -unusedAtTheEnd95 = scalar, U08, 432, "", 1, 0 -unusedAtTheEnd96 = scalar, U08, 433, "", 1, 0 -unusedAtTheEnd97 = scalar, U08, 434, "", 1, 0 -unusedAtTheEnd98 = scalar, U08, 435, "", 1, 0 -unusedAtTheEnd99 = scalar, U08, 436, "", 1, 0 -unusedAtTheEnd100 = scalar, U08, 437, "", 1, 0 -unusedAtTheEnd101 = scalar, U08, 438, "", 1, 0 -unusedAtTheEnd102 = scalar, U08, 439, "", 1, 0 -unusedAtTheEnd103 = scalar, U08, 440, "", 1, 0 -unusedAtTheEnd104 = scalar, U08, 441, "", 1, 0 -unusedAtTheEnd105 = scalar, U08, 442, "", 1, 0 -unusedAtTheEnd106 = scalar, U08, 443, "", 1, 0 -unusedAtTheEnd107 = scalar, U08, 444, "", 1, 0 -unusedAtTheEnd108 = scalar, U08, 445, "", 1, 0 -unusedAtTheEnd109 = scalar, U08, 446, "", 1, 0 -unusedAtTheEnd110 = scalar, U08, 447, "", 1, 0 -unusedAtTheEnd111 = scalar, U08, 448, "", 1, 0 -unusedAtTheEnd112 = scalar, U08, 449, "", 1, 0 -unusedAtTheEnd113 = scalar, U08, 450, "", 1, 0 -unusedAtTheEnd114 = scalar, U08, 451, "", 1, 0 -unusedAtTheEnd115 = scalar, U08, 452, "", 1, 0 -unusedAtTheEnd116 = scalar, U08, 453, "", 1, 0 -unusedAtTheEnd117 = scalar, U08, 454, "", 1, 0 -unusedAtTheEnd118 = scalar, U08, 455, "", 1, 0 -unusedAtTheEnd119 = scalar, U08, 456, "", 1, 0 -unusedAtTheEnd120 = scalar, U08, 457, "", 1, 0 -unusedAtTheEnd121 = scalar, U08, 458, "", 1, 0 -unusedAtTheEnd122 = scalar, U08, 459, "", 1, 0 -unusedAtTheEnd123 = scalar, U08, 460, "", 1, 0 -unusedAtTheEnd124 = scalar, U08, 461, "", 1, 0 -unusedAtTheEnd125 = scalar, U08, 462, "", 1, 0 -unusedAtTheEnd126 = scalar, U08, 463, "", 1, 0 -unusedAtTheEnd127 = scalar, U08, 464, "", 1, 0 -unusedAtTheEnd128 = scalar, U08, 465, "", 1, 0 -unusedAtTheEnd129 = scalar, U08, 466, "", 1, 0 -unusedAtTheEnd130 = scalar, U08, 467, "", 1, 0 -unusedAtTheEnd131 = scalar, U08, 468, "", 1, 0 -unusedAtTheEnd132 = scalar, U08, 469, "", 1, 0 -launchSpeedCondition = bits, U32, 470, [0:0] -launchRpmCondition = bits, U32, 470, [1:1] -launchTpsCondition = bits, U32, 470, [2:2] -launchActivateSwitchCondition = bits, U32, 470, [3:3] -launchIsLaunchCondition = bits, U32, 470, [4:4] -launchCombinedConditions = bits, U32, 470, [5:5] -launchActivatePinState = bits, U32, 470, [6:6] -unusedBit_173_7 = bits, U32, 470, [7:7] -unusedBit_173_8 = bits, U32, 470, [8:8] -unusedBit_173_9 = bits, U32, 470, [9:9] -unusedBit_173_10 = bits, U32, 470, [10:10] -unusedBit_173_11 = bits, U32, 470, [11:11] -unusedBit_173_12 = bits, U32, 470, [12:12] -unusedBit_173_13 = bits, U32, 470, [13:13] -unusedBit_173_14 = bits, U32, 470, [14:14] -unusedBit_173_15 = bits, U32, 470, [15:15] -unusedBit_173_16 = bits, U32, 470, [16:16] -unusedBit_173_17 = bits, U32, 470, [17:17] -unusedBit_173_18 = bits, U32, 470, [18:18] -unusedBit_173_19 = bits, U32, 470, [19:19] -unusedBit_173_20 = bits, U32, 470, [20:20] -unusedBit_173_21 = bits, U32, 470, [21:21] -unusedBit_173_22 = bits, U32, 470, [22:22] -unusedBit_173_23 = bits, U32, 470, [23:23] -unusedBit_173_24 = bits, U32, 470, [24:24] -unusedBit_173_25 = bits, U32, 470, [25:25] -unusedBit_173_26 = bits, U32, 470, [26:26] -unusedBit_173_27 = bits, U32, 470, [27:27] -unusedBit_173_28 = bits, U32, 470, [28:28] -unusedBit_173_29 = bits, U32, 470, [29:29] -unusedBit_173_30 = bits, U32, 470, [30:30] -unusedBit_173_31 = bits, U32, 470, [31:31] -TEMPLOG_MAP_AT_CYCLE_COUNT = scalar, U08, 474, "", 1, 0 -unused11 = scalar, U08, 475, "", 1, 0 -unused11 = scalar, U08, 475, "", 1, 0 -unused11 = scalar, U08, 475, "", 1, 0 +alignmentFill_at_338 = array, U08, 338, [2], "units", 1, 0 +fuel_requested_percent = scalar, F32, 340, "v", 1, 0 +fuel_requested_percent_pi = scalar, F32, 344, "v", 1, 0 +m_I_sum_percent = scalar, F32, 348, "v", 1, 0 +m_pressureTarget_kPa = scalar, F32, 352, "v", 1, 0 +unusedAtTheEnd1 = scalar, S32, 356, "", 1, 0 +unusedAtTheEnd2 = scalar, S32, 360, "", 1, 0 +unusedAtTheEnd3 = scalar, S32, 364, "", 1, 0 +unusedAtTheEnd4 = scalar, S32, 368, "", 1, 0 +unusedAtTheEnd5 = scalar, S32, 372, "", 1, 0 +unusedAtTheEnd6 = scalar, S32, 376, "", 1, 0 +unusedAtTheEnd7 = scalar, S32, 380, "", 1, 0 +unusedAtTheEnd8 = scalar, S32, 384, "", 1, 0 +unusedAtTheEnd9 = scalar, S32, 388, "", 1, 0 +unusedAtTheEnd10 = scalar, S32, 392, "", 1, 0 +unusedAtTheEnd11 = scalar, S32, 396, "", 1, 0 +unusedAtTheEnd12 = scalar, S32, 400, "", 1, 0 +unusedAtTheEnd13 = scalar, S32, 404, "", 1, 0 +unusedAtTheEnd14 = scalar, S32, 408, "", 1, 0 +unusedAtTheEnd15 = scalar, S32, 412, "", 1, 0 +unusedAtTheEnd16 = scalar, S32, 416, "", 1, 0 +unusedAtTheEnd17 = scalar, S32, 420, "", 1, 0 +unusedAtTheEnd18 = scalar, S32, 424, "", 1, 0 +unusedAtTheEnd19 = scalar, S32, 428, "", 1, 0 +unusedAtTheEnd20 = scalar, S32, 432, "", 1, 0 +unusedAtTheEnd21 = scalar, S32, 436, "", 1, 0 +unusedAtTheEnd22 = scalar, S32, 440, "", 1, 0 +unusedAtTheEnd23 = scalar, S32, 444, "", 1, 0 +unusedAtTheEnd24 = scalar, S32, 448, "", 1, 0 +unusedAtTheEnd25 = scalar, S32, 452, "", 1, 0 +unusedAtTheEnd26 = scalar, S32, 456, "", 1, 0 +unusedAtTheEnd27 = scalar, S32, 460, "", 1, 0 +unusedAtTheEnd28 = scalar, S32, 464, "", 1, 0 +launchSpeedCondition = bits, U32, 468, [0:0] +launchRpmCondition = bits, U32, 468, [1:1] +launchTpsCondition = bits, U32, 468, [2:2] +launchActivateSwitchCondition = bits, U32, 468, [3:3] +launchIsLaunchCondition = bits, U32, 468, [4:4] +launchCombinedConditions = bits, U32, 468, [5:5] +launchActivatePinState = bits, U32, 468, [6:6] +unusedBit_178_7 = bits, U32, 468, [7:7] +unusedBit_178_8 = bits, U32, 468, [8:8] +unusedBit_178_9 = bits, U32, 468, [9:9] +unusedBit_178_10 = bits, U32, 468, [10:10] +unusedBit_178_11 = bits, U32, 468, [11:11] +unusedBit_178_12 = bits, U32, 468, [12:12] +unusedBit_178_13 = bits, U32, 468, [13:13] +unusedBit_178_14 = bits, U32, 468, [14:14] +unusedBit_178_15 = bits, U32, 468, [15:15] +unusedBit_178_16 = bits, U32, 468, [16:16] +unusedBit_178_17 = bits, U32, 468, [17:17] +unusedBit_178_18 = bits, U32, 468, [18:18] +unusedBit_178_19 = bits, U32, 468, [19:19] +unusedBit_178_20 = bits, U32, 468, [20:20] +unusedBit_178_21 = bits, U32, 468, [21:21] +unusedBit_178_22 = bits, U32, 468, [22:22] +unusedBit_178_23 = bits, U32, 468, [23:23] +unusedBit_178_24 = bits, U32, 468, [24:24] +unusedBit_178_25 = bits, U32, 468, [25:25] +unusedBit_178_26 = bits, U32, 468, [26:26] +unusedBit_178_27 = bits, U32, 468, [27:27] +unusedBit_178_28 = bits, U32, 468, [28:28] +unusedBit_178_29 = bits, U32, 468, [29:29] +unusedBit_178_30 = bits, U32, 468, [30:30] +unusedBit_178_31 = bits, U32, 468, [31:31] +TEMPLOG_MAP_AT_CYCLE_COUNT = scalar, U08, 472, "", 1, 0 +unused11 = scalar, U08, 473, "", 1, 0 +unused11 = scalar, U08, 473, "", 1, 0 +unused11 = scalar, U08, 473, "", 1, 0 +alignmentFill_at_474 = array, U08, 474, [2], "units", 1, 0 TEMPLOG_MAP_AT_SPECIAL_POINT = scalar, F32, 476, "", 1, 0 TEMPLOG_MAP_AT_DIFF = scalar, F32, 480, "", 1, 0 vvtSyncGapRatio = scalar, F32, 484, "", 1, 0 @@ -3102,7 +3004,11 @@ TEMPLOG_MAP_AT_DIFFGauge = TEMPLOG_MAP_AT_DIFF,"TEMPLOG_MAP_AT_DIFF", "", -10000 TEMPLOG_MAP_AT_CYCLE_COUNTGauge = TEMPLOG_MAP_AT_CYCLE_COUNT,"TEMPLOG_MAP_AT_CYCLE_COUNT", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 gaugeCategory = GDI -m_requested_pumpGauge = m_requested_pump,"Pump Angle", "deg", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +m_requested_pumpGauge = m_requested_pump,"DI: Pump Angle", "deg", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +fuel_requested_percentGauge = fuel_requested_percent,"DI: fuel_requested_percent", "v", 0.0,100.0, 0.0,100.0, 0.0,100.0, 0,0 +fuel_requested_percent_piGauge = fuel_requested_percent_pi,"DI: fuel_requested_percent_pi", "v", 0.0,100.0, 0.0,100.0, 0.0,100.0, 0,0 +m_I_sum_percentGauge = m_I_sum_percent,"DI: m_I_sum_percent", "v", 0.0,100.0, 0.0,100.0, 0.0,100.0, 0,0 +m_pressureTarget_kPaGauge = m_pressureTarget_kPa,"DI: m_pressureTarget_kPa", "v", 0.0,100.0, 0.0,100.0, 0.0,100.0, 0,0 highFuelPressureGauge = highFuelPressure, "Fuel pressure (high)", "bar", 0, 200, 0, 0, 200, 200, 1, 0 gaugeCategory = Sensors - Extra 2 @@ -3581,7 +3487,11 @@ entry = tps1Split, "tps1Split", float, "%.3f" entry = tps2Split, "tps2Split", float, "%.3f" entry = tps12Split, "tps12Split", float, "%.3f" entry = accPedalSplit, "accPedalSplit", float, "%.3f" -entry = m_requested_pump, "Pump Angle", float, "%.3f" +entry = m_requested_pump, "DI: Pump Angle", float, "%.3f" +entry = fuel_requested_percent, "DI: fuel_requested_percent", float, "%.3f" +entry = fuel_requested_percent_pi, "DI: fuel_requested_percent_pi", float, "%.3f" +entry = m_I_sum_percent, "DI: m_I_sum_percent", float, "%.3f" +entry = m_pressureTarget_kPa, "DI: m_pressureTarget_kPa", float, "%.3f" entry = launchSpeedCondition, "launchSpeedCondition", int, "%d" entry = launchRpmCondition, "launchRpmCondition", int, "%d" entry = launchTpsCondition, "launchTpsCondition", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini index 9c06f09de2..e7752c6d5a 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.01.01.hellen121nissan.3180514790" + signature = "rusEFI 2022.01.01.hellen121nissan.553382043" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.01.01.hellen121nissan.3180514790" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.01.01.hellen121nissan.553382043" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jan 01 21:08:41 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jan 01 22:22:28 UTC 2022 pageSize = 20996 page = 1 @@ -2097,174 +2097,76 @@ tps12Split = scalar, S16, 330, "%", 0.01, 0 accPedalSplit = scalar, S16, 332, "%", 0.01, 0 m_requested_pump = scalar, S16, 334, "deg", 0.02, 0 unused16 = scalar, S16, 336, "deg", 0.02, 0 -unusedAtTheEnd1 = scalar, U08, 338, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 339, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 340, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 341, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 342, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 343, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 344, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 345, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 346, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 347, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 348, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 349, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 350, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 351, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 352, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 353, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 354, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 355, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 356, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 357, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 358, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 359, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 360, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 361, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 362, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 363, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 364, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 365, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 366, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 367, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 368, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 369, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 370, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 371, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 372, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 373, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 374, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 375, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 376, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 377, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 378, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 379, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 380, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 381, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 382, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 383, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 384, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 385, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 386, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 387, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 388, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 389, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 390, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 391, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 392, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 393, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 394, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 395, "", 1, 0 -unusedAtTheEnd59 = scalar, U08, 396, "", 1, 0 -unusedAtTheEnd60 = scalar, U08, 397, "", 1, 0 -unusedAtTheEnd61 = scalar, U08, 398, "", 1, 0 -unusedAtTheEnd62 = scalar, U08, 399, "", 1, 0 -unusedAtTheEnd63 = scalar, U08, 400, "", 1, 0 -unusedAtTheEnd64 = scalar, U08, 401, "", 1, 0 -unusedAtTheEnd65 = scalar, U08, 402, "", 1, 0 -unusedAtTheEnd66 = scalar, U08, 403, "", 1, 0 -unusedAtTheEnd67 = scalar, U08, 404, "", 1, 0 -unusedAtTheEnd68 = scalar, U08, 405, "", 1, 0 -unusedAtTheEnd69 = scalar, U08, 406, "", 1, 0 -unusedAtTheEnd70 = scalar, U08, 407, "", 1, 0 -unusedAtTheEnd71 = scalar, U08, 408, "", 1, 0 -unusedAtTheEnd72 = scalar, U08, 409, "", 1, 0 -unusedAtTheEnd73 = scalar, U08, 410, "", 1, 0 -unusedAtTheEnd74 = scalar, U08, 411, "", 1, 0 -unusedAtTheEnd75 = scalar, U08, 412, "", 1, 0 -unusedAtTheEnd76 = scalar, U08, 413, "", 1, 0 -unusedAtTheEnd77 = scalar, U08, 414, "", 1, 0 -unusedAtTheEnd78 = scalar, U08, 415, "", 1, 0 -unusedAtTheEnd79 = scalar, U08, 416, "", 1, 0 -unusedAtTheEnd80 = scalar, U08, 417, "", 1, 0 -unusedAtTheEnd81 = scalar, U08, 418, "", 1, 0 -unusedAtTheEnd82 = scalar, U08, 419, "", 1, 0 -unusedAtTheEnd83 = scalar, U08, 420, "", 1, 0 -unusedAtTheEnd84 = scalar, U08, 421, "", 1, 0 -unusedAtTheEnd85 = scalar, U08, 422, "", 1, 0 -unusedAtTheEnd86 = scalar, U08, 423, "", 1, 0 -unusedAtTheEnd87 = scalar, U08, 424, "", 1, 0 -unusedAtTheEnd88 = scalar, U08, 425, "", 1, 0 -unusedAtTheEnd89 = scalar, U08, 426, "", 1, 0 -unusedAtTheEnd90 = scalar, U08, 427, "", 1, 0 -unusedAtTheEnd91 = scalar, U08, 428, "", 1, 0 -unusedAtTheEnd92 = scalar, U08, 429, "", 1, 0 -unusedAtTheEnd93 = scalar, U08, 430, "", 1, 0 -unusedAtTheEnd94 = scalar, U08, 431, "", 1, 0 -unusedAtTheEnd95 = scalar, U08, 432, "", 1, 0 -unusedAtTheEnd96 = scalar, U08, 433, "", 1, 0 -unusedAtTheEnd97 = scalar, U08, 434, "", 1, 0 -unusedAtTheEnd98 = scalar, U08, 435, "", 1, 0 -unusedAtTheEnd99 = scalar, U08, 436, "", 1, 0 -unusedAtTheEnd100 = scalar, U08, 437, "", 1, 0 -unusedAtTheEnd101 = scalar, U08, 438, "", 1, 0 -unusedAtTheEnd102 = scalar, U08, 439, "", 1, 0 -unusedAtTheEnd103 = scalar, U08, 440, "", 1, 0 -unusedAtTheEnd104 = scalar, U08, 441, "", 1, 0 -unusedAtTheEnd105 = scalar, U08, 442, "", 1, 0 -unusedAtTheEnd106 = scalar, U08, 443, "", 1, 0 -unusedAtTheEnd107 = scalar, U08, 444, "", 1, 0 -unusedAtTheEnd108 = scalar, U08, 445, "", 1, 0 -unusedAtTheEnd109 = scalar, U08, 446, "", 1, 0 -unusedAtTheEnd110 = scalar, U08, 447, "", 1, 0 -unusedAtTheEnd111 = scalar, U08, 448, "", 1, 0 -unusedAtTheEnd112 = scalar, U08, 449, "", 1, 0 -unusedAtTheEnd113 = scalar, U08, 450, "", 1, 0 -unusedAtTheEnd114 = scalar, U08, 451, "", 1, 0 -unusedAtTheEnd115 = scalar, U08, 452, "", 1, 0 -unusedAtTheEnd116 = scalar, U08, 453, "", 1, 0 -unusedAtTheEnd117 = scalar, U08, 454, "", 1, 0 -unusedAtTheEnd118 = scalar, U08, 455, "", 1, 0 -unusedAtTheEnd119 = scalar, U08, 456, "", 1, 0 -unusedAtTheEnd120 = scalar, U08, 457, "", 1, 0 -unusedAtTheEnd121 = scalar, U08, 458, "", 1, 0 -unusedAtTheEnd122 = scalar, U08, 459, "", 1, 0 -unusedAtTheEnd123 = scalar, U08, 460, "", 1, 0 -unusedAtTheEnd124 = scalar, U08, 461, "", 1, 0 -unusedAtTheEnd125 = scalar, U08, 462, "", 1, 0 -unusedAtTheEnd126 = scalar, U08, 463, "", 1, 0 -unusedAtTheEnd127 = scalar, U08, 464, "", 1, 0 -unusedAtTheEnd128 = scalar, U08, 465, "", 1, 0 -unusedAtTheEnd129 = scalar, U08, 466, "", 1, 0 -unusedAtTheEnd130 = scalar, U08, 467, "", 1, 0 -unusedAtTheEnd131 = scalar, U08, 468, "", 1, 0 -unusedAtTheEnd132 = scalar, U08, 469, "", 1, 0 -launchSpeedCondition = bits, U32, 470, [0:0] -launchRpmCondition = bits, U32, 470, [1:1] -launchTpsCondition = bits, U32, 470, [2:2] -launchActivateSwitchCondition = bits, U32, 470, [3:3] -launchIsLaunchCondition = bits, U32, 470, [4:4] -launchCombinedConditions = bits, U32, 470, [5:5] -launchActivatePinState = bits, U32, 470, [6:6] -unusedBit_173_7 = bits, U32, 470, [7:7] -unusedBit_173_8 = bits, U32, 470, [8:8] -unusedBit_173_9 = bits, U32, 470, [9:9] -unusedBit_173_10 = bits, U32, 470, [10:10] -unusedBit_173_11 = bits, U32, 470, [11:11] -unusedBit_173_12 = bits, U32, 470, [12:12] -unusedBit_173_13 = bits, U32, 470, [13:13] -unusedBit_173_14 = bits, U32, 470, [14:14] -unusedBit_173_15 = bits, U32, 470, [15:15] -unusedBit_173_16 = bits, U32, 470, [16:16] -unusedBit_173_17 = bits, U32, 470, [17:17] -unusedBit_173_18 = bits, U32, 470, [18:18] -unusedBit_173_19 = bits, U32, 470, [19:19] -unusedBit_173_20 = bits, U32, 470, [20:20] -unusedBit_173_21 = bits, U32, 470, [21:21] -unusedBit_173_22 = bits, U32, 470, [22:22] -unusedBit_173_23 = bits, U32, 470, [23:23] -unusedBit_173_24 = bits, U32, 470, [24:24] -unusedBit_173_25 = bits, U32, 470, [25:25] -unusedBit_173_26 = bits, U32, 470, [26:26] -unusedBit_173_27 = bits, U32, 470, [27:27] -unusedBit_173_28 = bits, U32, 470, [28:28] -unusedBit_173_29 = bits, U32, 470, [29:29] -unusedBit_173_30 = bits, U32, 470, [30:30] -unusedBit_173_31 = bits, U32, 470, [31:31] -TEMPLOG_MAP_AT_CYCLE_COUNT = scalar, U08, 474, "", 1, 0 -unused11 = scalar, U08, 475, "", 1, 0 -unused11 = scalar, U08, 475, "", 1, 0 -unused11 = scalar, U08, 475, "", 1, 0 +alignmentFill_at_338 = array, U08, 338, [2], "units", 1, 0 +fuel_requested_percent = scalar, F32, 340, "v", 1, 0 +fuel_requested_percent_pi = scalar, F32, 344, "v", 1, 0 +m_I_sum_percent = scalar, F32, 348, "v", 1, 0 +m_pressureTarget_kPa = scalar, F32, 352, "v", 1, 0 +unusedAtTheEnd1 = scalar, S32, 356, "", 1, 0 +unusedAtTheEnd2 = scalar, S32, 360, "", 1, 0 +unusedAtTheEnd3 = scalar, S32, 364, "", 1, 0 +unusedAtTheEnd4 = scalar, S32, 368, "", 1, 0 +unusedAtTheEnd5 = scalar, S32, 372, "", 1, 0 +unusedAtTheEnd6 = scalar, S32, 376, "", 1, 0 +unusedAtTheEnd7 = scalar, S32, 380, "", 1, 0 +unusedAtTheEnd8 = scalar, S32, 384, "", 1, 0 +unusedAtTheEnd9 = scalar, S32, 388, "", 1, 0 +unusedAtTheEnd10 = scalar, S32, 392, "", 1, 0 +unusedAtTheEnd11 = scalar, S32, 396, "", 1, 0 +unusedAtTheEnd12 = scalar, S32, 400, "", 1, 0 +unusedAtTheEnd13 = scalar, S32, 404, "", 1, 0 +unusedAtTheEnd14 = scalar, S32, 408, "", 1, 0 +unusedAtTheEnd15 = scalar, S32, 412, "", 1, 0 +unusedAtTheEnd16 = scalar, S32, 416, "", 1, 0 +unusedAtTheEnd17 = scalar, S32, 420, "", 1, 0 +unusedAtTheEnd18 = scalar, S32, 424, "", 1, 0 +unusedAtTheEnd19 = scalar, S32, 428, "", 1, 0 +unusedAtTheEnd20 = scalar, S32, 432, "", 1, 0 +unusedAtTheEnd21 = scalar, S32, 436, "", 1, 0 +unusedAtTheEnd22 = scalar, S32, 440, "", 1, 0 +unusedAtTheEnd23 = scalar, S32, 444, "", 1, 0 +unusedAtTheEnd24 = scalar, S32, 448, "", 1, 0 +unusedAtTheEnd25 = scalar, S32, 452, "", 1, 0 +unusedAtTheEnd26 = scalar, S32, 456, "", 1, 0 +unusedAtTheEnd27 = scalar, S32, 460, "", 1, 0 +unusedAtTheEnd28 = scalar, S32, 464, "", 1, 0 +launchSpeedCondition = bits, U32, 468, [0:0] +launchRpmCondition = bits, U32, 468, [1:1] +launchTpsCondition = bits, U32, 468, [2:2] +launchActivateSwitchCondition = bits, U32, 468, [3:3] +launchIsLaunchCondition = bits, U32, 468, [4:4] +launchCombinedConditions = bits, U32, 468, [5:5] +launchActivatePinState = bits, U32, 468, [6:6] +unusedBit_178_7 = bits, U32, 468, [7:7] +unusedBit_178_8 = bits, U32, 468, [8:8] +unusedBit_178_9 = bits, U32, 468, [9:9] +unusedBit_178_10 = bits, U32, 468, [10:10] +unusedBit_178_11 = bits, U32, 468, [11:11] +unusedBit_178_12 = bits, U32, 468, [12:12] +unusedBit_178_13 = bits, U32, 468, [13:13] +unusedBit_178_14 = bits, U32, 468, [14:14] +unusedBit_178_15 = bits, U32, 468, [15:15] +unusedBit_178_16 = bits, U32, 468, [16:16] +unusedBit_178_17 = bits, U32, 468, [17:17] +unusedBit_178_18 = bits, U32, 468, [18:18] +unusedBit_178_19 = bits, U32, 468, [19:19] +unusedBit_178_20 = bits, U32, 468, [20:20] +unusedBit_178_21 = bits, U32, 468, [21:21] +unusedBit_178_22 = bits, U32, 468, [22:22] +unusedBit_178_23 = bits, U32, 468, [23:23] +unusedBit_178_24 = bits, U32, 468, [24:24] +unusedBit_178_25 = bits, U32, 468, [25:25] +unusedBit_178_26 = bits, U32, 468, [26:26] +unusedBit_178_27 = bits, U32, 468, [27:27] +unusedBit_178_28 = bits, U32, 468, [28:28] +unusedBit_178_29 = bits, U32, 468, [29:29] +unusedBit_178_30 = bits, U32, 468, [30:30] +unusedBit_178_31 = bits, U32, 468, [31:31] +TEMPLOG_MAP_AT_CYCLE_COUNT = scalar, U08, 472, "", 1, 0 +unused11 = scalar, U08, 473, "", 1, 0 +unused11 = scalar, U08, 473, "", 1, 0 +unused11 = scalar, U08, 473, "", 1, 0 +alignmentFill_at_474 = array, U08, 474, [2], "units", 1, 0 TEMPLOG_MAP_AT_SPECIAL_POINT = scalar, F32, 476, "", 1, 0 TEMPLOG_MAP_AT_DIFF = scalar, F32, 480, "", 1, 0 vvtSyncGapRatio = scalar, F32, 484, "", 1, 0 @@ -3102,7 +3004,11 @@ TEMPLOG_MAP_AT_DIFFGauge = TEMPLOG_MAP_AT_DIFF,"TEMPLOG_MAP_AT_DIFF", "", -10000 TEMPLOG_MAP_AT_CYCLE_COUNTGauge = TEMPLOG_MAP_AT_CYCLE_COUNT,"TEMPLOG_MAP_AT_CYCLE_COUNT", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 gaugeCategory = GDI -m_requested_pumpGauge = m_requested_pump,"Pump Angle", "deg", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +m_requested_pumpGauge = m_requested_pump,"DI: Pump Angle", "deg", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +fuel_requested_percentGauge = fuel_requested_percent,"DI: fuel_requested_percent", "v", 0.0,100.0, 0.0,100.0, 0.0,100.0, 0,0 +fuel_requested_percent_piGauge = fuel_requested_percent_pi,"DI: fuel_requested_percent_pi", "v", 0.0,100.0, 0.0,100.0, 0.0,100.0, 0,0 +m_I_sum_percentGauge = m_I_sum_percent,"DI: m_I_sum_percent", "v", 0.0,100.0, 0.0,100.0, 0.0,100.0, 0,0 +m_pressureTarget_kPaGauge = m_pressureTarget_kPa,"DI: m_pressureTarget_kPa", "v", 0.0,100.0, 0.0,100.0, 0.0,100.0, 0,0 highFuelPressureGauge = highFuelPressure, "Fuel pressure (high)", "bar", 0, 200, 0, 0, 200, 200, 1, 0 gaugeCategory = Sensors - Extra 2 @@ -3581,7 +3487,11 @@ entry = tps1Split, "tps1Split", float, "%.3f" entry = tps2Split, "tps2Split", float, "%.3f" entry = tps12Split, "tps12Split", float, "%.3f" entry = accPedalSplit, "accPedalSplit", float, "%.3f" -entry = m_requested_pump, "Pump Angle", float, "%.3f" +entry = m_requested_pump, "DI: Pump Angle", float, "%.3f" +entry = fuel_requested_percent, "DI: fuel_requested_percent", float, "%.3f" +entry = fuel_requested_percent_pi, "DI: fuel_requested_percent_pi", float, "%.3f" +entry = m_I_sum_percent, "DI: m_I_sum_percent", float, "%.3f" +entry = m_pressureTarget_kPa, "DI: m_pressureTarget_kPa", float, "%.3f" entry = launchSpeedCondition, "launchSpeedCondition", int, "%d" entry = launchRpmCondition, "launchRpmCondition", int, "%d" entry = launchTpsCondition, "launchTpsCondition", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini index 7cca641efc..140232ba0f 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.01.01.hellen121vag.1505069901" + signature = "rusEFI 2022.01.01.hellen121vag.3302798896" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.01.01.hellen121vag.1505069901" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.01.01.hellen121vag.3302798896" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jan 01 21:08:38 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jan 01 22:22:25 UTC 2022 pageSize = 20996 page = 1 @@ -2097,174 +2097,76 @@ tps12Split = scalar, S16, 330, "%", 0.01, 0 accPedalSplit = scalar, S16, 332, "%", 0.01, 0 m_requested_pump = scalar, S16, 334, "deg", 0.02, 0 unused16 = scalar, S16, 336, "deg", 0.02, 0 -unusedAtTheEnd1 = scalar, U08, 338, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 339, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 340, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 341, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 342, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 343, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 344, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 345, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 346, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 347, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 348, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 349, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 350, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 351, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 352, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 353, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 354, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 355, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 356, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 357, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 358, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 359, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 360, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 361, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 362, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 363, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 364, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 365, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 366, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 367, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 368, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 369, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 370, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 371, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 372, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 373, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 374, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 375, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 376, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 377, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 378, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 379, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 380, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 381, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 382, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 383, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 384, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 385, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 386, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 387, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 388, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 389, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 390, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 391, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 392, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 393, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 394, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 395, "", 1, 0 -unusedAtTheEnd59 = scalar, U08, 396, "", 1, 0 -unusedAtTheEnd60 = scalar, U08, 397, "", 1, 0 -unusedAtTheEnd61 = scalar, U08, 398, "", 1, 0 -unusedAtTheEnd62 = scalar, U08, 399, "", 1, 0 -unusedAtTheEnd63 = scalar, U08, 400, "", 1, 0 -unusedAtTheEnd64 = scalar, U08, 401, "", 1, 0 -unusedAtTheEnd65 = scalar, U08, 402, "", 1, 0 -unusedAtTheEnd66 = scalar, U08, 403, "", 1, 0 -unusedAtTheEnd67 = scalar, U08, 404, "", 1, 0 -unusedAtTheEnd68 = scalar, U08, 405, "", 1, 0 -unusedAtTheEnd69 = scalar, U08, 406, "", 1, 0 -unusedAtTheEnd70 = scalar, U08, 407, "", 1, 0 -unusedAtTheEnd71 = scalar, U08, 408, "", 1, 0 -unusedAtTheEnd72 = scalar, U08, 409, "", 1, 0 -unusedAtTheEnd73 = scalar, U08, 410, "", 1, 0 -unusedAtTheEnd74 = scalar, U08, 411, "", 1, 0 -unusedAtTheEnd75 = scalar, U08, 412, "", 1, 0 -unusedAtTheEnd76 = scalar, U08, 413, "", 1, 0 -unusedAtTheEnd77 = scalar, U08, 414, "", 1, 0 -unusedAtTheEnd78 = scalar, U08, 415, "", 1, 0 -unusedAtTheEnd79 = scalar, U08, 416, "", 1, 0 -unusedAtTheEnd80 = scalar, U08, 417, "", 1, 0 -unusedAtTheEnd81 = scalar, U08, 418, "", 1, 0 -unusedAtTheEnd82 = scalar, U08, 419, "", 1, 0 -unusedAtTheEnd83 = scalar, U08, 420, "", 1, 0 -unusedAtTheEnd84 = scalar, U08, 421, "", 1, 0 -unusedAtTheEnd85 = scalar, U08, 422, "", 1, 0 -unusedAtTheEnd86 = scalar, U08, 423, "", 1, 0 -unusedAtTheEnd87 = scalar, U08, 424, "", 1, 0 -unusedAtTheEnd88 = scalar, U08, 425, "", 1, 0 -unusedAtTheEnd89 = scalar, U08, 426, "", 1, 0 -unusedAtTheEnd90 = scalar, U08, 427, "", 1, 0 -unusedAtTheEnd91 = scalar, U08, 428, "", 1, 0 -unusedAtTheEnd92 = scalar, U08, 429, "", 1, 0 -unusedAtTheEnd93 = scalar, U08, 430, "", 1, 0 -unusedAtTheEnd94 = scalar, U08, 431, "", 1, 0 -unusedAtTheEnd95 = scalar, U08, 432, "", 1, 0 -unusedAtTheEnd96 = scalar, U08, 433, "", 1, 0 -unusedAtTheEnd97 = scalar, U08, 434, "", 1, 0 -unusedAtTheEnd98 = scalar, U08, 435, "", 1, 0 -unusedAtTheEnd99 = scalar, U08, 436, "", 1, 0 -unusedAtTheEnd100 = scalar, U08, 437, "", 1, 0 -unusedAtTheEnd101 = scalar, U08, 438, "", 1, 0 -unusedAtTheEnd102 = scalar, U08, 439, "", 1, 0 -unusedAtTheEnd103 = scalar, U08, 440, "", 1, 0 -unusedAtTheEnd104 = scalar, U08, 441, "", 1, 0 -unusedAtTheEnd105 = scalar, U08, 442, "", 1, 0 -unusedAtTheEnd106 = scalar, U08, 443, "", 1, 0 -unusedAtTheEnd107 = scalar, U08, 444, "", 1, 0 -unusedAtTheEnd108 = scalar, U08, 445, "", 1, 0 -unusedAtTheEnd109 = scalar, U08, 446, "", 1, 0 -unusedAtTheEnd110 = scalar, U08, 447, "", 1, 0 -unusedAtTheEnd111 = scalar, U08, 448, "", 1, 0 -unusedAtTheEnd112 = scalar, U08, 449, "", 1, 0 -unusedAtTheEnd113 = scalar, U08, 450, "", 1, 0 -unusedAtTheEnd114 = scalar, U08, 451, "", 1, 0 -unusedAtTheEnd115 = scalar, U08, 452, "", 1, 0 -unusedAtTheEnd116 = scalar, U08, 453, "", 1, 0 -unusedAtTheEnd117 = scalar, U08, 454, "", 1, 0 -unusedAtTheEnd118 = scalar, U08, 455, "", 1, 0 -unusedAtTheEnd119 = scalar, U08, 456, "", 1, 0 -unusedAtTheEnd120 = scalar, U08, 457, "", 1, 0 -unusedAtTheEnd121 = scalar, U08, 458, "", 1, 0 -unusedAtTheEnd122 = scalar, U08, 459, "", 1, 0 -unusedAtTheEnd123 = scalar, U08, 460, "", 1, 0 -unusedAtTheEnd124 = scalar, U08, 461, "", 1, 0 -unusedAtTheEnd125 = scalar, U08, 462, "", 1, 0 -unusedAtTheEnd126 = scalar, U08, 463, "", 1, 0 -unusedAtTheEnd127 = scalar, U08, 464, "", 1, 0 -unusedAtTheEnd128 = scalar, U08, 465, "", 1, 0 -unusedAtTheEnd129 = scalar, U08, 466, "", 1, 0 -unusedAtTheEnd130 = scalar, U08, 467, "", 1, 0 -unusedAtTheEnd131 = scalar, U08, 468, "", 1, 0 -unusedAtTheEnd132 = scalar, U08, 469, "", 1, 0 -launchSpeedCondition = bits, U32, 470, [0:0] -launchRpmCondition = bits, U32, 470, [1:1] -launchTpsCondition = bits, U32, 470, [2:2] -launchActivateSwitchCondition = bits, U32, 470, [3:3] -launchIsLaunchCondition = bits, U32, 470, [4:4] -launchCombinedConditions = bits, U32, 470, [5:5] -launchActivatePinState = bits, U32, 470, [6:6] -unusedBit_173_7 = bits, U32, 470, [7:7] -unusedBit_173_8 = bits, U32, 470, [8:8] -unusedBit_173_9 = bits, U32, 470, [9:9] -unusedBit_173_10 = bits, U32, 470, [10:10] -unusedBit_173_11 = bits, U32, 470, [11:11] -unusedBit_173_12 = bits, U32, 470, [12:12] -unusedBit_173_13 = bits, U32, 470, [13:13] -unusedBit_173_14 = bits, U32, 470, [14:14] -unusedBit_173_15 = bits, U32, 470, [15:15] -unusedBit_173_16 = bits, U32, 470, [16:16] -unusedBit_173_17 = bits, U32, 470, [17:17] -unusedBit_173_18 = bits, U32, 470, [18:18] -unusedBit_173_19 = bits, U32, 470, [19:19] -unusedBit_173_20 = bits, U32, 470, [20:20] -unusedBit_173_21 = bits, U32, 470, [21:21] -unusedBit_173_22 = bits, U32, 470, [22:22] -unusedBit_173_23 = bits, U32, 470, [23:23] -unusedBit_173_24 = bits, U32, 470, [24:24] -unusedBit_173_25 = bits, U32, 470, [25:25] -unusedBit_173_26 = bits, U32, 470, [26:26] -unusedBit_173_27 = bits, U32, 470, [27:27] -unusedBit_173_28 = bits, U32, 470, [28:28] -unusedBit_173_29 = bits, U32, 470, [29:29] -unusedBit_173_30 = bits, U32, 470, [30:30] -unusedBit_173_31 = bits, U32, 470, [31:31] -TEMPLOG_MAP_AT_CYCLE_COUNT = scalar, U08, 474, "", 1, 0 -unused11 = scalar, U08, 475, "", 1, 0 -unused11 = scalar, U08, 475, "", 1, 0 -unused11 = scalar, U08, 475, "", 1, 0 +alignmentFill_at_338 = array, U08, 338, [2], "units", 1, 0 +fuel_requested_percent = scalar, F32, 340, "v", 1, 0 +fuel_requested_percent_pi = scalar, F32, 344, "v", 1, 0 +m_I_sum_percent = scalar, F32, 348, "v", 1, 0 +m_pressureTarget_kPa = scalar, F32, 352, "v", 1, 0 +unusedAtTheEnd1 = scalar, S32, 356, "", 1, 0 +unusedAtTheEnd2 = scalar, S32, 360, "", 1, 0 +unusedAtTheEnd3 = scalar, S32, 364, "", 1, 0 +unusedAtTheEnd4 = scalar, S32, 368, "", 1, 0 +unusedAtTheEnd5 = scalar, S32, 372, "", 1, 0 +unusedAtTheEnd6 = scalar, S32, 376, "", 1, 0 +unusedAtTheEnd7 = scalar, S32, 380, "", 1, 0 +unusedAtTheEnd8 = scalar, S32, 384, "", 1, 0 +unusedAtTheEnd9 = scalar, S32, 388, "", 1, 0 +unusedAtTheEnd10 = scalar, S32, 392, "", 1, 0 +unusedAtTheEnd11 = scalar, S32, 396, "", 1, 0 +unusedAtTheEnd12 = scalar, S32, 400, "", 1, 0 +unusedAtTheEnd13 = scalar, S32, 404, "", 1, 0 +unusedAtTheEnd14 = scalar, S32, 408, "", 1, 0 +unusedAtTheEnd15 = scalar, S32, 412, "", 1, 0 +unusedAtTheEnd16 = scalar, S32, 416, "", 1, 0 +unusedAtTheEnd17 = scalar, S32, 420, "", 1, 0 +unusedAtTheEnd18 = scalar, S32, 424, "", 1, 0 +unusedAtTheEnd19 = scalar, S32, 428, "", 1, 0 +unusedAtTheEnd20 = scalar, S32, 432, "", 1, 0 +unusedAtTheEnd21 = scalar, S32, 436, "", 1, 0 +unusedAtTheEnd22 = scalar, S32, 440, "", 1, 0 +unusedAtTheEnd23 = scalar, S32, 444, "", 1, 0 +unusedAtTheEnd24 = scalar, S32, 448, "", 1, 0 +unusedAtTheEnd25 = scalar, S32, 452, "", 1, 0 +unusedAtTheEnd26 = scalar, S32, 456, "", 1, 0 +unusedAtTheEnd27 = scalar, S32, 460, "", 1, 0 +unusedAtTheEnd28 = scalar, S32, 464, "", 1, 0 +launchSpeedCondition = bits, U32, 468, [0:0] +launchRpmCondition = bits, U32, 468, [1:1] +launchTpsCondition = bits, U32, 468, [2:2] +launchActivateSwitchCondition = bits, U32, 468, [3:3] +launchIsLaunchCondition = bits, U32, 468, [4:4] +launchCombinedConditions = bits, U32, 468, [5:5] +launchActivatePinState = bits, U32, 468, [6:6] +unusedBit_178_7 = bits, U32, 468, [7:7] +unusedBit_178_8 = bits, U32, 468, [8:8] +unusedBit_178_9 = bits, U32, 468, [9:9] +unusedBit_178_10 = bits, U32, 468, [10:10] +unusedBit_178_11 = bits, U32, 468, [11:11] +unusedBit_178_12 = bits, U32, 468, [12:12] +unusedBit_178_13 = bits, U32, 468, [13:13] +unusedBit_178_14 = bits, U32, 468, [14:14] +unusedBit_178_15 = bits, U32, 468, [15:15] +unusedBit_178_16 = bits, U32, 468, [16:16] +unusedBit_178_17 = bits, U32, 468, [17:17] +unusedBit_178_18 = bits, U32, 468, [18:18] +unusedBit_178_19 = bits, U32, 468, [19:19] +unusedBit_178_20 = bits, U32, 468, [20:20] +unusedBit_178_21 = bits, U32, 468, [21:21] +unusedBit_178_22 = bits, U32, 468, [22:22] +unusedBit_178_23 = bits, U32, 468, [23:23] +unusedBit_178_24 = bits, U32, 468, [24:24] +unusedBit_178_25 = bits, U32, 468, [25:25] +unusedBit_178_26 = bits, U32, 468, [26:26] +unusedBit_178_27 = bits, U32, 468, [27:27] +unusedBit_178_28 = bits, U32, 468, [28:28] +unusedBit_178_29 = bits, U32, 468, [29:29] +unusedBit_178_30 = bits, U32, 468, [30:30] +unusedBit_178_31 = bits, U32, 468, [31:31] +TEMPLOG_MAP_AT_CYCLE_COUNT = scalar, U08, 472, "", 1, 0 +unused11 = scalar, U08, 473, "", 1, 0 +unused11 = scalar, U08, 473, "", 1, 0 +unused11 = scalar, U08, 473, "", 1, 0 +alignmentFill_at_474 = array, U08, 474, [2], "units", 1, 0 TEMPLOG_MAP_AT_SPECIAL_POINT = scalar, F32, 476, "", 1, 0 TEMPLOG_MAP_AT_DIFF = scalar, F32, 480, "", 1, 0 vvtSyncGapRatio = scalar, F32, 484, "", 1, 0 @@ -3102,7 +3004,11 @@ TEMPLOG_MAP_AT_DIFFGauge = TEMPLOG_MAP_AT_DIFF,"TEMPLOG_MAP_AT_DIFF", "", -10000 TEMPLOG_MAP_AT_CYCLE_COUNTGauge = TEMPLOG_MAP_AT_CYCLE_COUNT,"TEMPLOG_MAP_AT_CYCLE_COUNT", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 gaugeCategory = GDI -m_requested_pumpGauge = m_requested_pump,"Pump Angle", "deg", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +m_requested_pumpGauge = m_requested_pump,"DI: Pump Angle", "deg", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +fuel_requested_percentGauge = fuel_requested_percent,"DI: fuel_requested_percent", "v", 0.0,100.0, 0.0,100.0, 0.0,100.0, 0,0 +fuel_requested_percent_piGauge = fuel_requested_percent_pi,"DI: fuel_requested_percent_pi", "v", 0.0,100.0, 0.0,100.0, 0.0,100.0, 0,0 +m_I_sum_percentGauge = m_I_sum_percent,"DI: m_I_sum_percent", "v", 0.0,100.0, 0.0,100.0, 0.0,100.0, 0,0 +m_pressureTarget_kPaGauge = m_pressureTarget_kPa,"DI: m_pressureTarget_kPa", "v", 0.0,100.0, 0.0,100.0, 0.0,100.0, 0,0 highFuelPressureGauge = highFuelPressure, "Fuel pressure (high)", "bar", 0, 200, 0, 0, 200, 200, 1, 0 gaugeCategory = Sensors - Extra 2 @@ -3581,7 +3487,11 @@ entry = tps1Split, "tps1Split", float, "%.3f" entry = tps2Split, "tps2Split", float, "%.3f" entry = tps12Split, "tps12Split", float, "%.3f" entry = accPedalSplit, "accPedalSplit", float, "%.3f" -entry = m_requested_pump, "Pump Angle", float, "%.3f" +entry = m_requested_pump, "DI: Pump Angle", float, "%.3f" +entry = fuel_requested_percent, "DI: fuel_requested_percent", float, "%.3f" +entry = fuel_requested_percent_pi, "DI: fuel_requested_percent_pi", float, "%.3f" +entry = m_I_sum_percent, "DI: m_I_sum_percent", float, "%.3f" +entry = m_pressureTarget_kPa, "DI: m_pressureTarget_kPa", float, "%.3f" entry = launchSpeedCondition, "launchSpeedCondition", int, "%d" entry = launchRpmCondition, "launchRpmCondition", int, "%d" entry = launchTpsCondition, "launchTpsCondition", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini index 381bdd278a..a2606f0484 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.01.01.hellen128.737016656" + signature = "rusEFI 2022.01.01.hellen128.3062154797" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.01.01.hellen128.737016656" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.01.01.hellen128.3062154797" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jan 01 21:08:34 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jan 01 22:22:23 UTC 2022 pageSize = 20996 page = 1 @@ -2097,174 +2097,76 @@ tps12Split = scalar, S16, 330, "%", 0.01, 0 accPedalSplit = scalar, S16, 332, "%", 0.01, 0 m_requested_pump = scalar, S16, 334, "deg", 0.02, 0 unused16 = scalar, S16, 336, "deg", 0.02, 0 -unusedAtTheEnd1 = scalar, U08, 338, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 339, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 340, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 341, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 342, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 343, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 344, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 345, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 346, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 347, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 348, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 349, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 350, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 351, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 352, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 353, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 354, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 355, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 356, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 357, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 358, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 359, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 360, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 361, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 362, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 363, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 364, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 365, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 366, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 367, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 368, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 369, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 370, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 371, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 372, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 373, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 374, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 375, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 376, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 377, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 378, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 379, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 380, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 381, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 382, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 383, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 384, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 385, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 386, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 387, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 388, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 389, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 390, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 391, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 392, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 393, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 394, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 395, "", 1, 0 -unusedAtTheEnd59 = scalar, U08, 396, "", 1, 0 -unusedAtTheEnd60 = scalar, U08, 397, "", 1, 0 -unusedAtTheEnd61 = scalar, U08, 398, "", 1, 0 -unusedAtTheEnd62 = scalar, U08, 399, "", 1, 0 -unusedAtTheEnd63 = scalar, U08, 400, "", 1, 0 -unusedAtTheEnd64 = scalar, U08, 401, "", 1, 0 -unusedAtTheEnd65 = scalar, U08, 402, "", 1, 0 -unusedAtTheEnd66 = scalar, U08, 403, "", 1, 0 -unusedAtTheEnd67 = scalar, U08, 404, "", 1, 0 -unusedAtTheEnd68 = scalar, U08, 405, "", 1, 0 -unusedAtTheEnd69 = scalar, U08, 406, "", 1, 0 -unusedAtTheEnd70 = scalar, U08, 407, "", 1, 0 -unusedAtTheEnd71 = scalar, U08, 408, "", 1, 0 -unusedAtTheEnd72 = scalar, U08, 409, "", 1, 0 -unusedAtTheEnd73 = scalar, U08, 410, "", 1, 0 -unusedAtTheEnd74 = scalar, U08, 411, "", 1, 0 -unusedAtTheEnd75 = scalar, U08, 412, "", 1, 0 -unusedAtTheEnd76 = scalar, U08, 413, "", 1, 0 -unusedAtTheEnd77 = scalar, U08, 414, "", 1, 0 -unusedAtTheEnd78 = scalar, U08, 415, "", 1, 0 -unusedAtTheEnd79 = scalar, U08, 416, "", 1, 0 -unusedAtTheEnd80 = scalar, U08, 417, "", 1, 0 -unusedAtTheEnd81 = scalar, U08, 418, "", 1, 0 -unusedAtTheEnd82 = scalar, U08, 419, "", 1, 0 -unusedAtTheEnd83 = scalar, U08, 420, "", 1, 0 -unusedAtTheEnd84 = scalar, U08, 421, "", 1, 0 -unusedAtTheEnd85 = scalar, U08, 422, "", 1, 0 -unusedAtTheEnd86 = scalar, U08, 423, "", 1, 0 -unusedAtTheEnd87 = scalar, U08, 424, "", 1, 0 -unusedAtTheEnd88 = scalar, U08, 425, "", 1, 0 -unusedAtTheEnd89 = scalar, U08, 426, "", 1, 0 -unusedAtTheEnd90 = scalar, U08, 427, "", 1, 0 -unusedAtTheEnd91 = scalar, U08, 428, "", 1, 0 -unusedAtTheEnd92 = scalar, U08, 429, "", 1, 0 -unusedAtTheEnd93 = scalar, U08, 430, "", 1, 0 -unusedAtTheEnd94 = scalar, U08, 431, "", 1, 0 -unusedAtTheEnd95 = scalar, U08, 432, "", 1, 0 -unusedAtTheEnd96 = scalar, U08, 433, "", 1, 0 -unusedAtTheEnd97 = scalar, U08, 434, "", 1, 0 -unusedAtTheEnd98 = scalar, U08, 435, "", 1, 0 -unusedAtTheEnd99 = scalar, U08, 436, "", 1, 0 -unusedAtTheEnd100 = scalar, U08, 437, "", 1, 0 -unusedAtTheEnd101 = scalar, U08, 438, "", 1, 0 -unusedAtTheEnd102 = scalar, U08, 439, "", 1, 0 -unusedAtTheEnd103 = scalar, U08, 440, "", 1, 0 -unusedAtTheEnd104 = scalar, U08, 441, "", 1, 0 -unusedAtTheEnd105 = scalar, U08, 442, "", 1, 0 -unusedAtTheEnd106 = scalar, U08, 443, "", 1, 0 -unusedAtTheEnd107 = scalar, U08, 444, "", 1, 0 -unusedAtTheEnd108 = scalar, U08, 445, "", 1, 0 -unusedAtTheEnd109 = scalar, U08, 446, "", 1, 0 -unusedAtTheEnd110 = scalar, U08, 447, "", 1, 0 -unusedAtTheEnd111 = scalar, U08, 448, "", 1, 0 -unusedAtTheEnd112 = scalar, U08, 449, "", 1, 0 -unusedAtTheEnd113 = scalar, U08, 450, "", 1, 0 -unusedAtTheEnd114 = scalar, U08, 451, "", 1, 0 -unusedAtTheEnd115 = scalar, U08, 452, "", 1, 0 -unusedAtTheEnd116 = scalar, U08, 453, "", 1, 0 -unusedAtTheEnd117 = scalar, U08, 454, "", 1, 0 -unusedAtTheEnd118 = scalar, U08, 455, "", 1, 0 -unusedAtTheEnd119 = scalar, U08, 456, "", 1, 0 -unusedAtTheEnd120 = scalar, U08, 457, "", 1, 0 -unusedAtTheEnd121 = scalar, U08, 458, "", 1, 0 -unusedAtTheEnd122 = scalar, U08, 459, "", 1, 0 -unusedAtTheEnd123 = scalar, U08, 460, "", 1, 0 -unusedAtTheEnd124 = scalar, U08, 461, "", 1, 0 -unusedAtTheEnd125 = scalar, U08, 462, "", 1, 0 -unusedAtTheEnd126 = scalar, U08, 463, "", 1, 0 -unusedAtTheEnd127 = scalar, U08, 464, "", 1, 0 -unusedAtTheEnd128 = scalar, U08, 465, "", 1, 0 -unusedAtTheEnd129 = scalar, U08, 466, "", 1, 0 -unusedAtTheEnd130 = scalar, U08, 467, "", 1, 0 -unusedAtTheEnd131 = scalar, U08, 468, "", 1, 0 -unusedAtTheEnd132 = scalar, U08, 469, "", 1, 0 -launchSpeedCondition = bits, U32, 470, [0:0] -launchRpmCondition = bits, U32, 470, [1:1] -launchTpsCondition = bits, U32, 470, [2:2] -launchActivateSwitchCondition = bits, U32, 470, [3:3] -launchIsLaunchCondition = bits, U32, 470, [4:4] -launchCombinedConditions = bits, U32, 470, [5:5] -launchActivatePinState = bits, U32, 470, [6:6] -unusedBit_173_7 = bits, U32, 470, [7:7] -unusedBit_173_8 = bits, U32, 470, [8:8] -unusedBit_173_9 = bits, U32, 470, [9:9] -unusedBit_173_10 = bits, U32, 470, [10:10] -unusedBit_173_11 = bits, U32, 470, [11:11] -unusedBit_173_12 = bits, U32, 470, [12:12] -unusedBit_173_13 = bits, U32, 470, [13:13] -unusedBit_173_14 = bits, U32, 470, [14:14] -unusedBit_173_15 = bits, U32, 470, [15:15] -unusedBit_173_16 = bits, U32, 470, [16:16] -unusedBit_173_17 = bits, U32, 470, [17:17] -unusedBit_173_18 = bits, U32, 470, [18:18] -unusedBit_173_19 = bits, U32, 470, [19:19] -unusedBit_173_20 = bits, U32, 470, [20:20] -unusedBit_173_21 = bits, U32, 470, [21:21] -unusedBit_173_22 = bits, U32, 470, [22:22] -unusedBit_173_23 = bits, U32, 470, [23:23] -unusedBit_173_24 = bits, U32, 470, [24:24] -unusedBit_173_25 = bits, U32, 470, [25:25] -unusedBit_173_26 = bits, U32, 470, [26:26] -unusedBit_173_27 = bits, U32, 470, [27:27] -unusedBit_173_28 = bits, U32, 470, [28:28] -unusedBit_173_29 = bits, U32, 470, [29:29] -unusedBit_173_30 = bits, U32, 470, [30:30] -unusedBit_173_31 = bits, U32, 470, [31:31] -TEMPLOG_MAP_AT_CYCLE_COUNT = scalar, U08, 474, "", 1, 0 -unused11 = scalar, U08, 475, "", 1, 0 -unused11 = scalar, U08, 475, "", 1, 0 -unused11 = scalar, U08, 475, "", 1, 0 +alignmentFill_at_338 = array, U08, 338, [2], "units", 1, 0 +fuel_requested_percent = scalar, F32, 340, "v", 1, 0 +fuel_requested_percent_pi = scalar, F32, 344, "v", 1, 0 +m_I_sum_percent = scalar, F32, 348, "v", 1, 0 +m_pressureTarget_kPa = scalar, F32, 352, "v", 1, 0 +unusedAtTheEnd1 = scalar, S32, 356, "", 1, 0 +unusedAtTheEnd2 = scalar, S32, 360, "", 1, 0 +unusedAtTheEnd3 = scalar, S32, 364, "", 1, 0 +unusedAtTheEnd4 = scalar, S32, 368, "", 1, 0 +unusedAtTheEnd5 = scalar, S32, 372, "", 1, 0 +unusedAtTheEnd6 = scalar, S32, 376, "", 1, 0 +unusedAtTheEnd7 = scalar, S32, 380, "", 1, 0 +unusedAtTheEnd8 = scalar, S32, 384, "", 1, 0 +unusedAtTheEnd9 = scalar, S32, 388, "", 1, 0 +unusedAtTheEnd10 = scalar, S32, 392, "", 1, 0 +unusedAtTheEnd11 = scalar, S32, 396, "", 1, 0 +unusedAtTheEnd12 = scalar, S32, 400, "", 1, 0 +unusedAtTheEnd13 = scalar, S32, 404, "", 1, 0 +unusedAtTheEnd14 = scalar, S32, 408, "", 1, 0 +unusedAtTheEnd15 = scalar, S32, 412, "", 1, 0 +unusedAtTheEnd16 = scalar, S32, 416, "", 1, 0 +unusedAtTheEnd17 = scalar, S32, 420, "", 1, 0 +unusedAtTheEnd18 = scalar, S32, 424, "", 1, 0 +unusedAtTheEnd19 = scalar, S32, 428, "", 1, 0 +unusedAtTheEnd20 = scalar, S32, 432, "", 1, 0 +unusedAtTheEnd21 = scalar, S32, 436, "", 1, 0 +unusedAtTheEnd22 = scalar, S32, 440, "", 1, 0 +unusedAtTheEnd23 = scalar, S32, 444, "", 1, 0 +unusedAtTheEnd24 = scalar, S32, 448, "", 1, 0 +unusedAtTheEnd25 = scalar, S32, 452, "", 1, 0 +unusedAtTheEnd26 = scalar, S32, 456, "", 1, 0 +unusedAtTheEnd27 = scalar, S32, 460, "", 1, 0 +unusedAtTheEnd28 = scalar, S32, 464, "", 1, 0 +launchSpeedCondition = bits, U32, 468, [0:0] +launchRpmCondition = bits, U32, 468, [1:1] +launchTpsCondition = bits, U32, 468, [2:2] +launchActivateSwitchCondition = bits, U32, 468, [3:3] +launchIsLaunchCondition = bits, U32, 468, [4:4] +launchCombinedConditions = bits, U32, 468, [5:5] +launchActivatePinState = bits, U32, 468, [6:6] +unusedBit_178_7 = bits, U32, 468, [7:7] +unusedBit_178_8 = bits, U32, 468, [8:8] +unusedBit_178_9 = bits, U32, 468, [9:9] +unusedBit_178_10 = bits, U32, 468, [10:10] +unusedBit_178_11 = bits, U32, 468, [11:11] +unusedBit_178_12 = bits, U32, 468, [12:12] +unusedBit_178_13 = bits, U32, 468, [13:13] +unusedBit_178_14 = bits, U32, 468, [14:14] +unusedBit_178_15 = bits, U32, 468, [15:15] +unusedBit_178_16 = bits, U32, 468, [16:16] +unusedBit_178_17 = bits, U32, 468, [17:17] +unusedBit_178_18 = bits, U32, 468, [18:18] +unusedBit_178_19 = bits, U32, 468, [19:19] +unusedBit_178_20 = bits, U32, 468, [20:20] +unusedBit_178_21 = bits, U32, 468, [21:21] +unusedBit_178_22 = bits, U32, 468, [22:22] +unusedBit_178_23 = bits, U32, 468, [23:23] +unusedBit_178_24 = bits, U32, 468, [24:24] +unusedBit_178_25 = bits, U32, 468, [25:25] +unusedBit_178_26 = bits, U32, 468, [26:26] +unusedBit_178_27 = bits, U32, 468, [27:27] +unusedBit_178_28 = bits, U32, 468, [28:28] +unusedBit_178_29 = bits, U32, 468, [29:29] +unusedBit_178_30 = bits, U32, 468, [30:30] +unusedBit_178_31 = bits, U32, 468, [31:31] +TEMPLOG_MAP_AT_CYCLE_COUNT = scalar, U08, 472, "", 1, 0 +unused11 = scalar, U08, 473, "", 1, 0 +unused11 = scalar, U08, 473, "", 1, 0 +unused11 = scalar, U08, 473, "", 1, 0 +alignmentFill_at_474 = array, U08, 474, [2], "units", 1, 0 TEMPLOG_MAP_AT_SPECIAL_POINT = scalar, F32, 476, "", 1, 0 TEMPLOG_MAP_AT_DIFF = scalar, F32, 480, "", 1, 0 vvtSyncGapRatio = scalar, F32, 484, "", 1, 0 @@ -3102,7 +3004,11 @@ TEMPLOG_MAP_AT_DIFFGauge = TEMPLOG_MAP_AT_DIFF,"TEMPLOG_MAP_AT_DIFF", "", -10000 TEMPLOG_MAP_AT_CYCLE_COUNTGauge = TEMPLOG_MAP_AT_CYCLE_COUNT,"TEMPLOG_MAP_AT_CYCLE_COUNT", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 gaugeCategory = GDI -m_requested_pumpGauge = m_requested_pump,"Pump Angle", "deg", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +m_requested_pumpGauge = m_requested_pump,"DI: Pump Angle", "deg", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +fuel_requested_percentGauge = fuel_requested_percent,"DI: fuel_requested_percent", "v", 0.0,100.0, 0.0,100.0, 0.0,100.0, 0,0 +fuel_requested_percent_piGauge = fuel_requested_percent_pi,"DI: fuel_requested_percent_pi", "v", 0.0,100.0, 0.0,100.0, 0.0,100.0, 0,0 +m_I_sum_percentGauge = m_I_sum_percent,"DI: m_I_sum_percent", "v", 0.0,100.0, 0.0,100.0, 0.0,100.0, 0,0 +m_pressureTarget_kPaGauge = m_pressureTarget_kPa,"DI: m_pressureTarget_kPa", "v", 0.0,100.0, 0.0,100.0, 0.0,100.0, 0,0 highFuelPressureGauge = highFuelPressure, "Fuel pressure (high)", "bar", 0, 200, 0, 0, 200, 200, 1, 0 gaugeCategory = Sensors - Extra 2 @@ -3581,7 +3487,11 @@ entry = tps1Split, "tps1Split", float, "%.3f" entry = tps2Split, "tps2Split", float, "%.3f" entry = tps12Split, "tps12Split", float, "%.3f" entry = accPedalSplit, "accPedalSplit", float, "%.3f" -entry = m_requested_pump, "Pump Angle", float, "%.3f" +entry = m_requested_pump, "DI: Pump Angle", float, "%.3f" +entry = fuel_requested_percent, "DI: fuel_requested_percent", float, "%.3f" +entry = fuel_requested_percent_pi, "DI: fuel_requested_percent_pi", float, "%.3f" +entry = m_I_sum_percent, "DI: m_I_sum_percent", float, "%.3f" +entry = m_pressureTarget_kPa, "DI: m_pressureTarget_kPa", float, "%.3f" entry = launchSpeedCondition, "launchSpeedCondition", int, "%d" entry = launchRpmCondition, "launchRpmCondition", int, "%d" entry = launchTpsCondition, "launchTpsCondition", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini index 0f3bc141cf..8cddb501cf 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.01.01.hellen154hyundai.3389699051" + signature = "rusEFI 2022.01.01.hellen154hyundai.1466142358" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.01.01.hellen154hyundai.3389699051" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.01.01.hellen154hyundai.1466142358" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jan 01 21:08:44 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jan 01 22:22:30 UTC 2022 pageSize = 20996 page = 1 @@ -2097,174 +2097,76 @@ tps12Split = scalar, S16, 330, "%", 0.01, 0 accPedalSplit = scalar, S16, 332, "%", 0.01, 0 m_requested_pump = scalar, S16, 334, "deg", 0.02, 0 unused16 = scalar, S16, 336, "deg", 0.02, 0 -unusedAtTheEnd1 = scalar, U08, 338, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 339, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 340, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 341, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 342, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 343, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 344, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 345, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 346, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 347, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 348, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 349, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 350, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 351, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 352, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 353, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 354, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 355, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 356, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 357, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 358, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 359, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 360, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 361, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 362, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 363, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 364, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 365, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 366, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 367, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 368, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 369, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 370, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 371, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 372, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 373, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 374, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 375, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 376, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 377, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 378, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 379, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 380, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 381, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 382, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 383, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 384, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 385, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 386, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 387, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 388, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 389, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 390, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 391, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 392, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 393, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 394, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 395, "", 1, 0 -unusedAtTheEnd59 = scalar, U08, 396, "", 1, 0 -unusedAtTheEnd60 = scalar, U08, 397, "", 1, 0 -unusedAtTheEnd61 = scalar, U08, 398, "", 1, 0 -unusedAtTheEnd62 = scalar, U08, 399, "", 1, 0 -unusedAtTheEnd63 = scalar, U08, 400, "", 1, 0 -unusedAtTheEnd64 = scalar, U08, 401, "", 1, 0 -unusedAtTheEnd65 = scalar, U08, 402, "", 1, 0 -unusedAtTheEnd66 = scalar, U08, 403, "", 1, 0 -unusedAtTheEnd67 = scalar, U08, 404, "", 1, 0 -unusedAtTheEnd68 = scalar, U08, 405, "", 1, 0 -unusedAtTheEnd69 = scalar, U08, 406, "", 1, 0 -unusedAtTheEnd70 = scalar, U08, 407, "", 1, 0 -unusedAtTheEnd71 = scalar, U08, 408, "", 1, 0 -unusedAtTheEnd72 = scalar, U08, 409, "", 1, 0 -unusedAtTheEnd73 = scalar, U08, 410, "", 1, 0 -unusedAtTheEnd74 = scalar, U08, 411, "", 1, 0 -unusedAtTheEnd75 = scalar, U08, 412, "", 1, 0 -unusedAtTheEnd76 = scalar, U08, 413, "", 1, 0 -unusedAtTheEnd77 = scalar, U08, 414, "", 1, 0 -unusedAtTheEnd78 = scalar, U08, 415, "", 1, 0 -unusedAtTheEnd79 = scalar, U08, 416, "", 1, 0 -unusedAtTheEnd80 = scalar, U08, 417, "", 1, 0 -unusedAtTheEnd81 = scalar, U08, 418, "", 1, 0 -unusedAtTheEnd82 = scalar, U08, 419, "", 1, 0 -unusedAtTheEnd83 = scalar, U08, 420, "", 1, 0 -unusedAtTheEnd84 = scalar, U08, 421, "", 1, 0 -unusedAtTheEnd85 = scalar, U08, 422, "", 1, 0 -unusedAtTheEnd86 = scalar, U08, 423, "", 1, 0 -unusedAtTheEnd87 = scalar, U08, 424, "", 1, 0 -unusedAtTheEnd88 = scalar, U08, 425, "", 1, 0 -unusedAtTheEnd89 = scalar, U08, 426, "", 1, 0 -unusedAtTheEnd90 = scalar, U08, 427, "", 1, 0 -unusedAtTheEnd91 = scalar, U08, 428, "", 1, 0 -unusedAtTheEnd92 = scalar, U08, 429, "", 1, 0 -unusedAtTheEnd93 = scalar, U08, 430, "", 1, 0 -unusedAtTheEnd94 = scalar, U08, 431, "", 1, 0 -unusedAtTheEnd95 = scalar, U08, 432, "", 1, 0 -unusedAtTheEnd96 = scalar, U08, 433, "", 1, 0 -unusedAtTheEnd97 = scalar, U08, 434, "", 1, 0 -unusedAtTheEnd98 = scalar, U08, 435, "", 1, 0 -unusedAtTheEnd99 = scalar, U08, 436, "", 1, 0 -unusedAtTheEnd100 = scalar, U08, 437, "", 1, 0 -unusedAtTheEnd101 = scalar, U08, 438, "", 1, 0 -unusedAtTheEnd102 = scalar, U08, 439, "", 1, 0 -unusedAtTheEnd103 = scalar, U08, 440, "", 1, 0 -unusedAtTheEnd104 = scalar, U08, 441, "", 1, 0 -unusedAtTheEnd105 = scalar, U08, 442, "", 1, 0 -unusedAtTheEnd106 = scalar, U08, 443, "", 1, 0 -unusedAtTheEnd107 = scalar, U08, 444, "", 1, 0 -unusedAtTheEnd108 = scalar, U08, 445, "", 1, 0 -unusedAtTheEnd109 = scalar, U08, 446, "", 1, 0 -unusedAtTheEnd110 = scalar, U08, 447, "", 1, 0 -unusedAtTheEnd111 = scalar, U08, 448, "", 1, 0 -unusedAtTheEnd112 = scalar, U08, 449, "", 1, 0 -unusedAtTheEnd113 = scalar, U08, 450, "", 1, 0 -unusedAtTheEnd114 = scalar, U08, 451, "", 1, 0 -unusedAtTheEnd115 = scalar, U08, 452, "", 1, 0 -unusedAtTheEnd116 = scalar, U08, 453, "", 1, 0 -unusedAtTheEnd117 = scalar, U08, 454, "", 1, 0 -unusedAtTheEnd118 = scalar, U08, 455, "", 1, 0 -unusedAtTheEnd119 = scalar, U08, 456, "", 1, 0 -unusedAtTheEnd120 = scalar, U08, 457, "", 1, 0 -unusedAtTheEnd121 = scalar, U08, 458, "", 1, 0 -unusedAtTheEnd122 = scalar, U08, 459, "", 1, 0 -unusedAtTheEnd123 = scalar, U08, 460, "", 1, 0 -unusedAtTheEnd124 = scalar, U08, 461, "", 1, 0 -unusedAtTheEnd125 = scalar, U08, 462, "", 1, 0 -unusedAtTheEnd126 = scalar, U08, 463, "", 1, 0 -unusedAtTheEnd127 = scalar, U08, 464, "", 1, 0 -unusedAtTheEnd128 = scalar, U08, 465, "", 1, 0 -unusedAtTheEnd129 = scalar, U08, 466, "", 1, 0 -unusedAtTheEnd130 = scalar, U08, 467, "", 1, 0 -unusedAtTheEnd131 = scalar, U08, 468, "", 1, 0 -unusedAtTheEnd132 = scalar, U08, 469, "", 1, 0 -launchSpeedCondition = bits, U32, 470, [0:0] -launchRpmCondition = bits, U32, 470, [1:1] -launchTpsCondition = bits, U32, 470, [2:2] -launchActivateSwitchCondition = bits, U32, 470, [3:3] -launchIsLaunchCondition = bits, U32, 470, [4:4] -launchCombinedConditions = bits, U32, 470, [5:5] -launchActivatePinState = bits, U32, 470, [6:6] -unusedBit_173_7 = bits, U32, 470, [7:7] -unusedBit_173_8 = bits, U32, 470, [8:8] -unusedBit_173_9 = bits, U32, 470, [9:9] -unusedBit_173_10 = bits, U32, 470, [10:10] -unusedBit_173_11 = bits, U32, 470, [11:11] -unusedBit_173_12 = bits, U32, 470, [12:12] -unusedBit_173_13 = bits, U32, 470, [13:13] -unusedBit_173_14 = bits, U32, 470, [14:14] -unusedBit_173_15 = bits, U32, 470, [15:15] -unusedBit_173_16 = bits, U32, 470, [16:16] -unusedBit_173_17 = bits, U32, 470, [17:17] -unusedBit_173_18 = bits, U32, 470, [18:18] -unusedBit_173_19 = bits, U32, 470, [19:19] -unusedBit_173_20 = bits, U32, 470, [20:20] -unusedBit_173_21 = bits, U32, 470, [21:21] -unusedBit_173_22 = bits, U32, 470, [22:22] -unusedBit_173_23 = bits, U32, 470, [23:23] -unusedBit_173_24 = bits, U32, 470, [24:24] -unusedBit_173_25 = bits, U32, 470, [25:25] -unusedBit_173_26 = bits, U32, 470, [26:26] -unusedBit_173_27 = bits, U32, 470, [27:27] -unusedBit_173_28 = bits, U32, 470, [28:28] -unusedBit_173_29 = bits, U32, 470, [29:29] -unusedBit_173_30 = bits, U32, 470, [30:30] -unusedBit_173_31 = bits, U32, 470, [31:31] -TEMPLOG_MAP_AT_CYCLE_COUNT = scalar, U08, 474, "", 1, 0 -unused11 = scalar, U08, 475, "", 1, 0 -unused11 = scalar, U08, 475, "", 1, 0 -unused11 = scalar, U08, 475, "", 1, 0 +alignmentFill_at_338 = array, U08, 338, [2], "units", 1, 0 +fuel_requested_percent = scalar, F32, 340, "v", 1, 0 +fuel_requested_percent_pi = scalar, F32, 344, "v", 1, 0 +m_I_sum_percent = scalar, F32, 348, "v", 1, 0 +m_pressureTarget_kPa = scalar, F32, 352, "v", 1, 0 +unusedAtTheEnd1 = scalar, S32, 356, "", 1, 0 +unusedAtTheEnd2 = scalar, S32, 360, "", 1, 0 +unusedAtTheEnd3 = scalar, S32, 364, "", 1, 0 +unusedAtTheEnd4 = scalar, S32, 368, "", 1, 0 +unusedAtTheEnd5 = scalar, S32, 372, "", 1, 0 +unusedAtTheEnd6 = scalar, S32, 376, "", 1, 0 +unusedAtTheEnd7 = scalar, S32, 380, "", 1, 0 +unusedAtTheEnd8 = scalar, S32, 384, "", 1, 0 +unusedAtTheEnd9 = scalar, S32, 388, "", 1, 0 +unusedAtTheEnd10 = scalar, S32, 392, "", 1, 0 +unusedAtTheEnd11 = scalar, S32, 396, "", 1, 0 +unusedAtTheEnd12 = scalar, S32, 400, "", 1, 0 +unusedAtTheEnd13 = scalar, S32, 404, "", 1, 0 +unusedAtTheEnd14 = scalar, S32, 408, "", 1, 0 +unusedAtTheEnd15 = scalar, S32, 412, "", 1, 0 +unusedAtTheEnd16 = scalar, S32, 416, "", 1, 0 +unusedAtTheEnd17 = scalar, S32, 420, "", 1, 0 +unusedAtTheEnd18 = scalar, S32, 424, "", 1, 0 +unusedAtTheEnd19 = scalar, S32, 428, "", 1, 0 +unusedAtTheEnd20 = scalar, S32, 432, "", 1, 0 +unusedAtTheEnd21 = scalar, S32, 436, "", 1, 0 +unusedAtTheEnd22 = scalar, S32, 440, "", 1, 0 +unusedAtTheEnd23 = scalar, S32, 444, "", 1, 0 +unusedAtTheEnd24 = scalar, S32, 448, "", 1, 0 +unusedAtTheEnd25 = scalar, S32, 452, "", 1, 0 +unusedAtTheEnd26 = scalar, S32, 456, "", 1, 0 +unusedAtTheEnd27 = scalar, S32, 460, "", 1, 0 +unusedAtTheEnd28 = scalar, S32, 464, "", 1, 0 +launchSpeedCondition = bits, U32, 468, [0:0] +launchRpmCondition = bits, U32, 468, [1:1] +launchTpsCondition = bits, U32, 468, [2:2] +launchActivateSwitchCondition = bits, U32, 468, [3:3] +launchIsLaunchCondition = bits, U32, 468, [4:4] +launchCombinedConditions = bits, U32, 468, [5:5] +launchActivatePinState = bits, U32, 468, [6:6] +unusedBit_178_7 = bits, U32, 468, [7:7] +unusedBit_178_8 = bits, U32, 468, [8:8] +unusedBit_178_9 = bits, U32, 468, [9:9] +unusedBit_178_10 = bits, U32, 468, [10:10] +unusedBit_178_11 = bits, U32, 468, [11:11] +unusedBit_178_12 = bits, U32, 468, [12:12] +unusedBit_178_13 = bits, U32, 468, [13:13] +unusedBit_178_14 = bits, U32, 468, [14:14] +unusedBit_178_15 = bits, U32, 468, [15:15] +unusedBit_178_16 = bits, U32, 468, [16:16] +unusedBit_178_17 = bits, U32, 468, [17:17] +unusedBit_178_18 = bits, U32, 468, [18:18] +unusedBit_178_19 = bits, U32, 468, [19:19] +unusedBit_178_20 = bits, U32, 468, [20:20] +unusedBit_178_21 = bits, U32, 468, [21:21] +unusedBit_178_22 = bits, U32, 468, [22:22] +unusedBit_178_23 = bits, U32, 468, [23:23] +unusedBit_178_24 = bits, U32, 468, [24:24] +unusedBit_178_25 = bits, U32, 468, [25:25] +unusedBit_178_26 = bits, U32, 468, [26:26] +unusedBit_178_27 = bits, U32, 468, [27:27] +unusedBit_178_28 = bits, U32, 468, [28:28] +unusedBit_178_29 = bits, U32, 468, [29:29] +unusedBit_178_30 = bits, U32, 468, [30:30] +unusedBit_178_31 = bits, U32, 468, [31:31] +TEMPLOG_MAP_AT_CYCLE_COUNT = scalar, U08, 472, "", 1, 0 +unused11 = scalar, U08, 473, "", 1, 0 +unused11 = scalar, U08, 473, "", 1, 0 +unused11 = scalar, U08, 473, "", 1, 0 +alignmentFill_at_474 = array, U08, 474, [2], "units", 1, 0 TEMPLOG_MAP_AT_SPECIAL_POINT = scalar, F32, 476, "", 1, 0 TEMPLOG_MAP_AT_DIFF = scalar, F32, 480, "", 1, 0 vvtSyncGapRatio = scalar, F32, 484, "", 1, 0 @@ -3102,7 +3004,11 @@ TEMPLOG_MAP_AT_DIFFGauge = TEMPLOG_MAP_AT_DIFF,"TEMPLOG_MAP_AT_DIFF", "", -10000 TEMPLOG_MAP_AT_CYCLE_COUNTGauge = TEMPLOG_MAP_AT_CYCLE_COUNT,"TEMPLOG_MAP_AT_CYCLE_COUNT", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 gaugeCategory = GDI -m_requested_pumpGauge = m_requested_pump,"Pump Angle", "deg", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +m_requested_pumpGauge = m_requested_pump,"DI: Pump Angle", "deg", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +fuel_requested_percentGauge = fuel_requested_percent,"DI: fuel_requested_percent", "v", 0.0,100.0, 0.0,100.0, 0.0,100.0, 0,0 +fuel_requested_percent_piGauge = fuel_requested_percent_pi,"DI: fuel_requested_percent_pi", "v", 0.0,100.0, 0.0,100.0, 0.0,100.0, 0,0 +m_I_sum_percentGauge = m_I_sum_percent,"DI: m_I_sum_percent", "v", 0.0,100.0, 0.0,100.0, 0.0,100.0, 0,0 +m_pressureTarget_kPaGauge = m_pressureTarget_kPa,"DI: m_pressureTarget_kPa", "v", 0.0,100.0, 0.0,100.0, 0.0,100.0, 0,0 highFuelPressureGauge = highFuelPressure, "Fuel pressure (high)", "bar", 0, 200, 0, 0, 200, 200, 1, 0 gaugeCategory = Sensors - Extra 2 @@ -3581,7 +3487,11 @@ entry = tps1Split, "tps1Split", float, "%.3f" entry = tps2Split, "tps2Split", float, "%.3f" entry = tps12Split, "tps12Split", float, "%.3f" entry = accPedalSplit, "accPedalSplit", float, "%.3f" -entry = m_requested_pump, "Pump Angle", float, "%.3f" +entry = m_requested_pump, "DI: Pump Angle", float, "%.3f" +entry = fuel_requested_percent, "DI: fuel_requested_percent", float, "%.3f" +entry = fuel_requested_percent_pi, "DI: fuel_requested_percent_pi", float, "%.3f" +entry = m_I_sum_percent, "DI: m_I_sum_percent", float, "%.3f" +entry = m_pressureTarget_kPa, "DI: m_pressureTarget_kPa", float, "%.3f" entry = launchSpeedCondition, "launchSpeedCondition", int, "%d" entry = launchRpmCondition, "launchRpmCondition", int, "%d" entry = launchTpsCondition, "launchTpsCondition", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_hellen72.ini b/firmware/tunerstudio/generated/rusefi_hellen72.ini index 36a1fa653c..eb1a04a9e7 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen72.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen72.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.01.01.hellen72.4071303415" + signature = "rusEFI 2022.01.01.hellen72.1874990474" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.01.01.hellen72.4071303415" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.01.01.hellen72.1874990474" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jan 01 21:08:51 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jan 01 22:22:35 UTC 2022 pageSize = 20996 page = 1 @@ -2097,174 +2097,76 @@ tps12Split = scalar, S16, 330, "%", 0.01, 0 accPedalSplit = scalar, S16, 332, "%", 0.01, 0 m_requested_pump = scalar, S16, 334, "deg", 0.02, 0 unused16 = scalar, S16, 336, "deg", 0.02, 0 -unusedAtTheEnd1 = scalar, U08, 338, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 339, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 340, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 341, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 342, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 343, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 344, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 345, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 346, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 347, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 348, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 349, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 350, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 351, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 352, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 353, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 354, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 355, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 356, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 357, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 358, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 359, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 360, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 361, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 362, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 363, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 364, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 365, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 366, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 367, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 368, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 369, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 370, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 371, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 372, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 373, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 374, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 375, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 376, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 377, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 378, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 379, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 380, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 381, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 382, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 383, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 384, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 385, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 386, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 387, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 388, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 389, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 390, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 391, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 392, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 393, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 394, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 395, "", 1, 0 -unusedAtTheEnd59 = scalar, U08, 396, "", 1, 0 -unusedAtTheEnd60 = scalar, U08, 397, "", 1, 0 -unusedAtTheEnd61 = scalar, U08, 398, "", 1, 0 -unusedAtTheEnd62 = scalar, U08, 399, "", 1, 0 -unusedAtTheEnd63 = scalar, U08, 400, "", 1, 0 -unusedAtTheEnd64 = scalar, U08, 401, "", 1, 0 -unusedAtTheEnd65 = scalar, U08, 402, "", 1, 0 -unusedAtTheEnd66 = scalar, U08, 403, "", 1, 0 -unusedAtTheEnd67 = scalar, U08, 404, "", 1, 0 -unusedAtTheEnd68 = scalar, U08, 405, "", 1, 0 -unusedAtTheEnd69 = scalar, U08, 406, "", 1, 0 -unusedAtTheEnd70 = scalar, U08, 407, "", 1, 0 -unusedAtTheEnd71 = scalar, U08, 408, "", 1, 0 -unusedAtTheEnd72 = scalar, U08, 409, "", 1, 0 -unusedAtTheEnd73 = scalar, U08, 410, "", 1, 0 -unusedAtTheEnd74 = scalar, U08, 411, "", 1, 0 -unusedAtTheEnd75 = scalar, U08, 412, "", 1, 0 -unusedAtTheEnd76 = scalar, U08, 413, "", 1, 0 -unusedAtTheEnd77 = scalar, U08, 414, "", 1, 0 -unusedAtTheEnd78 = scalar, U08, 415, "", 1, 0 -unusedAtTheEnd79 = scalar, U08, 416, "", 1, 0 -unusedAtTheEnd80 = scalar, U08, 417, "", 1, 0 -unusedAtTheEnd81 = scalar, U08, 418, "", 1, 0 -unusedAtTheEnd82 = scalar, U08, 419, "", 1, 0 -unusedAtTheEnd83 = scalar, U08, 420, "", 1, 0 -unusedAtTheEnd84 = scalar, U08, 421, "", 1, 0 -unusedAtTheEnd85 = scalar, U08, 422, "", 1, 0 -unusedAtTheEnd86 = scalar, U08, 423, "", 1, 0 -unusedAtTheEnd87 = scalar, U08, 424, "", 1, 0 -unusedAtTheEnd88 = scalar, U08, 425, "", 1, 0 -unusedAtTheEnd89 = scalar, U08, 426, "", 1, 0 -unusedAtTheEnd90 = scalar, U08, 427, "", 1, 0 -unusedAtTheEnd91 = scalar, U08, 428, "", 1, 0 -unusedAtTheEnd92 = scalar, U08, 429, "", 1, 0 -unusedAtTheEnd93 = scalar, U08, 430, "", 1, 0 -unusedAtTheEnd94 = scalar, U08, 431, "", 1, 0 -unusedAtTheEnd95 = scalar, U08, 432, "", 1, 0 -unusedAtTheEnd96 = scalar, U08, 433, "", 1, 0 -unusedAtTheEnd97 = scalar, U08, 434, "", 1, 0 -unusedAtTheEnd98 = scalar, U08, 435, "", 1, 0 -unusedAtTheEnd99 = scalar, U08, 436, "", 1, 0 -unusedAtTheEnd100 = scalar, U08, 437, "", 1, 0 -unusedAtTheEnd101 = scalar, U08, 438, "", 1, 0 -unusedAtTheEnd102 = scalar, U08, 439, "", 1, 0 -unusedAtTheEnd103 = scalar, U08, 440, "", 1, 0 -unusedAtTheEnd104 = scalar, U08, 441, "", 1, 0 -unusedAtTheEnd105 = scalar, U08, 442, "", 1, 0 -unusedAtTheEnd106 = scalar, U08, 443, "", 1, 0 -unusedAtTheEnd107 = scalar, U08, 444, "", 1, 0 -unusedAtTheEnd108 = scalar, U08, 445, "", 1, 0 -unusedAtTheEnd109 = scalar, U08, 446, "", 1, 0 -unusedAtTheEnd110 = scalar, U08, 447, "", 1, 0 -unusedAtTheEnd111 = scalar, U08, 448, "", 1, 0 -unusedAtTheEnd112 = scalar, U08, 449, "", 1, 0 -unusedAtTheEnd113 = scalar, U08, 450, "", 1, 0 -unusedAtTheEnd114 = scalar, U08, 451, "", 1, 0 -unusedAtTheEnd115 = scalar, U08, 452, "", 1, 0 -unusedAtTheEnd116 = scalar, U08, 453, "", 1, 0 -unusedAtTheEnd117 = scalar, U08, 454, "", 1, 0 -unusedAtTheEnd118 = scalar, U08, 455, "", 1, 0 -unusedAtTheEnd119 = scalar, U08, 456, "", 1, 0 -unusedAtTheEnd120 = scalar, U08, 457, "", 1, 0 -unusedAtTheEnd121 = scalar, U08, 458, "", 1, 0 -unusedAtTheEnd122 = scalar, U08, 459, "", 1, 0 -unusedAtTheEnd123 = scalar, U08, 460, "", 1, 0 -unusedAtTheEnd124 = scalar, U08, 461, "", 1, 0 -unusedAtTheEnd125 = scalar, U08, 462, "", 1, 0 -unusedAtTheEnd126 = scalar, U08, 463, "", 1, 0 -unusedAtTheEnd127 = scalar, U08, 464, "", 1, 0 -unusedAtTheEnd128 = scalar, U08, 465, "", 1, 0 -unusedAtTheEnd129 = scalar, U08, 466, "", 1, 0 -unusedAtTheEnd130 = scalar, U08, 467, "", 1, 0 -unusedAtTheEnd131 = scalar, U08, 468, "", 1, 0 -unusedAtTheEnd132 = scalar, U08, 469, "", 1, 0 -launchSpeedCondition = bits, U32, 470, [0:0] -launchRpmCondition = bits, U32, 470, [1:1] -launchTpsCondition = bits, U32, 470, [2:2] -launchActivateSwitchCondition = bits, U32, 470, [3:3] -launchIsLaunchCondition = bits, U32, 470, [4:4] -launchCombinedConditions = bits, U32, 470, [5:5] -launchActivatePinState = bits, U32, 470, [6:6] -unusedBit_173_7 = bits, U32, 470, [7:7] -unusedBit_173_8 = bits, U32, 470, [8:8] -unusedBit_173_9 = bits, U32, 470, [9:9] -unusedBit_173_10 = bits, U32, 470, [10:10] -unusedBit_173_11 = bits, U32, 470, [11:11] -unusedBit_173_12 = bits, U32, 470, [12:12] -unusedBit_173_13 = bits, U32, 470, [13:13] -unusedBit_173_14 = bits, U32, 470, [14:14] -unusedBit_173_15 = bits, U32, 470, [15:15] -unusedBit_173_16 = bits, U32, 470, [16:16] -unusedBit_173_17 = bits, U32, 470, [17:17] -unusedBit_173_18 = bits, U32, 470, [18:18] -unusedBit_173_19 = bits, U32, 470, [19:19] -unusedBit_173_20 = bits, U32, 470, [20:20] -unusedBit_173_21 = bits, U32, 470, [21:21] -unusedBit_173_22 = bits, U32, 470, [22:22] -unusedBit_173_23 = bits, U32, 470, [23:23] -unusedBit_173_24 = bits, U32, 470, [24:24] -unusedBit_173_25 = bits, U32, 470, [25:25] -unusedBit_173_26 = bits, U32, 470, [26:26] -unusedBit_173_27 = bits, U32, 470, [27:27] -unusedBit_173_28 = bits, U32, 470, [28:28] -unusedBit_173_29 = bits, U32, 470, [29:29] -unusedBit_173_30 = bits, U32, 470, [30:30] -unusedBit_173_31 = bits, U32, 470, [31:31] -TEMPLOG_MAP_AT_CYCLE_COUNT = scalar, U08, 474, "", 1, 0 -unused11 = scalar, U08, 475, "", 1, 0 -unused11 = scalar, U08, 475, "", 1, 0 -unused11 = scalar, U08, 475, "", 1, 0 +alignmentFill_at_338 = array, U08, 338, [2], "units", 1, 0 +fuel_requested_percent = scalar, F32, 340, "v", 1, 0 +fuel_requested_percent_pi = scalar, F32, 344, "v", 1, 0 +m_I_sum_percent = scalar, F32, 348, "v", 1, 0 +m_pressureTarget_kPa = scalar, F32, 352, "v", 1, 0 +unusedAtTheEnd1 = scalar, S32, 356, "", 1, 0 +unusedAtTheEnd2 = scalar, S32, 360, "", 1, 0 +unusedAtTheEnd3 = scalar, S32, 364, "", 1, 0 +unusedAtTheEnd4 = scalar, S32, 368, "", 1, 0 +unusedAtTheEnd5 = scalar, S32, 372, "", 1, 0 +unusedAtTheEnd6 = scalar, S32, 376, "", 1, 0 +unusedAtTheEnd7 = scalar, S32, 380, "", 1, 0 +unusedAtTheEnd8 = scalar, S32, 384, "", 1, 0 +unusedAtTheEnd9 = scalar, S32, 388, "", 1, 0 +unusedAtTheEnd10 = scalar, S32, 392, "", 1, 0 +unusedAtTheEnd11 = scalar, S32, 396, "", 1, 0 +unusedAtTheEnd12 = scalar, S32, 400, "", 1, 0 +unusedAtTheEnd13 = scalar, S32, 404, "", 1, 0 +unusedAtTheEnd14 = scalar, S32, 408, "", 1, 0 +unusedAtTheEnd15 = scalar, S32, 412, "", 1, 0 +unusedAtTheEnd16 = scalar, S32, 416, "", 1, 0 +unusedAtTheEnd17 = scalar, S32, 420, "", 1, 0 +unusedAtTheEnd18 = scalar, S32, 424, "", 1, 0 +unusedAtTheEnd19 = scalar, S32, 428, "", 1, 0 +unusedAtTheEnd20 = scalar, S32, 432, "", 1, 0 +unusedAtTheEnd21 = scalar, S32, 436, "", 1, 0 +unusedAtTheEnd22 = scalar, S32, 440, "", 1, 0 +unusedAtTheEnd23 = scalar, S32, 444, "", 1, 0 +unusedAtTheEnd24 = scalar, S32, 448, "", 1, 0 +unusedAtTheEnd25 = scalar, S32, 452, "", 1, 0 +unusedAtTheEnd26 = scalar, S32, 456, "", 1, 0 +unusedAtTheEnd27 = scalar, S32, 460, "", 1, 0 +unusedAtTheEnd28 = scalar, S32, 464, "", 1, 0 +launchSpeedCondition = bits, U32, 468, [0:0] +launchRpmCondition = bits, U32, 468, [1:1] +launchTpsCondition = bits, U32, 468, [2:2] +launchActivateSwitchCondition = bits, U32, 468, [3:3] +launchIsLaunchCondition = bits, U32, 468, [4:4] +launchCombinedConditions = bits, U32, 468, [5:5] +launchActivatePinState = bits, U32, 468, [6:6] +unusedBit_178_7 = bits, U32, 468, [7:7] +unusedBit_178_8 = bits, U32, 468, [8:8] +unusedBit_178_9 = bits, U32, 468, [9:9] +unusedBit_178_10 = bits, U32, 468, [10:10] +unusedBit_178_11 = bits, U32, 468, [11:11] +unusedBit_178_12 = bits, U32, 468, [12:12] +unusedBit_178_13 = bits, U32, 468, [13:13] +unusedBit_178_14 = bits, U32, 468, [14:14] +unusedBit_178_15 = bits, U32, 468, [15:15] +unusedBit_178_16 = bits, U32, 468, [16:16] +unusedBit_178_17 = bits, U32, 468, [17:17] +unusedBit_178_18 = bits, U32, 468, [18:18] +unusedBit_178_19 = bits, U32, 468, [19:19] +unusedBit_178_20 = bits, U32, 468, [20:20] +unusedBit_178_21 = bits, U32, 468, [21:21] +unusedBit_178_22 = bits, U32, 468, [22:22] +unusedBit_178_23 = bits, U32, 468, [23:23] +unusedBit_178_24 = bits, U32, 468, [24:24] +unusedBit_178_25 = bits, U32, 468, [25:25] +unusedBit_178_26 = bits, U32, 468, [26:26] +unusedBit_178_27 = bits, U32, 468, [27:27] +unusedBit_178_28 = bits, U32, 468, [28:28] +unusedBit_178_29 = bits, U32, 468, [29:29] +unusedBit_178_30 = bits, U32, 468, [30:30] +unusedBit_178_31 = bits, U32, 468, [31:31] +TEMPLOG_MAP_AT_CYCLE_COUNT = scalar, U08, 472, "", 1, 0 +unused11 = scalar, U08, 473, "", 1, 0 +unused11 = scalar, U08, 473, "", 1, 0 +unused11 = scalar, U08, 473, "", 1, 0 +alignmentFill_at_474 = array, U08, 474, [2], "units", 1, 0 TEMPLOG_MAP_AT_SPECIAL_POINT = scalar, F32, 476, "", 1, 0 TEMPLOG_MAP_AT_DIFF = scalar, F32, 480, "", 1, 0 vvtSyncGapRatio = scalar, F32, 484, "", 1, 0 @@ -3102,7 +3004,11 @@ TEMPLOG_MAP_AT_DIFFGauge = TEMPLOG_MAP_AT_DIFF,"TEMPLOG_MAP_AT_DIFF", "", -10000 TEMPLOG_MAP_AT_CYCLE_COUNTGauge = TEMPLOG_MAP_AT_CYCLE_COUNT,"TEMPLOG_MAP_AT_CYCLE_COUNT", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 gaugeCategory = GDI -m_requested_pumpGauge = m_requested_pump,"Pump Angle", "deg", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +m_requested_pumpGauge = m_requested_pump,"DI: Pump Angle", "deg", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +fuel_requested_percentGauge = fuel_requested_percent,"DI: fuel_requested_percent", "v", 0.0,100.0, 0.0,100.0, 0.0,100.0, 0,0 +fuel_requested_percent_piGauge = fuel_requested_percent_pi,"DI: fuel_requested_percent_pi", "v", 0.0,100.0, 0.0,100.0, 0.0,100.0, 0,0 +m_I_sum_percentGauge = m_I_sum_percent,"DI: m_I_sum_percent", "v", 0.0,100.0, 0.0,100.0, 0.0,100.0, 0,0 +m_pressureTarget_kPaGauge = m_pressureTarget_kPa,"DI: m_pressureTarget_kPa", "v", 0.0,100.0, 0.0,100.0, 0.0,100.0, 0,0 highFuelPressureGauge = highFuelPressure, "Fuel pressure (high)", "bar", 0, 200, 0, 0, 200, 200, 1, 0 gaugeCategory = Sensors - Extra 2 @@ -3581,7 +3487,11 @@ entry = tps1Split, "tps1Split", float, "%.3f" entry = tps2Split, "tps2Split", float, "%.3f" entry = tps12Split, "tps12Split", float, "%.3f" entry = accPedalSplit, "accPedalSplit", float, "%.3f" -entry = m_requested_pump, "Pump Angle", float, "%.3f" +entry = m_requested_pump, "DI: Pump Angle", float, "%.3f" +entry = fuel_requested_percent, "DI: fuel_requested_percent", float, "%.3f" +entry = fuel_requested_percent_pi, "DI: fuel_requested_percent_pi", float, "%.3f" +entry = m_I_sum_percent, "DI: m_I_sum_percent", float, "%.3f" +entry = m_pressureTarget_kPa, "DI: m_pressureTarget_kPa", float, "%.3f" entry = launchSpeedCondition, "launchSpeedCondition", int, "%d" entry = launchRpmCondition, "launchRpmCondition", int, "%d" entry = launchTpsCondition, "launchTpsCondition", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_hellen81.ini b/firmware/tunerstudio/generated/rusefi_hellen81.ini index 6dc3c2a703..cd0e0db9b2 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen81.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen81.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.01.01.hellen81.1185330436" + signature = "rusEFI 2022.01.01.hellen81.3687811193" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.01.01.hellen81.1185330436" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.01.01.hellen81.3687811193" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jan 01 21:08:54 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jan 01 22:22:38 UTC 2022 pageSize = 20996 page = 1 @@ -2097,174 +2097,76 @@ tps12Split = scalar, S16, 330, "%", 0.01, 0 accPedalSplit = scalar, S16, 332, "%", 0.01, 0 m_requested_pump = scalar, S16, 334, "deg", 0.02, 0 unused16 = scalar, S16, 336, "deg", 0.02, 0 -unusedAtTheEnd1 = scalar, U08, 338, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 339, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 340, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 341, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 342, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 343, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 344, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 345, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 346, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 347, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 348, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 349, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 350, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 351, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 352, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 353, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 354, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 355, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 356, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 357, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 358, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 359, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 360, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 361, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 362, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 363, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 364, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 365, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 366, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 367, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 368, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 369, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 370, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 371, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 372, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 373, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 374, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 375, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 376, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 377, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 378, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 379, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 380, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 381, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 382, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 383, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 384, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 385, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 386, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 387, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 388, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 389, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 390, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 391, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 392, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 393, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 394, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 395, "", 1, 0 -unusedAtTheEnd59 = scalar, U08, 396, "", 1, 0 -unusedAtTheEnd60 = scalar, U08, 397, "", 1, 0 -unusedAtTheEnd61 = scalar, U08, 398, "", 1, 0 -unusedAtTheEnd62 = scalar, U08, 399, "", 1, 0 -unusedAtTheEnd63 = scalar, U08, 400, "", 1, 0 -unusedAtTheEnd64 = scalar, U08, 401, "", 1, 0 -unusedAtTheEnd65 = scalar, U08, 402, "", 1, 0 -unusedAtTheEnd66 = scalar, U08, 403, "", 1, 0 -unusedAtTheEnd67 = scalar, U08, 404, "", 1, 0 -unusedAtTheEnd68 = scalar, U08, 405, "", 1, 0 -unusedAtTheEnd69 = scalar, U08, 406, "", 1, 0 -unusedAtTheEnd70 = scalar, U08, 407, "", 1, 0 -unusedAtTheEnd71 = scalar, U08, 408, "", 1, 0 -unusedAtTheEnd72 = scalar, U08, 409, "", 1, 0 -unusedAtTheEnd73 = scalar, U08, 410, "", 1, 0 -unusedAtTheEnd74 = scalar, U08, 411, "", 1, 0 -unusedAtTheEnd75 = scalar, U08, 412, "", 1, 0 -unusedAtTheEnd76 = scalar, U08, 413, "", 1, 0 -unusedAtTheEnd77 = scalar, U08, 414, "", 1, 0 -unusedAtTheEnd78 = scalar, U08, 415, "", 1, 0 -unusedAtTheEnd79 = scalar, U08, 416, "", 1, 0 -unusedAtTheEnd80 = scalar, U08, 417, "", 1, 0 -unusedAtTheEnd81 = scalar, U08, 418, "", 1, 0 -unusedAtTheEnd82 = scalar, U08, 419, "", 1, 0 -unusedAtTheEnd83 = scalar, U08, 420, "", 1, 0 -unusedAtTheEnd84 = scalar, U08, 421, "", 1, 0 -unusedAtTheEnd85 = scalar, U08, 422, "", 1, 0 -unusedAtTheEnd86 = scalar, U08, 423, "", 1, 0 -unusedAtTheEnd87 = scalar, U08, 424, "", 1, 0 -unusedAtTheEnd88 = scalar, U08, 425, "", 1, 0 -unusedAtTheEnd89 = scalar, U08, 426, "", 1, 0 -unusedAtTheEnd90 = scalar, U08, 427, "", 1, 0 -unusedAtTheEnd91 = scalar, U08, 428, "", 1, 0 -unusedAtTheEnd92 = scalar, U08, 429, "", 1, 0 -unusedAtTheEnd93 = scalar, U08, 430, "", 1, 0 -unusedAtTheEnd94 = scalar, U08, 431, "", 1, 0 -unusedAtTheEnd95 = scalar, U08, 432, "", 1, 0 -unusedAtTheEnd96 = scalar, U08, 433, "", 1, 0 -unusedAtTheEnd97 = scalar, U08, 434, "", 1, 0 -unusedAtTheEnd98 = scalar, U08, 435, "", 1, 0 -unusedAtTheEnd99 = scalar, U08, 436, "", 1, 0 -unusedAtTheEnd100 = scalar, U08, 437, "", 1, 0 -unusedAtTheEnd101 = scalar, U08, 438, "", 1, 0 -unusedAtTheEnd102 = scalar, U08, 439, "", 1, 0 -unusedAtTheEnd103 = scalar, U08, 440, "", 1, 0 -unusedAtTheEnd104 = scalar, U08, 441, "", 1, 0 -unusedAtTheEnd105 = scalar, U08, 442, "", 1, 0 -unusedAtTheEnd106 = scalar, U08, 443, "", 1, 0 -unusedAtTheEnd107 = scalar, U08, 444, "", 1, 0 -unusedAtTheEnd108 = scalar, U08, 445, "", 1, 0 -unusedAtTheEnd109 = scalar, U08, 446, "", 1, 0 -unusedAtTheEnd110 = scalar, U08, 447, "", 1, 0 -unusedAtTheEnd111 = scalar, U08, 448, "", 1, 0 -unusedAtTheEnd112 = scalar, U08, 449, "", 1, 0 -unusedAtTheEnd113 = scalar, U08, 450, "", 1, 0 -unusedAtTheEnd114 = scalar, U08, 451, "", 1, 0 -unusedAtTheEnd115 = scalar, U08, 452, "", 1, 0 -unusedAtTheEnd116 = scalar, U08, 453, "", 1, 0 -unusedAtTheEnd117 = scalar, U08, 454, "", 1, 0 -unusedAtTheEnd118 = scalar, U08, 455, "", 1, 0 -unusedAtTheEnd119 = scalar, U08, 456, "", 1, 0 -unusedAtTheEnd120 = scalar, U08, 457, "", 1, 0 -unusedAtTheEnd121 = scalar, U08, 458, "", 1, 0 -unusedAtTheEnd122 = scalar, U08, 459, "", 1, 0 -unusedAtTheEnd123 = scalar, U08, 460, "", 1, 0 -unusedAtTheEnd124 = scalar, U08, 461, "", 1, 0 -unusedAtTheEnd125 = scalar, U08, 462, "", 1, 0 -unusedAtTheEnd126 = scalar, U08, 463, "", 1, 0 -unusedAtTheEnd127 = scalar, U08, 464, "", 1, 0 -unusedAtTheEnd128 = scalar, U08, 465, "", 1, 0 -unusedAtTheEnd129 = scalar, U08, 466, "", 1, 0 -unusedAtTheEnd130 = scalar, U08, 467, "", 1, 0 -unusedAtTheEnd131 = scalar, U08, 468, "", 1, 0 -unusedAtTheEnd132 = scalar, U08, 469, "", 1, 0 -launchSpeedCondition = bits, U32, 470, [0:0] -launchRpmCondition = bits, U32, 470, [1:1] -launchTpsCondition = bits, U32, 470, [2:2] -launchActivateSwitchCondition = bits, U32, 470, [3:3] -launchIsLaunchCondition = bits, U32, 470, [4:4] -launchCombinedConditions = bits, U32, 470, [5:5] -launchActivatePinState = bits, U32, 470, [6:6] -unusedBit_173_7 = bits, U32, 470, [7:7] -unusedBit_173_8 = bits, U32, 470, [8:8] -unusedBit_173_9 = bits, U32, 470, [9:9] -unusedBit_173_10 = bits, U32, 470, [10:10] -unusedBit_173_11 = bits, U32, 470, [11:11] -unusedBit_173_12 = bits, U32, 470, [12:12] -unusedBit_173_13 = bits, U32, 470, [13:13] -unusedBit_173_14 = bits, U32, 470, [14:14] -unusedBit_173_15 = bits, U32, 470, [15:15] -unusedBit_173_16 = bits, U32, 470, [16:16] -unusedBit_173_17 = bits, U32, 470, [17:17] -unusedBit_173_18 = bits, U32, 470, [18:18] -unusedBit_173_19 = bits, U32, 470, [19:19] -unusedBit_173_20 = bits, U32, 470, [20:20] -unusedBit_173_21 = bits, U32, 470, [21:21] -unusedBit_173_22 = bits, U32, 470, [22:22] -unusedBit_173_23 = bits, U32, 470, [23:23] -unusedBit_173_24 = bits, U32, 470, [24:24] -unusedBit_173_25 = bits, U32, 470, [25:25] -unusedBit_173_26 = bits, U32, 470, [26:26] -unusedBit_173_27 = bits, U32, 470, [27:27] -unusedBit_173_28 = bits, U32, 470, [28:28] -unusedBit_173_29 = bits, U32, 470, [29:29] -unusedBit_173_30 = bits, U32, 470, [30:30] -unusedBit_173_31 = bits, U32, 470, [31:31] -TEMPLOG_MAP_AT_CYCLE_COUNT = scalar, U08, 474, "", 1, 0 -unused11 = scalar, U08, 475, "", 1, 0 -unused11 = scalar, U08, 475, "", 1, 0 -unused11 = scalar, U08, 475, "", 1, 0 +alignmentFill_at_338 = array, U08, 338, [2], "units", 1, 0 +fuel_requested_percent = scalar, F32, 340, "v", 1, 0 +fuel_requested_percent_pi = scalar, F32, 344, "v", 1, 0 +m_I_sum_percent = scalar, F32, 348, "v", 1, 0 +m_pressureTarget_kPa = scalar, F32, 352, "v", 1, 0 +unusedAtTheEnd1 = scalar, S32, 356, "", 1, 0 +unusedAtTheEnd2 = scalar, S32, 360, "", 1, 0 +unusedAtTheEnd3 = scalar, S32, 364, "", 1, 0 +unusedAtTheEnd4 = scalar, S32, 368, "", 1, 0 +unusedAtTheEnd5 = scalar, S32, 372, "", 1, 0 +unusedAtTheEnd6 = scalar, S32, 376, "", 1, 0 +unusedAtTheEnd7 = scalar, S32, 380, "", 1, 0 +unusedAtTheEnd8 = scalar, S32, 384, "", 1, 0 +unusedAtTheEnd9 = scalar, S32, 388, "", 1, 0 +unusedAtTheEnd10 = scalar, S32, 392, "", 1, 0 +unusedAtTheEnd11 = scalar, S32, 396, "", 1, 0 +unusedAtTheEnd12 = scalar, S32, 400, "", 1, 0 +unusedAtTheEnd13 = scalar, S32, 404, "", 1, 0 +unusedAtTheEnd14 = scalar, S32, 408, "", 1, 0 +unusedAtTheEnd15 = scalar, S32, 412, "", 1, 0 +unusedAtTheEnd16 = scalar, S32, 416, "", 1, 0 +unusedAtTheEnd17 = scalar, S32, 420, "", 1, 0 +unusedAtTheEnd18 = scalar, S32, 424, "", 1, 0 +unusedAtTheEnd19 = scalar, S32, 428, "", 1, 0 +unusedAtTheEnd20 = scalar, S32, 432, "", 1, 0 +unusedAtTheEnd21 = scalar, S32, 436, "", 1, 0 +unusedAtTheEnd22 = scalar, S32, 440, "", 1, 0 +unusedAtTheEnd23 = scalar, S32, 444, "", 1, 0 +unusedAtTheEnd24 = scalar, S32, 448, "", 1, 0 +unusedAtTheEnd25 = scalar, S32, 452, "", 1, 0 +unusedAtTheEnd26 = scalar, S32, 456, "", 1, 0 +unusedAtTheEnd27 = scalar, S32, 460, "", 1, 0 +unusedAtTheEnd28 = scalar, S32, 464, "", 1, 0 +launchSpeedCondition = bits, U32, 468, [0:0] +launchRpmCondition = bits, U32, 468, [1:1] +launchTpsCondition = bits, U32, 468, [2:2] +launchActivateSwitchCondition = bits, U32, 468, [3:3] +launchIsLaunchCondition = bits, U32, 468, [4:4] +launchCombinedConditions = bits, U32, 468, [5:5] +launchActivatePinState = bits, U32, 468, [6:6] +unusedBit_178_7 = bits, U32, 468, [7:7] +unusedBit_178_8 = bits, U32, 468, [8:8] +unusedBit_178_9 = bits, U32, 468, [9:9] +unusedBit_178_10 = bits, U32, 468, [10:10] +unusedBit_178_11 = bits, U32, 468, [11:11] +unusedBit_178_12 = bits, U32, 468, [12:12] +unusedBit_178_13 = bits, U32, 468, [13:13] +unusedBit_178_14 = bits, U32, 468, [14:14] +unusedBit_178_15 = bits, U32, 468, [15:15] +unusedBit_178_16 = bits, U32, 468, [16:16] +unusedBit_178_17 = bits, U32, 468, [17:17] +unusedBit_178_18 = bits, U32, 468, [18:18] +unusedBit_178_19 = bits, U32, 468, [19:19] +unusedBit_178_20 = bits, U32, 468, [20:20] +unusedBit_178_21 = bits, U32, 468, [21:21] +unusedBit_178_22 = bits, U32, 468, [22:22] +unusedBit_178_23 = bits, U32, 468, [23:23] +unusedBit_178_24 = bits, U32, 468, [24:24] +unusedBit_178_25 = bits, U32, 468, [25:25] +unusedBit_178_26 = bits, U32, 468, [26:26] +unusedBit_178_27 = bits, U32, 468, [27:27] +unusedBit_178_28 = bits, U32, 468, [28:28] +unusedBit_178_29 = bits, U32, 468, [29:29] +unusedBit_178_30 = bits, U32, 468, [30:30] +unusedBit_178_31 = bits, U32, 468, [31:31] +TEMPLOG_MAP_AT_CYCLE_COUNT = scalar, U08, 472, "", 1, 0 +unused11 = scalar, U08, 473, "", 1, 0 +unused11 = scalar, U08, 473, "", 1, 0 +unused11 = scalar, U08, 473, "", 1, 0 +alignmentFill_at_474 = array, U08, 474, [2], "units", 1, 0 TEMPLOG_MAP_AT_SPECIAL_POINT = scalar, F32, 476, "", 1, 0 TEMPLOG_MAP_AT_DIFF = scalar, F32, 480, "", 1, 0 vvtSyncGapRatio = scalar, F32, 484, "", 1, 0 @@ -3102,7 +3004,11 @@ TEMPLOG_MAP_AT_DIFFGauge = TEMPLOG_MAP_AT_DIFF,"TEMPLOG_MAP_AT_DIFF", "", -10000 TEMPLOG_MAP_AT_CYCLE_COUNTGauge = TEMPLOG_MAP_AT_CYCLE_COUNT,"TEMPLOG_MAP_AT_CYCLE_COUNT", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 gaugeCategory = GDI -m_requested_pumpGauge = m_requested_pump,"Pump Angle", "deg", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +m_requested_pumpGauge = m_requested_pump,"DI: Pump Angle", "deg", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +fuel_requested_percentGauge = fuel_requested_percent,"DI: fuel_requested_percent", "v", 0.0,100.0, 0.0,100.0, 0.0,100.0, 0,0 +fuel_requested_percent_piGauge = fuel_requested_percent_pi,"DI: fuel_requested_percent_pi", "v", 0.0,100.0, 0.0,100.0, 0.0,100.0, 0,0 +m_I_sum_percentGauge = m_I_sum_percent,"DI: m_I_sum_percent", "v", 0.0,100.0, 0.0,100.0, 0.0,100.0, 0,0 +m_pressureTarget_kPaGauge = m_pressureTarget_kPa,"DI: m_pressureTarget_kPa", "v", 0.0,100.0, 0.0,100.0, 0.0,100.0, 0,0 highFuelPressureGauge = highFuelPressure, "Fuel pressure (high)", "bar", 0, 200, 0, 0, 200, 200, 1, 0 gaugeCategory = Sensors - Extra 2 @@ -3581,7 +3487,11 @@ entry = tps1Split, "tps1Split", float, "%.3f" entry = tps2Split, "tps2Split", float, "%.3f" entry = tps12Split, "tps12Split", float, "%.3f" entry = accPedalSplit, "accPedalSplit", float, "%.3f" -entry = m_requested_pump, "Pump Angle", float, "%.3f" +entry = m_requested_pump, "DI: Pump Angle", float, "%.3f" +entry = fuel_requested_percent, "DI: fuel_requested_percent", float, "%.3f" +entry = fuel_requested_percent_pi, "DI: fuel_requested_percent_pi", float, "%.3f" +entry = m_I_sum_percent, "DI: m_I_sum_percent", float, "%.3f" +entry = m_pressureTarget_kPa, "DI: m_pressureTarget_kPa", float, "%.3f" entry = launchSpeedCondition, "launchSpeedCondition", int, "%d" entry = launchRpmCondition, "launchRpmCondition", int, "%d" entry = launchTpsCondition, "launchTpsCondition", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini index f5a7625102..34faea45e7 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.01.01.hellen88bmw.2815835672" + signature = "rusEFI 2022.01.01.hellen88bmw.985596773" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.01.01.hellen88bmw.2815835672" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.01.01.hellen88bmw.985596773" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jan 01 21:08:48 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jan 01 22:22:33 UTC 2022 pageSize = 20996 page = 1 @@ -2097,174 +2097,76 @@ tps12Split = scalar, S16, 330, "%", 0.01, 0 accPedalSplit = scalar, S16, 332, "%", 0.01, 0 m_requested_pump = scalar, S16, 334, "deg", 0.02, 0 unused16 = scalar, S16, 336, "deg", 0.02, 0 -unusedAtTheEnd1 = scalar, U08, 338, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 339, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 340, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 341, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 342, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 343, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 344, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 345, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 346, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 347, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 348, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 349, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 350, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 351, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 352, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 353, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 354, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 355, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 356, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 357, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 358, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 359, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 360, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 361, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 362, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 363, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 364, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 365, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 366, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 367, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 368, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 369, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 370, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 371, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 372, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 373, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 374, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 375, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 376, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 377, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 378, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 379, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 380, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 381, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 382, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 383, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 384, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 385, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 386, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 387, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 388, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 389, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 390, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 391, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 392, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 393, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 394, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 395, "", 1, 0 -unusedAtTheEnd59 = scalar, U08, 396, "", 1, 0 -unusedAtTheEnd60 = scalar, U08, 397, "", 1, 0 -unusedAtTheEnd61 = scalar, U08, 398, "", 1, 0 -unusedAtTheEnd62 = scalar, U08, 399, "", 1, 0 -unusedAtTheEnd63 = scalar, U08, 400, "", 1, 0 -unusedAtTheEnd64 = scalar, U08, 401, "", 1, 0 -unusedAtTheEnd65 = scalar, U08, 402, "", 1, 0 -unusedAtTheEnd66 = scalar, U08, 403, "", 1, 0 -unusedAtTheEnd67 = scalar, U08, 404, "", 1, 0 -unusedAtTheEnd68 = scalar, U08, 405, "", 1, 0 -unusedAtTheEnd69 = scalar, U08, 406, "", 1, 0 -unusedAtTheEnd70 = scalar, U08, 407, "", 1, 0 -unusedAtTheEnd71 = scalar, U08, 408, "", 1, 0 -unusedAtTheEnd72 = scalar, U08, 409, "", 1, 0 -unusedAtTheEnd73 = scalar, U08, 410, "", 1, 0 -unusedAtTheEnd74 = scalar, U08, 411, "", 1, 0 -unusedAtTheEnd75 = scalar, U08, 412, "", 1, 0 -unusedAtTheEnd76 = scalar, U08, 413, "", 1, 0 -unusedAtTheEnd77 = scalar, U08, 414, "", 1, 0 -unusedAtTheEnd78 = scalar, U08, 415, "", 1, 0 -unusedAtTheEnd79 = scalar, U08, 416, "", 1, 0 -unusedAtTheEnd80 = scalar, U08, 417, "", 1, 0 -unusedAtTheEnd81 = scalar, U08, 418, "", 1, 0 -unusedAtTheEnd82 = scalar, U08, 419, "", 1, 0 -unusedAtTheEnd83 = scalar, U08, 420, "", 1, 0 -unusedAtTheEnd84 = scalar, U08, 421, "", 1, 0 -unusedAtTheEnd85 = scalar, U08, 422, "", 1, 0 -unusedAtTheEnd86 = scalar, U08, 423, "", 1, 0 -unusedAtTheEnd87 = scalar, U08, 424, "", 1, 0 -unusedAtTheEnd88 = scalar, U08, 425, "", 1, 0 -unusedAtTheEnd89 = scalar, U08, 426, "", 1, 0 -unusedAtTheEnd90 = scalar, U08, 427, "", 1, 0 -unusedAtTheEnd91 = scalar, U08, 428, "", 1, 0 -unusedAtTheEnd92 = scalar, U08, 429, "", 1, 0 -unusedAtTheEnd93 = scalar, U08, 430, "", 1, 0 -unusedAtTheEnd94 = scalar, U08, 431, "", 1, 0 -unusedAtTheEnd95 = scalar, U08, 432, "", 1, 0 -unusedAtTheEnd96 = scalar, U08, 433, "", 1, 0 -unusedAtTheEnd97 = scalar, U08, 434, "", 1, 0 -unusedAtTheEnd98 = scalar, U08, 435, "", 1, 0 -unusedAtTheEnd99 = scalar, U08, 436, "", 1, 0 -unusedAtTheEnd100 = scalar, U08, 437, "", 1, 0 -unusedAtTheEnd101 = scalar, U08, 438, "", 1, 0 -unusedAtTheEnd102 = scalar, U08, 439, "", 1, 0 -unusedAtTheEnd103 = scalar, U08, 440, "", 1, 0 -unusedAtTheEnd104 = scalar, U08, 441, "", 1, 0 -unusedAtTheEnd105 = scalar, U08, 442, "", 1, 0 -unusedAtTheEnd106 = scalar, U08, 443, "", 1, 0 -unusedAtTheEnd107 = scalar, U08, 444, "", 1, 0 -unusedAtTheEnd108 = scalar, U08, 445, "", 1, 0 -unusedAtTheEnd109 = scalar, U08, 446, "", 1, 0 -unusedAtTheEnd110 = scalar, U08, 447, "", 1, 0 -unusedAtTheEnd111 = scalar, U08, 448, "", 1, 0 -unusedAtTheEnd112 = scalar, U08, 449, "", 1, 0 -unusedAtTheEnd113 = scalar, U08, 450, "", 1, 0 -unusedAtTheEnd114 = scalar, U08, 451, "", 1, 0 -unusedAtTheEnd115 = scalar, U08, 452, "", 1, 0 -unusedAtTheEnd116 = scalar, U08, 453, "", 1, 0 -unusedAtTheEnd117 = scalar, U08, 454, "", 1, 0 -unusedAtTheEnd118 = scalar, U08, 455, "", 1, 0 -unusedAtTheEnd119 = scalar, U08, 456, "", 1, 0 -unusedAtTheEnd120 = scalar, U08, 457, "", 1, 0 -unusedAtTheEnd121 = scalar, U08, 458, "", 1, 0 -unusedAtTheEnd122 = scalar, U08, 459, "", 1, 0 -unusedAtTheEnd123 = scalar, U08, 460, "", 1, 0 -unusedAtTheEnd124 = scalar, U08, 461, "", 1, 0 -unusedAtTheEnd125 = scalar, U08, 462, "", 1, 0 -unusedAtTheEnd126 = scalar, U08, 463, "", 1, 0 -unusedAtTheEnd127 = scalar, U08, 464, "", 1, 0 -unusedAtTheEnd128 = scalar, U08, 465, "", 1, 0 -unusedAtTheEnd129 = scalar, U08, 466, "", 1, 0 -unusedAtTheEnd130 = scalar, U08, 467, "", 1, 0 -unusedAtTheEnd131 = scalar, U08, 468, "", 1, 0 -unusedAtTheEnd132 = scalar, U08, 469, "", 1, 0 -launchSpeedCondition = bits, U32, 470, [0:0] -launchRpmCondition = bits, U32, 470, [1:1] -launchTpsCondition = bits, U32, 470, [2:2] -launchActivateSwitchCondition = bits, U32, 470, [3:3] -launchIsLaunchCondition = bits, U32, 470, [4:4] -launchCombinedConditions = bits, U32, 470, [5:5] -launchActivatePinState = bits, U32, 470, [6:6] -unusedBit_173_7 = bits, U32, 470, [7:7] -unusedBit_173_8 = bits, U32, 470, [8:8] -unusedBit_173_9 = bits, U32, 470, [9:9] -unusedBit_173_10 = bits, U32, 470, [10:10] -unusedBit_173_11 = bits, U32, 470, [11:11] -unusedBit_173_12 = bits, U32, 470, [12:12] -unusedBit_173_13 = bits, U32, 470, [13:13] -unusedBit_173_14 = bits, U32, 470, [14:14] -unusedBit_173_15 = bits, U32, 470, [15:15] -unusedBit_173_16 = bits, U32, 470, [16:16] -unusedBit_173_17 = bits, U32, 470, [17:17] -unusedBit_173_18 = bits, U32, 470, [18:18] -unusedBit_173_19 = bits, U32, 470, [19:19] -unusedBit_173_20 = bits, U32, 470, [20:20] -unusedBit_173_21 = bits, U32, 470, [21:21] -unusedBit_173_22 = bits, U32, 470, [22:22] -unusedBit_173_23 = bits, U32, 470, [23:23] -unusedBit_173_24 = bits, U32, 470, [24:24] -unusedBit_173_25 = bits, U32, 470, [25:25] -unusedBit_173_26 = bits, U32, 470, [26:26] -unusedBit_173_27 = bits, U32, 470, [27:27] -unusedBit_173_28 = bits, U32, 470, [28:28] -unusedBit_173_29 = bits, U32, 470, [29:29] -unusedBit_173_30 = bits, U32, 470, [30:30] -unusedBit_173_31 = bits, U32, 470, [31:31] -TEMPLOG_MAP_AT_CYCLE_COUNT = scalar, U08, 474, "", 1, 0 -unused11 = scalar, U08, 475, "", 1, 0 -unused11 = scalar, U08, 475, "", 1, 0 -unused11 = scalar, U08, 475, "", 1, 0 +alignmentFill_at_338 = array, U08, 338, [2], "units", 1, 0 +fuel_requested_percent = scalar, F32, 340, "v", 1, 0 +fuel_requested_percent_pi = scalar, F32, 344, "v", 1, 0 +m_I_sum_percent = scalar, F32, 348, "v", 1, 0 +m_pressureTarget_kPa = scalar, F32, 352, "v", 1, 0 +unusedAtTheEnd1 = scalar, S32, 356, "", 1, 0 +unusedAtTheEnd2 = scalar, S32, 360, "", 1, 0 +unusedAtTheEnd3 = scalar, S32, 364, "", 1, 0 +unusedAtTheEnd4 = scalar, S32, 368, "", 1, 0 +unusedAtTheEnd5 = scalar, S32, 372, "", 1, 0 +unusedAtTheEnd6 = scalar, S32, 376, "", 1, 0 +unusedAtTheEnd7 = scalar, S32, 380, "", 1, 0 +unusedAtTheEnd8 = scalar, S32, 384, "", 1, 0 +unusedAtTheEnd9 = scalar, S32, 388, "", 1, 0 +unusedAtTheEnd10 = scalar, S32, 392, "", 1, 0 +unusedAtTheEnd11 = scalar, S32, 396, "", 1, 0 +unusedAtTheEnd12 = scalar, S32, 400, "", 1, 0 +unusedAtTheEnd13 = scalar, S32, 404, "", 1, 0 +unusedAtTheEnd14 = scalar, S32, 408, "", 1, 0 +unusedAtTheEnd15 = scalar, S32, 412, "", 1, 0 +unusedAtTheEnd16 = scalar, S32, 416, "", 1, 0 +unusedAtTheEnd17 = scalar, S32, 420, "", 1, 0 +unusedAtTheEnd18 = scalar, S32, 424, "", 1, 0 +unusedAtTheEnd19 = scalar, S32, 428, "", 1, 0 +unusedAtTheEnd20 = scalar, S32, 432, "", 1, 0 +unusedAtTheEnd21 = scalar, S32, 436, "", 1, 0 +unusedAtTheEnd22 = scalar, S32, 440, "", 1, 0 +unusedAtTheEnd23 = scalar, S32, 444, "", 1, 0 +unusedAtTheEnd24 = scalar, S32, 448, "", 1, 0 +unusedAtTheEnd25 = scalar, S32, 452, "", 1, 0 +unusedAtTheEnd26 = scalar, S32, 456, "", 1, 0 +unusedAtTheEnd27 = scalar, S32, 460, "", 1, 0 +unusedAtTheEnd28 = scalar, S32, 464, "", 1, 0 +launchSpeedCondition = bits, U32, 468, [0:0] +launchRpmCondition = bits, U32, 468, [1:1] +launchTpsCondition = bits, U32, 468, [2:2] +launchActivateSwitchCondition = bits, U32, 468, [3:3] +launchIsLaunchCondition = bits, U32, 468, [4:4] +launchCombinedConditions = bits, U32, 468, [5:5] +launchActivatePinState = bits, U32, 468, [6:6] +unusedBit_178_7 = bits, U32, 468, [7:7] +unusedBit_178_8 = bits, U32, 468, [8:8] +unusedBit_178_9 = bits, U32, 468, [9:9] +unusedBit_178_10 = bits, U32, 468, [10:10] +unusedBit_178_11 = bits, U32, 468, [11:11] +unusedBit_178_12 = bits, U32, 468, [12:12] +unusedBit_178_13 = bits, U32, 468, [13:13] +unusedBit_178_14 = bits, U32, 468, [14:14] +unusedBit_178_15 = bits, U32, 468, [15:15] +unusedBit_178_16 = bits, U32, 468, [16:16] +unusedBit_178_17 = bits, U32, 468, [17:17] +unusedBit_178_18 = bits, U32, 468, [18:18] +unusedBit_178_19 = bits, U32, 468, [19:19] +unusedBit_178_20 = bits, U32, 468, [20:20] +unusedBit_178_21 = bits, U32, 468, [21:21] +unusedBit_178_22 = bits, U32, 468, [22:22] +unusedBit_178_23 = bits, U32, 468, [23:23] +unusedBit_178_24 = bits, U32, 468, [24:24] +unusedBit_178_25 = bits, U32, 468, [25:25] +unusedBit_178_26 = bits, U32, 468, [26:26] +unusedBit_178_27 = bits, U32, 468, [27:27] +unusedBit_178_28 = bits, U32, 468, [28:28] +unusedBit_178_29 = bits, U32, 468, [29:29] +unusedBit_178_30 = bits, U32, 468, [30:30] +unusedBit_178_31 = bits, U32, 468, [31:31] +TEMPLOG_MAP_AT_CYCLE_COUNT = scalar, U08, 472, "", 1, 0 +unused11 = scalar, U08, 473, "", 1, 0 +unused11 = scalar, U08, 473, "", 1, 0 +unused11 = scalar, U08, 473, "", 1, 0 +alignmentFill_at_474 = array, U08, 474, [2], "units", 1, 0 TEMPLOG_MAP_AT_SPECIAL_POINT = scalar, F32, 476, "", 1, 0 TEMPLOG_MAP_AT_DIFF = scalar, F32, 480, "", 1, 0 vvtSyncGapRatio = scalar, F32, 484, "", 1, 0 @@ -3102,7 +3004,11 @@ TEMPLOG_MAP_AT_DIFFGauge = TEMPLOG_MAP_AT_DIFF,"TEMPLOG_MAP_AT_DIFF", "", -10000 TEMPLOG_MAP_AT_CYCLE_COUNTGauge = TEMPLOG_MAP_AT_CYCLE_COUNT,"TEMPLOG_MAP_AT_CYCLE_COUNT", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 gaugeCategory = GDI -m_requested_pumpGauge = m_requested_pump,"Pump Angle", "deg", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +m_requested_pumpGauge = m_requested_pump,"DI: Pump Angle", "deg", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +fuel_requested_percentGauge = fuel_requested_percent,"DI: fuel_requested_percent", "v", 0.0,100.0, 0.0,100.0, 0.0,100.0, 0,0 +fuel_requested_percent_piGauge = fuel_requested_percent_pi,"DI: fuel_requested_percent_pi", "v", 0.0,100.0, 0.0,100.0, 0.0,100.0, 0,0 +m_I_sum_percentGauge = m_I_sum_percent,"DI: m_I_sum_percent", "v", 0.0,100.0, 0.0,100.0, 0.0,100.0, 0,0 +m_pressureTarget_kPaGauge = m_pressureTarget_kPa,"DI: m_pressureTarget_kPa", "v", 0.0,100.0, 0.0,100.0, 0.0,100.0, 0,0 highFuelPressureGauge = highFuelPressure, "Fuel pressure (high)", "bar", 0, 200, 0, 0, 200, 200, 1, 0 gaugeCategory = Sensors - Extra 2 @@ -3581,7 +3487,11 @@ entry = tps1Split, "tps1Split", float, "%.3f" entry = tps2Split, "tps2Split", float, "%.3f" entry = tps12Split, "tps12Split", float, "%.3f" entry = accPedalSplit, "accPedalSplit", float, "%.3f" -entry = m_requested_pump, "Pump Angle", float, "%.3f" +entry = m_requested_pump, "DI: Pump Angle", float, "%.3f" +entry = fuel_requested_percent, "DI: fuel_requested_percent", float, "%.3f" +entry = fuel_requested_percent_pi, "DI: fuel_requested_percent_pi", float, "%.3f" +entry = m_I_sum_percent, "DI: m_I_sum_percent", float, "%.3f" +entry = m_pressureTarget_kPa, "DI: m_pressureTarget_kPa", float, "%.3f" entry = launchSpeedCondition, "launchSpeedCondition", int, "%d" entry = launchRpmCondition, "launchRpmCondition", int, "%d" entry = launchTpsCondition, "launchTpsCondition", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini index 03be1b67e6..91f778f652 100644 --- a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini +++ b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.01.01.hellenNA6.1881926127" + signature = "rusEFI 2022.01.01.hellenNA6.3980579986" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.01.01.hellenNA6.1881926127" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.01.01.hellenNA6.3980579986" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jan 01 21:09:00 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jan 01 22:22:43 UTC 2022 pageSize = 20996 page = 1 @@ -2097,174 +2097,76 @@ tps12Split = scalar, S16, 330, "%", 0.01, 0 accPedalSplit = scalar, S16, 332, "%", 0.01, 0 m_requested_pump = scalar, S16, 334, "deg", 0.02, 0 unused16 = scalar, S16, 336, "deg", 0.02, 0 -unusedAtTheEnd1 = scalar, U08, 338, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 339, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 340, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 341, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 342, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 343, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 344, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 345, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 346, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 347, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 348, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 349, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 350, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 351, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 352, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 353, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 354, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 355, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 356, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 357, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 358, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 359, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 360, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 361, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 362, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 363, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 364, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 365, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 366, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 367, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 368, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 369, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 370, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 371, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 372, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 373, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 374, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 375, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 376, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 377, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 378, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 379, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 380, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 381, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 382, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 383, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 384, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 385, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 386, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 387, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 388, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 389, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 390, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 391, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 392, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 393, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 394, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 395, "", 1, 0 -unusedAtTheEnd59 = scalar, U08, 396, "", 1, 0 -unusedAtTheEnd60 = scalar, U08, 397, "", 1, 0 -unusedAtTheEnd61 = scalar, U08, 398, "", 1, 0 -unusedAtTheEnd62 = scalar, U08, 399, "", 1, 0 -unusedAtTheEnd63 = scalar, U08, 400, "", 1, 0 -unusedAtTheEnd64 = scalar, U08, 401, "", 1, 0 -unusedAtTheEnd65 = scalar, U08, 402, "", 1, 0 -unusedAtTheEnd66 = scalar, U08, 403, "", 1, 0 -unusedAtTheEnd67 = scalar, U08, 404, "", 1, 0 -unusedAtTheEnd68 = scalar, U08, 405, "", 1, 0 -unusedAtTheEnd69 = scalar, U08, 406, "", 1, 0 -unusedAtTheEnd70 = scalar, U08, 407, "", 1, 0 -unusedAtTheEnd71 = scalar, U08, 408, "", 1, 0 -unusedAtTheEnd72 = scalar, U08, 409, "", 1, 0 -unusedAtTheEnd73 = scalar, U08, 410, "", 1, 0 -unusedAtTheEnd74 = scalar, U08, 411, "", 1, 0 -unusedAtTheEnd75 = scalar, U08, 412, "", 1, 0 -unusedAtTheEnd76 = scalar, U08, 413, "", 1, 0 -unusedAtTheEnd77 = scalar, U08, 414, "", 1, 0 -unusedAtTheEnd78 = scalar, U08, 415, "", 1, 0 -unusedAtTheEnd79 = scalar, U08, 416, "", 1, 0 -unusedAtTheEnd80 = scalar, U08, 417, "", 1, 0 -unusedAtTheEnd81 = scalar, U08, 418, "", 1, 0 -unusedAtTheEnd82 = scalar, U08, 419, "", 1, 0 -unusedAtTheEnd83 = scalar, U08, 420, "", 1, 0 -unusedAtTheEnd84 = scalar, U08, 421, "", 1, 0 -unusedAtTheEnd85 = scalar, U08, 422, "", 1, 0 -unusedAtTheEnd86 = scalar, U08, 423, "", 1, 0 -unusedAtTheEnd87 = scalar, U08, 424, "", 1, 0 -unusedAtTheEnd88 = scalar, U08, 425, "", 1, 0 -unusedAtTheEnd89 = scalar, U08, 426, "", 1, 0 -unusedAtTheEnd90 = scalar, U08, 427, "", 1, 0 -unusedAtTheEnd91 = scalar, U08, 428, "", 1, 0 -unusedAtTheEnd92 = scalar, U08, 429, "", 1, 0 -unusedAtTheEnd93 = scalar, U08, 430, "", 1, 0 -unusedAtTheEnd94 = scalar, U08, 431, "", 1, 0 -unusedAtTheEnd95 = scalar, U08, 432, "", 1, 0 -unusedAtTheEnd96 = scalar, U08, 433, "", 1, 0 -unusedAtTheEnd97 = scalar, U08, 434, "", 1, 0 -unusedAtTheEnd98 = scalar, U08, 435, "", 1, 0 -unusedAtTheEnd99 = scalar, U08, 436, "", 1, 0 -unusedAtTheEnd100 = scalar, U08, 437, "", 1, 0 -unusedAtTheEnd101 = scalar, U08, 438, "", 1, 0 -unusedAtTheEnd102 = scalar, U08, 439, "", 1, 0 -unusedAtTheEnd103 = scalar, U08, 440, "", 1, 0 -unusedAtTheEnd104 = scalar, U08, 441, "", 1, 0 -unusedAtTheEnd105 = scalar, U08, 442, "", 1, 0 -unusedAtTheEnd106 = scalar, U08, 443, "", 1, 0 -unusedAtTheEnd107 = scalar, U08, 444, "", 1, 0 -unusedAtTheEnd108 = scalar, U08, 445, "", 1, 0 -unusedAtTheEnd109 = scalar, U08, 446, "", 1, 0 -unusedAtTheEnd110 = scalar, U08, 447, "", 1, 0 -unusedAtTheEnd111 = scalar, U08, 448, "", 1, 0 -unusedAtTheEnd112 = scalar, U08, 449, "", 1, 0 -unusedAtTheEnd113 = scalar, U08, 450, "", 1, 0 -unusedAtTheEnd114 = scalar, U08, 451, "", 1, 0 -unusedAtTheEnd115 = scalar, U08, 452, "", 1, 0 -unusedAtTheEnd116 = scalar, U08, 453, "", 1, 0 -unusedAtTheEnd117 = scalar, U08, 454, "", 1, 0 -unusedAtTheEnd118 = scalar, U08, 455, "", 1, 0 -unusedAtTheEnd119 = scalar, U08, 456, "", 1, 0 -unusedAtTheEnd120 = scalar, U08, 457, "", 1, 0 -unusedAtTheEnd121 = scalar, U08, 458, "", 1, 0 -unusedAtTheEnd122 = scalar, U08, 459, "", 1, 0 -unusedAtTheEnd123 = scalar, U08, 460, "", 1, 0 -unusedAtTheEnd124 = scalar, U08, 461, "", 1, 0 -unusedAtTheEnd125 = scalar, U08, 462, "", 1, 0 -unusedAtTheEnd126 = scalar, U08, 463, "", 1, 0 -unusedAtTheEnd127 = scalar, U08, 464, "", 1, 0 -unusedAtTheEnd128 = scalar, U08, 465, "", 1, 0 -unusedAtTheEnd129 = scalar, U08, 466, "", 1, 0 -unusedAtTheEnd130 = scalar, U08, 467, "", 1, 0 -unusedAtTheEnd131 = scalar, U08, 468, "", 1, 0 -unusedAtTheEnd132 = scalar, U08, 469, "", 1, 0 -launchSpeedCondition = bits, U32, 470, [0:0] -launchRpmCondition = bits, U32, 470, [1:1] -launchTpsCondition = bits, U32, 470, [2:2] -launchActivateSwitchCondition = bits, U32, 470, [3:3] -launchIsLaunchCondition = bits, U32, 470, [4:4] -launchCombinedConditions = bits, U32, 470, [5:5] -launchActivatePinState = bits, U32, 470, [6:6] -unusedBit_173_7 = bits, U32, 470, [7:7] -unusedBit_173_8 = bits, U32, 470, [8:8] -unusedBit_173_9 = bits, U32, 470, [9:9] -unusedBit_173_10 = bits, U32, 470, [10:10] -unusedBit_173_11 = bits, U32, 470, [11:11] -unusedBit_173_12 = bits, U32, 470, [12:12] -unusedBit_173_13 = bits, U32, 470, [13:13] -unusedBit_173_14 = bits, U32, 470, [14:14] -unusedBit_173_15 = bits, U32, 470, [15:15] -unusedBit_173_16 = bits, U32, 470, [16:16] -unusedBit_173_17 = bits, U32, 470, [17:17] -unusedBit_173_18 = bits, U32, 470, [18:18] -unusedBit_173_19 = bits, U32, 470, [19:19] -unusedBit_173_20 = bits, U32, 470, [20:20] -unusedBit_173_21 = bits, U32, 470, [21:21] -unusedBit_173_22 = bits, U32, 470, [22:22] -unusedBit_173_23 = bits, U32, 470, [23:23] -unusedBit_173_24 = bits, U32, 470, [24:24] -unusedBit_173_25 = bits, U32, 470, [25:25] -unusedBit_173_26 = bits, U32, 470, [26:26] -unusedBit_173_27 = bits, U32, 470, [27:27] -unusedBit_173_28 = bits, U32, 470, [28:28] -unusedBit_173_29 = bits, U32, 470, [29:29] -unusedBit_173_30 = bits, U32, 470, [30:30] -unusedBit_173_31 = bits, U32, 470, [31:31] -TEMPLOG_MAP_AT_CYCLE_COUNT = scalar, U08, 474, "", 1, 0 -unused11 = scalar, U08, 475, "", 1, 0 -unused11 = scalar, U08, 475, "", 1, 0 -unused11 = scalar, U08, 475, "", 1, 0 +alignmentFill_at_338 = array, U08, 338, [2], "units", 1, 0 +fuel_requested_percent = scalar, F32, 340, "v", 1, 0 +fuel_requested_percent_pi = scalar, F32, 344, "v", 1, 0 +m_I_sum_percent = scalar, F32, 348, "v", 1, 0 +m_pressureTarget_kPa = scalar, F32, 352, "v", 1, 0 +unusedAtTheEnd1 = scalar, S32, 356, "", 1, 0 +unusedAtTheEnd2 = scalar, S32, 360, "", 1, 0 +unusedAtTheEnd3 = scalar, S32, 364, "", 1, 0 +unusedAtTheEnd4 = scalar, S32, 368, "", 1, 0 +unusedAtTheEnd5 = scalar, S32, 372, "", 1, 0 +unusedAtTheEnd6 = scalar, S32, 376, "", 1, 0 +unusedAtTheEnd7 = scalar, S32, 380, "", 1, 0 +unusedAtTheEnd8 = scalar, S32, 384, "", 1, 0 +unusedAtTheEnd9 = scalar, S32, 388, "", 1, 0 +unusedAtTheEnd10 = scalar, S32, 392, "", 1, 0 +unusedAtTheEnd11 = scalar, S32, 396, "", 1, 0 +unusedAtTheEnd12 = scalar, S32, 400, "", 1, 0 +unusedAtTheEnd13 = scalar, S32, 404, "", 1, 0 +unusedAtTheEnd14 = scalar, S32, 408, "", 1, 0 +unusedAtTheEnd15 = scalar, S32, 412, "", 1, 0 +unusedAtTheEnd16 = scalar, S32, 416, "", 1, 0 +unusedAtTheEnd17 = scalar, S32, 420, "", 1, 0 +unusedAtTheEnd18 = scalar, S32, 424, "", 1, 0 +unusedAtTheEnd19 = scalar, S32, 428, "", 1, 0 +unusedAtTheEnd20 = scalar, S32, 432, "", 1, 0 +unusedAtTheEnd21 = scalar, S32, 436, "", 1, 0 +unusedAtTheEnd22 = scalar, S32, 440, "", 1, 0 +unusedAtTheEnd23 = scalar, S32, 444, "", 1, 0 +unusedAtTheEnd24 = scalar, S32, 448, "", 1, 0 +unusedAtTheEnd25 = scalar, S32, 452, "", 1, 0 +unusedAtTheEnd26 = scalar, S32, 456, "", 1, 0 +unusedAtTheEnd27 = scalar, S32, 460, "", 1, 0 +unusedAtTheEnd28 = scalar, S32, 464, "", 1, 0 +launchSpeedCondition = bits, U32, 468, [0:0] +launchRpmCondition = bits, U32, 468, [1:1] +launchTpsCondition = bits, U32, 468, [2:2] +launchActivateSwitchCondition = bits, U32, 468, [3:3] +launchIsLaunchCondition = bits, U32, 468, [4:4] +launchCombinedConditions = bits, U32, 468, [5:5] +launchActivatePinState = bits, U32, 468, [6:6] +unusedBit_178_7 = bits, U32, 468, [7:7] +unusedBit_178_8 = bits, U32, 468, [8:8] +unusedBit_178_9 = bits, U32, 468, [9:9] +unusedBit_178_10 = bits, U32, 468, [10:10] +unusedBit_178_11 = bits, U32, 468, [11:11] +unusedBit_178_12 = bits, U32, 468, [12:12] +unusedBit_178_13 = bits, U32, 468, [13:13] +unusedBit_178_14 = bits, U32, 468, [14:14] +unusedBit_178_15 = bits, U32, 468, [15:15] +unusedBit_178_16 = bits, U32, 468, [16:16] +unusedBit_178_17 = bits, U32, 468, [17:17] +unusedBit_178_18 = bits, U32, 468, [18:18] +unusedBit_178_19 = bits, U32, 468, [19:19] +unusedBit_178_20 = bits, U32, 468, [20:20] +unusedBit_178_21 = bits, U32, 468, [21:21] +unusedBit_178_22 = bits, U32, 468, [22:22] +unusedBit_178_23 = bits, U32, 468, [23:23] +unusedBit_178_24 = bits, U32, 468, [24:24] +unusedBit_178_25 = bits, U32, 468, [25:25] +unusedBit_178_26 = bits, U32, 468, [26:26] +unusedBit_178_27 = bits, U32, 468, [27:27] +unusedBit_178_28 = bits, U32, 468, [28:28] +unusedBit_178_29 = bits, U32, 468, [29:29] +unusedBit_178_30 = bits, U32, 468, [30:30] +unusedBit_178_31 = bits, U32, 468, [31:31] +TEMPLOG_MAP_AT_CYCLE_COUNT = scalar, U08, 472, "", 1, 0 +unused11 = scalar, U08, 473, "", 1, 0 +unused11 = scalar, U08, 473, "", 1, 0 +unused11 = scalar, U08, 473, "", 1, 0 +alignmentFill_at_474 = array, U08, 474, [2], "units", 1, 0 TEMPLOG_MAP_AT_SPECIAL_POINT = scalar, F32, 476, "", 1, 0 TEMPLOG_MAP_AT_DIFF = scalar, F32, 480, "", 1, 0 vvtSyncGapRatio = scalar, F32, 484, "", 1, 0 @@ -3102,7 +3004,11 @@ TEMPLOG_MAP_AT_DIFFGauge = TEMPLOG_MAP_AT_DIFF,"TEMPLOG_MAP_AT_DIFF", "", -10000 TEMPLOG_MAP_AT_CYCLE_COUNTGauge = TEMPLOG_MAP_AT_CYCLE_COUNT,"TEMPLOG_MAP_AT_CYCLE_COUNT", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 gaugeCategory = GDI -m_requested_pumpGauge = m_requested_pump,"Pump Angle", "deg", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +m_requested_pumpGauge = m_requested_pump,"DI: Pump Angle", "deg", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +fuel_requested_percentGauge = fuel_requested_percent,"DI: fuel_requested_percent", "v", 0.0,100.0, 0.0,100.0, 0.0,100.0, 0,0 +fuel_requested_percent_piGauge = fuel_requested_percent_pi,"DI: fuel_requested_percent_pi", "v", 0.0,100.0, 0.0,100.0, 0.0,100.0, 0,0 +m_I_sum_percentGauge = m_I_sum_percent,"DI: m_I_sum_percent", "v", 0.0,100.0, 0.0,100.0, 0.0,100.0, 0,0 +m_pressureTarget_kPaGauge = m_pressureTarget_kPa,"DI: m_pressureTarget_kPa", "v", 0.0,100.0, 0.0,100.0, 0.0,100.0, 0,0 highFuelPressureGauge = highFuelPressure, "Fuel pressure (high)", "bar", 0, 200, 0, 0, 200, 200, 1, 0 gaugeCategory = Sensors - Extra 2 @@ -3581,7 +3487,11 @@ entry = tps1Split, "tps1Split", float, "%.3f" entry = tps2Split, "tps2Split", float, "%.3f" entry = tps12Split, "tps12Split", float, "%.3f" entry = accPedalSplit, "accPedalSplit", float, "%.3f" -entry = m_requested_pump, "Pump Angle", float, "%.3f" +entry = m_requested_pump, "DI: Pump Angle", float, "%.3f" +entry = fuel_requested_percent, "DI: fuel_requested_percent", float, "%.3f" +entry = fuel_requested_percent_pi, "DI: fuel_requested_percent_pi", float, "%.3f" +entry = m_I_sum_percent, "DI: m_I_sum_percent", float, "%.3f" +entry = m_pressureTarget_kPa, "DI: m_pressureTarget_kPa", float, "%.3f" entry = launchSpeedCondition, "launchSpeedCondition", int, "%d" entry = launchRpmCondition, "launchRpmCondition", int, "%d" entry = launchTpsCondition, "launchTpsCondition", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini b/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini index f045f885ee..be908e11e7 100644 --- a/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini +++ b/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.01.01.hellenNA8_96.3526910736" + signature = "rusEFI 2022.01.01.hellenNA8_96.1330732653" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.01.01.hellenNA8_96.3526910736" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.01.01.hellenNA8_96.1330732653" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jan 01 21:09:04 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jan 01 22:22:45 UTC 2022 pageSize = 20996 page = 1 @@ -2097,174 +2097,76 @@ tps12Split = scalar, S16, 330, "%", 0.01, 0 accPedalSplit = scalar, S16, 332, "%", 0.01, 0 m_requested_pump = scalar, S16, 334, "deg", 0.02, 0 unused16 = scalar, S16, 336, "deg", 0.02, 0 -unusedAtTheEnd1 = scalar, U08, 338, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 339, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 340, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 341, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 342, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 343, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 344, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 345, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 346, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 347, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 348, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 349, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 350, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 351, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 352, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 353, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 354, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 355, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 356, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 357, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 358, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 359, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 360, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 361, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 362, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 363, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 364, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 365, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 366, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 367, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 368, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 369, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 370, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 371, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 372, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 373, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 374, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 375, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 376, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 377, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 378, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 379, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 380, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 381, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 382, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 383, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 384, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 385, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 386, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 387, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 388, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 389, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 390, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 391, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 392, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 393, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 394, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 395, "", 1, 0 -unusedAtTheEnd59 = scalar, U08, 396, "", 1, 0 -unusedAtTheEnd60 = scalar, U08, 397, "", 1, 0 -unusedAtTheEnd61 = scalar, U08, 398, "", 1, 0 -unusedAtTheEnd62 = scalar, U08, 399, "", 1, 0 -unusedAtTheEnd63 = scalar, U08, 400, "", 1, 0 -unusedAtTheEnd64 = scalar, U08, 401, "", 1, 0 -unusedAtTheEnd65 = scalar, U08, 402, "", 1, 0 -unusedAtTheEnd66 = scalar, U08, 403, "", 1, 0 -unusedAtTheEnd67 = scalar, U08, 404, "", 1, 0 -unusedAtTheEnd68 = scalar, U08, 405, "", 1, 0 -unusedAtTheEnd69 = scalar, U08, 406, "", 1, 0 -unusedAtTheEnd70 = scalar, U08, 407, "", 1, 0 -unusedAtTheEnd71 = scalar, U08, 408, "", 1, 0 -unusedAtTheEnd72 = scalar, U08, 409, "", 1, 0 -unusedAtTheEnd73 = scalar, U08, 410, "", 1, 0 -unusedAtTheEnd74 = scalar, U08, 411, "", 1, 0 -unusedAtTheEnd75 = scalar, U08, 412, "", 1, 0 -unusedAtTheEnd76 = scalar, U08, 413, "", 1, 0 -unusedAtTheEnd77 = scalar, U08, 414, "", 1, 0 -unusedAtTheEnd78 = scalar, U08, 415, "", 1, 0 -unusedAtTheEnd79 = scalar, U08, 416, "", 1, 0 -unusedAtTheEnd80 = scalar, U08, 417, "", 1, 0 -unusedAtTheEnd81 = scalar, U08, 418, "", 1, 0 -unusedAtTheEnd82 = scalar, U08, 419, "", 1, 0 -unusedAtTheEnd83 = scalar, U08, 420, "", 1, 0 -unusedAtTheEnd84 = scalar, U08, 421, "", 1, 0 -unusedAtTheEnd85 = scalar, U08, 422, "", 1, 0 -unusedAtTheEnd86 = scalar, U08, 423, "", 1, 0 -unusedAtTheEnd87 = scalar, U08, 424, "", 1, 0 -unusedAtTheEnd88 = scalar, U08, 425, "", 1, 0 -unusedAtTheEnd89 = scalar, U08, 426, "", 1, 0 -unusedAtTheEnd90 = scalar, U08, 427, "", 1, 0 -unusedAtTheEnd91 = scalar, U08, 428, "", 1, 0 -unusedAtTheEnd92 = scalar, U08, 429, "", 1, 0 -unusedAtTheEnd93 = scalar, U08, 430, "", 1, 0 -unusedAtTheEnd94 = scalar, U08, 431, "", 1, 0 -unusedAtTheEnd95 = scalar, U08, 432, "", 1, 0 -unusedAtTheEnd96 = scalar, U08, 433, "", 1, 0 -unusedAtTheEnd97 = scalar, U08, 434, "", 1, 0 -unusedAtTheEnd98 = scalar, U08, 435, "", 1, 0 -unusedAtTheEnd99 = scalar, U08, 436, "", 1, 0 -unusedAtTheEnd100 = scalar, U08, 437, "", 1, 0 -unusedAtTheEnd101 = scalar, U08, 438, "", 1, 0 -unusedAtTheEnd102 = scalar, U08, 439, "", 1, 0 -unusedAtTheEnd103 = scalar, U08, 440, "", 1, 0 -unusedAtTheEnd104 = scalar, U08, 441, "", 1, 0 -unusedAtTheEnd105 = scalar, U08, 442, "", 1, 0 -unusedAtTheEnd106 = scalar, U08, 443, "", 1, 0 -unusedAtTheEnd107 = scalar, U08, 444, "", 1, 0 -unusedAtTheEnd108 = scalar, U08, 445, "", 1, 0 -unusedAtTheEnd109 = scalar, U08, 446, "", 1, 0 -unusedAtTheEnd110 = scalar, U08, 447, "", 1, 0 -unusedAtTheEnd111 = scalar, U08, 448, "", 1, 0 -unusedAtTheEnd112 = scalar, U08, 449, "", 1, 0 -unusedAtTheEnd113 = scalar, U08, 450, "", 1, 0 -unusedAtTheEnd114 = scalar, U08, 451, "", 1, 0 -unusedAtTheEnd115 = scalar, U08, 452, "", 1, 0 -unusedAtTheEnd116 = scalar, U08, 453, "", 1, 0 -unusedAtTheEnd117 = scalar, U08, 454, "", 1, 0 -unusedAtTheEnd118 = scalar, U08, 455, "", 1, 0 -unusedAtTheEnd119 = scalar, U08, 456, "", 1, 0 -unusedAtTheEnd120 = scalar, U08, 457, "", 1, 0 -unusedAtTheEnd121 = scalar, U08, 458, "", 1, 0 -unusedAtTheEnd122 = scalar, U08, 459, "", 1, 0 -unusedAtTheEnd123 = scalar, U08, 460, "", 1, 0 -unusedAtTheEnd124 = scalar, U08, 461, "", 1, 0 -unusedAtTheEnd125 = scalar, U08, 462, "", 1, 0 -unusedAtTheEnd126 = scalar, U08, 463, "", 1, 0 -unusedAtTheEnd127 = scalar, U08, 464, "", 1, 0 -unusedAtTheEnd128 = scalar, U08, 465, "", 1, 0 -unusedAtTheEnd129 = scalar, U08, 466, "", 1, 0 -unusedAtTheEnd130 = scalar, U08, 467, "", 1, 0 -unusedAtTheEnd131 = scalar, U08, 468, "", 1, 0 -unusedAtTheEnd132 = scalar, U08, 469, "", 1, 0 -launchSpeedCondition = bits, U32, 470, [0:0] -launchRpmCondition = bits, U32, 470, [1:1] -launchTpsCondition = bits, U32, 470, [2:2] -launchActivateSwitchCondition = bits, U32, 470, [3:3] -launchIsLaunchCondition = bits, U32, 470, [4:4] -launchCombinedConditions = bits, U32, 470, [5:5] -launchActivatePinState = bits, U32, 470, [6:6] -unusedBit_173_7 = bits, U32, 470, [7:7] -unusedBit_173_8 = bits, U32, 470, [8:8] -unusedBit_173_9 = bits, U32, 470, [9:9] -unusedBit_173_10 = bits, U32, 470, [10:10] -unusedBit_173_11 = bits, U32, 470, [11:11] -unusedBit_173_12 = bits, U32, 470, [12:12] -unusedBit_173_13 = bits, U32, 470, [13:13] -unusedBit_173_14 = bits, U32, 470, [14:14] -unusedBit_173_15 = bits, U32, 470, [15:15] -unusedBit_173_16 = bits, U32, 470, [16:16] -unusedBit_173_17 = bits, U32, 470, [17:17] -unusedBit_173_18 = bits, U32, 470, [18:18] -unusedBit_173_19 = bits, U32, 470, [19:19] -unusedBit_173_20 = bits, U32, 470, [20:20] -unusedBit_173_21 = bits, U32, 470, [21:21] -unusedBit_173_22 = bits, U32, 470, [22:22] -unusedBit_173_23 = bits, U32, 470, [23:23] -unusedBit_173_24 = bits, U32, 470, [24:24] -unusedBit_173_25 = bits, U32, 470, [25:25] -unusedBit_173_26 = bits, U32, 470, [26:26] -unusedBit_173_27 = bits, U32, 470, [27:27] -unusedBit_173_28 = bits, U32, 470, [28:28] -unusedBit_173_29 = bits, U32, 470, [29:29] -unusedBit_173_30 = bits, U32, 470, [30:30] -unusedBit_173_31 = bits, U32, 470, [31:31] -TEMPLOG_MAP_AT_CYCLE_COUNT = scalar, U08, 474, "", 1, 0 -unused11 = scalar, U08, 475, "", 1, 0 -unused11 = scalar, U08, 475, "", 1, 0 -unused11 = scalar, U08, 475, "", 1, 0 +alignmentFill_at_338 = array, U08, 338, [2], "units", 1, 0 +fuel_requested_percent = scalar, F32, 340, "v", 1, 0 +fuel_requested_percent_pi = scalar, F32, 344, "v", 1, 0 +m_I_sum_percent = scalar, F32, 348, "v", 1, 0 +m_pressureTarget_kPa = scalar, F32, 352, "v", 1, 0 +unusedAtTheEnd1 = scalar, S32, 356, "", 1, 0 +unusedAtTheEnd2 = scalar, S32, 360, "", 1, 0 +unusedAtTheEnd3 = scalar, S32, 364, "", 1, 0 +unusedAtTheEnd4 = scalar, S32, 368, "", 1, 0 +unusedAtTheEnd5 = scalar, S32, 372, "", 1, 0 +unusedAtTheEnd6 = scalar, S32, 376, "", 1, 0 +unusedAtTheEnd7 = scalar, S32, 380, "", 1, 0 +unusedAtTheEnd8 = scalar, S32, 384, "", 1, 0 +unusedAtTheEnd9 = scalar, S32, 388, "", 1, 0 +unusedAtTheEnd10 = scalar, S32, 392, "", 1, 0 +unusedAtTheEnd11 = scalar, S32, 396, "", 1, 0 +unusedAtTheEnd12 = scalar, S32, 400, "", 1, 0 +unusedAtTheEnd13 = scalar, S32, 404, "", 1, 0 +unusedAtTheEnd14 = scalar, S32, 408, "", 1, 0 +unusedAtTheEnd15 = scalar, S32, 412, "", 1, 0 +unusedAtTheEnd16 = scalar, S32, 416, "", 1, 0 +unusedAtTheEnd17 = scalar, S32, 420, "", 1, 0 +unusedAtTheEnd18 = scalar, S32, 424, "", 1, 0 +unusedAtTheEnd19 = scalar, S32, 428, "", 1, 0 +unusedAtTheEnd20 = scalar, S32, 432, "", 1, 0 +unusedAtTheEnd21 = scalar, S32, 436, "", 1, 0 +unusedAtTheEnd22 = scalar, S32, 440, "", 1, 0 +unusedAtTheEnd23 = scalar, S32, 444, "", 1, 0 +unusedAtTheEnd24 = scalar, S32, 448, "", 1, 0 +unusedAtTheEnd25 = scalar, S32, 452, "", 1, 0 +unusedAtTheEnd26 = scalar, S32, 456, "", 1, 0 +unusedAtTheEnd27 = scalar, S32, 460, "", 1, 0 +unusedAtTheEnd28 = scalar, S32, 464, "", 1, 0 +launchSpeedCondition = bits, U32, 468, [0:0] +launchRpmCondition = bits, U32, 468, [1:1] +launchTpsCondition = bits, U32, 468, [2:2] +launchActivateSwitchCondition = bits, U32, 468, [3:3] +launchIsLaunchCondition = bits, U32, 468, [4:4] +launchCombinedConditions = bits, U32, 468, [5:5] +launchActivatePinState = bits, U32, 468, [6:6] +unusedBit_178_7 = bits, U32, 468, [7:7] +unusedBit_178_8 = bits, U32, 468, [8:8] +unusedBit_178_9 = bits, U32, 468, [9:9] +unusedBit_178_10 = bits, U32, 468, [10:10] +unusedBit_178_11 = bits, U32, 468, [11:11] +unusedBit_178_12 = bits, U32, 468, [12:12] +unusedBit_178_13 = bits, U32, 468, [13:13] +unusedBit_178_14 = bits, U32, 468, [14:14] +unusedBit_178_15 = bits, U32, 468, [15:15] +unusedBit_178_16 = bits, U32, 468, [16:16] +unusedBit_178_17 = bits, U32, 468, [17:17] +unusedBit_178_18 = bits, U32, 468, [18:18] +unusedBit_178_19 = bits, U32, 468, [19:19] +unusedBit_178_20 = bits, U32, 468, [20:20] +unusedBit_178_21 = bits, U32, 468, [21:21] +unusedBit_178_22 = bits, U32, 468, [22:22] +unusedBit_178_23 = bits, U32, 468, [23:23] +unusedBit_178_24 = bits, U32, 468, [24:24] +unusedBit_178_25 = bits, U32, 468, [25:25] +unusedBit_178_26 = bits, U32, 468, [26:26] +unusedBit_178_27 = bits, U32, 468, [27:27] +unusedBit_178_28 = bits, U32, 468, [28:28] +unusedBit_178_29 = bits, U32, 468, [29:29] +unusedBit_178_30 = bits, U32, 468, [30:30] +unusedBit_178_31 = bits, U32, 468, [31:31] +TEMPLOG_MAP_AT_CYCLE_COUNT = scalar, U08, 472, "", 1, 0 +unused11 = scalar, U08, 473, "", 1, 0 +unused11 = scalar, U08, 473, "", 1, 0 +unused11 = scalar, U08, 473, "", 1, 0 +alignmentFill_at_474 = array, U08, 474, [2], "units", 1, 0 TEMPLOG_MAP_AT_SPECIAL_POINT = scalar, F32, 476, "", 1, 0 TEMPLOG_MAP_AT_DIFF = scalar, F32, 480, "", 1, 0 vvtSyncGapRatio = scalar, F32, 484, "", 1, 0 @@ -3102,7 +3004,11 @@ TEMPLOG_MAP_AT_DIFFGauge = TEMPLOG_MAP_AT_DIFF,"TEMPLOG_MAP_AT_DIFF", "", -10000 TEMPLOG_MAP_AT_CYCLE_COUNTGauge = TEMPLOG_MAP_AT_CYCLE_COUNT,"TEMPLOG_MAP_AT_CYCLE_COUNT", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 gaugeCategory = GDI -m_requested_pumpGauge = m_requested_pump,"Pump Angle", "deg", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +m_requested_pumpGauge = m_requested_pump,"DI: Pump Angle", "deg", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +fuel_requested_percentGauge = fuel_requested_percent,"DI: fuel_requested_percent", "v", 0.0,100.0, 0.0,100.0, 0.0,100.0, 0,0 +fuel_requested_percent_piGauge = fuel_requested_percent_pi,"DI: fuel_requested_percent_pi", "v", 0.0,100.0, 0.0,100.0, 0.0,100.0, 0,0 +m_I_sum_percentGauge = m_I_sum_percent,"DI: m_I_sum_percent", "v", 0.0,100.0, 0.0,100.0, 0.0,100.0, 0,0 +m_pressureTarget_kPaGauge = m_pressureTarget_kPa,"DI: m_pressureTarget_kPa", "v", 0.0,100.0, 0.0,100.0, 0.0,100.0, 0,0 highFuelPressureGauge = highFuelPressure, "Fuel pressure (high)", "bar", 0, 200, 0, 0, 200, 200, 1, 0 gaugeCategory = Sensors - Extra 2 @@ -3581,7 +3487,11 @@ entry = tps1Split, "tps1Split", float, "%.3f" entry = tps2Split, "tps2Split", float, "%.3f" entry = tps12Split, "tps12Split", float, "%.3f" entry = accPedalSplit, "accPedalSplit", float, "%.3f" -entry = m_requested_pump, "Pump Angle", float, "%.3f" +entry = m_requested_pump, "DI: Pump Angle", float, "%.3f" +entry = fuel_requested_percent, "DI: fuel_requested_percent", float, "%.3f" +entry = fuel_requested_percent_pi, "DI: fuel_requested_percent_pi", float, "%.3f" +entry = m_I_sum_percent, "DI: m_I_sum_percent", float, "%.3f" +entry = m_pressureTarget_kPa, "DI: m_pressureTarget_kPa", float, "%.3f" entry = launchSpeedCondition, "launchSpeedCondition", int, "%d" entry = launchRpmCondition, "launchRpmCondition", int, "%d" entry = launchTpsCondition, "launchTpsCondition", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini b/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini index 3f1890cbaf..f4c4d09639 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.01.01.hellen_cypress.1021528315" + signature = "rusEFI 2022.01.01.hellen_cypress.2710205830" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.01.01.hellen_cypress.1021528315" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.01.01.hellen_cypress.2710205830" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; 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 Jan 01 21:09:38 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Sat Jan 01 22:23:13 UTC 2022 pageSize = 20996 page = 1 @@ -2097,174 +2097,76 @@ tps12Split = scalar, S16, 330, "%", 0.01, 0 accPedalSplit = scalar, S16, 332, "%", 0.01, 0 m_requested_pump = scalar, S16, 334, "deg", 0.02, 0 unused16 = scalar, S16, 336, "deg", 0.02, 0 -unusedAtTheEnd1 = scalar, U08, 338, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 339, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 340, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 341, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 342, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 343, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 344, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 345, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 346, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 347, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 348, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 349, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 350, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 351, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 352, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 353, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 354, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 355, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 356, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 357, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 358, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 359, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 360, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 361, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 362, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 363, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 364, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 365, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 366, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 367, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 368, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 369, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 370, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 371, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 372, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 373, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 374, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 375, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 376, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 377, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 378, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 379, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 380, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 381, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 382, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 383, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 384, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 385, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 386, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 387, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 388, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 389, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 390, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 391, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 392, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 393, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 394, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 395, "", 1, 0 -unusedAtTheEnd59 = scalar, U08, 396, "", 1, 0 -unusedAtTheEnd60 = scalar, U08, 397, "", 1, 0 -unusedAtTheEnd61 = scalar, U08, 398, "", 1, 0 -unusedAtTheEnd62 = scalar, U08, 399, "", 1, 0 -unusedAtTheEnd63 = scalar, U08, 400, "", 1, 0 -unusedAtTheEnd64 = scalar, U08, 401, "", 1, 0 -unusedAtTheEnd65 = scalar, U08, 402, "", 1, 0 -unusedAtTheEnd66 = scalar, U08, 403, "", 1, 0 -unusedAtTheEnd67 = scalar, U08, 404, "", 1, 0 -unusedAtTheEnd68 = scalar, U08, 405, "", 1, 0 -unusedAtTheEnd69 = scalar, U08, 406, "", 1, 0 -unusedAtTheEnd70 = scalar, U08, 407, "", 1, 0 -unusedAtTheEnd71 = scalar, U08, 408, "", 1, 0 -unusedAtTheEnd72 = scalar, U08, 409, "", 1, 0 -unusedAtTheEnd73 = scalar, U08, 410, "", 1, 0 -unusedAtTheEnd74 = scalar, U08, 411, "", 1, 0 -unusedAtTheEnd75 = scalar, U08, 412, "", 1, 0 -unusedAtTheEnd76 = scalar, U08, 413, "", 1, 0 -unusedAtTheEnd77 = scalar, U08, 414, "", 1, 0 -unusedAtTheEnd78 = scalar, U08, 415, "", 1, 0 -unusedAtTheEnd79 = scalar, U08, 416, "", 1, 0 -unusedAtTheEnd80 = scalar, U08, 417, "", 1, 0 -unusedAtTheEnd81 = scalar, U08, 418, "", 1, 0 -unusedAtTheEnd82 = scalar, U08, 419, "", 1, 0 -unusedAtTheEnd83 = scalar, U08, 420, "", 1, 0 -unusedAtTheEnd84 = scalar, U08, 421, "", 1, 0 -unusedAtTheEnd85 = scalar, U08, 422, "", 1, 0 -unusedAtTheEnd86 = scalar, U08, 423, "", 1, 0 -unusedAtTheEnd87 = scalar, U08, 424, "", 1, 0 -unusedAtTheEnd88 = scalar, U08, 425, "", 1, 0 -unusedAtTheEnd89 = scalar, U08, 426, "", 1, 0 -unusedAtTheEnd90 = scalar, U08, 427, "", 1, 0 -unusedAtTheEnd91 = scalar, U08, 428, "", 1, 0 -unusedAtTheEnd92 = scalar, U08, 429, "", 1, 0 -unusedAtTheEnd93 = scalar, U08, 430, "", 1, 0 -unusedAtTheEnd94 = scalar, U08, 431, "", 1, 0 -unusedAtTheEnd95 = scalar, U08, 432, "", 1, 0 -unusedAtTheEnd96 = scalar, U08, 433, "", 1, 0 -unusedAtTheEnd97 = scalar, U08, 434, "", 1, 0 -unusedAtTheEnd98 = scalar, U08, 435, "", 1, 0 -unusedAtTheEnd99 = scalar, U08, 436, "", 1, 0 -unusedAtTheEnd100 = scalar, U08, 437, "", 1, 0 -unusedAtTheEnd101 = scalar, U08, 438, "", 1, 0 -unusedAtTheEnd102 = scalar, U08, 439, "", 1, 0 -unusedAtTheEnd103 = scalar, U08, 440, "", 1, 0 -unusedAtTheEnd104 = scalar, U08, 441, "", 1, 0 -unusedAtTheEnd105 = scalar, U08, 442, "", 1, 0 -unusedAtTheEnd106 = scalar, U08, 443, "", 1, 0 -unusedAtTheEnd107 = scalar, U08, 444, "", 1, 0 -unusedAtTheEnd108 = scalar, U08, 445, "", 1, 0 -unusedAtTheEnd109 = scalar, U08, 446, "", 1, 0 -unusedAtTheEnd110 = scalar, U08, 447, "", 1, 0 -unusedAtTheEnd111 = scalar, U08, 448, "", 1, 0 -unusedAtTheEnd112 = scalar, U08, 449, "", 1, 0 -unusedAtTheEnd113 = scalar, U08, 450, "", 1, 0 -unusedAtTheEnd114 = scalar, U08, 451, "", 1, 0 -unusedAtTheEnd115 = scalar, U08, 452, "", 1, 0 -unusedAtTheEnd116 = scalar, U08, 453, "", 1, 0 -unusedAtTheEnd117 = scalar, U08, 454, "", 1, 0 -unusedAtTheEnd118 = scalar, U08, 455, "", 1, 0 -unusedAtTheEnd119 = scalar, U08, 456, "", 1, 0 -unusedAtTheEnd120 = scalar, U08, 457, "", 1, 0 -unusedAtTheEnd121 = scalar, U08, 458, "", 1, 0 -unusedAtTheEnd122 = scalar, U08, 459, "", 1, 0 -unusedAtTheEnd123 = scalar, U08, 460, "", 1, 0 -unusedAtTheEnd124 = scalar, U08, 461, "", 1, 0 -unusedAtTheEnd125 = scalar, U08, 462, "", 1, 0 -unusedAtTheEnd126 = scalar, U08, 463, "", 1, 0 -unusedAtTheEnd127 = scalar, U08, 464, "", 1, 0 -unusedAtTheEnd128 = scalar, U08, 465, "", 1, 0 -unusedAtTheEnd129 = scalar, U08, 466, "", 1, 0 -unusedAtTheEnd130 = scalar, U08, 467, "", 1, 0 -unusedAtTheEnd131 = scalar, U08, 468, "", 1, 0 -unusedAtTheEnd132 = scalar, U08, 469, "", 1, 0 -launchSpeedCondition = bits, U32, 470, [0:0] -launchRpmCondition = bits, U32, 470, [1:1] -launchTpsCondition = bits, U32, 470, [2:2] -launchActivateSwitchCondition = bits, U32, 470, [3:3] -launchIsLaunchCondition = bits, U32, 470, [4:4] -launchCombinedConditions = bits, U32, 470, [5:5] -launchActivatePinState = bits, U32, 470, [6:6] -unusedBit_173_7 = bits, U32, 470, [7:7] -unusedBit_173_8 = bits, U32, 470, [8:8] -unusedBit_173_9 = bits, U32, 470, [9:9] -unusedBit_173_10 = bits, U32, 470, [10:10] -unusedBit_173_11 = bits, U32, 470, [11:11] -unusedBit_173_12 = bits, U32, 470, [12:12] -unusedBit_173_13 = bits, U32, 470, [13:13] -unusedBit_173_14 = bits, U32, 470, [14:14] -unusedBit_173_15 = bits, U32, 470, [15:15] -unusedBit_173_16 = bits, U32, 470, [16:16] -unusedBit_173_17 = bits, U32, 470, [17:17] -unusedBit_173_18 = bits, U32, 470, [18:18] -unusedBit_173_19 = bits, U32, 470, [19:19] -unusedBit_173_20 = bits, U32, 470, [20:20] -unusedBit_173_21 = bits, U32, 470, [21:21] -unusedBit_173_22 = bits, U32, 470, [22:22] -unusedBit_173_23 = bits, U32, 470, [23:23] -unusedBit_173_24 = bits, U32, 470, [24:24] -unusedBit_173_25 = bits, U32, 470, [25:25] -unusedBit_173_26 = bits, U32, 470, [26:26] -unusedBit_173_27 = bits, U32, 470, [27:27] -unusedBit_173_28 = bits, U32, 470, [28:28] -unusedBit_173_29 = bits, U32, 470, [29:29] -unusedBit_173_30 = bits, U32, 470, [30:30] -unusedBit_173_31 = bits, U32, 470, [31:31] -TEMPLOG_MAP_AT_CYCLE_COUNT = scalar, U08, 474, "", 1, 0 -unused11 = scalar, U08, 475, "", 1, 0 -unused11 = scalar, U08, 475, "", 1, 0 -unused11 = scalar, U08, 475, "", 1, 0 +alignmentFill_at_338 = array, U08, 338, [2], "units", 1, 0 +fuel_requested_percent = scalar, F32, 340, "v", 1, 0 +fuel_requested_percent_pi = scalar, F32, 344, "v", 1, 0 +m_I_sum_percent = scalar, F32, 348, "v", 1, 0 +m_pressureTarget_kPa = scalar, F32, 352, "v", 1, 0 +unusedAtTheEnd1 = scalar, S32, 356, "", 1, 0 +unusedAtTheEnd2 = scalar, S32, 360, "", 1, 0 +unusedAtTheEnd3 = scalar, S32, 364, "", 1, 0 +unusedAtTheEnd4 = scalar, S32, 368, "", 1, 0 +unusedAtTheEnd5 = scalar, S32, 372, "", 1, 0 +unusedAtTheEnd6 = scalar, S32, 376, "", 1, 0 +unusedAtTheEnd7 = scalar, S32, 380, "", 1, 0 +unusedAtTheEnd8 = scalar, S32, 384, "", 1, 0 +unusedAtTheEnd9 = scalar, S32, 388, "", 1, 0 +unusedAtTheEnd10 = scalar, S32, 392, "", 1, 0 +unusedAtTheEnd11 = scalar, S32, 396, "", 1, 0 +unusedAtTheEnd12 = scalar, S32, 400, "", 1, 0 +unusedAtTheEnd13 = scalar, S32, 404, "", 1, 0 +unusedAtTheEnd14 = scalar, S32, 408, "", 1, 0 +unusedAtTheEnd15 = scalar, S32, 412, "", 1, 0 +unusedAtTheEnd16 = scalar, S32, 416, "", 1, 0 +unusedAtTheEnd17 = scalar, S32, 420, "", 1, 0 +unusedAtTheEnd18 = scalar, S32, 424, "", 1, 0 +unusedAtTheEnd19 = scalar, S32, 428, "", 1, 0 +unusedAtTheEnd20 = scalar, S32, 432, "", 1, 0 +unusedAtTheEnd21 = scalar, S32, 436, "", 1, 0 +unusedAtTheEnd22 = scalar, S32, 440, "", 1, 0 +unusedAtTheEnd23 = scalar, S32, 444, "", 1, 0 +unusedAtTheEnd24 = scalar, S32, 448, "", 1, 0 +unusedAtTheEnd25 = scalar, S32, 452, "", 1, 0 +unusedAtTheEnd26 = scalar, S32, 456, "", 1, 0 +unusedAtTheEnd27 = scalar, S32, 460, "", 1, 0 +unusedAtTheEnd28 = scalar, S32, 464, "", 1, 0 +launchSpeedCondition = bits, U32, 468, [0:0] +launchRpmCondition = bits, U32, 468, [1:1] +launchTpsCondition = bits, U32, 468, [2:2] +launchActivateSwitchCondition = bits, U32, 468, [3:3] +launchIsLaunchCondition = bits, U32, 468, [4:4] +launchCombinedConditions = bits, U32, 468, [5:5] +launchActivatePinState = bits, U32, 468, [6:6] +unusedBit_178_7 = bits, U32, 468, [7:7] +unusedBit_178_8 = bits, U32, 468, [8:8] +unusedBit_178_9 = bits, U32, 468, [9:9] +unusedBit_178_10 = bits, U32, 468, [10:10] +unusedBit_178_11 = bits, U32, 468, [11:11] +unusedBit_178_12 = bits, U32, 468, [12:12] +unusedBit_178_13 = bits, U32, 468, [13:13] +unusedBit_178_14 = bits, U32, 468, [14:14] +unusedBit_178_15 = bits, U32, 468, [15:15] +unusedBit_178_16 = bits, U32, 468, [16:16] +unusedBit_178_17 = bits, U32, 468, [17:17] +unusedBit_178_18 = bits, U32, 468, [18:18] +unusedBit_178_19 = bits, U32, 468, [19:19] +unusedBit_178_20 = bits, U32, 468, [20:20] +unusedBit_178_21 = bits, U32, 468, [21:21] +unusedBit_178_22 = bits, U32, 468, [22:22] +unusedBit_178_23 = bits, U32, 468, [23:23] +unusedBit_178_24 = bits, U32, 468, [24:24] +unusedBit_178_25 = bits, U32, 468, [25:25] +unusedBit_178_26 = bits, U32, 468, [26:26] +unusedBit_178_27 = bits, U32, 468, [27:27] +unusedBit_178_28 = bits, U32, 468, [28:28] +unusedBit_178_29 = bits, U32, 468, [29:29] +unusedBit_178_30 = bits, U32, 468, [30:30] +unusedBit_178_31 = bits, U32, 468, [31:31] +TEMPLOG_MAP_AT_CYCLE_COUNT = scalar, U08, 472, "", 1, 0 +unused11 = scalar, U08, 473, "", 1, 0 +unused11 = scalar, U08, 473, "", 1, 0 +unused11 = scalar, U08, 473, "", 1, 0 +alignmentFill_at_474 = array, U08, 474, [2], "units", 1, 0 TEMPLOG_MAP_AT_SPECIAL_POINT = scalar, F32, 476, "", 1, 0 TEMPLOG_MAP_AT_DIFF = scalar, F32, 480, "", 1, 0 vvtSyncGapRatio = scalar, F32, 484, "", 1, 0 @@ -3102,7 +3004,11 @@ TEMPLOG_MAP_AT_DIFFGauge = TEMPLOG_MAP_AT_DIFF,"TEMPLOG_MAP_AT_DIFF", "", -10000 TEMPLOG_MAP_AT_CYCLE_COUNTGauge = TEMPLOG_MAP_AT_CYCLE_COUNT,"TEMPLOG_MAP_AT_CYCLE_COUNT", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 gaugeCategory = GDI -m_requested_pumpGauge = m_requested_pump,"Pump Angle", "deg", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +m_requested_pumpGauge = m_requested_pump,"DI: Pump Angle", "deg", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +fuel_requested_percentGauge = fuel_requested_percent,"DI: fuel_requested_percent", "v", 0.0,100.0, 0.0,100.0, 0.0,100.0, 0,0 +fuel_requested_percent_piGauge = fuel_requested_percent_pi,"DI: fuel_requested_percent_pi", "v", 0.0,100.0, 0.0,100.0, 0.0,100.0, 0,0 +m_I_sum_percentGauge = m_I_sum_percent,"DI: m_I_sum_percent", "v", 0.0,100.0, 0.0,100.0, 0.0,100.0, 0,0 +m_pressureTarget_kPaGauge = m_pressureTarget_kPa,"DI: m_pressureTarget_kPa", "v", 0.0,100.0, 0.0,100.0, 0.0,100.0, 0,0 highFuelPressureGauge = highFuelPressure, "Fuel pressure (high)", "bar", 0, 200, 0, 0, 200, 200, 1, 0 gaugeCategory = Sensors - Extra 2 @@ -3581,7 +3487,11 @@ entry = tps1Split, "tps1Split", float, "%.3f" entry = tps2Split, "tps2Split", float, "%.3f" entry = tps12Split, "tps12Split", float, "%.3f" entry = accPedalSplit, "accPedalSplit", float, "%.3f" -entry = m_requested_pump, "Pump Angle", float, "%.3f" +entry = m_requested_pump, "DI: Pump Angle", float, "%.3f" +entry = fuel_requested_percent, "DI: fuel_requested_percent", float, "%.3f" +entry = fuel_requested_percent_pi, "DI: fuel_requested_percent_pi", float, "%.3f" +entry = m_I_sum_percent, "DI: m_I_sum_percent", float, "%.3f" +entry = m_pressureTarget_kPa, "DI: m_pressureTarget_kPa", float, "%.3f" entry = launchSpeedCondition, "launchSpeedCondition", int, "%d" entry = launchRpmCondition, "launchRpmCondition", int, "%d" entry = launchTpsCondition, "launchTpsCondition", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_kinetis.ini b/firmware/tunerstudio/generated/rusefi_kinetis.ini index cf3aa35abb..e7be59c064 100644 --- a/firmware/tunerstudio/generated/rusefi_kinetis.ini +++ b/firmware/tunerstudio/generated/rusefi_kinetis.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.01.01.kin.3276178439" + signature = "rusEFI 2022.01.01.kin.1580185978" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.01.01.kin.3276178439" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.01.01.kin.1580185978" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sat Jan 01 21:09:35 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sat Jan 01 22:23:11 UTC 2022 pageSize = 20968 page = 1 @@ -2063,174 +2063,76 @@ tps12Split = scalar, S16, 330, "%", 0.01, 0 accPedalSplit = scalar, S16, 332, "%", 0.01, 0 m_requested_pump = scalar, S16, 334, "deg", 0.02, 0 unused16 = scalar, S16, 336, "deg", 0.02, 0 -unusedAtTheEnd1 = scalar, U08, 338, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 339, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 340, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 341, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 342, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 343, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 344, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 345, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 346, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 347, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 348, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 349, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 350, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 351, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 352, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 353, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 354, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 355, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 356, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 357, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 358, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 359, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 360, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 361, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 362, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 363, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 364, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 365, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 366, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 367, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 368, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 369, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 370, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 371, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 372, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 373, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 374, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 375, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 376, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 377, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 378, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 379, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 380, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 381, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 382, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 383, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 384, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 385, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 386, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 387, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 388, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 389, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 390, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 391, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 392, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 393, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 394, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 395, "", 1, 0 -unusedAtTheEnd59 = scalar, U08, 396, "", 1, 0 -unusedAtTheEnd60 = scalar, U08, 397, "", 1, 0 -unusedAtTheEnd61 = scalar, U08, 398, "", 1, 0 -unusedAtTheEnd62 = scalar, U08, 399, "", 1, 0 -unusedAtTheEnd63 = scalar, U08, 400, "", 1, 0 -unusedAtTheEnd64 = scalar, U08, 401, "", 1, 0 -unusedAtTheEnd65 = scalar, U08, 402, "", 1, 0 -unusedAtTheEnd66 = scalar, U08, 403, "", 1, 0 -unusedAtTheEnd67 = scalar, U08, 404, "", 1, 0 -unusedAtTheEnd68 = scalar, U08, 405, "", 1, 0 -unusedAtTheEnd69 = scalar, U08, 406, "", 1, 0 -unusedAtTheEnd70 = scalar, U08, 407, "", 1, 0 -unusedAtTheEnd71 = scalar, U08, 408, "", 1, 0 -unusedAtTheEnd72 = scalar, U08, 409, "", 1, 0 -unusedAtTheEnd73 = scalar, U08, 410, "", 1, 0 -unusedAtTheEnd74 = scalar, U08, 411, "", 1, 0 -unusedAtTheEnd75 = scalar, U08, 412, "", 1, 0 -unusedAtTheEnd76 = scalar, U08, 413, "", 1, 0 -unusedAtTheEnd77 = scalar, U08, 414, "", 1, 0 -unusedAtTheEnd78 = scalar, U08, 415, "", 1, 0 -unusedAtTheEnd79 = scalar, U08, 416, "", 1, 0 -unusedAtTheEnd80 = scalar, U08, 417, "", 1, 0 -unusedAtTheEnd81 = scalar, U08, 418, "", 1, 0 -unusedAtTheEnd82 = scalar, U08, 419, "", 1, 0 -unusedAtTheEnd83 = scalar, U08, 420, "", 1, 0 -unusedAtTheEnd84 = scalar, U08, 421, "", 1, 0 -unusedAtTheEnd85 = scalar, U08, 422, "", 1, 0 -unusedAtTheEnd86 = scalar, U08, 423, "", 1, 0 -unusedAtTheEnd87 = scalar, U08, 424, "", 1, 0 -unusedAtTheEnd88 = scalar, U08, 425, "", 1, 0 -unusedAtTheEnd89 = scalar, U08, 426, "", 1, 0 -unusedAtTheEnd90 = scalar, U08, 427, "", 1, 0 -unusedAtTheEnd91 = scalar, U08, 428, "", 1, 0 -unusedAtTheEnd92 = scalar, U08, 429, "", 1, 0 -unusedAtTheEnd93 = scalar, U08, 430, "", 1, 0 -unusedAtTheEnd94 = scalar, U08, 431, "", 1, 0 -unusedAtTheEnd95 = scalar, U08, 432, "", 1, 0 -unusedAtTheEnd96 = scalar, U08, 433, "", 1, 0 -unusedAtTheEnd97 = scalar, U08, 434, "", 1, 0 -unusedAtTheEnd98 = scalar, U08, 435, "", 1, 0 -unusedAtTheEnd99 = scalar, U08, 436, "", 1, 0 -unusedAtTheEnd100 = scalar, U08, 437, "", 1, 0 -unusedAtTheEnd101 = scalar, U08, 438, "", 1, 0 -unusedAtTheEnd102 = scalar, U08, 439, "", 1, 0 -unusedAtTheEnd103 = scalar, U08, 440, "", 1, 0 -unusedAtTheEnd104 = scalar, U08, 441, "", 1, 0 -unusedAtTheEnd105 = scalar, U08, 442, "", 1, 0 -unusedAtTheEnd106 = scalar, U08, 443, "", 1, 0 -unusedAtTheEnd107 = scalar, U08, 444, "", 1, 0 -unusedAtTheEnd108 = scalar, U08, 445, "", 1, 0 -unusedAtTheEnd109 = scalar, U08, 446, "", 1, 0 -unusedAtTheEnd110 = scalar, U08, 447, "", 1, 0 -unusedAtTheEnd111 = scalar, U08, 448, "", 1, 0 -unusedAtTheEnd112 = scalar, U08, 449, "", 1, 0 -unusedAtTheEnd113 = scalar, U08, 450, "", 1, 0 -unusedAtTheEnd114 = scalar, U08, 451, "", 1, 0 -unusedAtTheEnd115 = scalar, U08, 452, "", 1, 0 -unusedAtTheEnd116 = scalar, U08, 453, "", 1, 0 -unusedAtTheEnd117 = scalar, U08, 454, "", 1, 0 -unusedAtTheEnd118 = scalar, U08, 455, "", 1, 0 -unusedAtTheEnd119 = scalar, U08, 456, "", 1, 0 -unusedAtTheEnd120 = scalar, U08, 457, "", 1, 0 -unusedAtTheEnd121 = scalar, U08, 458, "", 1, 0 -unusedAtTheEnd122 = scalar, U08, 459, "", 1, 0 -unusedAtTheEnd123 = scalar, U08, 460, "", 1, 0 -unusedAtTheEnd124 = scalar, U08, 461, "", 1, 0 -unusedAtTheEnd125 = scalar, U08, 462, "", 1, 0 -unusedAtTheEnd126 = scalar, U08, 463, "", 1, 0 -unusedAtTheEnd127 = scalar, U08, 464, "", 1, 0 -unusedAtTheEnd128 = scalar, U08, 465, "", 1, 0 -unusedAtTheEnd129 = scalar, U08, 466, "", 1, 0 -unusedAtTheEnd130 = scalar, U08, 467, "", 1, 0 -unusedAtTheEnd131 = scalar, U08, 468, "", 1, 0 -unusedAtTheEnd132 = scalar, U08, 469, "", 1, 0 -launchSpeedCondition = bits, U32, 470, [0:0] -launchRpmCondition = bits, U32, 470, [1:1] -launchTpsCondition = bits, U32, 470, [2:2] -launchActivateSwitchCondition = bits, U32, 470, [3:3] -launchIsLaunchCondition = bits, U32, 470, [4:4] -launchCombinedConditions = bits, U32, 470, [5:5] -launchActivatePinState = bits, U32, 470, [6:6] -unusedBit_173_7 = bits, U32, 470, [7:7] -unusedBit_173_8 = bits, U32, 470, [8:8] -unusedBit_173_9 = bits, U32, 470, [9:9] -unusedBit_173_10 = bits, U32, 470, [10:10] -unusedBit_173_11 = bits, U32, 470, [11:11] -unusedBit_173_12 = bits, U32, 470, [12:12] -unusedBit_173_13 = bits, U32, 470, [13:13] -unusedBit_173_14 = bits, U32, 470, [14:14] -unusedBit_173_15 = bits, U32, 470, [15:15] -unusedBit_173_16 = bits, U32, 470, [16:16] -unusedBit_173_17 = bits, U32, 470, [17:17] -unusedBit_173_18 = bits, U32, 470, [18:18] -unusedBit_173_19 = bits, U32, 470, [19:19] -unusedBit_173_20 = bits, U32, 470, [20:20] -unusedBit_173_21 = bits, U32, 470, [21:21] -unusedBit_173_22 = bits, U32, 470, [22:22] -unusedBit_173_23 = bits, U32, 470, [23:23] -unusedBit_173_24 = bits, U32, 470, [24:24] -unusedBit_173_25 = bits, U32, 470, [25:25] -unusedBit_173_26 = bits, U32, 470, [26:26] -unusedBit_173_27 = bits, U32, 470, [27:27] -unusedBit_173_28 = bits, U32, 470, [28:28] -unusedBit_173_29 = bits, U32, 470, [29:29] -unusedBit_173_30 = bits, U32, 470, [30:30] -unusedBit_173_31 = bits, U32, 470, [31:31] -TEMPLOG_MAP_AT_CYCLE_COUNT = scalar, U08, 474, "", 1, 0 -unused11 = scalar, U08, 475, "", 1, 0 -unused11 = scalar, U08, 475, "", 1, 0 -unused11 = scalar, U08, 475, "", 1, 0 +alignmentFill_at_338 = array, U08, 338, [2], "units", 1, 0 +fuel_requested_percent = scalar, F32, 340, "v", 1, 0 +fuel_requested_percent_pi = scalar, F32, 344, "v", 1, 0 +m_I_sum_percent = scalar, F32, 348, "v", 1, 0 +m_pressureTarget_kPa = scalar, F32, 352, "v", 1, 0 +unusedAtTheEnd1 = scalar, S32, 356, "", 1, 0 +unusedAtTheEnd2 = scalar, S32, 360, "", 1, 0 +unusedAtTheEnd3 = scalar, S32, 364, "", 1, 0 +unusedAtTheEnd4 = scalar, S32, 368, "", 1, 0 +unusedAtTheEnd5 = scalar, S32, 372, "", 1, 0 +unusedAtTheEnd6 = scalar, S32, 376, "", 1, 0 +unusedAtTheEnd7 = scalar, S32, 380, "", 1, 0 +unusedAtTheEnd8 = scalar, S32, 384, "", 1, 0 +unusedAtTheEnd9 = scalar, S32, 388, "", 1, 0 +unusedAtTheEnd10 = scalar, S32, 392, "", 1, 0 +unusedAtTheEnd11 = scalar, S32, 396, "", 1, 0 +unusedAtTheEnd12 = scalar, S32, 400, "", 1, 0 +unusedAtTheEnd13 = scalar, S32, 404, "", 1, 0 +unusedAtTheEnd14 = scalar, S32, 408, "", 1, 0 +unusedAtTheEnd15 = scalar, S32, 412, "", 1, 0 +unusedAtTheEnd16 = scalar, S32, 416, "", 1, 0 +unusedAtTheEnd17 = scalar, S32, 420, "", 1, 0 +unusedAtTheEnd18 = scalar, S32, 424, "", 1, 0 +unusedAtTheEnd19 = scalar, S32, 428, "", 1, 0 +unusedAtTheEnd20 = scalar, S32, 432, "", 1, 0 +unusedAtTheEnd21 = scalar, S32, 436, "", 1, 0 +unusedAtTheEnd22 = scalar, S32, 440, "", 1, 0 +unusedAtTheEnd23 = scalar, S32, 444, "", 1, 0 +unusedAtTheEnd24 = scalar, S32, 448, "", 1, 0 +unusedAtTheEnd25 = scalar, S32, 452, "", 1, 0 +unusedAtTheEnd26 = scalar, S32, 456, "", 1, 0 +unusedAtTheEnd27 = scalar, S32, 460, "", 1, 0 +unusedAtTheEnd28 = scalar, S32, 464, "", 1, 0 +launchSpeedCondition = bits, U32, 468, [0:0] +launchRpmCondition = bits, U32, 468, [1:1] +launchTpsCondition = bits, U32, 468, [2:2] +launchActivateSwitchCondition = bits, U32, 468, [3:3] +launchIsLaunchCondition = bits, U32, 468, [4:4] +launchCombinedConditions = bits, U32, 468, [5:5] +launchActivatePinState = bits, U32, 468, [6:6] +unusedBit_178_7 = bits, U32, 468, [7:7] +unusedBit_178_8 = bits, U32, 468, [8:8] +unusedBit_178_9 = bits, U32, 468, [9:9] +unusedBit_178_10 = bits, U32, 468, [10:10] +unusedBit_178_11 = bits, U32, 468, [11:11] +unusedBit_178_12 = bits, U32, 468, [12:12] +unusedBit_178_13 = bits, U32, 468, [13:13] +unusedBit_178_14 = bits, U32, 468, [14:14] +unusedBit_178_15 = bits, U32, 468, [15:15] +unusedBit_178_16 = bits, U32, 468, [16:16] +unusedBit_178_17 = bits, U32, 468, [17:17] +unusedBit_178_18 = bits, U32, 468, [18:18] +unusedBit_178_19 = bits, U32, 468, [19:19] +unusedBit_178_20 = bits, U32, 468, [20:20] +unusedBit_178_21 = bits, U32, 468, [21:21] +unusedBit_178_22 = bits, U32, 468, [22:22] +unusedBit_178_23 = bits, U32, 468, [23:23] +unusedBit_178_24 = bits, U32, 468, [24:24] +unusedBit_178_25 = bits, U32, 468, [25:25] +unusedBit_178_26 = bits, U32, 468, [26:26] +unusedBit_178_27 = bits, U32, 468, [27:27] +unusedBit_178_28 = bits, U32, 468, [28:28] +unusedBit_178_29 = bits, U32, 468, [29:29] +unusedBit_178_30 = bits, U32, 468, [30:30] +unusedBit_178_31 = bits, U32, 468, [31:31] +TEMPLOG_MAP_AT_CYCLE_COUNT = scalar, U08, 472, "", 1, 0 +unused11 = scalar, U08, 473, "", 1, 0 +unused11 = scalar, U08, 473, "", 1, 0 +unused11 = scalar, U08, 473, "", 1, 0 +alignmentFill_at_474 = array, U08, 474, [2], "units", 1, 0 TEMPLOG_MAP_AT_SPECIAL_POINT = scalar, F32, 476, "", 1, 0 TEMPLOG_MAP_AT_DIFF = scalar, F32, 480, "", 1, 0 vvtSyncGapRatio = scalar, F32, 484, "", 1, 0 @@ -3068,7 +2970,11 @@ TEMPLOG_MAP_AT_DIFFGauge = TEMPLOG_MAP_AT_DIFF,"TEMPLOG_MAP_AT_DIFF", "", -10000 TEMPLOG_MAP_AT_CYCLE_COUNTGauge = TEMPLOG_MAP_AT_CYCLE_COUNT,"TEMPLOG_MAP_AT_CYCLE_COUNT", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 gaugeCategory = GDI -m_requested_pumpGauge = m_requested_pump,"Pump Angle", "deg", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +m_requested_pumpGauge = m_requested_pump,"DI: Pump Angle", "deg", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +fuel_requested_percentGauge = fuel_requested_percent,"DI: fuel_requested_percent", "v", 0.0,100.0, 0.0,100.0, 0.0,100.0, 0,0 +fuel_requested_percent_piGauge = fuel_requested_percent_pi,"DI: fuel_requested_percent_pi", "v", 0.0,100.0, 0.0,100.0, 0.0,100.0, 0,0 +m_I_sum_percentGauge = m_I_sum_percent,"DI: m_I_sum_percent", "v", 0.0,100.0, 0.0,100.0, 0.0,100.0, 0,0 +m_pressureTarget_kPaGauge = m_pressureTarget_kPa,"DI: m_pressureTarget_kPa", "v", 0.0,100.0, 0.0,100.0, 0.0,100.0, 0,0 highFuelPressureGauge = highFuelPressure, "Fuel pressure (high)", "bar", 0, 200, 0, 0, 200, 200, 1, 0 gaugeCategory = Sensors - Extra 2 @@ -3547,7 +3453,11 @@ entry = tps1Split, "tps1Split", float, "%.3f" entry = tps2Split, "tps2Split", float, "%.3f" entry = tps12Split, "tps12Split", float, "%.3f" entry = accPedalSplit, "accPedalSplit", float, "%.3f" -entry = m_requested_pump, "Pump Angle", float, "%.3f" +entry = m_requested_pump, "DI: Pump Angle", float, "%.3f" +entry = fuel_requested_percent, "DI: fuel_requested_percent", float, "%.3f" +entry = fuel_requested_percent_pi, "DI: fuel_requested_percent_pi", float, "%.3f" +entry = m_I_sum_percent, "DI: m_I_sum_percent", float, "%.3f" +entry = m_pressureTarget_kPa, "DI: m_pressureTarget_kPa", float, "%.3f" entry = launchSpeedCondition, "launchSpeedCondition", int, "%d" entry = launchRpmCondition, "launchRpmCondition", int, "%d" entry = launchTpsCondition, "launchTpsCondition", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index 814ac1106a..f4a883c713 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f4.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.01.01.mre_f4.3039942131" + signature = "rusEFI 2022.01.01.mre_f4.676915342" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.01.01.mre_f4.3039942131" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.01.01.mre_f4.676915342" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jan 01 21:09:11 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jan 01 22:22:50 UTC 2022 pageSize = 20996 page = 1 @@ -2097,174 +2097,76 @@ tps12Split = scalar, S16, 330, "%", 0.01, 0 accPedalSplit = scalar, S16, 332, "%", 0.01, 0 m_requested_pump = scalar, S16, 334, "deg", 0.02, 0 unused16 = scalar, S16, 336, "deg", 0.02, 0 -unusedAtTheEnd1 = scalar, U08, 338, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 339, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 340, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 341, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 342, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 343, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 344, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 345, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 346, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 347, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 348, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 349, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 350, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 351, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 352, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 353, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 354, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 355, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 356, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 357, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 358, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 359, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 360, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 361, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 362, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 363, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 364, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 365, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 366, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 367, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 368, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 369, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 370, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 371, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 372, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 373, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 374, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 375, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 376, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 377, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 378, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 379, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 380, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 381, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 382, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 383, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 384, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 385, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 386, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 387, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 388, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 389, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 390, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 391, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 392, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 393, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 394, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 395, "", 1, 0 -unusedAtTheEnd59 = scalar, U08, 396, "", 1, 0 -unusedAtTheEnd60 = scalar, U08, 397, "", 1, 0 -unusedAtTheEnd61 = scalar, U08, 398, "", 1, 0 -unusedAtTheEnd62 = scalar, U08, 399, "", 1, 0 -unusedAtTheEnd63 = scalar, U08, 400, "", 1, 0 -unusedAtTheEnd64 = scalar, U08, 401, "", 1, 0 -unusedAtTheEnd65 = scalar, U08, 402, "", 1, 0 -unusedAtTheEnd66 = scalar, U08, 403, "", 1, 0 -unusedAtTheEnd67 = scalar, U08, 404, "", 1, 0 -unusedAtTheEnd68 = scalar, U08, 405, "", 1, 0 -unusedAtTheEnd69 = scalar, U08, 406, "", 1, 0 -unusedAtTheEnd70 = scalar, U08, 407, "", 1, 0 -unusedAtTheEnd71 = scalar, U08, 408, "", 1, 0 -unusedAtTheEnd72 = scalar, U08, 409, "", 1, 0 -unusedAtTheEnd73 = scalar, U08, 410, "", 1, 0 -unusedAtTheEnd74 = scalar, U08, 411, "", 1, 0 -unusedAtTheEnd75 = scalar, U08, 412, "", 1, 0 -unusedAtTheEnd76 = scalar, U08, 413, "", 1, 0 -unusedAtTheEnd77 = scalar, U08, 414, "", 1, 0 -unusedAtTheEnd78 = scalar, U08, 415, "", 1, 0 -unusedAtTheEnd79 = scalar, U08, 416, "", 1, 0 -unusedAtTheEnd80 = scalar, U08, 417, "", 1, 0 -unusedAtTheEnd81 = scalar, U08, 418, "", 1, 0 -unusedAtTheEnd82 = scalar, U08, 419, "", 1, 0 -unusedAtTheEnd83 = scalar, U08, 420, "", 1, 0 -unusedAtTheEnd84 = scalar, U08, 421, "", 1, 0 -unusedAtTheEnd85 = scalar, U08, 422, "", 1, 0 -unusedAtTheEnd86 = scalar, U08, 423, "", 1, 0 -unusedAtTheEnd87 = scalar, U08, 424, "", 1, 0 -unusedAtTheEnd88 = scalar, U08, 425, "", 1, 0 -unusedAtTheEnd89 = scalar, U08, 426, "", 1, 0 -unusedAtTheEnd90 = scalar, U08, 427, "", 1, 0 -unusedAtTheEnd91 = scalar, U08, 428, "", 1, 0 -unusedAtTheEnd92 = scalar, U08, 429, "", 1, 0 -unusedAtTheEnd93 = scalar, U08, 430, "", 1, 0 -unusedAtTheEnd94 = scalar, U08, 431, "", 1, 0 -unusedAtTheEnd95 = scalar, U08, 432, "", 1, 0 -unusedAtTheEnd96 = scalar, U08, 433, "", 1, 0 -unusedAtTheEnd97 = scalar, U08, 434, "", 1, 0 -unusedAtTheEnd98 = scalar, U08, 435, "", 1, 0 -unusedAtTheEnd99 = scalar, U08, 436, "", 1, 0 -unusedAtTheEnd100 = scalar, U08, 437, "", 1, 0 -unusedAtTheEnd101 = scalar, U08, 438, "", 1, 0 -unusedAtTheEnd102 = scalar, U08, 439, "", 1, 0 -unusedAtTheEnd103 = scalar, U08, 440, "", 1, 0 -unusedAtTheEnd104 = scalar, U08, 441, "", 1, 0 -unusedAtTheEnd105 = scalar, U08, 442, "", 1, 0 -unusedAtTheEnd106 = scalar, U08, 443, "", 1, 0 -unusedAtTheEnd107 = scalar, U08, 444, "", 1, 0 -unusedAtTheEnd108 = scalar, U08, 445, "", 1, 0 -unusedAtTheEnd109 = scalar, U08, 446, "", 1, 0 -unusedAtTheEnd110 = scalar, U08, 447, "", 1, 0 -unusedAtTheEnd111 = scalar, U08, 448, "", 1, 0 -unusedAtTheEnd112 = scalar, U08, 449, "", 1, 0 -unusedAtTheEnd113 = scalar, U08, 450, "", 1, 0 -unusedAtTheEnd114 = scalar, U08, 451, "", 1, 0 -unusedAtTheEnd115 = scalar, U08, 452, "", 1, 0 -unusedAtTheEnd116 = scalar, U08, 453, "", 1, 0 -unusedAtTheEnd117 = scalar, U08, 454, "", 1, 0 -unusedAtTheEnd118 = scalar, U08, 455, "", 1, 0 -unusedAtTheEnd119 = scalar, U08, 456, "", 1, 0 -unusedAtTheEnd120 = scalar, U08, 457, "", 1, 0 -unusedAtTheEnd121 = scalar, U08, 458, "", 1, 0 -unusedAtTheEnd122 = scalar, U08, 459, "", 1, 0 -unusedAtTheEnd123 = scalar, U08, 460, "", 1, 0 -unusedAtTheEnd124 = scalar, U08, 461, "", 1, 0 -unusedAtTheEnd125 = scalar, U08, 462, "", 1, 0 -unusedAtTheEnd126 = scalar, U08, 463, "", 1, 0 -unusedAtTheEnd127 = scalar, U08, 464, "", 1, 0 -unusedAtTheEnd128 = scalar, U08, 465, "", 1, 0 -unusedAtTheEnd129 = scalar, U08, 466, "", 1, 0 -unusedAtTheEnd130 = scalar, U08, 467, "", 1, 0 -unusedAtTheEnd131 = scalar, U08, 468, "", 1, 0 -unusedAtTheEnd132 = scalar, U08, 469, "", 1, 0 -launchSpeedCondition = bits, U32, 470, [0:0] -launchRpmCondition = bits, U32, 470, [1:1] -launchTpsCondition = bits, U32, 470, [2:2] -launchActivateSwitchCondition = bits, U32, 470, [3:3] -launchIsLaunchCondition = bits, U32, 470, [4:4] -launchCombinedConditions = bits, U32, 470, [5:5] -launchActivatePinState = bits, U32, 470, [6:6] -unusedBit_173_7 = bits, U32, 470, [7:7] -unusedBit_173_8 = bits, U32, 470, [8:8] -unusedBit_173_9 = bits, U32, 470, [9:9] -unusedBit_173_10 = bits, U32, 470, [10:10] -unusedBit_173_11 = bits, U32, 470, [11:11] -unusedBit_173_12 = bits, U32, 470, [12:12] -unusedBit_173_13 = bits, U32, 470, [13:13] -unusedBit_173_14 = bits, U32, 470, [14:14] -unusedBit_173_15 = bits, U32, 470, [15:15] -unusedBit_173_16 = bits, U32, 470, [16:16] -unusedBit_173_17 = bits, U32, 470, [17:17] -unusedBit_173_18 = bits, U32, 470, [18:18] -unusedBit_173_19 = bits, U32, 470, [19:19] -unusedBit_173_20 = bits, U32, 470, [20:20] -unusedBit_173_21 = bits, U32, 470, [21:21] -unusedBit_173_22 = bits, U32, 470, [22:22] -unusedBit_173_23 = bits, U32, 470, [23:23] -unusedBit_173_24 = bits, U32, 470, [24:24] -unusedBit_173_25 = bits, U32, 470, [25:25] -unusedBit_173_26 = bits, U32, 470, [26:26] -unusedBit_173_27 = bits, U32, 470, [27:27] -unusedBit_173_28 = bits, U32, 470, [28:28] -unusedBit_173_29 = bits, U32, 470, [29:29] -unusedBit_173_30 = bits, U32, 470, [30:30] -unusedBit_173_31 = bits, U32, 470, [31:31] -TEMPLOG_MAP_AT_CYCLE_COUNT = scalar, U08, 474, "", 1, 0 -unused11 = scalar, U08, 475, "", 1, 0 -unused11 = scalar, U08, 475, "", 1, 0 -unused11 = scalar, U08, 475, "", 1, 0 +alignmentFill_at_338 = array, U08, 338, [2], "units", 1, 0 +fuel_requested_percent = scalar, F32, 340, "v", 1, 0 +fuel_requested_percent_pi = scalar, F32, 344, "v", 1, 0 +m_I_sum_percent = scalar, F32, 348, "v", 1, 0 +m_pressureTarget_kPa = scalar, F32, 352, "v", 1, 0 +unusedAtTheEnd1 = scalar, S32, 356, "", 1, 0 +unusedAtTheEnd2 = scalar, S32, 360, "", 1, 0 +unusedAtTheEnd3 = scalar, S32, 364, "", 1, 0 +unusedAtTheEnd4 = scalar, S32, 368, "", 1, 0 +unusedAtTheEnd5 = scalar, S32, 372, "", 1, 0 +unusedAtTheEnd6 = scalar, S32, 376, "", 1, 0 +unusedAtTheEnd7 = scalar, S32, 380, "", 1, 0 +unusedAtTheEnd8 = scalar, S32, 384, "", 1, 0 +unusedAtTheEnd9 = scalar, S32, 388, "", 1, 0 +unusedAtTheEnd10 = scalar, S32, 392, "", 1, 0 +unusedAtTheEnd11 = scalar, S32, 396, "", 1, 0 +unusedAtTheEnd12 = scalar, S32, 400, "", 1, 0 +unusedAtTheEnd13 = scalar, S32, 404, "", 1, 0 +unusedAtTheEnd14 = scalar, S32, 408, "", 1, 0 +unusedAtTheEnd15 = scalar, S32, 412, "", 1, 0 +unusedAtTheEnd16 = scalar, S32, 416, "", 1, 0 +unusedAtTheEnd17 = scalar, S32, 420, "", 1, 0 +unusedAtTheEnd18 = scalar, S32, 424, "", 1, 0 +unusedAtTheEnd19 = scalar, S32, 428, "", 1, 0 +unusedAtTheEnd20 = scalar, S32, 432, "", 1, 0 +unusedAtTheEnd21 = scalar, S32, 436, "", 1, 0 +unusedAtTheEnd22 = scalar, S32, 440, "", 1, 0 +unusedAtTheEnd23 = scalar, S32, 444, "", 1, 0 +unusedAtTheEnd24 = scalar, S32, 448, "", 1, 0 +unusedAtTheEnd25 = scalar, S32, 452, "", 1, 0 +unusedAtTheEnd26 = scalar, S32, 456, "", 1, 0 +unusedAtTheEnd27 = scalar, S32, 460, "", 1, 0 +unusedAtTheEnd28 = scalar, S32, 464, "", 1, 0 +launchSpeedCondition = bits, U32, 468, [0:0] +launchRpmCondition = bits, U32, 468, [1:1] +launchTpsCondition = bits, U32, 468, [2:2] +launchActivateSwitchCondition = bits, U32, 468, [3:3] +launchIsLaunchCondition = bits, U32, 468, [4:4] +launchCombinedConditions = bits, U32, 468, [5:5] +launchActivatePinState = bits, U32, 468, [6:6] +unusedBit_178_7 = bits, U32, 468, [7:7] +unusedBit_178_8 = bits, U32, 468, [8:8] +unusedBit_178_9 = bits, U32, 468, [9:9] +unusedBit_178_10 = bits, U32, 468, [10:10] +unusedBit_178_11 = bits, U32, 468, [11:11] +unusedBit_178_12 = bits, U32, 468, [12:12] +unusedBit_178_13 = bits, U32, 468, [13:13] +unusedBit_178_14 = bits, U32, 468, [14:14] +unusedBit_178_15 = bits, U32, 468, [15:15] +unusedBit_178_16 = bits, U32, 468, [16:16] +unusedBit_178_17 = bits, U32, 468, [17:17] +unusedBit_178_18 = bits, U32, 468, [18:18] +unusedBit_178_19 = bits, U32, 468, [19:19] +unusedBit_178_20 = bits, U32, 468, [20:20] +unusedBit_178_21 = bits, U32, 468, [21:21] +unusedBit_178_22 = bits, U32, 468, [22:22] +unusedBit_178_23 = bits, U32, 468, [23:23] +unusedBit_178_24 = bits, U32, 468, [24:24] +unusedBit_178_25 = bits, U32, 468, [25:25] +unusedBit_178_26 = bits, U32, 468, [26:26] +unusedBit_178_27 = bits, U32, 468, [27:27] +unusedBit_178_28 = bits, U32, 468, [28:28] +unusedBit_178_29 = bits, U32, 468, [29:29] +unusedBit_178_30 = bits, U32, 468, [30:30] +unusedBit_178_31 = bits, U32, 468, [31:31] +TEMPLOG_MAP_AT_CYCLE_COUNT = scalar, U08, 472, "", 1, 0 +unused11 = scalar, U08, 473, "", 1, 0 +unused11 = scalar, U08, 473, "", 1, 0 +unused11 = scalar, U08, 473, "", 1, 0 +alignmentFill_at_474 = array, U08, 474, [2], "units", 1, 0 TEMPLOG_MAP_AT_SPECIAL_POINT = scalar, F32, 476, "", 1, 0 TEMPLOG_MAP_AT_DIFF = scalar, F32, 480, "", 1, 0 vvtSyncGapRatio = scalar, F32, 484, "", 1, 0 @@ -3102,7 +3004,11 @@ TEMPLOG_MAP_AT_DIFFGauge = TEMPLOG_MAP_AT_DIFF,"TEMPLOG_MAP_AT_DIFF", "", -10000 TEMPLOG_MAP_AT_CYCLE_COUNTGauge = TEMPLOG_MAP_AT_CYCLE_COUNT,"TEMPLOG_MAP_AT_CYCLE_COUNT", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 gaugeCategory = GDI -m_requested_pumpGauge = m_requested_pump,"Pump Angle", "deg", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +m_requested_pumpGauge = m_requested_pump,"DI: Pump Angle", "deg", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +fuel_requested_percentGauge = fuel_requested_percent,"DI: fuel_requested_percent", "v", 0.0,100.0, 0.0,100.0, 0.0,100.0, 0,0 +fuel_requested_percent_piGauge = fuel_requested_percent_pi,"DI: fuel_requested_percent_pi", "v", 0.0,100.0, 0.0,100.0, 0.0,100.0, 0,0 +m_I_sum_percentGauge = m_I_sum_percent,"DI: m_I_sum_percent", "v", 0.0,100.0, 0.0,100.0, 0.0,100.0, 0,0 +m_pressureTarget_kPaGauge = m_pressureTarget_kPa,"DI: m_pressureTarget_kPa", "v", 0.0,100.0, 0.0,100.0, 0.0,100.0, 0,0 highFuelPressureGauge = highFuelPressure, "Fuel pressure (high)", "bar", 0, 200, 0, 0, 200, 200, 1, 0 gaugeCategory = Sensors - Extra 2 @@ -3581,7 +3487,11 @@ entry = tps1Split, "tps1Split", float, "%.3f" entry = tps2Split, "tps2Split", float, "%.3f" entry = tps12Split, "tps12Split", float, "%.3f" entry = accPedalSplit, "accPedalSplit", float, "%.3f" -entry = m_requested_pump, "Pump Angle", float, "%.3f" +entry = m_requested_pump, "DI: Pump Angle", float, "%.3f" +entry = fuel_requested_percent, "DI: fuel_requested_percent", float, "%.3f" +entry = fuel_requested_percent_pi, "DI: fuel_requested_percent_pi", float, "%.3f" +entry = m_I_sum_percent, "DI: m_I_sum_percent", float, "%.3f" +entry = m_pressureTarget_kPa, "DI: m_pressureTarget_kPa", float, "%.3f" entry = launchSpeedCondition, "launchSpeedCondition", int, "%d" entry = launchRpmCondition, "launchRpmCondition", int, "%d" entry = launchTpsCondition, "launchTpsCondition", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index 0b30be5afb..9ae123c76a 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f7.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.01.01.mre_f7.3039942131" + signature = "rusEFI 2022.01.01.mre_f7.676915342" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.01.01.mre_f7.3039942131" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.01.01.mre_f7.676915342" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jan 01 21:09:08 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jan 01 22:22:48 UTC 2022 pageSize = 20996 page = 1 @@ -2097,174 +2097,76 @@ tps12Split = scalar, S16, 330, "%", 0.01, 0 accPedalSplit = scalar, S16, 332, "%", 0.01, 0 m_requested_pump = scalar, S16, 334, "deg", 0.02, 0 unused16 = scalar, S16, 336, "deg", 0.02, 0 -unusedAtTheEnd1 = scalar, U08, 338, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 339, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 340, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 341, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 342, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 343, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 344, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 345, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 346, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 347, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 348, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 349, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 350, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 351, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 352, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 353, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 354, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 355, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 356, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 357, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 358, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 359, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 360, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 361, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 362, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 363, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 364, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 365, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 366, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 367, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 368, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 369, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 370, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 371, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 372, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 373, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 374, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 375, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 376, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 377, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 378, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 379, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 380, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 381, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 382, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 383, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 384, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 385, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 386, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 387, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 388, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 389, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 390, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 391, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 392, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 393, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 394, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 395, "", 1, 0 -unusedAtTheEnd59 = scalar, U08, 396, "", 1, 0 -unusedAtTheEnd60 = scalar, U08, 397, "", 1, 0 -unusedAtTheEnd61 = scalar, U08, 398, "", 1, 0 -unusedAtTheEnd62 = scalar, U08, 399, "", 1, 0 -unusedAtTheEnd63 = scalar, U08, 400, "", 1, 0 -unusedAtTheEnd64 = scalar, U08, 401, "", 1, 0 -unusedAtTheEnd65 = scalar, U08, 402, "", 1, 0 -unusedAtTheEnd66 = scalar, U08, 403, "", 1, 0 -unusedAtTheEnd67 = scalar, U08, 404, "", 1, 0 -unusedAtTheEnd68 = scalar, U08, 405, "", 1, 0 -unusedAtTheEnd69 = scalar, U08, 406, "", 1, 0 -unusedAtTheEnd70 = scalar, U08, 407, "", 1, 0 -unusedAtTheEnd71 = scalar, U08, 408, "", 1, 0 -unusedAtTheEnd72 = scalar, U08, 409, "", 1, 0 -unusedAtTheEnd73 = scalar, U08, 410, "", 1, 0 -unusedAtTheEnd74 = scalar, U08, 411, "", 1, 0 -unusedAtTheEnd75 = scalar, U08, 412, "", 1, 0 -unusedAtTheEnd76 = scalar, U08, 413, "", 1, 0 -unusedAtTheEnd77 = scalar, U08, 414, "", 1, 0 -unusedAtTheEnd78 = scalar, U08, 415, "", 1, 0 -unusedAtTheEnd79 = scalar, U08, 416, "", 1, 0 -unusedAtTheEnd80 = scalar, U08, 417, "", 1, 0 -unusedAtTheEnd81 = scalar, U08, 418, "", 1, 0 -unusedAtTheEnd82 = scalar, U08, 419, "", 1, 0 -unusedAtTheEnd83 = scalar, U08, 420, "", 1, 0 -unusedAtTheEnd84 = scalar, U08, 421, "", 1, 0 -unusedAtTheEnd85 = scalar, U08, 422, "", 1, 0 -unusedAtTheEnd86 = scalar, U08, 423, "", 1, 0 -unusedAtTheEnd87 = scalar, U08, 424, "", 1, 0 -unusedAtTheEnd88 = scalar, U08, 425, "", 1, 0 -unusedAtTheEnd89 = scalar, U08, 426, "", 1, 0 -unusedAtTheEnd90 = scalar, U08, 427, "", 1, 0 -unusedAtTheEnd91 = scalar, U08, 428, "", 1, 0 -unusedAtTheEnd92 = scalar, U08, 429, "", 1, 0 -unusedAtTheEnd93 = scalar, U08, 430, "", 1, 0 -unusedAtTheEnd94 = scalar, U08, 431, "", 1, 0 -unusedAtTheEnd95 = scalar, U08, 432, "", 1, 0 -unusedAtTheEnd96 = scalar, U08, 433, "", 1, 0 -unusedAtTheEnd97 = scalar, U08, 434, "", 1, 0 -unusedAtTheEnd98 = scalar, U08, 435, "", 1, 0 -unusedAtTheEnd99 = scalar, U08, 436, "", 1, 0 -unusedAtTheEnd100 = scalar, U08, 437, "", 1, 0 -unusedAtTheEnd101 = scalar, U08, 438, "", 1, 0 -unusedAtTheEnd102 = scalar, U08, 439, "", 1, 0 -unusedAtTheEnd103 = scalar, U08, 440, "", 1, 0 -unusedAtTheEnd104 = scalar, U08, 441, "", 1, 0 -unusedAtTheEnd105 = scalar, U08, 442, "", 1, 0 -unusedAtTheEnd106 = scalar, U08, 443, "", 1, 0 -unusedAtTheEnd107 = scalar, U08, 444, "", 1, 0 -unusedAtTheEnd108 = scalar, U08, 445, "", 1, 0 -unusedAtTheEnd109 = scalar, U08, 446, "", 1, 0 -unusedAtTheEnd110 = scalar, U08, 447, "", 1, 0 -unusedAtTheEnd111 = scalar, U08, 448, "", 1, 0 -unusedAtTheEnd112 = scalar, U08, 449, "", 1, 0 -unusedAtTheEnd113 = scalar, U08, 450, "", 1, 0 -unusedAtTheEnd114 = scalar, U08, 451, "", 1, 0 -unusedAtTheEnd115 = scalar, U08, 452, "", 1, 0 -unusedAtTheEnd116 = scalar, U08, 453, "", 1, 0 -unusedAtTheEnd117 = scalar, U08, 454, "", 1, 0 -unusedAtTheEnd118 = scalar, U08, 455, "", 1, 0 -unusedAtTheEnd119 = scalar, U08, 456, "", 1, 0 -unusedAtTheEnd120 = scalar, U08, 457, "", 1, 0 -unusedAtTheEnd121 = scalar, U08, 458, "", 1, 0 -unusedAtTheEnd122 = scalar, U08, 459, "", 1, 0 -unusedAtTheEnd123 = scalar, U08, 460, "", 1, 0 -unusedAtTheEnd124 = scalar, U08, 461, "", 1, 0 -unusedAtTheEnd125 = scalar, U08, 462, "", 1, 0 -unusedAtTheEnd126 = scalar, U08, 463, "", 1, 0 -unusedAtTheEnd127 = scalar, U08, 464, "", 1, 0 -unusedAtTheEnd128 = scalar, U08, 465, "", 1, 0 -unusedAtTheEnd129 = scalar, U08, 466, "", 1, 0 -unusedAtTheEnd130 = scalar, U08, 467, "", 1, 0 -unusedAtTheEnd131 = scalar, U08, 468, "", 1, 0 -unusedAtTheEnd132 = scalar, U08, 469, "", 1, 0 -launchSpeedCondition = bits, U32, 470, [0:0] -launchRpmCondition = bits, U32, 470, [1:1] -launchTpsCondition = bits, U32, 470, [2:2] -launchActivateSwitchCondition = bits, U32, 470, [3:3] -launchIsLaunchCondition = bits, U32, 470, [4:4] -launchCombinedConditions = bits, U32, 470, [5:5] -launchActivatePinState = bits, U32, 470, [6:6] -unusedBit_173_7 = bits, U32, 470, [7:7] -unusedBit_173_8 = bits, U32, 470, [8:8] -unusedBit_173_9 = bits, U32, 470, [9:9] -unusedBit_173_10 = bits, U32, 470, [10:10] -unusedBit_173_11 = bits, U32, 470, [11:11] -unusedBit_173_12 = bits, U32, 470, [12:12] -unusedBit_173_13 = bits, U32, 470, [13:13] -unusedBit_173_14 = bits, U32, 470, [14:14] -unusedBit_173_15 = bits, U32, 470, [15:15] -unusedBit_173_16 = bits, U32, 470, [16:16] -unusedBit_173_17 = bits, U32, 470, [17:17] -unusedBit_173_18 = bits, U32, 470, [18:18] -unusedBit_173_19 = bits, U32, 470, [19:19] -unusedBit_173_20 = bits, U32, 470, [20:20] -unusedBit_173_21 = bits, U32, 470, [21:21] -unusedBit_173_22 = bits, U32, 470, [22:22] -unusedBit_173_23 = bits, U32, 470, [23:23] -unusedBit_173_24 = bits, U32, 470, [24:24] -unusedBit_173_25 = bits, U32, 470, [25:25] -unusedBit_173_26 = bits, U32, 470, [26:26] -unusedBit_173_27 = bits, U32, 470, [27:27] -unusedBit_173_28 = bits, U32, 470, [28:28] -unusedBit_173_29 = bits, U32, 470, [29:29] -unusedBit_173_30 = bits, U32, 470, [30:30] -unusedBit_173_31 = bits, U32, 470, [31:31] -TEMPLOG_MAP_AT_CYCLE_COUNT = scalar, U08, 474, "", 1, 0 -unused11 = scalar, U08, 475, "", 1, 0 -unused11 = scalar, U08, 475, "", 1, 0 -unused11 = scalar, U08, 475, "", 1, 0 +alignmentFill_at_338 = array, U08, 338, [2], "units", 1, 0 +fuel_requested_percent = scalar, F32, 340, "v", 1, 0 +fuel_requested_percent_pi = scalar, F32, 344, "v", 1, 0 +m_I_sum_percent = scalar, F32, 348, "v", 1, 0 +m_pressureTarget_kPa = scalar, F32, 352, "v", 1, 0 +unusedAtTheEnd1 = scalar, S32, 356, "", 1, 0 +unusedAtTheEnd2 = scalar, S32, 360, "", 1, 0 +unusedAtTheEnd3 = scalar, S32, 364, "", 1, 0 +unusedAtTheEnd4 = scalar, S32, 368, "", 1, 0 +unusedAtTheEnd5 = scalar, S32, 372, "", 1, 0 +unusedAtTheEnd6 = scalar, S32, 376, "", 1, 0 +unusedAtTheEnd7 = scalar, S32, 380, "", 1, 0 +unusedAtTheEnd8 = scalar, S32, 384, "", 1, 0 +unusedAtTheEnd9 = scalar, S32, 388, "", 1, 0 +unusedAtTheEnd10 = scalar, S32, 392, "", 1, 0 +unusedAtTheEnd11 = scalar, S32, 396, "", 1, 0 +unusedAtTheEnd12 = scalar, S32, 400, "", 1, 0 +unusedAtTheEnd13 = scalar, S32, 404, "", 1, 0 +unusedAtTheEnd14 = scalar, S32, 408, "", 1, 0 +unusedAtTheEnd15 = scalar, S32, 412, "", 1, 0 +unusedAtTheEnd16 = scalar, S32, 416, "", 1, 0 +unusedAtTheEnd17 = scalar, S32, 420, "", 1, 0 +unusedAtTheEnd18 = scalar, S32, 424, "", 1, 0 +unusedAtTheEnd19 = scalar, S32, 428, "", 1, 0 +unusedAtTheEnd20 = scalar, S32, 432, "", 1, 0 +unusedAtTheEnd21 = scalar, S32, 436, "", 1, 0 +unusedAtTheEnd22 = scalar, S32, 440, "", 1, 0 +unusedAtTheEnd23 = scalar, S32, 444, "", 1, 0 +unusedAtTheEnd24 = scalar, S32, 448, "", 1, 0 +unusedAtTheEnd25 = scalar, S32, 452, "", 1, 0 +unusedAtTheEnd26 = scalar, S32, 456, "", 1, 0 +unusedAtTheEnd27 = scalar, S32, 460, "", 1, 0 +unusedAtTheEnd28 = scalar, S32, 464, "", 1, 0 +launchSpeedCondition = bits, U32, 468, [0:0] +launchRpmCondition = bits, U32, 468, [1:1] +launchTpsCondition = bits, U32, 468, [2:2] +launchActivateSwitchCondition = bits, U32, 468, [3:3] +launchIsLaunchCondition = bits, U32, 468, [4:4] +launchCombinedConditions = bits, U32, 468, [5:5] +launchActivatePinState = bits, U32, 468, [6:6] +unusedBit_178_7 = bits, U32, 468, [7:7] +unusedBit_178_8 = bits, U32, 468, [8:8] +unusedBit_178_9 = bits, U32, 468, [9:9] +unusedBit_178_10 = bits, U32, 468, [10:10] +unusedBit_178_11 = bits, U32, 468, [11:11] +unusedBit_178_12 = bits, U32, 468, [12:12] +unusedBit_178_13 = bits, U32, 468, [13:13] +unusedBit_178_14 = bits, U32, 468, [14:14] +unusedBit_178_15 = bits, U32, 468, [15:15] +unusedBit_178_16 = bits, U32, 468, [16:16] +unusedBit_178_17 = bits, U32, 468, [17:17] +unusedBit_178_18 = bits, U32, 468, [18:18] +unusedBit_178_19 = bits, U32, 468, [19:19] +unusedBit_178_20 = bits, U32, 468, [20:20] +unusedBit_178_21 = bits, U32, 468, [21:21] +unusedBit_178_22 = bits, U32, 468, [22:22] +unusedBit_178_23 = bits, U32, 468, [23:23] +unusedBit_178_24 = bits, U32, 468, [24:24] +unusedBit_178_25 = bits, U32, 468, [25:25] +unusedBit_178_26 = bits, U32, 468, [26:26] +unusedBit_178_27 = bits, U32, 468, [27:27] +unusedBit_178_28 = bits, U32, 468, [28:28] +unusedBit_178_29 = bits, U32, 468, [29:29] +unusedBit_178_30 = bits, U32, 468, [30:30] +unusedBit_178_31 = bits, U32, 468, [31:31] +TEMPLOG_MAP_AT_CYCLE_COUNT = scalar, U08, 472, "", 1, 0 +unused11 = scalar, U08, 473, "", 1, 0 +unused11 = scalar, U08, 473, "", 1, 0 +unused11 = scalar, U08, 473, "", 1, 0 +alignmentFill_at_474 = array, U08, 474, [2], "units", 1, 0 TEMPLOG_MAP_AT_SPECIAL_POINT = scalar, F32, 476, "", 1, 0 TEMPLOG_MAP_AT_DIFF = scalar, F32, 480, "", 1, 0 vvtSyncGapRatio = scalar, F32, 484, "", 1, 0 @@ -3102,7 +3004,11 @@ TEMPLOG_MAP_AT_DIFFGauge = TEMPLOG_MAP_AT_DIFF,"TEMPLOG_MAP_AT_DIFF", "", -10000 TEMPLOG_MAP_AT_CYCLE_COUNTGauge = TEMPLOG_MAP_AT_CYCLE_COUNT,"TEMPLOG_MAP_AT_CYCLE_COUNT", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 gaugeCategory = GDI -m_requested_pumpGauge = m_requested_pump,"Pump Angle", "deg", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +m_requested_pumpGauge = m_requested_pump,"DI: Pump Angle", "deg", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +fuel_requested_percentGauge = fuel_requested_percent,"DI: fuel_requested_percent", "v", 0.0,100.0, 0.0,100.0, 0.0,100.0, 0,0 +fuel_requested_percent_piGauge = fuel_requested_percent_pi,"DI: fuel_requested_percent_pi", "v", 0.0,100.0, 0.0,100.0, 0.0,100.0, 0,0 +m_I_sum_percentGauge = m_I_sum_percent,"DI: m_I_sum_percent", "v", 0.0,100.0, 0.0,100.0, 0.0,100.0, 0,0 +m_pressureTarget_kPaGauge = m_pressureTarget_kPa,"DI: m_pressureTarget_kPa", "v", 0.0,100.0, 0.0,100.0, 0.0,100.0, 0,0 highFuelPressureGauge = highFuelPressure, "Fuel pressure (high)", "bar", 0, 200, 0, 0, 200, 200, 1, 0 gaugeCategory = Sensors - Extra 2 @@ -3581,7 +3487,11 @@ entry = tps1Split, "tps1Split", float, "%.3f" entry = tps2Split, "tps2Split", float, "%.3f" entry = tps12Split, "tps12Split", float, "%.3f" entry = accPedalSplit, "accPedalSplit", float, "%.3f" -entry = m_requested_pump, "Pump Angle", float, "%.3f" +entry = m_requested_pump, "DI: Pump Angle", float, "%.3f" +entry = fuel_requested_percent, "DI: fuel_requested_percent", float, "%.3f" +entry = fuel_requested_percent_pi, "DI: fuel_requested_percent_pi", float, "%.3f" +entry = m_I_sum_percent, "DI: m_I_sum_percent", float, "%.3f" +entry = m_pressureTarget_kPa, "DI: m_pressureTarget_kPa", float, "%.3f" entry = launchSpeedCondition, "launchSpeedCondition", int, "%d" entry = launchRpmCondition, "launchRpmCondition", int, "%d" entry = launchTpsCondition, "launchTpsCondition", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index c73c3d3335..229afe307e 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.01.01.prometheus_405.1459386017" + signature = "rusEFI 2022.01.01.prometheus_405.3415559132" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.01.01.prometheus_405.1459386017" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.01.01.prometheus_405.3415559132" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jan 01 21:09:20 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jan 01 22:22:58 UTC 2022 pageSize = 20996 page = 1 @@ -2097,174 +2097,76 @@ tps12Split = scalar, S16, 330, "%", 0.01, 0 accPedalSplit = scalar, S16, 332, "%", 0.01, 0 m_requested_pump = scalar, S16, 334, "deg", 0.02, 0 unused16 = scalar, S16, 336, "deg", 0.02, 0 -unusedAtTheEnd1 = scalar, U08, 338, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 339, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 340, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 341, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 342, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 343, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 344, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 345, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 346, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 347, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 348, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 349, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 350, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 351, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 352, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 353, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 354, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 355, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 356, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 357, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 358, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 359, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 360, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 361, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 362, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 363, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 364, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 365, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 366, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 367, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 368, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 369, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 370, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 371, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 372, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 373, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 374, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 375, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 376, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 377, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 378, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 379, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 380, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 381, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 382, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 383, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 384, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 385, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 386, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 387, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 388, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 389, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 390, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 391, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 392, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 393, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 394, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 395, "", 1, 0 -unusedAtTheEnd59 = scalar, U08, 396, "", 1, 0 -unusedAtTheEnd60 = scalar, U08, 397, "", 1, 0 -unusedAtTheEnd61 = scalar, U08, 398, "", 1, 0 -unusedAtTheEnd62 = scalar, U08, 399, "", 1, 0 -unusedAtTheEnd63 = scalar, U08, 400, "", 1, 0 -unusedAtTheEnd64 = scalar, U08, 401, "", 1, 0 -unusedAtTheEnd65 = scalar, U08, 402, "", 1, 0 -unusedAtTheEnd66 = scalar, U08, 403, "", 1, 0 -unusedAtTheEnd67 = scalar, U08, 404, "", 1, 0 -unusedAtTheEnd68 = scalar, U08, 405, "", 1, 0 -unusedAtTheEnd69 = scalar, U08, 406, "", 1, 0 -unusedAtTheEnd70 = scalar, U08, 407, "", 1, 0 -unusedAtTheEnd71 = scalar, U08, 408, "", 1, 0 -unusedAtTheEnd72 = scalar, U08, 409, "", 1, 0 -unusedAtTheEnd73 = scalar, U08, 410, "", 1, 0 -unusedAtTheEnd74 = scalar, U08, 411, "", 1, 0 -unusedAtTheEnd75 = scalar, U08, 412, "", 1, 0 -unusedAtTheEnd76 = scalar, U08, 413, "", 1, 0 -unusedAtTheEnd77 = scalar, U08, 414, "", 1, 0 -unusedAtTheEnd78 = scalar, U08, 415, "", 1, 0 -unusedAtTheEnd79 = scalar, U08, 416, "", 1, 0 -unusedAtTheEnd80 = scalar, U08, 417, "", 1, 0 -unusedAtTheEnd81 = scalar, U08, 418, "", 1, 0 -unusedAtTheEnd82 = scalar, U08, 419, "", 1, 0 -unusedAtTheEnd83 = scalar, U08, 420, "", 1, 0 -unusedAtTheEnd84 = scalar, U08, 421, "", 1, 0 -unusedAtTheEnd85 = scalar, U08, 422, "", 1, 0 -unusedAtTheEnd86 = scalar, U08, 423, "", 1, 0 -unusedAtTheEnd87 = scalar, U08, 424, "", 1, 0 -unusedAtTheEnd88 = scalar, U08, 425, "", 1, 0 -unusedAtTheEnd89 = scalar, U08, 426, "", 1, 0 -unusedAtTheEnd90 = scalar, U08, 427, "", 1, 0 -unusedAtTheEnd91 = scalar, U08, 428, "", 1, 0 -unusedAtTheEnd92 = scalar, U08, 429, "", 1, 0 -unusedAtTheEnd93 = scalar, U08, 430, "", 1, 0 -unusedAtTheEnd94 = scalar, U08, 431, "", 1, 0 -unusedAtTheEnd95 = scalar, U08, 432, "", 1, 0 -unusedAtTheEnd96 = scalar, U08, 433, "", 1, 0 -unusedAtTheEnd97 = scalar, U08, 434, "", 1, 0 -unusedAtTheEnd98 = scalar, U08, 435, "", 1, 0 -unusedAtTheEnd99 = scalar, U08, 436, "", 1, 0 -unusedAtTheEnd100 = scalar, U08, 437, "", 1, 0 -unusedAtTheEnd101 = scalar, U08, 438, "", 1, 0 -unusedAtTheEnd102 = scalar, U08, 439, "", 1, 0 -unusedAtTheEnd103 = scalar, U08, 440, "", 1, 0 -unusedAtTheEnd104 = scalar, U08, 441, "", 1, 0 -unusedAtTheEnd105 = scalar, U08, 442, "", 1, 0 -unusedAtTheEnd106 = scalar, U08, 443, "", 1, 0 -unusedAtTheEnd107 = scalar, U08, 444, "", 1, 0 -unusedAtTheEnd108 = scalar, U08, 445, "", 1, 0 -unusedAtTheEnd109 = scalar, U08, 446, "", 1, 0 -unusedAtTheEnd110 = scalar, U08, 447, "", 1, 0 -unusedAtTheEnd111 = scalar, U08, 448, "", 1, 0 -unusedAtTheEnd112 = scalar, U08, 449, "", 1, 0 -unusedAtTheEnd113 = scalar, U08, 450, "", 1, 0 -unusedAtTheEnd114 = scalar, U08, 451, "", 1, 0 -unusedAtTheEnd115 = scalar, U08, 452, "", 1, 0 -unusedAtTheEnd116 = scalar, U08, 453, "", 1, 0 -unusedAtTheEnd117 = scalar, U08, 454, "", 1, 0 -unusedAtTheEnd118 = scalar, U08, 455, "", 1, 0 -unusedAtTheEnd119 = scalar, U08, 456, "", 1, 0 -unusedAtTheEnd120 = scalar, U08, 457, "", 1, 0 -unusedAtTheEnd121 = scalar, U08, 458, "", 1, 0 -unusedAtTheEnd122 = scalar, U08, 459, "", 1, 0 -unusedAtTheEnd123 = scalar, U08, 460, "", 1, 0 -unusedAtTheEnd124 = scalar, U08, 461, "", 1, 0 -unusedAtTheEnd125 = scalar, U08, 462, "", 1, 0 -unusedAtTheEnd126 = scalar, U08, 463, "", 1, 0 -unusedAtTheEnd127 = scalar, U08, 464, "", 1, 0 -unusedAtTheEnd128 = scalar, U08, 465, "", 1, 0 -unusedAtTheEnd129 = scalar, U08, 466, "", 1, 0 -unusedAtTheEnd130 = scalar, U08, 467, "", 1, 0 -unusedAtTheEnd131 = scalar, U08, 468, "", 1, 0 -unusedAtTheEnd132 = scalar, U08, 469, "", 1, 0 -launchSpeedCondition = bits, U32, 470, [0:0] -launchRpmCondition = bits, U32, 470, [1:1] -launchTpsCondition = bits, U32, 470, [2:2] -launchActivateSwitchCondition = bits, U32, 470, [3:3] -launchIsLaunchCondition = bits, U32, 470, [4:4] -launchCombinedConditions = bits, U32, 470, [5:5] -launchActivatePinState = bits, U32, 470, [6:6] -unusedBit_173_7 = bits, U32, 470, [7:7] -unusedBit_173_8 = bits, U32, 470, [8:8] -unusedBit_173_9 = bits, U32, 470, [9:9] -unusedBit_173_10 = bits, U32, 470, [10:10] -unusedBit_173_11 = bits, U32, 470, [11:11] -unusedBit_173_12 = bits, U32, 470, [12:12] -unusedBit_173_13 = bits, U32, 470, [13:13] -unusedBit_173_14 = bits, U32, 470, [14:14] -unusedBit_173_15 = bits, U32, 470, [15:15] -unusedBit_173_16 = bits, U32, 470, [16:16] -unusedBit_173_17 = bits, U32, 470, [17:17] -unusedBit_173_18 = bits, U32, 470, [18:18] -unusedBit_173_19 = bits, U32, 470, [19:19] -unusedBit_173_20 = bits, U32, 470, [20:20] -unusedBit_173_21 = bits, U32, 470, [21:21] -unusedBit_173_22 = bits, U32, 470, [22:22] -unusedBit_173_23 = bits, U32, 470, [23:23] -unusedBit_173_24 = bits, U32, 470, [24:24] -unusedBit_173_25 = bits, U32, 470, [25:25] -unusedBit_173_26 = bits, U32, 470, [26:26] -unusedBit_173_27 = bits, U32, 470, [27:27] -unusedBit_173_28 = bits, U32, 470, [28:28] -unusedBit_173_29 = bits, U32, 470, [29:29] -unusedBit_173_30 = bits, U32, 470, [30:30] -unusedBit_173_31 = bits, U32, 470, [31:31] -TEMPLOG_MAP_AT_CYCLE_COUNT = scalar, U08, 474, "", 1, 0 -unused11 = scalar, U08, 475, "", 1, 0 -unused11 = scalar, U08, 475, "", 1, 0 -unused11 = scalar, U08, 475, "", 1, 0 +alignmentFill_at_338 = array, U08, 338, [2], "units", 1, 0 +fuel_requested_percent = scalar, F32, 340, "v", 1, 0 +fuel_requested_percent_pi = scalar, F32, 344, "v", 1, 0 +m_I_sum_percent = scalar, F32, 348, "v", 1, 0 +m_pressureTarget_kPa = scalar, F32, 352, "v", 1, 0 +unusedAtTheEnd1 = scalar, S32, 356, "", 1, 0 +unusedAtTheEnd2 = scalar, S32, 360, "", 1, 0 +unusedAtTheEnd3 = scalar, S32, 364, "", 1, 0 +unusedAtTheEnd4 = scalar, S32, 368, "", 1, 0 +unusedAtTheEnd5 = scalar, S32, 372, "", 1, 0 +unusedAtTheEnd6 = scalar, S32, 376, "", 1, 0 +unusedAtTheEnd7 = scalar, S32, 380, "", 1, 0 +unusedAtTheEnd8 = scalar, S32, 384, "", 1, 0 +unusedAtTheEnd9 = scalar, S32, 388, "", 1, 0 +unusedAtTheEnd10 = scalar, S32, 392, "", 1, 0 +unusedAtTheEnd11 = scalar, S32, 396, "", 1, 0 +unusedAtTheEnd12 = scalar, S32, 400, "", 1, 0 +unusedAtTheEnd13 = scalar, S32, 404, "", 1, 0 +unusedAtTheEnd14 = scalar, S32, 408, "", 1, 0 +unusedAtTheEnd15 = scalar, S32, 412, "", 1, 0 +unusedAtTheEnd16 = scalar, S32, 416, "", 1, 0 +unusedAtTheEnd17 = scalar, S32, 420, "", 1, 0 +unusedAtTheEnd18 = scalar, S32, 424, "", 1, 0 +unusedAtTheEnd19 = scalar, S32, 428, "", 1, 0 +unusedAtTheEnd20 = scalar, S32, 432, "", 1, 0 +unusedAtTheEnd21 = scalar, S32, 436, "", 1, 0 +unusedAtTheEnd22 = scalar, S32, 440, "", 1, 0 +unusedAtTheEnd23 = scalar, S32, 444, "", 1, 0 +unusedAtTheEnd24 = scalar, S32, 448, "", 1, 0 +unusedAtTheEnd25 = scalar, S32, 452, "", 1, 0 +unusedAtTheEnd26 = scalar, S32, 456, "", 1, 0 +unusedAtTheEnd27 = scalar, S32, 460, "", 1, 0 +unusedAtTheEnd28 = scalar, S32, 464, "", 1, 0 +launchSpeedCondition = bits, U32, 468, [0:0] +launchRpmCondition = bits, U32, 468, [1:1] +launchTpsCondition = bits, U32, 468, [2:2] +launchActivateSwitchCondition = bits, U32, 468, [3:3] +launchIsLaunchCondition = bits, U32, 468, [4:4] +launchCombinedConditions = bits, U32, 468, [5:5] +launchActivatePinState = bits, U32, 468, [6:6] +unusedBit_178_7 = bits, U32, 468, [7:7] +unusedBit_178_8 = bits, U32, 468, [8:8] +unusedBit_178_9 = bits, U32, 468, [9:9] +unusedBit_178_10 = bits, U32, 468, [10:10] +unusedBit_178_11 = bits, U32, 468, [11:11] +unusedBit_178_12 = bits, U32, 468, [12:12] +unusedBit_178_13 = bits, U32, 468, [13:13] +unusedBit_178_14 = bits, U32, 468, [14:14] +unusedBit_178_15 = bits, U32, 468, [15:15] +unusedBit_178_16 = bits, U32, 468, [16:16] +unusedBit_178_17 = bits, U32, 468, [17:17] +unusedBit_178_18 = bits, U32, 468, [18:18] +unusedBit_178_19 = bits, U32, 468, [19:19] +unusedBit_178_20 = bits, U32, 468, [20:20] +unusedBit_178_21 = bits, U32, 468, [21:21] +unusedBit_178_22 = bits, U32, 468, [22:22] +unusedBit_178_23 = bits, U32, 468, [23:23] +unusedBit_178_24 = bits, U32, 468, [24:24] +unusedBit_178_25 = bits, U32, 468, [25:25] +unusedBit_178_26 = bits, U32, 468, [26:26] +unusedBit_178_27 = bits, U32, 468, [27:27] +unusedBit_178_28 = bits, U32, 468, [28:28] +unusedBit_178_29 = bits, U32, 468, [29:29] +unusedBit_178_30 = bits, U32, 468, [30:30] +unusedBit_178_31 = bits, U32, 468, [31:31] +TEMPLOG_MAP_AT_CYCLE_COUNT = scalar, U08, 472, "", 1, 0 +unused11 = scalar, U08, 473, "", 1, 0 +unused11 = scalar, U08, 473, "", 1, 0 +unused11 = scalar, U08, 473, "", 1, 0 +alignmentFill_at_474 = array, U08, 474, [2], "units", 1, 0 TEMPLOG_MAP_AT_SPECIAL_POINT = scalar, F32, 476, "", 1, 0 TEMPLOG_MAP_AT_DIFF = scalar, F32, 480, "", 1, 0 vvtSyncGapRatio = scalar, F32, 484, "", 1, 0 @@ -3102,7 +3004,11 @@ TEMPLOG_MAP_AT_DIFFGauge = TEMPLOG_MAP_AT_DIFF,"TEMPLOG_MAP_AT_DIFF", "", -10000 TEMPLOG_MAP_AT_CYCLE_COUNTGauge = TEMPLOG_MAP_AT_CYCLE_COUNT,"TEMPLOG_MAP_AT_CYCLE_COUNT", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 gaugeCategory = GDI -m_requested_pumpGauge = m_requested_pump,"Pump Angle", "deg", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +m_requested_pumpGauge = m_requested_pump,"DI: Pump Angle", "deg", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +fuel_requested_percentGauge = fuel_requested_percent,"DI: fuel_requested_percent", "v", 0.0,100.0, 0.0,100.0, 0.0,100.0, 0,0 +fuel_requested_percent_piGauge = fuel_requested_percent_pi,"DI: fuel_requested_percent_pi", "v", 0.0,100.0, 0.0,100.0, 0.0,100.0, 0,0 +m_I_sum_percentGauge = m_I_sum_percent,"DI: m_I_sum_percent", "v", 0.0,100.0, 0.0,100.0, 0.0,100.0, 0,0 +m_pressureTarget_kPaGauge = m_pressureTarget_kPa,"DI: m_pressureTarget_kPa", "v", 0.0,100.0, 0.0,100.0, 0.0,100.0, 0,0 highFuelPressureGauge = highFuelPressure, "Fuel pressure (high)", "bar", 0, 200, 0, 0, 200, 200, 1, 0 gaugeCategory = Sensors - Extra 2 @@ -3581,7 +3487,11 @@ entry = tps1Split, "tps1Split", float, "%.3f" entry = tps2Split, "tps2Split", float, "%.3f" entry = tps12Split, "tps12Split", float, "%.3f" entry = accPedalSplit, "accPedalSplit", float, "%.3f" -entry = m_requested_pump, "Pump Angle", float, "%.3f" +entry = m_requested_pump, "DI: Pump Angle", float, "%.3f" +entry = fuel_requested_percent, "DI: fuel_requested_percent", float, "%.3f" +entry = fuel_requested_percent_pi, "DI: fuel_requested_percent_pi", float, "%.3f" +entry = m_I_sum_percent, "DI: m_I_sum_percent", float, "%.3f" +entry = m_pressureTarget_kPa, "DI: m_pressureTarget_kPa", float, "%.3f" entry = launchSpeedCondition, "launchSpeedCondition", int, "%d" entry = launchRpmCondition, "launchRpmCondition", int, "%d" entry = launchTpsCondition, "launchTpsCondition", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index 902513e631..d07bf48018 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.01.01.prometheus_469.1459386017" + signature = "rusEFI 2022.01.01.prometheus_469.3415559132" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.01.01.prometheus_469.1459386017" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.01.01.prometheus_469.3415559132" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jan 01 21:09:17 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jan 01 22:22:55 UTC 2022 pageSize = 20996 page = 1 @@ -2097,174 +2097,76 @@ tps12Split = scalar, S16, 330, "%", 0.01, 0 accPedalSplit = scalar, S16, 332, "%", 0.01, 0 m_requested_pump = scalar, S16, 334, "deg", 0.02, 0 unused16 = scalar, S16, 336, "deg", 0.02, 0 -unusedAtTheEnd1 = scalar, U08, 338, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 339, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 340, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 341, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 342, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 343, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 344, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 345, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 346, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 347, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 348, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 349, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 350, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 351, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 352, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 353, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 354, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 355, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 356, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 357, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 358, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 359, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 360, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 361, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 362, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 363, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 364, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 365, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 366, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 367, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 368, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 369, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 370, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 371, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 372, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 373, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 374, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 375, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 376, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 377, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 378, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 379, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 380, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 381, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 382, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 383, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 384, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 385, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 386, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 387, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 388, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 389, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 390, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 391, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 392, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 393, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 394, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 395, "", 1, 0 -unusedAtTheEnd59 = scalar, U08, 396, "", 1, 0 -unusedAtTheEnd60 = scalar, U08, 397, "", 1, 0 -unusedAtTheEnd61 = scalar, U08, 398, "", 1, 0 -unusedAtTheEnd62 = scalar, U08, 399, "", 1, 0 -unusedAtTheEnd63 = scalar, U08, 400, "", 1, 0 -unusedAtTheEnd64 = scalar, U08, 401, "", 1, 0 -unusedAtTheEnd65 = scalar, U08, 402, "", 1, 0 -unusedAtTheEnd66 = scalar, U08, 403, "", 1, 0 -unusedAtTheEnd67 = scalar, U08, 404, "", 1, 0 -unusedAtTheEnd68 = scalar, U08, 405, "", 1, 0 -unusedAtTheEnd69 = scalar, U08, 406, "", 1, 0 -unusedAtTheEnd70 = scalar, U08, 407, "", 1, 0 -unusedAtTheEnd71 = scalar, U08, 408, "", 1, 0 -unusedAtTheEnd72 = scalar, U08, 409, "", 1, 0 -unusedAtTheEnd73 = scalar, U08, 410, "", 1, 0 -unusedAtTheEnd74 = scalar, U08, 411, "", 1, 0 -unusedAtTheEnd75 = scalar, U08, 412, "", 1, 0 -unusedAtTheEnd76 = scalar, U08, 413, "", 1, 0 -unusedAtTheEnd77 = scalar, U08, 414, "", 1, 0 -unusedAtTheEnd78 = scalar, U08, 415, "", 1, 0 -unusedAtTheEnd79 = scalar, U08, 416, "", 1, 0 -unusedAtTheEnd80 = scalar, U08, 417, "", 1, 0 -unusedAtTheEnd81 = scalar, U08, 418, "", 1, 0 -unusedAtTheEnd82 = scalar, U08, 419, "", 1, 0 -unusedAtTheEnd83 = scalar, U08, 420, "", 1, 0 -unusedAtTheEnd84 = scalar, U08, 421, "", 1, 0 -unusedAtTheEnd85 = scalar, U08, 422, "", 1, 0 -unusedAtTheEnd86 = scalar, U08, 423, "", 1, 0 -unusedAtTheEnd87 = scalar, U08, 424, "", 1, 0 -unusedAtTheEnd88 = scalar, U08, 425, "", 1, 0 -unusedAtTheEnd89 = scalar, U08, 426, "", 1, 0 -unusedAtTheEnd90 = scalar, U08, 427, "", 1, 0 -unusedAtTheEnd91 = scalar, U08, 428, "", 1, 0 -unusedAtTheEnd92 = scalar, U08, 429, "", 1, 0 -unusedAtTheEnd93 = scalar, U08, 430, "", 1, 0 -unusedAtTheEnd94 = scalar, U08, 431, "", 1, 0 -unusedAtTheEnd95 = scalar, U08, 432, "", 1, 0 -unusedAtTheEnd96 = scalar, U08, 433, "", 1, 0 -unusedAtTheEnd97 = scalar, U08, 434, "", 1, 0 -unusedAtTheEnd98 = scalar, U08, 435, "", 1, 0 -unusedAtTheEnd99 = scalar, U08, 436, "", 1, 0 -unusedAtTheEnd100 = scalar, U08, 437, "", 1, 0 -unusedAtTheEnd101 = scalar, U08, 438, "", 1, 0 -unusedAtTheEnd102 = scalar, U08, 439, "", 1, 0 -unusedAtTheEnd103 = scalar, U08, 440, "", 1, 0 -unusedAtTheEnd104 = scalar, U08, 441, "", 1, 0 -unusedAtTheEnd105 = scalar, U08, 442, "", 1, 0 -unusedAtTheEnd106 = scalar, U08, 443, "", 1, 0 -unusedAtTheEnd107 = scalar, U08, 444, "", 1, 0 -unusedAtTheEnd108 = scalar, U08, 445, "", 1, 0 -unusedAtTheEnd109 = scalar, U08, 446, "", 1, 0 -unusedAtTheEnd110 = scalar, U08, 447, "", 1, 0 -unusedAtTheEnd111 = scalar, U08, 448, "", 1, 0 -unusedAtTheEnd112 = scalar, U08, 449, "", 1, 0 -unusedAtTheEnd113 = scalar, U08, 450, "", 1, 0 -unusedAtTheEnd114 = scalar, U08, 451, "", 1, 0 -unusedAtTheEnd115 = scalar, U08, 452, "", 1, 0 -unusedAtTheEnd116 = scalar, U08, 453, "", 1, 0 -unusedAtTheEnd117 = scalar, U08, 454, "", 1, 0 -unusedAtTheEnd118 = scalar, U08, 455, "", 1, 0 -unusedAtTheEnd119 = scalar, U08, 456, "", 1, 0 -unusedAtTheEnd120 = scalar, U08, 457, "", 1, 0 -unusedAtTheEnd121 = scalar, U08, 458, "", 1, 0 -unusedAtTheEnd122 = scalar, U08, 459, "", 1, 0 -unusedAtTheEnd123 = scalar, U08, 460, "", 1, 0 -unusedAtTheEnd124 = scalar, U08, 461, "", 1, 0 -unusedAtTheEnd125 = scalar, U08, 462, "", 1, 0 -unusedAtTheEnd126 = scalar, U08, 463, "", 1, 0 -unusedAtTheEnd127 = scalar, U08, 464, "", 1, 0 -unusedAtTheEnd128 = scalar, U08, 465, "", 1, 0 -unusedAtTheEnd129 = scalar, U08, 466, "", 1, 0 -unusedAtTheEnd130 = scalar, U08, 467, "", 1, 0 -unusedAtTheEnd131 = scalar, U08, 468, "", 1, 0 -unusedAtTheEnd132 = scalar, U08, 469, "", 1, 0 -launchSpeedCondition = bits, U32, 470, [0:0] -launchRpmCondition = bits, U32, 470, [1:1] -launchTpsCondition = bits, U32, 470, [2:2] -launchActivateSwitchCondition = bits, U32, 470, [3:3] -launchIsLaunchCondition = bits, U32, 470, [4:4] -launchCombinedConditions = bits, U32, 470, [5:5] -launchActivatePinState = bits, U32, 470, [6:6] -unusedBit_173_7 = bits, U32, 470, [7:7] -unusedBit_173_8 = bits, U32, 470, [8:8] -unusedBit_173_9 = bits, U32, 470, [9:9] -unusedBit_173_10 = bits, U32, 470, [10:10] -unusedBit_173_11 = bits, U32, 470, [11:11] -unusedBit_173_12 = bits, U32, 470, [12:12] -unusedBit_173_13 = bits, U32, 470, [13:13] -unusedBit_173_14 = bits, U32, 470, [14:14] -unusedBit_173_15 = bits, U32, 470, [15:15] -unusedBit_173_16 = bits, U32, 470, [16:16] -unusedBit_173_17 = bits, U32, 470, [17:17] -unusedBit_173_18 = bits, U32, 470, [18:18] -unusedBit_173_19 = bits, U32, 470, [19:19] -unusedBit_173_20 = bits, U32, 470, [20:20] -unusedBit_173_21 = bits, U32, 470, [21:21] -unusedBit_173_22 = bits, U32, 470, [22:22] -unusedBit_173_23 = bits, U32, 470, [23:23] -unusedBit_173_24 = bits, U32, 470, [24:24] -unusedBit_173_25 = bits, U32, 470, [25:25] -unusedBit_173_26 = bits, U32, 470, [26:26] -unusedBit_173_27 = bits, U32, 470, [27:27] -unusedBit_173_28 = bits, U32, 470, [28:28] -unusedBit_173_29 = bits, U32, 470, [29:29] -unusedBit_173_30 = bits, U32, 470, [30:30] -unusedBit_173_31 = bits, U32, 470, [31:31] -TEMPLOG_MAP_AT_CYCLE_COUNT = scalar, U08, 474, "", 1, 0 -unused11 = scalar, U08, 475, "", 1, 0 -unused11 = scalar, U08, 475, "", 1, 0 -unused11 = scalar, U08, 475, "", 1, 0 +alignmentFill_at_338 = array, U08, 338, [2], "units", 1, 0 +fuel_requested_percent = scalar, F32, 340, "v", 1, 0 +fuel_requested_percent_pi = scalar, F32, 344, "v", 1, 0 +m_I_sum_percent = scalar, F32, 348, "v", 1, 0 +m_pressureTarget_kPa = scalar, F32, 352, "v", 1, 0 +unusedAtTheEnd1 = scalar, S32, 356, "", 1, 0 +unusedAtTheEnd2 = scalar, S32, 360, "", 1, 0 +unusedAtTheEnd3 = scalar, S32, 364, "", 1, 0 +unusedAtTheEnd4 = scalar, S32, 368, "", 1, 0 +unusedAtTheEnd5 = scalar, S32, 372, "", 1, 0 +unusedAtTheEnd6 = scalar, S32, 376, "", 1, 0 +unusedAtTheEnd7 = scalar, S32, 380, "", 1, 0 +unusedAtTheEnd8 = scalar, S32, 384, "", 1, 0 +unusedAtTheEnd9 = scalar, S32, 388, "", 1, 0 +unusedAtTheEnd10 = scalar, S32, 392, "", 1, 0 +unusedAtTheEnd11 = scalar, S32, 396, "", 1, 0 +unusedAtTheEnd12 = scalar, S32, 400, "", 1, 0 +unusedAtTheEnd13 = scalar, S32, 404, "", 1, 0 +unusedAtTheEnd14 = scalar, S32, 408, "", 1, 0 +unusedAtTheEnd15 = scalar, S32, 412, "", 1, 0 +unusedAtTheEnd16 = scalar, S32, 416, "", 1, 0 +unusedAtTheEnd17 = scalar, S32, 420, "", 1, 0 +unusedAtTheEnd18 = scalar, S32, 424, "", 1, 0 +unusedAtTheEnd19 = scalar, S32, 428, "", 1, 0 +unusedAtTheEnd20 = scalar, S32, 432, "", 1, 0 +unusedAtTheEnd21 = scalar, S32, 436, "", 1, 0 +unusedAtTheEnd22 = scalar, S32, 440, "", 1, 0 +unusedAtTheEnd23 = scalar, S32, 444, "", 1, 0 +unusedAtTheEnd24 = scalar, S32, 448, "", 1, 0 +unusedAtTheEnd25 = scalar, S32, 452, "", 1, 0 +unusedAtTheEnd26 = scalar, S32, 456, "", 1, 0 +unusedAtTheEnd27 = scalar, S32, 460, "", 1, 0 +unusedAtTheEnd28 = scalar, S32, 464, "", 1, 0 +launchSpeedCondition = bits, U32, 468, [0:0] +launchRpmCondition = bits, U32, 468, [1:1] +launchTpsCondition = bits, U32, 468, [2:2] +launchActivateSwitchCondition = bits, U32, 468, [3:3] +launchIsLaunchCondition = bits, U32, 468, [4:4] +launchCombinedConditions = bits, U32, 468, [5:5] +launchActivatePinState = bits, U32, 468, [6:6] +unusedBit_178_7 = bits, U32, 468, [7:7] +unusedBit_178_8 = bits, U32, 468, [8:8] +unusedBit_178_9 = bits, U32, 468, [9:9] +unusedBit_178_10 = bits, U32, 468, [10:10] +unusedBit_178_11 = bits, U32, 468, [11:11] +unusedBit_178_12 = bits, U32, 468, [12:12] +unusedBit_178_13 = bits, U32, 468, [13:13] +unusedBit_178_14 = bits, U32, 468, [14:14] +unusedBit_178_15 = bits, U32, 468, [15:15] +unusedBit_178_16 = bits, U32, 468, [16:16] +unusedBit_178_17 = bits, U32, 468, [17:17] +unusedBit_178_18 = bits, U32, 468, [18:18] +unusedBit_178_19 = bits, U32, 468, [19:19] +unusedBit_178_20 = bits, U32, 468, [20:20] +unusedBit_178_21 = bits, U32, 468, [21:21] +unusedBit_178_22 = bits, U32, 468, [22:22] +unusedBit_178_23 = bits, U32, 468, [23:23] +unusedBit_178_24 = bits, U32, 468, [24:24] +unusedBit_178_25 = bits, U32, 468, [25:25] +unusedBit_178_26 = bits, U32, 468, [26:26] +unusedBit_178_27 = bits, U32, 468, [27:27] +unusedBit_178_28 = bits, U32, 468, [28:28] +unusedBit_178_29 = bits, U32, 468, [29:29] +unusedBit_178_30 = bits, U32, 468, [30:30] +unusedBit_178_31 = bits, U32, 468, [31:31] +TEMPLOG_MAP_AT_CYCLE_COUNT = scalar, U08, 472, "", 1, 0 +unused11 = scalar, U08, 473, "", 1, 0 +unused11 = scalar, U08, 473, "", 1, 0 +unused11 = scalar, U08, 473, "", 1, 0 +alignmentFill_at_474 = array, U08, 474, [2], "units", 1, 0 TEMPLOG_MAP_AT_SPECIAL_POINT = scalar, F32, 476, "", 1, 0 TEMPLOG_MAP_AT_DIFF = scalar, F32, 480, "", 1, 0 vvtSyncGapRatio = scalar, F32, 484, "", 1, 0 @@ -3102,7 +3004,11 @@ TEMPLOG_MAP_AT_DIFFGauge = TEMPLOG_MAP_AT_DIFF,"TEMPLOG_MAP_AT_DIFF", "", -10000 TEMPLOG_MAP_AT_CYCLE_COUNTGauge = TEMPLOG_MAP_AT_CYCLE_COUNT,"TEMPLOG_MAP_AT_CYCLE_COUNT", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 gaugeCategory = GDI -m_requested_pumpGauge = m_requested_pump,"Pump Angle", "deg", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +m_requested_pumpGauge = m_requested_pump,"DI: Pump Angle", "deg", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +fuel_requested_percentGauge = fuel_requested_percent,"DI: fuel_requested_percent", "v", 0.0,100.0, 0.0,100.0, 0.0,100.0, 0,0 +fuel_requested_percent_piGauge = fuel_requested_percent_pi,"DI: fuel_requested_percent_pi", "v", 0.0,100.0, 0.0,100.0, 0.0,100.0, 0,0 +m_I_sum_percentGauge = m_I_sum_percent,"DI: m_I_sum_percent", "v", 0.0,100.0, 0.0,100.0, 0.0,100.0, 0,0 +m_pressureTarget_kPaGauge = m_pressureTarget_kPa,"DI: m_pressureTarget_kPa", "v", 0.0,100.0, 0.0,100.0, 0.0,100.0, 0,0 highFuelPressureGauge = highFuelPressure, "Fuel pressure (high)", "bar", 0, 200, 0, 0, 200, 200, 1, 0 gaugeCategory = Sensors - Extra 2 @@ -3581,7 +3487,11 @@ entry = tps1Split, "tps1Split", float, "%.3f" entry = tps2Split, "tps2Split", float, "%.3f" entry = tps12Split, "tps12Split", float, "%.3f" entry = accPedalSplit, "accPedalSplit", float, "%.3f" -entry = m_requested_pump, "Pump Angle", float, "%.3f" +entry = m_requested_pump, "DI: Pump Angle", float, "%.3f" +entry = fuel_requested_percent, "DI: fuel_requested_percent", float, "%.3f" +entry = fuel_requested_percent_pi, "DI: fuel_requested_percent_pi", float, "%.3f" +entry = m_I_sum_percent, "DI: m_I_sum_percent", float, "%.3f" +entry = m_pressureTarget_kPa, "DI: m_pressureTarget_kPa", float, "%.3f" entry = launchSpeedCondition, "launchSpeedCondition", int, "%d" entry = launchRpmCondition, "launchRpmCondition", int, "%d" entry = launchTpsCondition, "launchTpsCondition", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index 8bc2b22786..2d7b4951d7 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.01.01.proteus_f4.3303754139" + signature = "rusEFI 2022.01.01.proteus_f4.1501721830" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.01.01.proteus_f4.3303754139" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.01.01.proteus_f4.1501721830" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jan 01 21:09:26 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jan 01 22:23:03 UTC 2022 pageSize = 20996 page = 1 @@ -2097,174 +2097,76 @@ tps12Split = scalar, S16, 330, "%", 0.01, 0 accPedalSplit = scalar, S16, 332, "%", 0.01, 0 m_requested_pump = scalar, S16, 334, "deg", 0.02, 0 unused16 = scalar, S16, 336, "deg", 0.02, 0 -unusedAtTheEnd1 = scalar, U08, 338, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 339, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 340, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 341, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 342, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 343, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 344, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 345, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 346, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 347, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 348, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 349, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 350, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 351, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 352, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 353, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 354, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 355, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 356, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 357, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 358, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 359, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 360, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 361, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 362, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 363, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 364, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 365, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 366, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 367, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 368, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 369, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 370, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 371, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 372, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 373, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 374, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 375, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 376, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 377, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 378, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 379, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 380, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 381, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 382, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 383, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 384, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 385, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 386, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 387, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 388, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 389, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 390, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 391, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 392, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 393, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 394, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 395, "", 1, 0 -unusedAtTheEnd59 = scalar, U08, 396, "", 1, 0 -unusedAtTheEnd60 = scalar, U08, 397, "", 1, 0 -unusedAtTheEnd61 = scalar, U08, 398, "", 1, 0 -unusedAtTheEnd62 = scalar, U08, 399, "", 1, 0 -unusedAtTheEnd63 = scalar, U08, 400, "", 1, 0 -unusedAtTheEnd64 = scalar, U08, 401, "", 1, 0 -unusedAtTheEnd65 = scalar, U08, 402, "", 1, 0 -unusedAtTheEnd66 = scalar, U08, 403, "", 1, 0 -unusedAtTheEnd67 = scalar, U08, 404, "", 1, 0 -unusedAtTheEnd68 = scalar, U08, 405, "", 1, 0 -unusedAtTheEnd69 = scalar, U08, 406, "", 1, 0 -unusedAtTheEnd70 = scalar, U08, 407, "", 1, 0 -unusedAtTheEnd71 = scalar, U08, 408, "", 1, 0 -unusedAtTheEnd72 = scalar, U08, 409, "", 1, 0 -unusedAtTheEnd73 = scalar, U08, 410, "", 1, 0 -unusedAtTheEnd74 = scalar, U08, 411, "", 1, 0 -unusedAtTheEnd75 = scalar, U08, 412, "", 1, 0 -unusedAtTheEnd76 = scalar, U08, 413, "", 1, 0 -unusedAtTheEnd77 = scalar, U08, 414, "", 1, 0 -unusedAtTheEnd78 = scalar, U08, 415, "", 1, 0 -unusedAtTheEnd79 = scalar, U08, 416, "", 1, 0 -unusedAtTheEnd80 = scalar, U08, 417, "", 1, 0 -unusedAtTheEnd81 = scalar, U08, 418, "", 1, 0 -unusedAtTheEnd82 = scalar, U08, 419, "", 1, 0 -unusedAtTheEnd83 = scalar, U08, 420, "", 1, 0 -unusedAtTheEnd84 = scalar, U08, 421, "", 1, 0 -unusedAtTheEnd85 = scalar, U08, 422, "", 1, 0 -unusedAtTheEnd86 = scalar, U08, 423, "", 1, 0 -unusedAtTheEnd87 = scalar, U08, 424, "", 1, 0 -unusedAtTheEnd88 = scalar, U08, 425, "", 1, 0 -unusedAtTheEnd89 = scalar, U08, 426, "", 1, 0 -unusedAtTheEnd90 = scalar, U08, 427, "", 1, 0 -unusedAtTheEnd91 = scalar, U08, 428, "", 1, 0 -unusedAtTheEnd92 = scalar, U08, 429, "", 1, 0 -unusedAtTheEnd93 = scalar, U08, 430, "", 1, 0 -unusedAtTheEnd94 = scalar, U08, 431, "", 1, 0 -unusedAtTheEnd95 = scalar, U08, 432, "", 1, 0 -unusedAtTheEnd96 = scalar, U08, 433, "", 1, 0 -unusedAtTheEnd97 = scalar, U08, 434, "", 1, 0 -unusedAtTheEnd98 = scalar, U08, 435, "", 1, 0 -unusedAtTheEnd99 = scalar, U08, 436, "", 1, 0 -unusedAtTheEnd100 = scalar, U08, 437, "", 1, 0 -unusedAtTheEnd101 = scalar, U08, 438, "", 1, 0 -unusedAtTheEnd102 = scalar, U08, 439, "", 1, 0 -unusedAtTheEnd103 = scalar, U08, 440, "", 1, 0 -unusedAtTheEnd104 = scalar, U08, 441, "", 1, 0 -unusedAtTheEnd105 = scalar, U08, 442, "", 1, 0 -unusedAtTheEnd106 = scalar, U08, 443, "", 1, 0 -unusedAtTheEnd107 = scalar, U08, 444, "", 1, 0 -unusedAtTheEnd108 = scalar, U08, 445, "", 1, 0 -unusedAtTheEnd109 = scalar, U08, 446, "", 1, 0 -unusedAtTheEnd110 = scalar, U08, 447, "", 1, 0 -unusedAtTheEnd111 = scalar, U08, 448, "", 1, 0 -unusedAtTheEnd112 = scalar, U08, 449, "", 1, 0 -unusedAtTheEnd113 = scalar, U08, 450, "", 1, 0 -unusedAtTheEnd114 = scalar, U08, 451, "", 1, 0 -unusedAtTheEnd115 = scalar, U08, 452, "", 1, 0 -unusedAtTheEnd116 = scalar, U08, 453, "", 1, 0 -unusedAtTheEnd117 = scalar, U08, 454, "", 1, 0 -unusedAtTheEnd118 = scalar, U08, 455, "", 1, 0 -unusedAtTheEnd119 = scalar, U08, 456, "", 1, 0 -unusedAtTheEnd120 = scalar, U08, 457, "", 1, 0 -unusedAtTheEnd121 = scalar, U08, 458, "", 1, 0 -unusedAtTheEnd122 = scalar, U08, 459, "", 1, 0 -unusedAtTheEnd123 = scalar, U08, 460, "", 1, 0 -unusedAtTheEnd124 = scalar, U08, 461, "", 1, 0 -unusedAtTheEnd125 = scalar, U08, 462, "", 1, 0 -unusedAtTheEnd126 = scalar, U08, 463, "", 1, 0 -unusedAtTheEnd127 = scalar, U08, 464, "", 1, 0 -unusedAtTheEnd128 = scalar, U08, 465, "", 1, 0 -unusedAtTheEnd129 = scalar, U08, 466, "", 1, 0 -unusedAtTheEnd130 = scalar, U08, 467, "", 1, 0 -unusedAtTheEnd131 = scalar, U08, 468, "", 1, 0 -unusedAtTheEnd132 = scalar, U08, 469, "", 1, 0 -launchSpeedCondition = bits, U32, 470, [0:0] -launchRpmCondition = bits, U32, 470, [1:1] -launchTpsCondition = bits, U32, 470, [2:2] -launchActivateSwitchCondition = bits, U32, 470, [3:3] -launchIsLaunchCondition = bits, U32, 470, [4:4] -launchCombinedConditions = bits, U32, 470, [5:5] -launchActivatePinState = bits, U32, 470, [6:6] -unusedBit_173_7 = bits, U32, 470, [7:7] -unusedBit_173_8 = bits, U32, 470, [8:8] -unusedBit_173_9 = bits, U32, 470, [9:9] -unusedBit_173_10 = bits, U32, 470, [10:10] -unusedBit_173_11 = bits, U32, 470, [11:11] -unusedBit_173_12 = bits, U32, 470, [12:12] -unusedBit_173_13 = bits, U32, 470, [13:13] -unusedBit_173_14 = bits, U32, 470, [14:14] -unusedBit_173_15 = bits, U32, 470, [15:15] -unusedBit_173_16 = bits, U32, 470, [16:16] -unusedBit_173_17 = bits, U32, 470, [17:17] -unusedBit_173_18 = bits, U32, 470, [18:18] -unusedBit_173_19 = bits, U32, 470, [19:19] -unusedBit_173_20 = bits, U32, 470, [20:20] -unusedBit_173_21 = bits, U32, 470, [21:21] -unusedBit_173_22 = bits, U32, 470, [22:22] -unusedBit_173_23 = bits, U32, 470, [23:23] -unusedBit_173_24 = bits, U32, 470, [24:24] -unusedBit_173_25 = bits, U32, 470, [25:25] -unusedBit_173_26 = bits, U32, 470, [26:26] -unusedBit_173_27 = bits, U32, 470, [27:27] -unusedBit_173_28 = bits, U32, 470, [28:28] -unusedBit_173_29 = bits, U32, 470, [29:29] -unusedBit_173_30 = bits, U32, 470, [30:30] -unusedBit_173_31 = bits, U32, 470, [31:31] -TEMPLOG_MAP_AT_CYCLE_COUNT = scalar, U08, 474, "", 1, 0 -unused11 = scalar, U08, 475, "", 1, 0 -unused11 = scalar, U08, 475, "", 1, 0 -unused11 = scalar, U08, 475, "", 1, 0 +alignmentFill_at_338 = array, U08, 338, [2], "units", 1, 0 +fuel_requested_percent = scalar, F32, 340, "v", 1, 0 +fuel_requested_percent_pi = scalar, F32, 344, "v", 1, 0 +m_I_sum_percent = scalar, F32, 348, "v", 1, 0 +m_pressureTarget_kPa = scalar, F32, 352, "v", 1, 0 +unusedAtTheEnd1 = scalar, S32, 356, "", 1, 0 +unusedAtTheEnd2 = scalar, S32, 360, "", 1, 0 +unusedAtTheEnd3 = scalar, S32, 364, "", 1, 0 +unusedAtTheEnd4 = scalar, S32, 368, "", 1, 0 +unusedAtTheEnd5 = scalar, S32, 372, "", 1, 0 +unusedAtTheEnd6 = scalar, S32, 376, "", 1, 0 +unusedAtTheEnd7 = scalar, S32, 380, "", 1, 0 +unusedAtTheEnd8 = scalar, S32, 384, "", 1, 0 +unusedAtTheEnd9 = scalar, S32, 388, "", 1, 0 +unusedAtTheEnd10 = scalar, S32, 392, "", 1, 0 +unusedAtTheEnd11 = scalar, S32, 396, "", 1, 0 +unusedAtTheEnd12 = scalar, S32, 400, "", 1, 0 +unusedAtTheEnd13 = scalar, S32, 404, "", 1, 0 +unusedAtTheEnd14 = scalar, S32, 408, "", 1, 0 +unusedAtTheEnd15 = scalar, S32, 412, "", 1, 0 +unusedAtTheEnd16 = scalar, S32, 416, "", 1, 0 +unusedAtTheEnd17 = scalar, S32, 420, "", 1, 0 +unusedAtTheEnd18 = scalar, S32, 424, "", 1, 0 +unusedAtTheEnd19 = scalar, S32, 428, "", 1, 0 +unusedAtTheEnd20 = scalar, S32, 432, "", 1, 0 +unusedAtTheEnd21 = scalar, S32, 436, "", 1, 0 +unusedAtTheEnd22 = scalar, S32, 440, "", 1, 0 +unusedAtTheEnd23 = scalar, S32, 444, "", 1, 0 +unusedAtTheEnd24 = scalar, S32, 448, "", 1, 0 +unusedAtTheEnd25 = scalar, S32, 452, "", 1, 0 +unusedAtTheEnd26 = scalar, S32, 456, "", 1, 0 +unusedAtTheEnd27 = scalar, S32, 460, "", 1, 0 +unusedAtTheEnd28 = scalar, S32, 464, "", 1, 0 +launchSpeedCondition = bits, U32, 468, [0:0] +launchRpmCondition = bits, U32, 468, [1:1] +launchTpsCondition = bits, U32, 468, [2:2] +launchActivateSwitchCondition = bits, U32, 468, [3:3] +launchIsLaunchCondition = bits, U32, 468, [4:4] +launchCombinedConditions = bits, U32, 468, [5:5] +launchActivatePinState = bits, U32, 468, [6:6] +unusedBit_178_7 = bits, U32, 468, [7:7] +unusedBit_178_8 = bits, U32, 468, [8:8] +unusedBit_178_9 = bits, U32, 468, [9:9] +unusedBit_178_10 = bits, U32, 468, [10:10] +unusedBit_178_11 = bits, U32, 468, [11:11] +unusedBit_178_12 = bits, U32, 468, [12:12] +unusedBit_178_13 = bits, U32, 468, [13:13] +unusedBit_178_14 = bits, U32, 468, [14:14] +unusedBit_178_15 = bits, U32, 468, [15:15] +unusedBit_178_16 = bits, U32, 468, [16:16] +unusedBit_178_17 = bits, U32, 468, [17:17] +unusedBit_178_18 = bits, U32, 468, [18:18] +unusedBit_178_19 = bits, U32, 468, [19:19] +unusedBit_178_20 = bits, U32, 468, [20:20] +unusedBit_178_21 = bits, U32, 468, [21:21] +unusedBit_178_22 = bits, U32, 468, [22:22] +unusedBit_178_23 = bits, U32, 468, [23:23] +unusedBit_178_24 = bits, U32, 468, [24:24] +unusedBit_178_25 = bits, U32, 468, [25:25] +unusedBit_178_26 = bits, U32, 468, [26:26] +unusedBit_178_27 = bits, U32, 468, [27:27] +unusedBit_178_28 = bits, U32, 468, [28:28] +unusedBit_178_29 = bits, U32, 468, [29:29] +unusedBit_178_30 = bits, U32, 468, [30:30] +unusedBit_178_31 = bits, U32, 468, [31:31] +TEMPLOG_MAP_AT_CYCLE_COUNT = scalar, U08, 472, "", 1, 0 +unused11 = scalar, U08, 473, "", 1, 0 +unused11 = scalar, U08, 473, "", 1, 0 +unused11 = scalar, U08, 473, "", 1, 0 +alignmentFill_at_474 = array, U08, 474, [2], "units", 1, 0 TEMPLOG_MAP_AT_SPECIAL_POINT = scalar, F32, 476, "", 1, 0 TEMPLOG_MAP_AT_DIFF = scalar, F32, 480, "", 1, 0 vvtSyncGapRatio = scalar, F32, 484, "", 1, 0 @@ -3102,7 +3004,11 @@ TEMPLOG_MAP_AT_DIFFGauge = TEMPLOG_MAP_AT_DIFF,"TEMPLOG_MAP_AT_DIFF", "", -10000 TEMPLOG_MAP_AT_CYCLE_COUNTGauge = TEMPLOG_MAP_AT_CYCLE_COUNT,"TEMPLOG_MAP_AT_CYCLE_COUNT", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 gaugeCategory = GDI -m_requested_pumpGauge = m_requested_pump,"Pump Angle", "deg", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +m_requested_pumpGauge = m_requested_pump,"DI: Pump Angle", "deg", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +fuel_requested_percentGauge = fuel_requested_percent,"DI: fuel_requested_percent", "v", 0.0,100.0, 0.0,100.0, 0.0,100.0, 0,0 +fuel_requested_percent_piGauge = fuel_requested_percent_pi,"DI: fuel_requested_percent_pi", "v", 0.0,100.0, 0.0,100.0, 0.0,100.0, 0,0 +m_I_sum_percentGauge = m_I_sum_percent,"DI: m_I_sum_percent", "v", 0.0,100.0, 0.0,100.0, 0.0,100.0, 0,0 +m_pressureTarget_kPaGauge = m_pressureTarget_kPa,"DI: m_pressureTarget_kPa", "v", 0.0,100.0, 0.0,100.0, 0.0,100.0, 0,0 highFuelPressureGauge = highFuelPressure, "Fuel pressure (high)", "bar", 0, 200, 0, 0, 200, 200, 1, 0 gaugeCategory = Sensors - Extra 2 @@ -3581,7 +3487,11 @@ entry = tps1Split, "tps1Split", float, "%.3f" entry = tps2Split, "tps2Split", float, "%.3f" entry = tps12Split, "tps12Split", float, "%.3f" entry = accPedalSplit, "accPedalSplit", float, "%.3f" -entry = m_requested_pump, "Pump Angle", float, "%.3f" +entry = m_requested_pump, "DI: Pump Angle", float, "%.3f" +entry = fuel_requested_percent, "DI: fuel_requested_percent", float, "%.3f" +entry = fuel_requested_percent_pi, "DI: fuel_requested_percent_pi", float, "%.3f" +entry = m_I_sum_percent, "DI: m_I_sum_percent", float, "%.3f" +entry = m_pressureTarget_kPa, "DI: m_pressureTarget_kPa", float, "%.3f" entry = launchSpeedCondition, "launchSpeedCondition", int, "%d" entry = launchRpmCondition, "launchRpmCondition", int, "%d" entry = launchTpsCondition, "launchTpsCondition", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index 033599a8f7..df63daeec0 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.01.01.proteus_f7.3303754139" + signature = "rusEFI 2022.01.01.proteus_f7.1501721830" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.01.01.proteus_f7.3303754139" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.01.01.proteus_f7.1501721830" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jan 01 21:09:23 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jan 01 22:23:00 UTC 2022 pageSize = 20996 page = 1 @@ -2097,174 +2097,76 @@ tps12Split = scalar, S16, 330, "%", 0.01, 0 accPedalSplit = scalar, S16, 332, "%", 0.01, 0 m_requested_pump = scalar, S16, 334, "deg", 0.02, 0 unused16 = scalar, S16, 336, "deg", 0.02, 0 -unusedAtTheEnd1 = scalar, U08, 338, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 339, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 340, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 341, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 342, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 343, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 344, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 345, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 346, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 347, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 348, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 349, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 350, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 351, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 352, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 353, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 354, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 355, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 356, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 357, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 358, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 359, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 360, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 361, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 362, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 363, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 364, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 365, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 366, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 367, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 368, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 369, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 370, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 371, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 372, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 373, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 374, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 375, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 376, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 377, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 378, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 379, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 380, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 381, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 382, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 383, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 384, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 385, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 386, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 387, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 388, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 389, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 390, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 391, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 392, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 393, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 394, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 395, "", 1, 0 -unusedAtTheEnd59 = scalar, U08, 396, "", 1, 0 -unusedAtTheEnd60 = scalar, U08, 397, "", 1, 0 -unusedAtTheEnd61 = scalar, U08, 398, "", 1, 0 -unusedAtTheEnd62 = scalar, U08, 399, "", 1, 0 -unusedAtTheEnd63 = scalar, U08, 400, "", 1, 0 -unusedAtTheEnd64 = scalar, U08, 401, "", 1, 0 -unusedAtTheEnd65 = scalar, U08, 402, "", 1, 0 -unusedAtTheEnd66 = scalar, U08, 403, "", 1, 0 -unusedAtTheEnd67 = scalar, U08, 404, "", 1, 0 -unusedAtTheEnd68 = scalar, U08, 405, "", 1, 0 -unusedAtTheEnd69 = scalar, U08, 406, "", 1, 0 -unusedAtTheEnd70 = scalar, U08, 407, "", 1, 0 -unusedAtTheEnd71 = scalar, U08, 408, "", 1, 0 -unusedAtTheEnd72 = scalar, U08, 409, "", 1, 0 -unusedAtTheEnd73 = scalar, U08, 410, "", 1, 0 -unusedAtTheEnd74 = scalar, U08, 411, "", 1, 0 -unusedAtTheEnd75 = scalar, U08, 412, "", 1, 0 -unusedAtTheEnd76 = scalar, U08, 413, "", 1, 0 -unusedAtTheEnd77 = scalar, U08, 414, "", 1, 0 -unusedAtTheEnd78 = scalar, U08, 415, "", 1, 0 -unusedAtTheEnd79 = scalar, U08, 416, "", 1, 0 -unusedAtTheEnd80 = scalar, U08, 417, "", 1, 0 -unusedAtTheEnd81 = scalar, U08, 418, "", 1, 0 -unusedAtTheEnd82 = scalar, U08, 419, "", 1, 0 -unusedAtTheEnd83 = scalar, U08, 420, "", 1, 0 -unusedAtTheEnd84 = scalar, U08, 421, "", 1, 0 -unusedAtTheEnd85 = scalar, U08, 422, "", 1, 0 -unusedAtTheEnd86 = scalar, U08, 423, "", 1, 0 -unusedAtTheEnd87 = scalar, U08, 424, "", 1, 0 -unusedAtTheEnd88 = scalar, U08, 425, "", 1, 0 -unusedAtTheEnd89 = scalar, U08, 426, "", 1, 0 -unusedAtTheEnd90 = scalar, U08, 427, "", 1, 0 -unusedAtTheEnd91 = scalar, U08, 428, "", 1, 0 -unusedAtTheEnd92 = scalar, U08, 429, "", 1, 0 -unusedAtTheEnd93 = scalar, U08, 430, "", 1, 0 -unusedAtTheEnd94 = scalar, U08, 431, "", 1, 0 -unusedAtTheEnd95 = scalar, U08, 432, "", 1, 0 -unusedAtTheEnd96 = scalar, U08, 433, "", 1, 0 -unusedAtTheEnd97 = scalar, U08, 434, "", 1, 0 -unusedAtTheEnd98 = scalar, U08, 435, "", 1, 0 -unusedAtTheEnd99 = scalar, U08, 436, "", 1, 0 -unusedAtTheEnd100 = scalar, U08, 437, "", 1, 0 -unusedAtTheEnd101 = scalar, U08, 438, "", 1, 0 -unusedAtTheEnd102 = scalar, U08, 439, "", 1, 0 -unusedAtTheEnd103 = scalar, U08, 440, "", 1, 0 -unusedAtTheEnd104 = scalar, U08, 441, "", 1, 0 -unusedAtTheEnd105 = scalar, U08, 442, "", 1, 0 -unusedAtTheEnd106 = scalar, U08, 443, "", 1, 0 -unusedAtTheEnd107 = scalar, U08, 444, "", 1, 0 -unusedAtTheEnd108 = scalar, U08, 445, "", 1, 0 -unusedAtTheEnd109 = scalar, U08, 446, "", 1, 0 -unusedAtTheEnd110 = scalar, U08, 447, "", 1, 0 -unusedAtTheEnd111 = scalar, U08, 448, "", 1, 0 -unusedAtTheEnd112 = scalar, U08, 449, "", 1, 0 -unusedAtTheEnd113 = scalar, U08, 450, "", 1, 0 -unusedAtTheEnd114 = scalar, U08, 451, "", 1, 0 -unusedAtTheEnd115 = scalar, U08, 452, "", 1, 0 -unusedAtTheEnd116 = scalar, U08, 453, "", 1, 0 -unusedAtTheEnd117 = scalar, U08, 454, "", 1, 0 -unusedAtTheEnd118 = scalar, U08, 455, "", 1, 0 -unusedAtTheEnd119 = scalar, U08, 456, "", 1, 0 -unusedAtTheEnd120 = scalar, U08, 457, "", 1, 0 -unusedAtTheEnd121 = scalar, U08, 458, "", 1, 0 -unusedAtTheEnd122 = scalar, U08, 459, "", 1, 0 -unusedAtTheEnd123 = scalar, U08, 460, "", 1, 0 -unusedAtTheEnd124 = scalar, U08, 461, "", 1, 0 -unusedAtTheEnd125 = scalar, U08, 462, "", 1, 0 -unusedAtTheEnd126 = scalar, U08, 463, "", 1, 0 -unusedAtTheEnd127 = scalar, U08, 464, "", 1, 0 -unusedAtTheEnd128 = scalar, U08, 465, "", 1, 0 -unusedAtTheEnd129 = scalar, U08, 466, "", 1, 0 -unusedAtTheEnd130 = scalar, U08, 467, "", 1, 0 -unusedAtTheEnd131 = scalar, U08, 468, "", 1, 0 -unusedAtTheEnd132 = scalar, U08, 469, "", 1, 0 -launchSpeedCondition = bits, U32, 470, [0:0] -launchRpmCondition = bits, U32, 470, [1:1] -launchTpsCondition = bits, U32, 470, [2:2] -launchActivateSwitchCondition = bits, U32, 470, [3:3] -launchIsLaunchCondition = bits, U32, 470, [4:4] -launchCombinedConditions = bits, U32, 470, [5:5] -launchActivatePinState = bits, U32, 470, [6:6] -unusedBit_173_7 = bits, U32, 470, [7:7] -unusedBit_173_8 = bits, U32, 470, [8:8] -unusedBit_173_9 = bits, U32, 470, [9:9] -unusedBit_173_10 = bits, U32, 470, [10:10] -unusedBit_173_11 = bits, U32, 470, [11:11] -unusedBit_173_12 = bits, U32, 470, [12:12] -unusedBit_173_13 = bits, U32, 470, [13:13] -unusedBit_173_14 = bits, U32, 470, [14:14] -unusedBit_173_15 = bits, U32, 470, [15:15] -unusedBit_173_16 = bits, U32, 470, [16:16] -unusedBit_173_17 = bits, U32, 470, [17:17] -unusedBit_173_18 = bits, U32, 470, [18:18] -unusedBit_173_19 = bits, U32, 470, [19:19] -unusedBit_173_20 = bits, U32, 470, [20:20] -unusedBit_173_21 = bits, U32, 470, [21:21] -unusedBit_173_22 = bits, U32, 470, [22:22] -unusedBit_173_23 = bits, U32, 470, [23:23] -unusedBit_173_24 = bits, U32, 470, [24:24] -unusedBit_173_25 = bits, U32, 470, [25:25] -unusedBit_173_26 = bits, U32, 470, [26:26] -unusedBit_173_27 = bits, U32, 470, [27:27] -unusedBit_173_28 = bits, U32, 470, [28:28] -unusedBit_173_29 = bits, U32, 470, [29:29] -unusedBit_173_30 = bits, U32, 470, [30:30] -unusedBit_173_31 = bits, U32, 470, [31:31] -TEMPLOG_MAP_AT_CYCLE_COUNT = scalar, U08, 474, "", 1, 0 -unused11 = scalar, U08, 475, "", 1, 0 -unused11 = scalar, U08, 475, "", 1, 0 -unused11 = scalar, U08, 475, "", 1, 0 +alignmentFill_at_338 = array, U08, 338, [2], "units", 1, 0 +fuel_requested_percent = scalar, F32, 340, "v", 1, 0 +fuel_requested_percent_pi = scalar, F32, 344, "v", 1, 0 +m_I_sum_percent = scalar, F32, 348, "v", 1, 0 +m_pressureTarget_kPa = scalar, F32, 352, "v", 1, 0 +unusedAtTheEnd1 = scalar, S32, 356, "", 1, 0 +unusedAtTheEnd2 = scalar, S32, 360, "", 1, 0 +unusedAtTheEnd3 = scalar, S32, 364, "", 1, 0 +unusedAtTheEnd4 = scalar, S32, 368, "", 1, 0 +unusedAtTheEnd5 = scalar, S32, 372, "", 1, 0 +unusedAtTheEnd6 = scalar, S32, 376, "", 1, 0 +unusedAtTheEnd7 = scalar, S32, 380, "", 1, 0 +unusedAtTheEnd8 = scalar, S32, 384, "", 1, 0 +unusedAtTheEnd9 = scalar, S32, 388, "", 1, 0 +unusedAtTheEnd10 = scalar, S32, 392, "", 1, 0 +unusedAtTheEnd11 = scalar, S32, 396, "", 1, 0 +unusedAtTheEnd12 = scalar, S32, 400, "", 1, 0 +unusedAtTheEnd13 = scalar, S32, 404, "", 1, 0 +unusedAtTheEnd14 = scalar, S32, 408, "", 1, 0 +unusedAtTheEnd15 = scalar, S32, 412, "", 1, 0 +unusedAtTheEnd16 = scalar, S32, 416, "", 1, 0 +unusedAtTheEnd17 = scalar, S32, 420, "", 1, 0 +unusedAtTheEnd18 = scalar, S32, 424, "", 1, 0 +unusedAtTheEnd19 = scalar, S32, 428, "", 1, 0 +unusedAtTheEnd20 = scalar, S32, 432, "", 1, 0 +unusedAtTheEnd21 = scalar, S32, 436, "", 1, 0 +unusedAtTheEnd22 = scalar, S32, 440, "", 1, 0 +unusedAtTheEnd23 = scalar, S32, 444, "", 1, 0 +unusedAtTheEnd24 = scalar, S32, 448, "", 1, 0 +unusedAtTheEnd25 = scalar, S32, 452, "", 1, 0 +unusedAtTheEnd26 = scalar, S32, 456, "", 1, 0 +unusedAtTheEnd27 = scalar, S32, 460, "", 1, 0 +unusedAtTheEnd28 = scalar, S32, 464, "", 1, 0 +launchSpeedCondition = bits, U32, 468, [0:0] +launchRpmCondition = bits, U32, 468, [1:1] +launchTpsCondition = bits, U32, 468, [2:2] +launchActivateSwitchCondition = bits, U32, 468, [3:3] +launchIsLaunchCondition = bits, U32, 468, [4:4] +launchCombinedConditions = bits, U32, 468, [5:5] +launchActivatePinState = bits, U32, 468, [6:6] +unusedBit_178_7 = bits, U32, 468, [7:7] +unusedBit_178_8 = bits, U32, 468, [8:8] +unusedBit_178_9 = bits, U32, 468, [9:9] +unusedBit_178_10 = bits, U32, 468, [10:10] +unusedBit_178_11 = bits, U32, 468, [11:11] +unusedBit_178_12 = bits, U32, 468, [12:12] +unusedBit_178_13 = bits, U32, 468, [13:13] +unusedBit_178_14 = bits, U32, 468, [14:14] +unusedBit_178_15 = bits, U32, 468, [15:15] +unusedBit_178_16 = bits, U32, 468, [16:16] +unusedBit_178_17 = bits, U32, 468, [17:17] +unusedBit_178_18 = bits, U32, 468, [18:18] +unusedBit_178_19 = bits, U32, 468, [19:19] +unusedBit_178_20 = bits, U32, 468, [20:20] +unusedBit_178_21 = bits, U32, 468, [21:21] +unusedBit_178_22 = bits, U32, 468, [22:22] +unusedBit_178_23 = bits, U32, 468, [23:23] +unusedBit_178_24 = bits, U32, 468, [24:24] +unusedBit_178_25 = bits, U32, 468, [25:25] +unusedBit_178_26 = bits, U32, 468, [26:26] +unusedBit_178_27 = bits, U32, 468, [27:27] +unusedBit_178_28 = bits, U32, 468, [28:28] +unusedBit_178_29 = bits, U32, 468, [29:29] +unusedBit_178_30 = bits, U32, 468, [30:30] +unusedBit_178_31 = bits, U32, 468, [31:31] +TEMPLOG_MAP_AT_CYCLE_COUNT = scalar, U08, 472, "", 1, 0 +unused11 = scalar, U08, 473, "", 1, 0 +unused11 = scalar, U08, 473, "", 1, 0 +unused11 = scalar, U08, 473, "", 1, 0 +alignmentFill_at_474 = array, U08, 474, [2], "units", 1, 0 TEMPLOG_MAP_AT_SPECIAL_POINT = scalar, F32, 476, "", 1, 0 TEMPLOG_MAP_AT_DIFF = scalar, F32, 480, "", 1, 0 vvtSyncGapRatio = scalar, F32, 484, "", 1, 0 @@ -3102,7 +3004,11 @@ TEMPLOG_MAP_AT_DIFFGauge = TEMPLOG_MAP_AT_DIFF,"TEMPLOG_MAP_AT_DIFF", "", -10000 TEMPLOG_MAP_AT_CYCLE_COUNTGauge = TEMPLOG_MAP_AT_CYCLE_COUNT,"TEMPLOG_MAP_AT_CYCLE_COUNT", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 gaugeCategory = GDI -m_requested_pumpGauge = m_requested_pump,"Pump Angle", "deg", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +m_requested_pumpGauge = m_requested_pump,"DI: Pump Angle", "deg", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +fuel_requested_percentGauge = fuel_requested_percent,"DI: fuel_requested_percent", "v", 0.0,100.0, 0.0,100.0, 0.0,100.0, 0,0 +fuel_requested_percent_piGauge = fuel_requested_percent_pi,"DI: fuel_requested_percent_pi", "v", 0.0,100.0, 0.0,100.0, 0.0,100.0, 0,0 +m_I_sum_percentGauge = m_I_sum_percent,"DI: m_I_sum_percent", "v", 0.0,100.0, 0.0,100.0, 0.0,100.0, 0,0 +m_pressureTarget_kPaGauge = m_pressureTarget_kPa,"DI: m_pressureTarget_kPa", "v", 0.0,100.0, 0.0,100.0, 0.0,100.0, 0,0 highFuelPressureGauge = highFuelPressure, "Fuel pressure (high)", "bar", 0, 200, 0, 0, 200, 200, 1, 0 gaugeCategory = Sensors - Extra 2 @@ -3581,7 +3487,11 @@ entry = tps1Split, "tps1Split", float, "%.3f" entry = tps2Split, "tps2Split", float, "%.3f" entry = tps12Split, "tps12Split", float, "%.3f" entry = accPedalSplit, "accPedalSplit", float, "%.3f" -entry = m_requested_pump, "Pump Angle", float, "%.3f" +entry = m_requested_pump, "DI: Pump Angle", float, "%.3f" +entry = fuel_requested_percent, "DI: fuel_requested_percent", float, "%.3f" +entry = fuel_requested_percent_pi, "DI: fuel_requested_percent_pi", float, "%.3f" +entry = m_I_sum_percent, "DI: m_I_sum_percent", float, "%.3f" +entry = m_pressureTarget_kPa, "DI: m_pressureTarget_kPa", float, "%.3f" entry = launchSpeedCondition, "launchSpeedCondition", int, "%d" entry = launchRpmCondition, "launchRpmCondition", int, "%d" entry = launchTpsCondition, "launchTpsCondition", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini index 6e0cce0ae4..c7a484ddc7 100644 --- a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.01.01.subaru_eg33_f7.3316431127" + signature = "rusEFI 2022.01.01.subaru_eg33_f7.1489339498" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.01.01.subaru_eg33_f7.3316431127" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.01.01.subaru_eg33_f7.1489339498" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_config.sh integration/rusefi_config.txt Sat Jan 01 21:09:41 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_config.sh integration/rusefi_config.txt Sat Jan 01 22:23:15 UTC 2022 pageSize = 20996 page = 1 @@ -2097,174 +2097,76 @@ tps12Split = scalar, S16, 330, "%", 0.01, 0 accPedalSplit = scalar, S16, 332, "%", 0.01, 0 m_requested_pump = scalar, S16, 334, "deg", 0.02, 0 unused16 = scalar, S16, 336, "deg", 0.02, 0 -unusedAtTheEnd1 = scalar, U08, 338, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 339, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 340, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 341, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 342, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 343, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 344, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 345, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 346, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 347, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 348, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 349, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 350, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 351, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 352, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 353, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 354, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 355, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 356, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 357, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 358, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 359, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 360, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 361, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 362, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 363, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 364, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 365, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 366, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 367, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 368, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 369, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 370, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 371, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 372, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 373, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 374, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 375, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 376, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 377, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 378, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 379, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 380, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 381, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 382, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 383, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 384, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 385, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 386, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 387, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 388, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 389, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 390, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 391, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 392, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 393, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 394, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 395, "", 1, 0 -unusedAtTheEnd59 = scalar, U08, 396, "", 1, 0 -unusedAtTheEnd60 = scalar, U08, 397, "", 1, 0 -unusedAtTheEnd61 = scalar, U08, 398, "", 1, 0 -unusedAtTheEnd62 = scalar, U08, 399, "", 1, 0 -unusedAtTheEnd63 = scalar, U08, 400, "", 1, 0 -unusedAtTheEnd64 = scalar, U08, 401, "", 1, 0 -unusedAtTheEnd65 = scalar, U08, 402, "", 1, 0 -unusedAtTheEnd66 = scalar, U08, 403, "", 1, 0 -unusedAtTheEnd67 = scalar, U08, 404, "", 1, 0 -unusedAtTheEnd68 = scalar, U08, 405, "", 1, 0 -unusedAtTheEnd69 = scalar, U08, 406, "", 1, 0 -unusedAtTheEnd70 = scalar, U08, 407, "", 1, 0 -unusedAtTheEnd71 = scalar, U08, 408, "", 1, 0 -unusedAtTheEnd72 = scalar, U08, 409, "", 1, 0 -unusedAtTheEnd73 = scalar, U08, 410, "", 1, 0 -unusedAtTheEnd74 = scalar, U08, 411, "", 1, 0 -unusedAtTheEnd75 = scalar, U08, 412, "", 1, 0 -unusedAtTheEnd76 = scalar, U08, 413, "", 1, 0 -unusedAtTheEnd77 = scalar, U08, 414, "", 1, 0 -unusedAtTheEnd78 = scalar, U08, 415, "", 1, 0 -unusedAtTheEnd79 = scalar, U08, 416, "", 1, 0 -unusedAtTheEnd80 = scalar, U08, 417, "", 1, 0 -unusedAtTheEnd81 = scalar, U08, 418, "", 1, 0 -unusedAtTheEnd82 = scalar, U08, 419, "", 1, 0 -unusedAtTheEnd83 = scalar, U08, 420, "", 1, 0 -unusedAtTheEnd84 = scalar, U08, 421, "", 1, 0 -unusedAtTheEnd85 = scalar, U08, 422, "", 1, 0 -unusedAtTheEnd86 = scalar, U08, 423, "", 1, 0 -unusedAtTheEnd87 = scalar, U08, 424, "", 1, 0 -unusedAtTheEnd88 = scalar, U08, 425, "", 1, 0 -unusedAtTheEnd89 = scalar, U08, 426, "", 1, 0 -unusedAtTheEnd90 = scalar, U08, 427, "", 1, 0 -unusedAtTheEnd91 = scalar, U08, 428, "", 1, 0 -unusedAtTheEnd92 = scalar, U08, 429, "", 1, 0 -unusedAtTheEnd93 = scalar, U08, 430, "", 1, 0 -unusedAtTheEnd94 = scalar, U08, 431, "", 1, 0 -unusedAtTheEnd95 = scalar, U08, 432, "", 1, 0 -unusedAtTheEnd96 = scalar, U08, 433, "", 1, 0 -unusedAtTheEnd97 = scalar, U08, 434, "", 1, 0 -unusedAtTheEnd98 = scalar, U08, 435, "", 1, 0 -unusedAtTheEnd99 = scalar, U08, 436, "", 1, 0 -unusedAtTheEnd100 = scalar, U08, 437, "", 1, 0 -unusedAtTheEnd101 = scalar, U08, 438, "", 1, 0 -unusedAtTheEnd102 = scalar, U08, 439, "", 1, 0 -unusedAtTheEnd103 = scalar, U08, 440, "", 1, 0 -unusedAtTheEnd104 = scalar, U08, 441, "", 1, 0 -unusedAtTheEnd105 = scalar, U08, 442, "", 1, 0 -unusedAtTheEnd106 = scalar, U08, 443, "", 1, 0 -unusedAtTheEnd107 = scalar, U08, 444, "", 1, 0 -unusedAtTheEnd108 = scalar, U08, 445, "", 1, 0 -unusedAtTheEnd109 = scalar, U08, 446, "", 1, 0 -unusedAtTheEnd110 = scalar, U08, 447, "", 1, 0 -unusedAtTheEnd111 = scalar, U08, 448, "", 1, 0 -unusedAtTheEnd112 = scalar, U08, 449, "", 1, 0 -unusedAtTheEnd113 = scalar, U08, 450, "", 1, 0 -unusedAtTheEnd114 = scalar, U08, 451, "", 1, 0 -unusedAtTheEnd115 = scalar, U08, 452, "", 1, 0 -unusedAtTheEnd116 = scalar, U08, 453, "", 1, 0 -unusedAtTheEnd117 = scalar, U08, 454, "", 1, 0 -unusedAtTheEnd118 = scalar, U08, 455, "", 1, 0 -unusedAtTheEnd119 = scalar, U08, 456, "", 1, 0 -unusedAtTheEnd120 = scalar, U08, 457, "", 1, 0 -unusedAtTheEnd121 = scalar, U08, 458, "", 1, 0 -unusedAtTheEnd122 = scalar, U08, 459, "", 1, 0 -unusedAtTheEnd123 = scalar, U08, 460, "", 1, 0 -unusedAtTheEnd124 = scalar, U08, 461, "", 1, 0 -unusedAtTheEnd125 = scalar, U08, 462, "", 1, 0 -unusedAtTheEnd126 = scalar, U08, 463, "", 1, 0 -unusedAtTheEnd127 = scalar, U08, 464, "", 1, 0 -unusedAtTheEnd128 = scalar, U08, 465, "", 1, 0 -unusedAtTheEnd129 = scalar, U08, 466, "", 1, 0 -unusedAtTheEnd130 = scalar, U08, 467, "", 1, 0 -unusedAtTheEnd131 = scalar, U08, 468, "", 1, 0 -unusedAtTheEnd132 = scalar, U08, 469, "", 1, 0 -launchSpeedCondition = bits, U32, 470, [0:0] -launchRpmCondition = bits, U32, 470, [1:1] -launchTpsCondition = bits, U32, 470, [2:2] -launchActivateSwitchCondition = bits, U32, 470, [3:3] -launchIsLaunchCondition = bits, U32, 470, [4:4] -launchCombinedConditions = bits, U32, 470, [5:5] -launchActivatePinState = bits, U32, 470, [6:6] -unusedBit_173_7 = bits, U32, 470, [7:7] -unusedBit_173_8 = bits, U32, 470, [8:8] -unusedBit_173_9 = bits, U32, 470, [9:9] -unusedBit_173_10 = bits, U32, 470, [10:10] -unusedBit_173_11 = bits, U32, 470, [11:11] -unusedBit_173_12 = bits, U32, 470, [12:12] -unusedBit_173_13 = bits, U32, 470, [13:13] -unusedBit_173_14 = bits, U32, 470, [14:14] -unusedBit_173_15 = bits, U32, 470, [15:15] -unusedBit_173_16 = bits, U32, 470, [16:16] -unusedBit_173_17 = bits, U32, 470, [17:17] -unusedBit_173_18 = bits, U32, 470, [18:18] -unusedBit_173_19 = bits, U32, 470, [19:19] -unusedBit_173_20 = bits, U32, 470, [20:20] -unusedBit_173_21 = bits, U32, 470, [21:21] -unusedBit_173_22 = bits, U32, 470, [22:22] -unusedBit_173_23 = bits, U32, 470, [23:23] -unusedBit_173_24 = bits, U32, 470, [24:24] -unusedBit_173_25 = bits, U32, 470, [25:25] -unusedBit_173_26 = bits, U32, 470, [26:26] -unusedBit_173_27 = bits, U32, 470, [27:27] -unusedBit_173_28 = bits, U32, 470, [28:28] -unusedBit_173_29 = bits, U32, 470, [29:29] -unusedBit_173_30 = bits, U32, 470, [30:30] -unusedBit_173_31 = bits, U32, 470, [31:31] -TEMPLOG_MAP_AT_CYCLE_COUNT = scalar, U08, 474, "", 1, 0 -unused11 = scalar, U08, 475, "", 1, 0 -unused11 = scalar, U08, 475, "", 1, 0 -unused11 = scalar, U08, 475, "", 1, 0 +alignmentFill_at_338 = array, U08, 338, [2], "units", 1, 0 +fuel_requested_percent = scalar, F32, 340, "v", 1, 0 +fuel_requested_percent_pi = scalar, F32, 344, "v", 1, 0 +m_I_sum_percent = scalar, F32, 348, "v", 1, 0 +m_pressureTarget_kPa = scalar, F32, 352, "v", 1, 0 +unusedAtTheEnd1 = scalar, S32, 356, "", 1, 0 +unusedAtTheEnd2 = scalar, S32, 360, "", 1, 0 +unusedAtTheEnd3 = scalar, S32, 364, "", 1, 0 +unusedAtTheEnd4 = scalar, S32, 368, "", 1, 0 +unusedAtTheEnd5 = scalar, S32, 372, "", 1, 0 +unusedAtTheEnd6 = scalar, S32, 376, "", 1, 0 +unusedAtTheEnd7 = scalar, S32, 380, "", 1, 0 +unusedAtTheEnd8 = scalar, S32, 384, "", 1, 0 +unusedAtTheEnd9 = scalar, S32, 388, "", 1, 0 +unusedAtTheEnd10 = scalar, S32, 392, "", 1, 0 +unusedAtTheEnd11 = scalar, S32, 396, "", 1, 0 +unusedAtTheEnd12 = scalar, S32, 400, "", 1, 0 +unusedAtTheEnd13 = scalar, S32, 404, "", 1, 0 +unusedAtTheEnd14 = scalar, S32, 408, "", 1, 0 +unusedAtTheEnd15 = scalar, S32, 412, "", 1, 0 +unusedAtTheEnd16 = scalar, S32, 416, "", 1, 0 +unusedAtTheEnd17 = scalar, S32, 420, "", 1, 0 +unusedAtTheEnd18 = scalar, S32, 424, "", 1, 0 +unusedAtTheEnd19 = scalar, S32, 428, "", 1, 0 +unusedAtTheEnd20 = scalar, S32, 432, "", 1, 0 +unusedAtTheEnd21 = scalar, S32, 436, "", 1, 0 +unusedAtTheEnd22 = scalar, S32, 440, "", 1, 0 +unusedAtTheEnd23 = scalar, S32, 444, "", 1, 0 +unusedAtTheEnd24 = scalar, S32, 448, "", 1, 0 +unusedAtTheEnd25 = scalar, S32, 452, "", 1, 0 +unusedAtTheEnd26 = scalar, S32, 456, "", 1, 0 +unusedAtTheEnd27 = scalar, S32, 460, "", 1, 0 +unusedAtTheEnd28 = scalar, S32, 464, "", 1, 0 +launchSpeedCondition = bits, U32, 468, [0:0] +launchRpmCondition = bits, U32, 468, [1:1] +launchTpsCondition = bits, U32, 468, [2:2] +launchActivateSwitchCondition = bits, U32, 468, [3:3] +launchIsLaunchCondition = bits, U32, 468, [4:4] +launchCombinedConditions = bits, U32, 468, [5:5] +launchActivatePinState = bits, U32, 468, [6:6] +unusedBit_178_7 = bits, U32, 468, [7:7] +unusedBit_178_8 = bits, U32, 468, [8:8] +unusedBit_178_9 = bits, U32, 468, [9:9] +unusedBit_178_10 = bits, U32, 468, [10:10] +unusedBit_178_11 = bits, U32, 468, [11:11] +unusedBit_178_12 = bits, U32, 468, [12:12] +unusedBit_178_13 = bits, U32, 468, [13:13] +unusedBit_178_14 = bits, U32, 468, [14:14] +unusedBit_178_15 = bits, U32, 468, [15:15] +unusedBit_178_16 = bits, U32, 468, [16:16] +unusedBit_178_17 = bits, U32, 468, [17:17] +unusedBit_178_18 = bits, U32, 468, [18:18] +unusedBit_178_19 = bits, U32, 468, [19:19] +unusedBit_178_20 = bits, U32, 468, [20:20] +unusedBit_178_21 = bits, U32, 468, [21:21] +unusedBit_178_22 = bits, U32, 468, [22:22] +unusedBit_178_23 = bits, U32, 468, [23:23] +unusedBit_178_24 = bits, U32, 468, [24:24] +unusedBit_178_25 = bits, U32, 468, [25:25] +unusedBit_178_26 = bits, U32, 468, [26:26] +unusedBit_178_27 = bits, U32, 468, [27:27] +unusedBit_178_28 = bits, U32, 468, [28:28] +unusedBit_178_29 = bits, U32, 468, [29:29] +unusedBit_178_30 = bits, U32, 468, [30:30] +unusedBit_178_31 = bits, U32, 468, [31:31] +TEMPLOG_MAP_AT_CYCLE_COUNT = scalar, U08, 472, "", 1, 0 +unused11 = scalar, U08, 473, "", 1, 0 +unused11 = scalar, U08, 473, "", 1, 0 +unused11 = scalar, U08, 473, "", 1, 0 +alignmentFill_at_474 = array, U08, 474, [2], "units", 1, 0 TEMPLOG_MAP_AT_SPECIAL_POINT = scalar, F32, 476, "", 1, 0 TEMPLOG_MAP_AT_DIFF = scalar, F32, 480, "", 1, 0 vvtSyncGapRatio = scalar, F32, 484, "", 1, 0 @@ -3102,7 +3004,11 @@ TEMPLOG_MAP_AT_DIFFGauge = TEMPLOG_MAP_AT_DIFF,"TEMPLOG_MAP_AT_DIFF", "", -10000 TEMPLOG_MAP_AT_CYCLE_COUNTGauge = TEMPLOG_MAP_AT_CYCLE_COUNT,"TEMPLOG_MAP_AT_CYCLE_COUNT", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 gaugeCategory = GDI -m_requested_pumpGauge = m_requested_pump,"Pump Angle", "deg", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +m_requested_pumpGauge = m_requested_pump,"DI: Pump Angle", "deg", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +fuel_requested_percentGauge = fuel_requested_percent,"DI: fuel_requested_percent", "v", 0.0,100.0, 0.0,100.0, 0.0,100.0, 0,0 +fuel_requested_percent_piGauge = fuel_requested_percent_pi,"DI: fuel_requested_percent_pi", "v", 0.0,100.0, 0.0,100.0, 0.0,100.0, 0,0 +m_I_sum_percentGauge = m_I_sum_percent,"DI: m_I_sum_percent", "v", 0.0,100.0, 0.0,100.0, 0.0,100.0, 0,0 +m_pressureTarget_kPaGauge = m_pressureTarget_kPa,"DI: m_pressureTarget_kPa", "v", 0.0,100.0, 0.0,100.0, 0.0,100.0, 0,0 highFuelPressureGauge = highFuelPressure, "Fuel pressure (high)", "bar", 0, 200, 0, 0, 200, 200, 1, 0 gaugeCategory = Sensors - Extra 2 @@ -3581,7 +3487,11 @@ entry = tps1Split, "tps1Split", float, "%.3f" entry = tps2Split, "tps2Split", float, "%.3f" entry = tps12Split, "tps12Split", float, "%.3f" entry = accPedalSplit, "accPedalSplit", float, "%.3f" -entry = m_requested_pump, "Pump Angle", float, "%.3f" +entry = m_requested_pump, "DI: Pump Angle", float, "%.3f" +entry = fuel_requested_percent, "DI: fuel_requested_percent", float, "%.3f" +entry = fuel_requested_percent_pi, "DI: fuel_requested_percent_pi", float, "%.3f" +entry = m_I_sum_percent, "DI: m_I_sum_percent", float, "%.3f" +entry = m_pressureTarget_kPa, "DI: m_pressureTarget_kPa", float, "%.3f" entry = launchSpeedCondition, "launchSpeedCondition", int, "%d" entry = launchRpmCondition, "launchRpmCondition", int, "%d" entry = launchTpsCondition, "launchTpsCondition", int, "%d" 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 5e801c5d67..caec5a734f 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 Sat Jan 01 21:09:45 UTC 2022 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jan 01 22:23:19 UTC 2022 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -1798,7 +1798,6 @@ public class Fields { public static final int servoOutputPins8_offset = 2739; public static final int showHumanReadableWarning_offset = 896; public static final int showSdCardWarning_offset = 164; - public static final int SIGNATURE_HASH = 102149959; public static final int silentTriggerError_offset = 1260; public static final int slowAdcAlpha_offset = 1712; public static final int sparkDwellRpmBins_offset = 54; @@ -2263,7 +2262,7 @@ public class Fields { public static final int TS_RESPONSE_UNDERRUN = 0x80; public static final int TS_RESPONSE_UNRECOGNIZED_COMMAND = 0x83; public static final char TS_SET_LOGGER_SWITCH = 'l'; - public static final String TS_SIGNATURE = "rusEFI 2022.01.01.all.102149959"; + public static final String TS_SIGNATURE = "rusEFI 2022.01.01.all.2608828986"; public static final char TS_SINGLE_WRITE_COMMAND = 'W'; public static final char TS_TEST_COMMAND = 't'; public static final int tunerStudioSerialSpeed_offset = 732;