From 5fa54ed9ac4d71c67809a0b0eef02759ba42df4c Mon Sep 17 00:00:00 2001 From: GitHub build-firmware Action Date: Wed, 12 Jan 2022 21:38:47 +0000 Subject: [PATCH] Auto-generated configs and docs --- .../controllers/algo/rusefi_generated.h | 7 +- .../controllers/algo/rusefi_generated.h | 7 +- .../controllers/algo/rusefi_generated.h | 7 +- .../console/binary/generated/data_logs.ini | 6 +- firmware/console/binary/generated/gauges.ini | 136 ++++++++--- .../binary/generated/output_channels.ini | 192 +++++++++++----- .../console/binary/ts_outputs_generated.h | 76 ++++--- .../controllers/generated/rusefi_generated.h | 7 +- .../controllers/generated/signature_all.h | 4 +- .../generated/signature_alphax-2chan.h | 4 +- .../generated/signature_alphax-4chan.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 +- .../lua/generated/output_lookup_generated.cpp | 12 +- firmware/tunerstudio/generated/rusefi.ini | 213 ++++++++++++------ .../generated/rusefi_alphax-2chan.ini | 213 ++++++++++++------ .../generated/rusefi_alphax-4chan.ini | 213 ++++++++++++------ .../tunerstudio/generated/rusefi_atlas.ini | 213 ++++++++++++------ .../generated/rusefi_f429-discovery.ini | 213 ++++++++++++------ .../generated/rusefi_frankenso_na6.ini | 213 ++++++++++++------ .../generated/rusefi_hellen-nb1.ini | 213 ++++++++++++------ .../generated/rusefi_hellen121nissan.ini | 213 ++++++++++++------ .../generated/rusefi_hellen121vag.ini | 213 ++++++++++++------ .../generated/rusefi_hellen128mercedes.ini | 213 ++++++++++++------ .../generated/rusefi_hellen154hyundai.ini | 213 ++++++++++++------ .../tunerstudio/generated/rusefi_hellen72.ini | 213 ++++++++++++------ .../tunerstudio/generated/rusefi_hellen81.ini | 213 ++++++++++++------ .../generated/rusefi_hellen88bmw.ini | 213 ++++++++++++------ .../generated/rusefi_hellenNA6.ini | 213 ++++++++++++------ .../generated/rusefi_hellenNA8_96.ini | 213 ++++++++++++------ .../generated/rusefi_hellen_cypress.ini | 213 ++++++++++++------ .../tunerstudio/generated/rusefi_kinetis.ini | 213 ++++++++++++------ .../tunerstudio/generated/rusefi_mre_f4.ini | 213 ++++++++++++------ .../tunerstudio/generated/rusefi_mre_f7.ini | 213 ++++++++++++------ .../generated/rusefi_prometheus_405.ini | 213 ++++++++++++------ .../generated/rusefi_prometheus_469.ini | 213 ++++++++++++------ .../generated/rusefi_proteus_f4.ini | 213 ++++++++++++------ .../generated/rusefi_proteus_f7.ini | 213 ++++++++++++------ .../generated/rusefi_subaru_eg33_f7.ini | 213 ++++++++++++------ .../com/rusefi/config/generated/Fields.java | 9 +- 60 files changed, 4097 insertions(+), 1787 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 13d8333354..9e0ebf543d 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 @@ -1013,7 +1013,8 @@ #define GAUGE_NAME_ACCEL_Z "Acceleration: Z" #define GAUGE_NAME_AFR "Air/Fuel Ratio" #define GAUGE_NAME_AFR2 "Air/Fuel Ratio 2" -#define GAUGE_NAME_AIR_FLOW "MAF air flow" +#define GAUGE_NAME_AIR_FLOW_ESTIMATE "MAF estimate" +#define GAUGE_NAME_AIR_FLOW_MEASURED "MAF sensor" #define GAUGE_NAME_AIR_MASS "air mass" #define GAUGE_NAME_AUX_TEMP1 "Aux temp 1" #define GAUGE_NAME_AUX_TEMP2 "Aux temp 2" @@ -1878,7 +1879,7 @@ #define show_test_presets true #define showHumanReadableWarning_offset 896 #define showSdCardWarning_offset 164 -#define SIGNATURE_HASH 1770445152 +#define SIGNATURE_HASH 1351096775 #define silentTriggerError_offset 1260 #define slowAdcAlpha_offset 1712 #define sparkDwellRpmBins_offset 54 @@ -2401,7 +2402,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2022.01.12.hellen_cypress.1770445152" +#define TS_SIGNATURE "rusEFI 2022.01.12.hellen_cypress.1351096775" #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 b67b775ee5..985b8fc782 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -998,7 +998,8 @@ #define GAUGE_NAME_ACCEL_Z "Acceleration: Z" #define GAUGE_NAME_AFR "Air/Fuel Ratio" #define GAUGE_NAME_AFR2 "Air/Fuel Ratio 2" -#define GAUGE_NAME_AIR_FLOW "MAF air flow" +#define GAUGE_NAME_AIR_FLOW_ESTIMATE "MAF estimate" +#define GAUGE_NAME_AIR_FLOW_MEASURED "MAF sensor" #define GAUGE_NAME_AIR_MASS "air mass" #define GAUGE_NAME_AUX_TEMP1 "Aux temp 1" #define GAUGE_NAME_AUX_TEMP2 "Aux temp 2" @@ -1863,7 +1864,7 @@ #define show_test_presets true #define showHumanReadableWarning_offset 896 #define showSdCardWarning_offset 164 -#define SIGNATURE_HASH 2518881692 +#define SIGNATURE_HASH 2939016507 #define silentTriggerError_offset 1260 #define slowAdcAlpha_offset 1712 #define sparkDwellRpmBins_offset 54 @@ -2386,7 +2387,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator true #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2022.01.12.kin.2518881692" +#define TS_SIGNATURE "rusEFI 2022.01.12.kin.2939016507" #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 b3fdb5bf05..6c63d4ce59 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 @@ -1025,7 +1025,8 @@ #define GAUGE_NAME_ACCEL_Z "Acceleration: Z" #define GAUGE_NAME_AFR "Air/Fuel Ratio" #define GAUGE_NAME_AFR2 "Air/Fuel Ratio 2" -#define GAUGE_NAME_AIR_FLOW "MAF air flow" +#define GAUGE_NAME_AIR_FLOW_ESTIMATE "MAF estimate" +#define GAUGE_NAME_AIR_FLOW_MEASURED "MAF sensor" #define GAUGE_NAME_AIR_MASS "air mass" #define GAUGE_NAME_AUX_TEMP1 "Aux temp 1" #define GAUGE_NAME_AUX_TEMP2 "Aux temp 2" @@ -1891,7 +1892,7 @@ #define show_test_presets false #define showHumanReadableWarning_offset 896 #define showSdCardWarning_offset 164 -#define SIGNATURE_HASH 2429102220 +#define SIGNATURE_HASH 2848450603 #define silentTriggerError_offset 1260 #define slowAdcAlpha_offset 1712 #define sparkDwellRpmBins_offset 54 @@ -2414,7 +2415,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port false -#define TS_SIGNATURE "rusEFI 2022.01.12.subaru_eg33_f7.2429102220" +#define TS_SIGNATURE "rusEFI 2022.01.12.subaru_eg33_f7.2848450603" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' diff --git a/firmware/console/binary/generated/data_logs.ini b/firmware/console/binary/generated/data_logs.ini index d44b44739d..ec79e81a15 100644 --- a/firmware/console/binary/generated/data_logs.ini +++ b/firmware/console/binary/generated/data_logs.ini @@ -42,8 +42,8 @@ entry = auxTemp2, "auxTemp2", float, "%.3f" entry = TPSValue, "TPS", float, "%.3f" entry = throttlePedalPosition, "Throttle pedal position", float, "%.3f" entry = tpsADC, "tpsADC", int, "%d" -entry = MAFValue, "MAF", float, "%.3f" -entry = massAirFlowValue, "MAF air flow", float, "%.3f" +entry = rawMaf, "rawMaf", float, "%.3f" +entry = mafMeasured, "MAF sensor", float, "%.3f" entry = MAPValue, "MAP", float, "%.3f" entry = baroPressure, "baroPressure", float, "%.3f" entry = lambdaValue, "Lambda", float, "%.3f" @@ -200,6 +200,8 @@ 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 = mafEstimate, "MAF estimate", float, "%.3f" +entry = instantRpm, "instantRpm", int, "%d" entry = launchSpeedCondition, "launchSpeedCondition", int, "%d" entry = launchRpmCondition, "launchRpmCondition", int, "%d" entry = launchTpsCondition, "launchTpsCondition", int, "%d" diff --git a/firmware/console/binary/generated/gauges.ini b/firmware/console/binary/generated/gauges.ini index 3f414a5b5a..8f8a927ffe 100644 --- a/firmware/console/binary/generated/gauges.ini +++ b/firmware/console/binary/generated/gauges.ini @@ -42,8 +42,8 @@ auxTemp2Gauge = auxTemp2,"auxTemp2", "deg C", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 TPSValueGauge = TPSValue,"TPS", "%", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 throttlePedalPositionGauge = throttlePedalPosition,"Throttle pedal position", "%", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 tpsADCGauge = tpsADC,"tpsADC", "ADC", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -MAFValueGauge = MAFValue,"MAF", "V", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -massAirFlowValueGauge = massAirFlowValue,"MAF air flow", "Kg/h", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +rawMafGauge = rawMaf,"rawMaf", "V", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +mafMeasuredGauge = mafMeasured,"MAF sensor", "kg/h", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 MAPValueGauge = MAPValue,"MAP", "kPa", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 baroPressureGauge = baroPressure,"baroPressure", "kPa", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 lambdaValueGauge = lambdaValue,"Lambda", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 @@ -200,6 +200,8 @@ fuel_requested_percentGauge = fuel_requested_percent,"DI: fuel_requested_percent 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 +mafEstimateGauge = mafEstimate,"MAF estimate", "kg/h", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +instantRpmGauge = instantRpm,"instantRpm", "rpm", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 unusedAtTheEnd1Gauge = unusedAtTheEnd1,"unusedAtTheEnd1", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 unusedAtTheEnd2Gauge = unusedAtTheEnd2,"unusedAtTheEnd2", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 unusedAtTheEnd3Gauge = unusedAtTheEnd3,"unusedAtTheEnd3", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 @@ -228,6 +230,86 @@ unusedAtTheEnd25Gauge = unusedAtTheEnd25,"unusedAtTheEnd25", "", 0.0,0.0, 0.0,0. unusedAtTheEnd26Gauge = unusedAtTheEnd26,"unusedAtTheEnd26", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 unusedAtTheEnd27Gauge = unusedAtTheEnd27,"unusedAtTheEnd27", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 unusedAtTheEnd28Gauge = unusedAtTheEnd28,"unusedAtTheEnd28", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +unusedAtTheEnd29Gauge = unusedAtTheEnd29,"unusedAtTheEnd29", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +unusedAtTheEnd30Gauge = unusedAtTheEnd30,"unusedAtTheEnd30", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +unusedAtTheEnd31Gauge = unusedAtTheEnd31,"unusedAtTheEnd31", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +unusedAtTheEnd32Gauge = unusedAtTheEnd32,"unusedAtTheEnd32", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +unusedAtTheEnd33Gauge = unusedAtTheEnd33,"unusedAtTheEnd33", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +unusedAtTheEnd34Gauge = unusedAtTheEnd34,"unusedAtTheEnd34", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +unusedAtTheEnd35Gauge = unusedAtTheEnd35,"unusedAtTheEnd35", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +unusedAtTheEnd36Gauge = unusedAtTheEnd36,"unusedAtTheEnd36", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +unusedAtTheEnd37Gauge = unusedAtTheEnd37,"unusedAtTheEnd37", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +unusedAtTheEnd38Gauge = unusedAtTheEnd38,"unusedAtTheEnd38", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +unusedAtTheEnd39Gauge = unusedAtTheEnd39,"unusedAtTheEnd39", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +unusedAtTheEnd40Gauge = unusedAtTheEnd40,"unusedAtTheEnd40", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +unusedAtTheEnd41Gauge = unusedAtTheEnd41,"unusedAtTheEnd41", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +unusedAtTheEnd42Gauge = unusedAtTheEnd42,"unusedAtTheEnd42", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +unusedAtTheEnd43Gauge = unusedAtTheEnd43,"unusedAtTheEnd43", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +unusedAtTheEnd44Gauge = unusedAtTheEnd44,"unusedAtTheEnd44", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +unusedAtTheEnd45Gauge = unusedAtTheEnd45,"unusedAtTheEnd45", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +unusedAtTheEnd46Gauge = unusedAtTheEnd46,"unusedAtTheEnd46", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +unusedAtTheEnd47Gauge = unusedAtTheEnd47,"unusedAtTheEnd47", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +unusedAtTheEnd48Gauge = unusedAtTheEnd48,"unusedAtTheEnd48", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +unusedAtTheEnd49Gauge = unusedAtTheEnd49,"unusedAtTheEnd49", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +unusedAtTheEnd50Gauge = unusedAtTheEnd50,"unusedAtTheEnd50", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +unusedAtTheEnd51Gauge = unusedAtTheEnd51,"unusedAtTheEnd51", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +unusedAtTheEnd52Gauge = unusedAtTheEnd52,"unusedAtTheEnd52", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +unusedAtTheEnd53Gauge = unusedAtTheEnd53,"unusedAtTheEnd53", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +unusedAtTheEnd54Gauge = unusedAtTheEnd54,"unusedAtTheEnd54", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +unusedAtTheEnd55Gauge = unusedAtTheEnd55,"unusedAtTheEnd55", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +unusedAtTheEnd56Gauge = unusedAtTheEnd56,"unusedAtTheEnd56", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +unusedAtTheEnd57Gauge = unusedAtTheEnd57,"unusedAtTheEnd57", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +unusedAtTheEnd58Gauge = unusedAtTheEnd58,"unusedAtTheEnd58", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +unusedAtTheEnd59Gauge = unusedAtTheEnd59,"unusedAtTheEnd59", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +unusedAtTheEnd60Gauge = unusedAtTheEnd60,"unusedAtTheEnd60", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +unusedAtTheEnd61Gauge = unusedAtTheEnd61,"unusedAtTheEnd61", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +unusedAtTheEnd62Gauge = unusedAtTheEnd62,"unusedAtTheEnd62", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +unusedAtTheEnd63Gauge = unusedAtTheEnd63,"unusedAtTheEnd63", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +unusedAtTheEnd64Gauge = unusedAtTheEnd64,"unusedAtTheEnd64", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +unusedAtTheEnd65Gauge = unusedAtTheEnd65,"unusedAtTheEnd65", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +unusedAtTheEnd66Gauge = unusedAtTheEnd66,"unusedAtTheEnd66", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +unusedAtTheEnd67Gauge = unusedAtTheEnd67,"unusedAtTheEnd67", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +unusedAtTheEnd68Gauge = unusedAtTheEnd68,"unusedAtTheEnd68", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +unusedAtTheEnd69Gauge = unusedAtTheEnd69,"unusedAtTheEnd69", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +unusedAtTheEnd70Gauge = unusedAtTheEnd70,"unusedAtTheEnd70", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +unusedAtTheEnd71Gauge = unusedAtTheEnd71,"unusedAtTheEnd71", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +unusedAtTheEnd72Gauge = unusedAtTheEnd72,"unusedAtTheEnd72", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +unusedAtTheEnd73Gauge = unusedAtTheEnd73,"unusedAtTheEnd73", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +unusedAtTheEnd74Gauge = unusedAtTheEnd74,"unusedAtTheEnd74", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +unusedAtTheEnd75Gauge = unusedAtTheEnd75,"unusedAtTheEnd75", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +unusedAtTheEnd76Gauge = unusedAtTheEnd76,"unusedAtTheEnd76", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +unusedAtTheEnd77Gauge = unusedAtTheEnd77,"unusedAtTheEnd77", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +unusedAtTheEnd78Gauge = unusedAtTheEnd78,"unusedAtTheEnd78", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +unusedAtTheEnd79Gauge = unusedAtTheEnd79,"unusedAtTheEnd79", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +unusedAtTheEnd80Gauge = unusedAtTheEnd80,"unusedAtTheEnd80", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +unusedAtTheEnd81Gauge = unusedAtTheEnd81,"unusedAtTheEnd81", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +unusedAtTheEnd82Gauge = unusedAtTheEnd82,"unusedAtTheEnd82", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +unusedAtTheEnd83Gauge = unusedAtTheEnd83,"unusedAtTheEnd83", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +unusedAtTheEnd84Gauge = unusedAtTheEnd84,"unusedAtTheEnd84", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +unusedAtTheEnd85Gauge = unusedAtTheEnd85,"unusedAtTheEnd85", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +unusedAtTheEnd86Gauge = unusedAtTheEnd86,"unusedAtTheEnd86", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +unusedAtTheEnd87Gauge = unusedAtTheEnd87,"unusedAtTheEnd87", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +unusedAtTheEnd88Gauge = unusedAtTheEnd88,"unusedAtTheEnd88", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +unusedAtTheEnd89Gauge = unusedAtTheEnd89,"unusedAtTheEnd89", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +unusedAtTheEnd90Gauge = unusedAtTheEnd90,"unusedAtTheEnd90", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +unusedAtTheEnd91Gauge = unusedAtTheEnd91,"unusedAtTheEnd91", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +unusedAtTheEnd92Gauge = unusedAtTheEnd92,"unusedAtTheEnd92", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +unusedAtTheEnd93Gauge = unusedAtTheEnd93,"unusedAtTheEnd93", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +unusedAtTheEnd94Gauge = unusedAtTheEnd94,"unusedAtTheEnd94", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +unusedAtTheEnd95Gauge = unusedAtTheEnd95,"unusedAtTheEnd95", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +unusedAtTheEnd96Gauge = unusedAtTheEnd96,"unusedAtTheEnd96", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +unusedAtTheEnd97Gauge = unusedAtTheEnd97,"unusedAtTheEnd97", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +unusedAtTheEnd98Gauge = unusedAtTheEnd98,"unusedAtTheEnd98", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +unusedAtTheEnd99Gauge = unusedAtTheEnd99,"unusedAtTheEnd99", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +unusedAtTheEnd100Gauge = unusedAtTheEnd100,"unusedAtTheEnd100", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +unusedAtTheEnd101Gauge = unusedAtTheEnd101,"unusedAtTheEnd101", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +unusedAtTheEnd102Gauge = unusedAtTheEnd102,"unusedAtTheEnd102", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +unusedAtTheEnd103Gauge = unusedAtTheEnd103,"unusedAtTheEnd103", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +unusedAtTheEnd104Gauge = unusedAtTheEnd104,"unusedAtTheEnd104", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +unusedAtTheEnd105Gauge = unusedAtTheEnd105,"unusedAtTheEnd105", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +unusedAtTheEnd106Gauge = unusedAtTheEnd106,"unusedAtTheEnd106", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +unusedAtTheEnd107Gauge = unusedAtTheEnd107,"unusedAtTheEnd107", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +unusedAtTheEnd108Gauge = unusedAtTheEnd108,"unusedAtTheEnd108", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 launchSpeedConditionGauge = launchSpeedCondition,"launchSpeedCondition", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 launchRpmConditionGauge = launchRpmCondition,"launchRpmCondition", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 launchTpsConditionGauge = launchTpsCondition,"launchTpsCondition", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 @@ -235,31 +317,31 @@ launchActivateSwitchConditionGauge = launchActivateSwitchCondition,"launchActiva launchIsLaunchConditionGauge = launchIsLaunchCondition,"launchIsLaunchCondition", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 launchCombinedConditionsGauge = launchCombinedConditions,"launchCombinedConditions", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 launchActivatePinStateGauge = launchActivatePinState,"launchActivatePinState", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 -unusedBit_179_7Gauge = unusedBit_179_7,"unusedBit_179_7", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 -unusedBit_179_8Gauge = unusedBit_179_8,"unusedBit_179_8", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 -unusedBit_179_9Gauge = unusedBit_179_9,"unusedBit_179_9", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 -unusedBit_179_10Gauge = unusedBit_179_10,"unusedBit_179_10", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 -unusedBit_179_11Gauge = unusedBit_179_11,"unusedBit_179_11", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 -unusedBit_179_12Gauge = unusedBit_179_12,"unusedBit_179_12", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 -unusedBit_179_13Gauge = unusedBit_179_13,"unusedBit_179_13", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 -unusedBit_179_14Gauge = unusedBit_179_14,"unusedBit_179_14", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 -unusedBit_179_15Gauge = unusedBit_179_15,"unusedBit_179_15", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 -unusedBit_179_16Gauge = unusedBit_179_16,"unusedBit_179_16", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 -unusedBit_179_17Gauge = unusedBit_179_17,"unusedBit_179_17", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 -unusedBit_179_18Gauge = unusedBit_179_18,"unusedBit_179_18", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 -unusedBit_179_19Gauge = unusedBit_179_19,"unusedBit_179_19", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 -unusedBit_179_20Gauge = unusedBit_179_20,"unusedBit_179_20", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 -unusedBit_179_21Gauge = unusedBit_179_21,"unusedBit_179_21", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 -unusedBit_179_22Gauge = unusedBit_179_22,"unusedBit_179_22", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 -unusedBit_179_23Gauge = unusedBit_179_23,"unusedBit_179_23", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 -unusedBit_179_24Gauge = unusedBit_179_24,"unusedBit_179_24", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 -unusedBit_179_25Gauge = unusedBit_179_25,"unusedBit_179_25", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 -unusedBit_179_26Gauge = unusedBit_179_26,"unusedBit_179_26", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 -unusedBit_179_27Gauge = unusedBit_179_27,"unusedBit_179_27", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 -unusedBit_179_28Gauge = unusedBit_179_28,"unusedBit_179_28", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 -unusedBit_179_29Gauge = unusedBit_179_29,"unusedBit_179_29", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 -unusedBit_179_30Gauge = unusedBit_179_30,"unusedBit_179_30", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 -unusedBit_179_31Gauge = unusedBit_179_31,"unusedBit_179_31", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 +unusedBit_181_7Gauge = unusedBit_181_7,"unusedBit_181_7", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 +unusedBit_181_8Gauge = unusedBit_181_8,"unusedBit_181_8", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 +unusedBit_181_9Gauge = unusedBit_181_9,"unusedBit_181_9", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 +unusedBit_181_10Gauge = unusedBit_181_10,"unusedBit_181_10", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 +unusedBit_181_11Gauge = unusedBit_181_11,"unusedBit_181_11", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 +unusedBit_181_12Gauge = unusedBit_181_12,"unusedBit_181_12", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 +unusedBit_181_13Gauge = unusedBit_181_13,"unusedBit_181_13", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 +unusedBit_181_14Gauge = unusedBit_181_14,"unusedBit_181_14", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 +unusedBit_181_15Gauge = unusedBit_181_15,"unusedBit_181_15", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 +unusedBit_181_16Gauge = unusedBit_181_16,"unusedBit_181_16", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 +unusedBit_181_17Gauge = unusedBit_181_17,"unusedBit_181_17", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 +unusedBit_181_18Gauge = unusedBit_181_18,"unusedBit_181_18", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 +unusedBit_181_19Gauge = unusedBit_181_19,"unusedBit_181_19", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 +unusedBit_181_20Gauge = unusedBit_181_20,"unusedBit_181_20", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 +unusedBit_181_21Gauge = unusedBit_181_21,"unusedBit_181_21", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 +unusedBit_181_22Gauge = unusedBit_181_22,"unusedBit_181_22", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 +unusedBit_181_23Gauge = unusedBit_181_23,"unusedBit_181_23", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 +unusedBit_181_24Gauge = unusedBit_181_24,"unusedBit_181_24", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 +unusedBit_181_25Gauge = unusedBit_181_25,"unusedBit_181_25", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 +unusedBit_181_26Gauge = unusedBit_181_26,"unusedBit_181_26", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 +unusedBit_181_27Gauge = unusedBit_181_27,"unusedBit_181_27", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 +unusedBit_181_28Gauge = unusedBit_181_28,"unusedBit_181_28", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 +unusedBit_181_29Gauge = unusedBit_181_29,"unusedBit_181_29", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 +unusedBit_181_30Gauge = unusedBit_181_30,"unusedBit_181_30", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 +unusedBit_181_31Gauge = unusedBit_181_31,"unusedBit_181_31", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 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 boostControllerOutputGauge = boostControllerOutput,"boostControllerOutput", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 0,0 boostControllerClosedLoopPartGauge = boostControllerClosedLoopPart,"boostControllerClosedLoopPart", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 0,0 diff --git a/firmware/console/binary/generated/output_channels.ini b/firmware/console/binary/generated/output_channels.ini index fa405f136e..83a277ddac 100644 --- a/firmware/console/binary/generated/output_channels.ini +++ b/firmware/console/binary/generated/output_channels.ini @@ -42,8 +42,8 @@ auxTemp2 = scalar, S16, 18, "deg C", 0.01, 0 TPSValue = scalar, S16, 20, "%", 0.01, 0 throttlePedalPosition = scalar, S16, 22, "%", 0.01, 0 tpsADC = scalar, U16, 24, "ADC", 1, 0 -MAFValue = scalar, U16, 26, "V", 0.001, 0 -massAirFlowValue = scalar, U16, 28, "Kg/h", 0.1, 0 +rawMaf = scalar, U16, 26, "V", 0.001, 0 +mafMeasured = scalar, U16, 28, "kg/h", 0.1, 0 MAPValue = scalar, U16, 30, "kPa", 0.03333333333333333, 0 baroPressure = scalar, U16, 32, "kPa", 0.03333333333333333, 0 lambdaValue = scalar, U16, 34, "", 1.0E-4, 0 @@ -200,34 +200,116 @@ 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 +mafEstimate = scalar, U16, 356, "kg/h", 0.1, 0 +instantRpm = scalar, U16, 358, "rpm", 1, 0 +unusedAtTheEnd1 = scalar, U08, 360, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 361, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 362, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 363, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 364, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 365, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 366, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 367, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 368, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 369, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 370, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 371, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 372, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 373, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 374, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 375, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 376, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 377, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 378, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 379, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 380, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 381, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 382, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 383, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 384, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 385, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 386, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 387, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 388, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 389, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 390, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 391, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 392, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 393, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 394, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 395, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 396, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 397, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 398, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 399, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 400, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 401, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 402, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 403, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 404, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 405, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 406, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 407, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 408, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 409, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 410, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 411, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 412, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 413, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 414, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 415, "", 1, 0 +unusedAtTheEnd57 = scalar, U08, 416, "", 1, 0 +unusedAtTheEnd58 = scalar, U08, 417, "", 1, 0 +unusedAtTheEnd59 = scalar, U08, 418, "", 1, 0 +unusedAtTheEnd60 = scalar, U08, 419, "", 1, 0 +unusedAtTheEnd61 = scalar, U08, 420, "", 1, 0 +unusedAtTheEnd62 = scalar, U08, 421, "", 1, 0 +unusedAtTheEnd63 = scalar, U08, 422, "", 1, 0 +unusedAtTheEnd64 = scalar, U08, 423, "", 1, 0 +unusedAtTheEnd65 = scalar, U08, 424, "", 1, 0 +unusedAtTheEnd66 = scalar, U08, 425, "", 1, 0 +unusedAtTheEnd67 = scalar, U08, 426, "", 1, 0 +unusedAtTheEnd68 = scalar, U08, 427, "", 1, 0 +unusedAtTheEnd69 = scalar, U08, 428, "", 1, 0 +unusedAtTheEnd70 = scalar, U08, 429, "", 1, 0 +unusedAtTheEnd71 = scalar, U08, 430, "", 1, 0 +unusedAtTheEnd72 = scalar, U08, 431, "", 1, 0 +unusedAtTheEnd73 = scalar, U08, 432, "", 1, 0 +unusedAtTheEnd74 = scalar, U08, 433, "", 1, 0 +unusedAtTheEnd75 = scalar, U08, 434, "", 1, 0 +unusedAtTheEnd76 = scalar, U08, 435, "", 1, 0 +unusedAtTheEnd77 = scalar, U08, 436, "", 1, 0 +unusedAtTheEnd78 = scalar, U08, 437, "", 1, 0 +unusedAtTheEnd79 = scalar, U08, 438, "", 1, 0 +unusedAtTheEnd80 = scalar, U08, 439, "", 1, 0 +unusedAtTheEnd81 = scalar, U08, 440, "", 1, 0 +unusedAtTheEnd82 = scalar, U08, 441, "", 1, 0 +unusedAtTheEnd83 = scalar, U08, 442, "", 1, 0 +unusedAtTheEnd84 = scalar, U08, 443, "", 1, 0 +unusedAtTheEnd85 = scalar, U08, 444, "", 1, 0 +unusedAtTheEnd86 = scalar, U08, 445, "", 1, 0 +unusedAtTheEnd87 = scalar, U08, 446, "", 1, 0 +unusedAtTheEnd88 = scalar, U08, 447, "", 1, 0 +unusedAtTheEnd89 = scalar, U08, 448, "", 1, 0 +unusedAtTheEnd90 = scalar, U08, 449, "", 1, 0 +unusedAtTheEnd91 = scalar, U08, 450, "", 1, 0 +unusedAtTheEnd92 = scalar, U08, 451, "", 1, 0 +unusedAtTheEnd93 = scalar, U08, 452, "", 1, 0 +unusedAtTheEnd94 = scalar, U08, 453, "", 1, 0 +unusedAtTheEnd95 = scalar, U08, 454, "", 1, 0 +unusedAtTheEnd96 = scalar, U08, 455, "", 1, 0 +unusedAtTheEnd97 = scalar, U08, 456, "", 1, 0 +unusedAtTheEnd98 = scalar, U08, 457, "", 1, 0 +unusedAtTheEnd99 = scalar, U08, 458, "", 1, 0 +unusedAtTheEnd100 = scalar, U08, 459, "", 1, 0 +unusedAtTheEnd101 = scalar, U08, 460, "", 1, 0 +unusedAtTheEnd102 = scalar, U08, 461, "", 1, 0 +unusedAtTheEnd103 = scalar, U08, 462, "", 1, 0 +unusedAtTheEnd104 = scalar, U08, 463, "", 1, 0 +unusedAtTheEnd105 = scalar, U08, 464, "", 1, 0 +unusedAtTheEnd106 = scalar, U08, 465, "", 1, 0 +unusedAtTheEnd107 = scalar, U08, 466, "", 1, 0 +unusedAtTheEnd108 = scalar, U08, 467, "", 1, 0 launchSpeedCondition = bits, U32, 468, [0:0] launchRpmCondition = bits, U32, 468, [1:1] launchTpsCondition = bits, U32, 468, [2:2] @@ -235,31 +317,31 @@ 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_179_7 = bits, U32, 468, [7:7] -unusedBit_179_8 = bits, U32, 468, [8:8] -unusedBit_179_9 = bits, U32, 468, [9:9] -unusedBit_179_10 = bits, U32, 468, [10:10] -unusedBit_179_11 = bits, U32, 468, [11:11] -unusedBit_179_12 = bits, U32, 468, [12:12] -unusedBit_179_13 = bits, U32, 468, [13:13] -unusedBit_179_14 = bits, U32, 468, [14:14] -unusedBit_179_15 = bits, U32, 468, [15:15] -unusedBit_179_16 = bits, U32, 468, [16:16] -unusedBit_179_17 = bits, U32, 468, [17:17] -unusedBit_179_18 = bits, U32, 468, [18:18] -unusedBit_179_19 = bits, U32, 468, [19:19] -unusedBit_179_20 = bits, U32, 468, [20:20] -unusedBit_179_21 = bits, U32, 468, [21:21] -unusedBit_179_22 = bits, U32, 468, [22:22] -unusedBit_179_23 = bits, U32, 468, [23:23] -unusedBit_179_24 = bits, U32, 468, [24:24] -unusedBit_179_25 = bits, U32, 468, [25:25] -unusedBit_179_26 = bits, U32, 468, [26:26] -unusedBit_179_27 = bits, U32, 468, [27:27] -unusedBit_179_28 = bits, U32, 468, [28:28] -unusedBit_179_29 = bits, U32, 468, [29:29] -unusedBit_179_30 = bits, U32, 468, [30:30] -unusedBit_179_31 = bits, U32, 468, [31:31] +unusedBit_181_7 = bits, U32, 468, [7:7] +unusedBit_181_8 = bits, U32, 468, [8:8] +unusedBit_181_9 = bits, U32, 468, [9:9] +unusedBit_181_10 = bits, U32, 468, [10:10] +unusedBit_181_11 = bits, U32, 468, [11:11] +unusedBit_181_12 = bits, U32, 468, [12:12] +unusedBit_181_13 = bits, U32, 468, [13:13] +unusedBit_181_14 = bits, U32, 468, [14:14] +unusedBit_181_15 = bits, U32, 468, [15:15] +unusedBit_181_16 = bits, U32, 468, [16:16] +unusedBit_181_17 = bits, U32, 468, [17:17] +unusedBit_181_18 = bits, U32, 468, [18:18] +unusedBit_181_19 = bits, U32, 468, [19:19] +unusedBit_181_20 = bits, U32, 468, [20:20] +unusedBit_181_21 = bits, U32, 468, [21:21] +unusedBit_181_22 = bits, U32, 468, [22:22] +unusedBit_181_23 = bits, U32, 468, [23:23] +unusedBit_181_24 = bits, U32, 468, [24:24] +unusedBit_181_25 = bits, U32, 468, [25:25] +unusedBit_181_26 = bits, U32, 468, [26:26] +unusedBit_181_27 = bits, U32, 468, [27:27] +unusedBit_181_28 = bits, U32, 468, [28:28] +unusedBit_181_29 = bits, U32, 468, [29:29] +unusedBit_181_30 = bits, U32, 468, [30:30] +unusedBit_181_31 = bits, U32, 468, [31:31] TEMPLOG_MAP_AT_CYCLE_COUNT = scalar, U08, 472, "", 1, 0 boostControllerOutput = scalar, U08, 473, "", 1, 0 boostControllerClosedLoopPart = scalar, U08, 474, "", 1, 0 diff --git a/firmware/console/binary/ts_outputs_generated.h b/firmware/console/binary/ts_outputs_generated.h index 09a0b22835..d0e9b30f96 100644 --- a/firmware/console/binary/ts_outputs_generated.h +++ b/firmware/console/binary/ts_outputs_generated.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Sat Jan 08 21:38:58 EST 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Wed Jan 12 21:36:23 UTC 2022 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -201,17 +201,16 @@ struct ts_outputs_s { */ uint16_t tpsADC = (uint16_t)0; /** - * @@GAUGE_NAME_MAF@@ V * offset 26 */ - scaled_channel MAFValue = (uint16_t)0; + scaled_channel rawMaf = (uint16_t)0; /** - * @@GAUGE_NAME_AIR_FLOW@@ - Kg/h + * @@GAUGE_NAME_AIR_FLOW_MEASURED@@ + kg/h * offset 28 */ - scaled_channel massAirFlowValue = (uint16_t)0; + scaled_channel mafMeasured = (uint16_t)0; /** * @@GAUGE_NAME_MAP@@ kPa @@ -900,9 +899,20 @@ struct ts_outputs_s { */ float m_pressureTarget_kPa = (float)0; /** + * @@GAUGE_NAME_AIR_FLOW_ESTIMATE@@ + kg/h * offset 356 */ - int unusedAtTheEnd[28]; + scaled_channel mafEstimate = (uint16_t)0; + /** + rpm + * offset 358 + */ + uint16_t instantRpm = (uint16_t)0; + /** + * offset 360 + */ + uint8_t unusedAtTheEnd[108]; /** offset 468 bit 0 */ bool launchSpeedCondition : 1 {}; @@ -926,79 +936,79 @@ struct ts_outputs_s { bool launchActivatePinState : 1 {}; /** offset 468 bit 7 */ - bool unusedBit_179_7 : 1 {}; + bool unusedBit_181_7 : 1 {}; /** offset 468 bit 8 */ - bool unusedBit_179_8 : 1 {}; + bool unusedBit_181_8 : 1 {}; /** offset 468 bit 9 */ - bool unusedBit_179_9 : 1 {}; + bool unusedBit_181_9 : 1 {}; /** offset 468 bit 10 */ - bool unusedBit_179_10 : 1 {}; + bool unusedBit_181_10 : 1 {}; /** offset 468 bit 11 */ - bool unusedBit_179_11 : 1 {}; + bool unusedBit_181_11 : 1 {}; /** offset 468 bit 12 */ - bool unusedBit_179_12 : 1 {}; + bool unusedBit_181_12 : 1 {}; /** offset 468 bit 13 */ - bool unusedBit_179_13 : 1 {}; + bool unusedBit_181_13 : 1 {}; /** offset 468 bit 14 */ - bool unusedBit_179_14 : 1 {}; + bool unusedBit_181_14 : 1 {}; /** offset 468 bit 15 */ - bool unusedBit_179_15 : 1 {}; + bool unusedBit_181_15 : 1 {}; /** offset 468 bit 16 */ - bool unusedBit_179_16 : 1 {}; + bool unusedBit_181_16 : 1 {}; /** offset 468 bit 17 */ - bool unusedBit_179_17 : 1 {}; + bool unusedBit_181_17 : 1 {}; /** offset 468 bit 18 */ - bool unusedBit_179_18 : 1 {}; + bool unusedBit_181_18 : 1 {}; /** offset 468 bit 19 */ - bool unusedBit_179_19 : 1 {}; + bool unusedBit_181_19 : 1 {}; /** offset 468 bit 20 */ - bool unusedBit_179_20 : 1 {}; + bool unusedBit_181_20 : 1 {}; /** offset 468 bit 21 */ - bool unusedBit_179_21 : 1 {}; + bool unusedBit_181_21 : 1 {}; /** offset 468 bit 22 */ - bool unusedBit_179_22 : 1 {}; + bool unusedBit_181_22 : 1 {}; /** offset 468 bit 23 */ - bool unusedBit_179_23 : 1 {}; + bool unusedBit_181_23 : 1 {}; /** offset 468 bit 24 */ - bool unusedBit_179_24 : 1 {}; + bool unusedBit_181_24 : 1 {}; /** offset 468 bit 25 */ - bool unusedBit_179_25 : 1 {}; + bool unusedBit_181_25 : 1 {}; /** offset 468 bit 26 */ - bool unusedBit_179_26 : 1 {}; + bool unusedBit_181_26 : 1 {}; /** offset 468 bit 27 */ - bool unusedBit_179_27 : 1 {}; + bool unusedBit_181_27 : 1 {}; /** offset 468 bit 28 */ - bool unusedBit_179_28 : 1 {}; + bool unusedBit_181_28 : 1 {}; /** offset 468 bit 29 */ - bool unusedBit_179_29 : 1 {}; + bool unusedBit_181_29 : 1 {}; /** offset 468 bit 30 */ - bool unusedBit_179_30 : 1 {}; + bool unusedBit_181_30 : 1 {}; /** offset 468 bit 31 */ - bool unusedBit_179_31 : 1 {}; + bool unusedBit_181_31 : 1 {}; /** * offset 472 */ @@ -1196,4 +1206,4 @@ struct ts_outputs_s { }; // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Sat Jan 08 21:38:58 EST 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Wed Jan 12 21:36:23 UTC 2022 diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h index 41fdabd2f4..ae39613838 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -1013,7 +1013,8 @@ #define GAUGE_NAME_ACCEL_Z "Acceleration: Z" #define GAUGE_NAME_AFR "Air/Fuel Ratio" #define GAUGE_NAME_AFR2 "Air/Fuel Ratio 2" -#define GAUGE_NAME_AIR_FLOW "MAF air flow" +#define GAUGE_NAME_AIR_FLOW_ESTIMATE "MAF estimate" +#define GAUGE_NAME_AIR_FLOW_MEASURED "MAF sensor" #define GAUGE_NAME_AIR_MASS "air mass" #define GAUGE_NAME_AUX_TEMP1 "Aux temp 1" #define GAUGE_NAME_AUX_TEMP2 "Aux temp 2" @@ -1878,7 +1879,7 @@ #define show_test_presets true #define showHumanReadableWarning_offset 896 #define showSdCardWarning_offset 164 -#define SIGNATURE_HASH 1400061660 +#define SIGNATURE_HASH 1786642043 #define silentTriggerError_offset 1260 #define slowAdcAlpha_offset 1712 #define sparkDwellRpmBins_offset 54 @@ -2401,7 +2402,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2022.01.12.all.1400061660" +#define TS_SIGNATURE "rusEFI 2022.01.12.all.1786642043" #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 e7b340ebd9..3b6b9b772b 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 null // -#define SIGNATURE_HASH 1400061660 -#define TS_SIGNATURE "rusEFI 2022.01.12.all.1400061660" +#define SIGNATURE_HASH 1786642043 +#define TS_SIGNATURE "rusEFI 2022.01.12.all.1786642043" diff --git a/firmware/controllers/generated/signature_alphax-2chan.h b/firmware/controllers/generated/signature_alphax-2chan.h index 8124ab4049..651c4b9bc9 100644 --- a/firmware/controllers/generated/signature_alphax-2chan.h +++ b/firmware/controllers/generated/signature_alphax-2chan.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3258707287 -#define TS_SIGNATURE "rusEFI 2022.01.12.alphax-2chan.3258707287" +#define SIGNATURE_HASH 4214566384 +#define TS_SIGNATURE "rusEFI 2022.01.12.alphax-2chan.4214566384" diff --git a/firmware/controllers/generated/signature_alphax-4chan.h b/firmware/controllers/generated/signature_alphax-4chan.h index 2f6c4c76b5..f0266f39eb 100644 --- a/firmware/controllers/generated/signature_alphax-4chan.h +++ b/firmware/controllers/generated/signature_alphax-4chan.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 4255758023 -#define TS_SIGNATURE "rusEFI 2022.01.12.alphax-4chan.4255758023" +#define SIGNATURE_HASH 3299309152 +#define TS_SIGNATURE "rusEFI 2022.01.12.alphax-4chan.3299309152" diff --git a/firmware/controllers/generated/signature_atlas.h b/firmware/controllers/generated/signature_atlas.h index c116c2a3a2..864750b5a9 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 null // -#define SIGNATURE_HASH 1337576443 -#define TS_SIGNATURE "rusEFI 2022.01.12.atlas.1337576443" +#define SIGNATURE_HASH 1991707484 +#define TS_SIGNATURE "rusEFI 2022.01.12.atlas.1991707484" diff --git a/firmware/controllers/generated/signature_f429-discovery.h b/firmware/controllers/generated/signature_f429-discovery.h index fb3ebd0a72..5b52ec058c 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 null // -#define SIGNATURE_HASH 1400061660 -#define TS_SIGNATURE "rusEFI 2022.01.12.f429-discovery.1400061660" +#define SIGNATURE_HASH 1786642043 +#define TS_SIGNATURE "rusEFI 2022.01.12.f429-discovery.1786642043" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index 264fe21c09..bfd7109af5 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 null // -#define SIGNATURE_HASH 692153141 -#define TS_SIGNATURE "rusEFI 2022.01.12.frankenso_na6.692153141" +#define SIGNATURE_HASH 273656722 +#define TS_SIGNATURE "rusEFI 2022.01.12.frankenso_na6.273656722" diff --git a/firmware/controllers/generated/signature_hellen-nb1.h b/firmware/controllers/generated/signature_hellen-nb1.h index 3225b509f8..ff3fd7935b 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 null // -#define SIGNATURE_HASH 2948251653 -#define TS_SIGNATURE "rusEFI 2022.01.12.hellen-nb1.2948251653" +#define SIGNATURE_HASH 2528379042 +#define TS_SIGNATURE "rusEFI 2022.01.12.hellen-nb1.2528379042" diff --git a/firmware/controllers/generated/signature_hellen121nissan.h b/firmware/controllers/generated/signature_hellen121nissan.h index 0edce13de9..8e73e49939 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 null // -#define SIGNATURE_HASH 4156714415 -#define TS_SIGNATURE "rusEFI 2022.01.12.hellen121nissan.4156714415" +#define SIGNATURE_HASH 3469520136 +#define TS_SIGNATURE "rusEFI 2022.01.12.hellen121nissan.3469520136" diff --git a/firmware/controllers/generated/signature_hellen121vag.h b/firmware/controllers/generated/signature_hellen121vag.h index f83457d568..1abcd0fd69 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 null // -#define SIGNATURE_HASH 214964950 -#define TS_SIGNATURE "rusEFI 2022.01.12.hellen121vag.214964950" +#define SIGNATURE_HASH 903797361 +#define TS_SIGNATURE "rusEFI 2022.01.12.hellen121vag.903797361" diff --git a/firmware/controllers/generated/signature_hellen128.h b/firmware/controllers/generated/signature_hellen128.h index 99f7b6f052..4300f230ab 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 null // -#define SIGNATURE_HASH 1300858191 -#define TS_SIGNATURE "rusEFI 2022.01.12.hellen128.1300858191" +#define SIGNATURE_HASH 1955022312 +#define TS_SIGNATURE "rusEFI 2022.01.12.hellen128.1955022312" diff --git a/firmware/controllers/generated/signature_hellen154hyundai.h b/firmware/controllers/generated/signature_hellen154hyundai.h index f996fe0d9b..0c2b8c265b 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 null // -#define SIGNATURE_HASH 2674860656 -#define TS_SIGNATURE "rusEFI 2022.01.12.hellen154hyundai.2674860656" +#define SIGNATURE_HASH 2791432919 +#define TS_SIGNATURE "rusEFI 2022.01.12.hellen154hyundai.2791432919" diff --git a/firmware/controllers/generated/signature_hellen72.h b/firmware/controllers/generated/signature_hellen72.h index 3b669e57be..5a24d60fb5 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 null // -#define SIGNATURE_HASH 2815342956 -#define TS_SIGNATURE "rusEFI 2022.01.12.hellen72.2815342956" +#define SIGNATURE_HASH 2663414219 +#define TS_SIGNATURE "rusEFI 2022.01.12.hellen72.2663414219" diff --git a/firmware/controllers/generated/signature_hellen81.h b/firmware/controllers/generated/signature_hellen81.h index 150adb11f4..98f537f658 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 null // -#define SIGNATURE_HASH 331555999 -#define TS_SIGNATURE "rusEFI 2022.01.12.hellen81.331555999" +#define SIGNATURE_HASH 718136376 +#define TS_SIGNATURE "rusEFI 2022.01.12.hellen81.718136376" diff --git a/firmware/controllers/generated/signature_hellen88bmw.h b/firmware/controllers/generated/signature_hellen88bmw.h index 721214bf14..e639140f81 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 null // -#define SIGNATURE_HASH 4071862147 -#define TS_SIGNATURE "rusEFI 2022.01.12.hellen88bmw.4071862147" +#define SIGNATURE_HASH 3418189604 +#define TS_SIGNATURE "rusEFI 2022.01.12.hellen88bmw.3418189604" diff --git a/firmware/controllers/generated/signature_hellenNA6.h b/firmware/controllers/generated/signature_hellenNA6.h index 85729c82df..d17d9e18ef 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 null // -#define SIGNATURE_HASH 625899636 -#define TS_SIGNATURE "rusEFI 2022.01.12.hellenNA6.625899636" +#define SIGNATURE_HASH 474003667 +#define TS_SIGNATURE "rusEFI 2022.01.12.hellenNA6.474003667" diff --git a/firmware/controllers/generated/signature_hellenNA8_96.h b/firmware/controllers/generated/signature_hellenNA8_96.h index 184993fdeb..668da44dde 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 null // -#define SIGNATURE_HASH 2025803527 -#define TS_SIGNATURE "rusEFI 2022.01.12.hellenNA8_96.2025803527" +#define SIGNATURE_HASH 1102155680 +#define TS_SIGNATURE "rusEFI 2022.01.12.hellenNA8_96.1102155680" diff --git a/firmware/controllers/generated/signature_hellen_cypress.h b/firmware/controllers/generated/signature_hellen_cypress.h index 9db95f7638..5a9b30a6b2 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 null // -#define SIGNATURE_HASH 1770445152 -#define TS_SIGNATURE "rusEFI 2022.01.12.hellen_cypress.1770445152" +#define SIGNATURE_HASH 1351096775 +#define TS_SIGNATURE "rusEFI 2022.01.12.hellen_cypress.1351096775" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index d8b1fce3c6..f4286158c5 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 null // -#define SIGNATURE_HASH 2518881692 -#define TS_SIGNATURE "rusEFI 2022.01.12.kin.2518881692" +#define SIGNATURE_HASH 2939016507 +#define TS_SIGNATURE "rusEFI 2022.01.12.kin.2939016507" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index 21d8a27f09..6498c67019 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 null // -#define SIGNATURE_HASH 1447585560 -#define TS_SIGNATURE "rusEFI 2022.01.12.mre_f4.1447585560" +#define SIGNATURE_HASH 1866901439 +#define TS_SIGNATURE "rusEFI 2022.01.12.mre_f4.1866901439" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index 7fdfba71e2..9b24f5402b 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 null // -#define SIGNATURE_HASH 1447585560 -#define TS_SIGNATURE "rusEFI 2022.01.12.mre_f7.1447585560" +#define SIGNATURE_HASH 1866901439 +#define TS_SIGNATURE "rusEFI 2022.01.12.mre_f7.1866901439" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index 637ea8c83b..eae450726b 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 null // -#define SIGNATURE_HASH 60417850 -#define TS_SIGNATURE "rusEFI 2022.01.12.prometheus_405.60417850" +#define SIGNATURE_HASH 982984605 +#define TS_SIGNATURE "rusEFI 2022.01.12.prometheus_405.982984605" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index 14d1ca2164..264269cb4a 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 null // -#define SIGNATURE_HASH 60417850 -#define TS_SIGNATURE "rusEFI 2022.01.12.prometheus_469.60417850" +#define SIGNATURE_HASH 982984605 +#define TS_SIGNATURE "rusEFI 2022.01.12.prometheus_469.982984605" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index 4931664db4..9d1f9c018c 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 null // -#define SIGNATURE_HASH 2442057728 -#define TS_SIGNATURE "rusEFI 2022.01.12.proteus_f4.2442057728" +#define SIGNATURE_HASH 2826967207 +#define TS_SIGNATURE "rusEFI 2022.01.12.proteus_f4.2826967207" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index 7a611d4bb7..6eb204e214 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 null // -#define SIGNATURE_HASH 2442057728 -#define TS_SIGNATURE "rusEFI 2022.01.12.proteus_f7.2442057728" +#define SIGNATURE_HASH 2826967207 +#define TS_SIGNATURE "rusEFI 2022.01.12.proteus_f7.2826967207" diff --git a/firmware/controllers/generated/signature_subaru_eg33_f7.h b/firmware/controllers/generated/signature_subaru_eg33_f7.h index 32488210e7..c92939d652 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 null // -#define SIGNATURE_HASH 2429102220 -#define TS_SIGNATURE "rusEFI 2022.01.12.subaru_eg33_f7.2429102220" +#define SIGNATURE_HASH 2848450603 +#define TS_SIGNATURE "rusEFI 2022.01.12.subaru_eg33_f7.2848450603" diff --git a/firmware/controllers/lua/generated/output_lookup_generated.cpp b/firmware/controllers/lua/generated/output_lookup_generated.cpp index b13d38ffb1..b53d617074 100644 --- a/firmware/controllers/lua/generated/output_lookup_generated.cpp +++ b/firmware/controllers/lua/generated/output_lookup_generated.cpp @@ -88,10 +88,10 @@ float getOutputValueByName(const char *name) { return engine->outputChannels.throttlePedalPosition; if (strEqualCaseInsensitive(name, "tpsADC")) return engine->outputChannels.tpsADC; - if (strEqualCaseInsensitive(name, "MAFValue")) - return engine->outputChannels.MAFValue; - if (strEqualCaseInsensitive(name, "massAirFlowValue")) - return engine->outputChannels.massAirFlowValue; + if (strEqualCaseInsensitive(name, "rawMaf")) + return engine->outputChannels.rawMaf; + if (strEqualCaseInsensitive(name, "mafMeasured")) + return engine->outputChannels.mafMeasured; if (strEqualCaseInsensitive(name, "MAPValue")) return engine->outputChannels.MAPValue; if (strEqualCaseInsensitive(name, "baroPressure")) @@ -328,6 +328,10 @@ float getOutputValueByName(const char *name) { return engine->outputChannels.m_I_sum_percent; if (strEqualCaseInsensitive(name, "m_pressureTarget_kPa")) return engine->outputChannels.m_pressureTarget_kPa; + if (strEqualCaseInsensitive(name, "mafEstimate")) + return engine->outputChannels.mafEstimate; + if (strEqualCaseInsensitive(name, "instantRpm")) + return engine->outputChannels.instantRpm; if (strEqualCaseInsensitive(name, "launchSpeedCondition")) return engine->outputChannels.launchSpeedCondition; if (strEqualCaseInsensitive(name, "launchRpmCondition")) diff --git a/firmware/tunerstudio/generated/rusefi.ini b/firmware/tunerstudio/generated/rusefi.ini index 720cd10f4b..794c48aed2 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.12.all.1400061660" + signature = "rusEFI 2022.01.12.all.1786642043" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.01.12.all.1400061660" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.01.12.all.1786642043" ; 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 (unknown script) integration/rusefi_config.txt Wed Jan 12 01:51:29 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 12 21:37:00 UTC 2022 pageSize = 20996 page = 1 @@ -1958,8 +1958,8 @@ auxTemp2 = scalar, S16, 18, "deg C", 0.01, 0 TPSValue = scalar, S16, 20, "%", 0.01, 0 throttlePedalPosition = scalar, S16, 22, "%", 0.01, 0 tpsADC = scalar, U16, 24, "ADC", 1, 0 -MAFValue = scalar, U16, 26, "V", 0.001, 0 -massAirFlowValue = scalar, U16, 28, "Kg/h", 0.1, 0 +rawMaf = scalar, U16, 26, "V", 0.001, 0 +mafMeasured = scalar, U16, 28, "kg/h", 0.1, 0 MAPValue = scalar, U16, 30, "kPa", 0.03333333333333333, 0 baroPressure = scalar, U16, 32, "kPa", 0.03333333333333333, 0 lambdaValue = scalar, U16, 34, "", 1.0E-4, 0 @@ -2116,34 +2116,116 @@ 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 +mafEstimate = scalar, U16, 356, "kg/h", 0.1, 0 +instantRpm = scalar, U16, 358, "rpm", 1, 0 +unusedAtTheEnd1 = scalar, U08, 360, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 361, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 362, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 363, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 364, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 365, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 366, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 367, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 368, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 369, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 370, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 371, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 372, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 373, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 374, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 375, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 376, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 377, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 378, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 379, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 380, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 381, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 382, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 383, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 384, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 385, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 386, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 387, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 388, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 389, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 390, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 391, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 392, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 393, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 394, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 395, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 396, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 397, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 398, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 399, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 400, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 401, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 402, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 403, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 404, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 405, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 406, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 407, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 408, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 409, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 410, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 411, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 412, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 413, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 414, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 415, "", 1, 0 +unusedAtTheEnd57 = scalar, U08, 416, "", 1, 0 +unusedAtTheEnd58 = scalar, U08, 417, "", 1, 0 +unusedAtTheEnd59 = scalar, U08, 418, "", 1, 0 +unusedAtTheEnd60 = scalar, U08, 419, "", 1, 0 +unusedAtTheEnd61 = scalar, U08, 420, "", 1, 0 +unusedAtTheEnd62 = scalar, U08, 421, "", 1, 0 +unusedAtTheEnd63 = scalar, U08, 422, "", 1, 0 +unusedAtTheEnd64 = scalar, U08, 423, "", 1, 0 +unusedAtTheEnd65 = scalar, U08, 424, "", 1, 0 +unusedAtTheEnd66 = scalar, U08, 425, "", 1, 0 +unusedAtTheEnd67 = scalar, U08, 426, "", 1, 0 +unusedAtTheEnd68 = scalar, U08, 427, "", 1, 0 +unusedAtTheEnd69 = scalar, U08, 428, "", 1, 0 +unusedAtTheEnd70 = scalar, U08, 429, "", 1, 0 +unusedAtTheEnd71 = scalar, U08, 430, "", 1, 0 +unusedAtTheEnd72 = scalar, U08, 431, "", 1, 0 +unusedAtTheEnd73 = scalar, U08, 432, "", 1, 0 +unusedAtTheEnd74 = scalar, U08, 433, "", 1, 0 +unusedAtTheEnd75 = scalar, U08, 434, "", 1, 0 +unusedAtTheEnd76 = scalar, U08, 435, "", 1, 0 +unusedAtTheEnd77 = scalar, U08, 436, "", 1, 0 +unusedAtTheEnd78 = scalar, U08, 437, "", 1, 0 +unusedAtTheEnd79 = scalar, U08, 438, "", 1, 0 +unusedAtTheEnd80 = scalar, U08, 439, "", 1, 0 +unusedAtTheEnd81 = scalar, U08, 440, "", 1, 0 +unusedAtTheEnd82 = scalar, U08, 441, "", 1, 0 +unusedAtTheEnd83 = scalar, U08, 442, "", 1, 0 +unusedAtTheEnd84 = scalar, U08, 443, "", 1, 0 +unusedAtTheEnd85 = scalar, U08, 444, "", 1, 0 +unusedAtTheEnd86 = scalar, U08, 445, "", 1, 0 +unusedAtTheEnd87 = scalar, U08, 446, "", 1, 0 +unusedAtTheEnd88 = scalar, U08, 447, "", 1, 0 +unusedAtTheEnd89 = scalar, U08, 448, "", 1, 0 +unusedAtTheEnd90 = scalar, U08, 449, "", 1, 0 +unusedAtTheEnd91 = scalar, U08, 450, "", 1, 0 +unusedAtTheEnd92 = scalar, U08, 451, "", 1, 0 +unusedAtTheEnd93 = scalar, U08, 452, "", 1, 0 +unusedAtTheEnd94 = scalar, U08, 453, "", 1, 0 +unusedAtTheEnd95 = scalar, U08, 454, "", 1, 0 +unusedAtTheEnd96 = scalar, U08, 455, "", 1, 0 +unusedAtTheEnd97 = scalar, U08, 456, "", 1, 0 +unusedAtTheEnd98 = scalar, U08, 457, "", 1, 0 +unusedAtTheEnd99 = scalar, U08, 458, "", 1, 0 +unusedAtTheEnd100 = scalar, U08, 459, "", 1, 0 +unusedAtTheEnd101 = scalar, U08, 460, "", 1, 0 +unusedAtTheEnd102 = scalar, U08, 461, "", 1, 0 +unusedAtTheEnd103 = scalar, U08, 462, "", 1, 0 +unusedAtTheEnd104 = scalar, U08, 463, "", 1, 0 +unusedAtTheEnd105 = scalar, U08, 464, "", 1, 0 +unusedAtTheEnd106 = scalar, U08, 465, "", 1, 0 +unusedAtTheEnd107 = scalar, U08, 466, "", 1, 0 +unusedAtTheEnd108 = scalar, U08, 467, "", 1, 0 launchSpeedCondition = bits, U32, 468, [0:0] launchRpmCondition = bits, U32, 468, [1:1] launchTpsCondition = bits, U32, 468, [2:2] @@ -2151,31 +2233,31 @@ 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_179_7 = bits, U32, 468, [7:7] -unusedBit_179_8 = bits, U32, 468, [8:8] -unusedBit_179_9 = bits, U32, 468, [9:9] -unusedBit_179_10 = bits, U32, 468, [10:10] -unusedBit_179_11 = bits, U32, 468, [11:11] -unusedBit_179_12 = bits, U32, 468, [12:12] -unusedBit_179_13 = bits, U32, 468, [13:13] -unusedBit_179_14 = bits, U32, 468, [14:14] -unusedBit_179_15 = bits, U32, 468, [15:15] -unusedBit_179_16 = bits, U32, 468, [16:16] -unusedBit_179_17 = bits, U32, 468, [17:17] -unusedBit_179_18 = bits, U32, 468, [18:18] -unusedBit_179_19 = bits, U32, 468, [19:19] -unusedBit_179_20 = bits, U32, 468, [20:20] -unusedBit_179_21 = bits, U32, 468, [21:21] -unusedBit_179_22 = bits, U32, 468, [22:22] -unusedBit_179_23 = bits, U32, 468, [23:23] -unusedBit_179_24 = bits, U32, 468, [24:24] -unusedBit_179_25 = bits, U32, 468, [25:25] -unusedBit_179_26 = bits, U32, 468, [26:26] -unusedBit_179_27 = bits, U32, 468, [27:27] -unusedBit_179_28 = bits, U32, 468, [28:28] -unusedBit_179_29 = bits, U32, 468, [29:29] -unusedBit_179_30 = bits, U32, 468, [30:30] -unusedBit_179_31 = bits, U32, 468, [31:31] +unusedBit_181_7 = bits, U32, 468, [7:7] +unusedBit_181_8 = bits, U32, 468, [8:8] +unusedBit_181_9 = bits, U32, 468, [9:9] +unusedBit_181_10 = bits, U32, 468, [10:10] +unusedBit_181_11 = bits, U32, 468, [11:11] +unusedBit_181_12 = bits, U32, 468, [12:12] +unusedBit_181_13 = bits, U32, 468, [13:13] +unusedBit_181_14 = bits, U32, 468, [14:14] +unusedBit_181_15 = bits, U32, 468, [15:15] +unusedBit_181_16 = bits, U32, 468, [16:16] +unusedBit_181_17 = bits, U32, 468, [17:17] +unusedBit_181_18 = bits, U32, 468, [18:18] +unusedBit_181_19 = bits, U32, 468, [19:19] +unusedBit_181_20 = bits, U32, 468, [20:20] +unusedBit_181_21 = bits, U32, 468, [21:21] +unusedBit_181_22 = bits, U32, 468, [22:22] +unusedBit_181_23 = bits, U32, 468, [23:23] +unusedBit_181_24 = bits, U32, 468, [24:24] +unusedBit_181_25 = bits, U32, 468, [25:25] +unusedBit_181_26 = bits, U32, 468, [26:26] +unusedBit_181_27 = bits, U32, 468, [27:27] +unusedBit_181_28 = bits, U32, 468, [28:28] +unusedBit_181_29 = bits, U32, 468, [29:29] +unusedBit_181_30 = bits, U32, 468, [30:30] +unusedBit_181_31 = bits, U32, 468, [31:31] TEMPLOG_MAP_AT_CYCLE_COUNT = scalar, U08, 472, "", 1, 0 boostControllerOutput = scalar, U08, 473, "", 1, 0 boostControllerClosedLoopPart = scalar, U08, 474, "", 1, 0 @@ -2514,9 +2596,9 @@ etbStatus_resetCounter = scalar, S32, 636, "", 1, 0 columnLabel = "Voltage", "kg/hour" xAxis = -1, 6, 10 yAxis = -30, 1300, 10 - xBins = mafDecodingBins, MAFValue + xBins = mafDecodingBins, rawMaf yBins = mafDecoding - gauge = MAFGauge + gauge = rawMafGauge curve = iatFuelCorrCurve, "Intake air temperature fuel Multiplier" columnLabel = "Air Temp", "Multiplier" @@ -3082,10 +3164,9 @@ gaugeCategory = Sensors - Basic afr2Gauge = AFRValue2, "Air/Fuel Ratio 2", "", 10, 19.4, 12, 13, 15, 16, 2, 2 lambda1Gauge = lambdaValue, "Lambda", "", 0.65, 1.2, 0.7, 0.75, 1.1, 1.15, 3, 2 lambda2Gauge = lambdaValue2, "Lambda 2", "", 0.65, 1.2, 0.7, 0.75, 1.1, 1.15, 3, 2 - MAFGauge = MAFValue, "Mass air flow", "V", 0, 5, 0, 1, 3, 4, 1, 1 VBattGauge = VBatt, "Battery", "V", 8, 21, 9, 10, 17, 19, 1, 1 MAPGauge = MAPValue, "MAP", "kPa", 0, 300, 10, 10, 200, 200, 0, 0 - massAirFlowValueGa = massAirFlowValue,"Mass air flow", "kg/hr", 0, 50, -999, -999, 999, 999, 1, 1 + massAirFlowValueGa = mafMeasured, "MAF sensor", "kg/h", 0, 50, -999, -999, 999, 999, 1, 1 gaugeCategory = Sensors - Extra 1 @@ -3175,6 +3256,8 @@ gaugeCategory = Sensors - Raw rawWastegatePositionGauge = rawWastegatePosition,"Raw Wastegate Position","V", 0, 5, 0, 0, 5, 5, 3, 0 rawLowFuelPressureGauge = rawLowFuelPressure,"Raw fuel pressure (low) voltage","V", 0, 5, 0, 0, 5, 5, 3, 0 rawHighFuelPressureGauge = rawHighFuelPressure,"Raw fuel pressure (high) voltage","V", 0, 5, 0, 0, 5, 5, 3, 0 + rawMafGauge = rawMaf , "Raw MAF", "V", 0, 5, 0, 0, 5, 5, 3, 0 + gaugeCategory = Transmission desiredGearGauge = tcuDesiredGear, "Desired Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 @@ -3352,8 +3435,8 @@ entry = auxTemp2, "auxTemp2", float, "%.3f" entry = TPSValue, "TPS", float, "%.3f" entry = throttlePedalPosition, "Throttle pedal position", float, "%.3f" entry = tpsADC, "tpsADC", int, "%d" -entry = MAFValue, "MAF", float, "%.3f" -entry = massAirFlowValue, "MAF air flow", float, "%.3f" +entry = rawMaf, "rawMaf", float, "%.3f" +entry = mafMeasured, "MAF sensor", float, "%.3f" entry = MAPValue, "MAP", float, "%.3f" entry = baroPressure, "baroPressure", float, "%.3f" entry = lambdaValue, "Lambda", float, "%.3f" @@ -3510,6 +3593,8 @@ 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 = mafEstimate, "MAF estimate", float, "%.3f" +entry = instantRpm, "instantRpm", int, "%d" entry = launchSpeedCondition, "launchSpeedCondition", int, "%d" entry = launchRpmCondition, "launchRpmCondition", int, "%d" entry = launchTpsCondition, "launchTpsCondition", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini index 6de1376165..e73d838a0f 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.01.12.alphax-2chan.3258707287" + signature = "rusEFI 2022.01.12.alphax-2chan.4214566384" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.01.12.alphax-2chan.3258707287" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.01.12.alphax-2chan.4214566384" ; 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 (unknown script) integration/rusefi_config.txt Wed Jan 12 01:50:59 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 12 21:36:25 UTC 2022 pageSize = 20996 page = 1 @@ -1958,8 +1958,8 @@ auxTemp2 = scalar, S16, 18, "deg C", 0.01, 0 TPSValue = scalar, S16, 20, "%", 0.01, 0 throttlePedalPosition = scalar, S16, 22, "%", 0.01, 0 tpsADC = scalar, U16, 24, "ADC", 1, 0 -MAFValue = scalar, U16, 26, "V", 0.001, 0 -massAirFlowValue = scalar, U16, 28, "Kg/h", 0.1, 0 +rawMaf = scalar, U16, 26, "V", 0.001, 0 +mafMeasured = scalar, U16, 28, "kg/h", 0.1, 0 MAPValue = scalar, U16, 30, "kPa", 0.03333333333333333, 0 baroPressure = scalar, U16, 32, "kPa", 0.03333333333333333, 0 lambdaValue = scalar, U16, 34, "", 1.0E-4, 0 @@ -2116,34 +2116,116 @@ 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 +mafEstimate = scalar, U16, 356, "kg/h", 0.1, 0 +instantRpm = scalar, U16, 358, "rpm", 1, 0 +unusedAtTheEnd1 = scalar, U08, 360, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 361, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 362, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 363, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 364, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 365, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 366, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 367, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 368, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 369, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 370, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 371, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 372, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 373, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 374, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 375, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 376, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 377, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 378, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 379, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 380, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 381, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 382, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 383, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 384, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 385, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 386, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 387, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 388, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 389, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 390, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 391, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 392, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 393, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 394, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 395, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 396, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 397, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 398, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 399, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 400, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 401, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 402, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 403, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 404, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 405, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 406, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 407, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 408, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 409, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 410, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 411, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 412, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 413, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 414, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 415, "", 1, 0 +unusedAtTheEnd57 = scalar, U08, 416, "", 1, 0 +unusedAtTheEnd58 = scalar, U08, 417, "", 1, 0 +unusedAtTheEnd59 = scalar, U08, 418, "", 1, 0 +unusedAtTheEnd60 = scalar, U08, 419, "", 1, 0 +unusedAtTheEnd61 = scalar, U08, 420, "", 1, 0 +unusedAtTheEnd62 = scalar, U08, 421, "", 1, 0 +unusedAtTheEnd63 = scalar, U08, 422, "", 1, 0 +unusedAtTheEnd64 = scalar, U08, 423, "", 1, 0 +unusedAtTheEnd65 = scalar, U08, 424, "", 1, 0 +unusedAtTheEnd66 = scalar, U08, 425, "", 1, 0 +unusedAtTheEnd67 = scalar, U08, 426, "", 1, 0 +unusedAtTheEnd68 = scalar, U08, 427, "", 1, 0 +unusedAtTheEnd69 = scalar, U08, 428, "", 1, 0 +unusedAtTheEnd70 = scalar, U08, 429, "", 1, 0 +unusedAtTheEnd71 = scalar, U08, 430, "", 1, 0 +unusedAtTheEnd72 = scalar, U08, 431, "", 1, 0 +unusedAtTheEnd73 = scalar, U08, 432, "", 1, 0 +unusedAtTheEnd74 = scalar, U08, 433, "", 1, 0 +unusedAtTheEnd75 = scalar, U08, 434, "", 1, 0 +unusedAtTheEnd76 = scalar, U08, 435, "", 1, 0 +unusedAtTheEnd77 = scalar, U08, 436, "", 1, 0 +unusedAtTheEnd78 = scalar, U08, 437, "", 1, 0 +unusedAtTheEnd79 = scalar, U08, 438, "", 1, 0 +unusedAtTheEnd80 = scalar, U08, 439, "", 1, 0 +unusedAtTheEnd81 = scalar, U08, 440, "", 1, 0 +unusedAtTheEnd82 = scalar, U08, 441, "", 1, 0 +unusedAtTheEnd83 = scalar, U08, 442, "", 1, 0 +unusedAtTheEnd84 = scalar, U08, 443, "", 1, 0 +unusedAtTheEnd85 = scalar, U08, 444, "", 1, 0 +unusedAtTheEnd86 = scalar, U08, 445, "", 1, 0 +unusedAtTheEnd87 = scalar, U08, 446, "", 1, 0 +unusedAtTheEnd88 = scalar, U08, 447, "", 1, 0 +unusedAtTheEnd89 = scalar, U08, 448, "", 1, 0 +unusedAtTheEnd90 = scalar, U08, 449, "", 1, 0 +unusedAtTheEnd91 = scalar, U08, 450, "", 1, 0 +unusedAtTheEnd92 = scalar, U08, 451, "", 1, 0 +unusedAtTheEnd93 = scalar, U08, 452, "", 1, 0 +unusedAtTheEnd94 = scalar, U08, 453, "", 1, 0 +unusedAtTheEnd95 = scalar, U08, 454, "", 1, 0 +unusedAtTheEnd96 = scalar, U08, 455, "", 1, 0 +unusedAtTheEnd97 = scalar, U08, 456, "", 1, 0 +unusedAtTheEnd98 = scalar, U08, 457, "", 1, 0 +unusedAtTheEnd99 = scalar, U08, 458, "", 1, 0 +unusedAtTheEnd100 = scalar, U08, 459, "", 1, 0 +unusedAtTheEnd101 = scalar, U08, 460, "", 1, 0 +unusedAtTheEnd102 = scalar, U08, 461, "", 1, 0 +unusedAtTheEnd103 = scalar, U08, 462, "", 1, 0 +unusedAtTheEnd104 = scalar, U08, 463, "", 1, 0 +unusedAtTheEnd105 = scalar, U08, 464, "", 1, 0 +unusedAtTheEnd106 = scalar, U08, 465, "", 1, 0 +unusedAtTheEnd107 = scalar, U08, 466, "", 1, 0 +unusedAtTheEnd108 = scalar, U08, 467, "", 1, 0 launchSpeedCondition = bits, U32, 468, [0:0] launchRpmCondition = bits, U32, 468, [1:1] launchTpsCondition = bits, U32, 468, [2:2] @@ -2151,31 +2233,31 @@ 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_179_7 = bits, U32, 468, [7:7] -unusedBit_179_8 = bits, U32, 468, [8:8] -unusedBit_179_9 = bits, U32, 468, [9:9] -unusedBit_179_10 = bits, U32, 468, [10:10] -unusedBit_179_11 = bits, U32, 468, [11:11] -unusedBit_179_12 = bits, U32, 468, [12:12] -unusedBit_179_13 = bits, U32, 468, [13:13] -unusedBit_179_14 = bits, U32, 468, [14:14] -unusedBit_179_15 = bits, U32, 468, [15:15] -unusedBit_179_16 = bits, U32, 468, [16:16] -unusedBit_179_17 = bits, U32, 468, [17:17] -unusedBit_179_18 = bits, U32, 468, [18:18] -unusedBit_179_19 = bits, U32, 468, [19:19] -unusedBit_179_20 = bits, U32, 468, [20:20] -unusedBit_179_21 = bits, U32, 468, [21:21] -unusedBit_179_22 = bits, U32, 468, [22:22] -unusedBit_179_23 = bits, U32, 468, [23:23] -unusedBit_179_24 = bits, U32, 468, [24:24] -unusedBit_179_25 = bits, U32, 468, [25:25] -unusedBit_179_26 = bits, U32, 468, [26:26] -unusedBit_179_27 = bits, U32, 468, [27:27] -unusedBit_179_28 = bits, U32, 468, [28:28] -unusedBit_179_29 = bits, U32, 468, [29:29] -unusedBit_179_30 = bits, U32, 468, [30:30] -unusedBit_179_31 = bits, U32, 468, [31:31] +unusedBit_181_7 = bits, U32, 468, [7:7] +unusedBit_181_8 = bits, U32, 468, [8:8] +unusedBit_181_9 = bits, U32, 468, [9:9] +unusedBit_181_10 = bits, U32, 468, [10:10] +unusedBit_181_11 = bits, U32, 468, [11:11] +unusedBit_181_12 = bits, U32, 468, [12:12] +unusedBit_181_13 = bits, U32, 468, [13:13] +unusedBit_181_14 = bits, U32, 468, [14:14] +unusedBit_181_15 = bits, U32, 468, [15:15] +unusedBit_181_16 = bits, U32, 468, [16:16] +unusedBit_181_17 = bits, U32, 468, [17:17] +unusedBit_181_18 = bits, U32, 468, [18:18] +unusedBit_181_19 = bits, U32, 468, [19:19] +unusedBit_181_20 = bits, U32, 468, [20:20] +unusedBit_181_21 = bits, U32, 468, [21:21] +unusedBit_181_22 = bits, U32, 468, [22:22] +unusedBit_181_23 = bits, U32, 468, [23:23] +unusedBit_181_24 = bits, U32, 468, [24:24] +unusedBit_181_25 = bits, U32, 468, [25:25] +unusedBit_181_26 = bits, U32, 468, [26:26] +unusedBit_181_27 = bits, U32, 468, [27:27] +unusedBit_181_28 = bits, U32, 468, [28:28] +unusedBit_181_29 = bits, U32, 468, [29:29] +unusedBit_181_30 = bits, U32, 468, [30:30] +unusedBit_181_31 = bits, U32, 468, [31:31] TEMPLOG_MAP_AT_CYCLE_COUNT = scalar, U08, 472, "", 1, 0 boostControllerOutput = scalar, U08, 473, "", 1, 0 boostControllerClosedLoopPart = scalar, U08, 474, "", 1, 0 @@ -2514,9 +2596,9 @@ etbStatus_resetCounter = scalar, S32, 636, "", 1, 0 columnLabel = "Voltage", "kg/hour" xAxis = -1, 6, 10 yAxis = -30, 1300, 10 - xBins = mafDecodingBins, MAFValue + xBins = mafDecodingBins, rawMaf yBins = mafDecoding - gauge = MAFGauge + gauge = rawMafGauge curve = iatFuelCorrCurve, "Intake air temperature fuel Multiplier" columnLabel = "Air Temp", "Multiplier" @@ -3082,10 +3164,9 @@ gaugeCategory = Sensors - Basic afr2Gauge = AFRValue2, "Air/Fuel Ratio 2", "", 10, 19.4, 12, 13, 15, 16, 2, 2 lambda1Gauge = lambdaValue, "Lambda", "", 0.65, 1.2, 0.7, 0.75, 1.1, 1.15, 3, 2 lambda2Gauge = lambdaValue2, "Lambda 2", "", 0.65, 1.2, 0.7, 0.75, 1.1, 1.15, 3, 2 - MAFGauge = MAFValue, "Mass air flow", "V", 0, 5, 0, 1, 3, 4, 1, 1 VBattGauge = VBatt, "Battery", "V", 8, 21, 9, 10, 17, 19, 1, 1 MAPGauge = MAPValue, "MAP", "kPa", 0, 300, 10, 10, 200, 200, 0, 0 - massAirFlowValueGa = massAirFlowValue,"Mass air flow", "kg/hr", 0, 50, -999, -999, 999, 999, 1, 1 + massAirFlowValueGa = mafMeasured, "MAF sensor", "kg/h", 0, 50, -999, -999, 999, 999, 1, 1 gaugeCategory = Sensors - Extra 1 @@ -3175,6 +3256,8 @@ gaugeCategory = Sensors - Raw rawWastegatePositionGauge = rawWastegatePosition,"Raw Wastegate Position","V", 0, 5, 0, 0, 5, 5, 3, 0 rawLowFuelPressureGauge = rawLowFuelPressure,"Raw fuel pressure (low) voltage","V", 0, 5, 0, 0, 5, 5, 3, 0 rawHighFuelPressureGauge = rawHighFuelPressure,"Raw fuel pressure (high) voltage","V", 0, 5, 0, 0, 5, 5, 3, 0 + rawMafGauge = rawMaf , "Raw MAF", "V", 0, 5, 0, 0, 5, 5, 3, 0 + gaugeCategory = Transmission desiredGearGauge = tcuDesiredGear, "Desired Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 @@ -3352,8 +3435,8 @@ entry = auxTemp2, "auxTemp2", float, "%.3f" entry = TPSValue, "TPS", float, "%.3f" entry = throttlePedalPosition, "Throttle pedal position", float, "%.3f" entry = tpsADC, "tpsADC", int, "%d" -entry = MAFValue, "MAF", float, "%.3f" -entry = massAirFlowValue, "MAF air flow", float, "%.3f" +entry = rawMaf, "rawMaf", float, "%.3f" +entry = mafMeasured, "MAF sensor", float, "%.3f" entry = MAPValue, "MAP", float, "%.3f" entry = baroPressure, "baroPressure", float, "%.3f" entry = lambdaValue, "Lambda", float, "%.3f" @@ -3510,6 +3593,8 @@ 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 = mafEstimate, "MAF estimate", float, "%.3f" +entry = instantRpm, "instantRpm", int, "%d" entry = launchSpeedCondition, "launchSpeedCondition", int, "%d" entry = launchRpmCondition, "launchRpmCondition", int, "%d" entry = launchTpsCondition, "launchTpsCondition", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini index 1502fab452..a6cca72958 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.01.12.alphax-4chan.4255758023" + signature = "rusEFI 2022.01.12.alphax-4chan.3299309152" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.01.12.alphax-4chan.4255758023" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.01.12.alphax-4chan.3299309152" ; 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 (unknown script) integration/rusefi_config.txt Wed Jan 12 01:51:01 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 12 21:36:27 UTC 2022 pageSize = 20996 page = 1 @@ -1958,8 +1958,8 @@ auxTemp2 = scalar, S16, 18, "deg C", 0.01, 0 TPSValue = scalar, S16, 20, "%", 0.01, 0 throttlePedalPosition = scalar, S16, 22, "%", 0.01, 0 tpsADC = scalar, U16, 24, "ADC", 1, 0 -MAFValue = scalar, U16, 26, "V", 0.001, 0 -massAirFlowValue = scalar, U16, 28, "Kg/h", 0.1, 0 +rawMaf = scalar, U16, 26, "V", 0.001, 0 +mafMeasured = scalar, U16, 28, "kg/h", 0.1, 0 MAPValue = scalar, U16, 30, "kPa", 0.03333333333333333, 0 baroPressure = scalar, U16, 32, "kPa", 0.03333333333333333, 0 lambdaValue = scalar, U16, 34, "", 1.0E-4, 0 @@ -2116,34 +2116,116 @@ 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 +mafEstimate = scalar, U16, 356, "kg/h", 0.1, 0 +instantRpm = scalar, U16, 358, "rpm", 1, 0 +unusedAtTheEnd1 = scalar, U08, 360, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 361, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 362, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 363, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 364, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 365, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 366, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 367, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 368, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 369, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 370, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 371, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 372, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 373, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 374, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 375, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 376, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 377, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 378, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 379, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 380, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 381, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 382, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 383, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 384, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 385, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 386, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 387, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 388, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 389, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 390, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 391, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 392, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 393, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 394, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 395, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 396, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 397, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 398, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 399, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 400, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 401, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 402, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 403, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 404, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 405, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 406, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 407, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 408, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 409, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 410, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 411, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 412, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 413, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 414, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 415, "", 1, 0 +unusedAtTheEnd57 = scalar, U08, 416, "", 1, 0 +unusedAtTheEnd58 = scalar, U08, 417, "", 1, 0 +unusedAtTheEnd59 = scalar, U08, 418, "", 1, 0 +unusedAtTheEnd60 = scalar, U08, 419, "", 1, 0 +unusedAtTheEnd61 = scalar, U08, 420, "", 1, 0 +unusedAtTheEnd62 = scalar, U08, 421, "", 1, 0 +unusedAtTheEnd63 = scalar, U08, 422, "", 1, 0 +unusedAtTheEnd64 = scalar, U08, 423, "", 1, 0 +unusedAtTheEnd65 = scalar, U08, 424, "", 1, 0 +unusedAtTheEnd66 = scalar, U08, 425, "", 1, 0 +unusedAtTheEnd67 = scalar, U08, 426, "", 1, 0 +unusedAtTheEnd68 = scalar, U08, 427, "", 1, 0 +unusedAtTheEnd69 = scalar, U08, 428, "", 1, 0 +unusedAtTheEnd70 = scalar, U08, 429, "", 1, 0 +unusedAtTheEnd71 = scalar, U08, 430, "", 1, 0 +unusedAtTheEnd72 = scalar, U08, 431, "", 1, 0 +unusedAtTheEnd73 = scalar, U08, 432, "", 1, 0 +unusedAtTheEnd74 = scalar, U08, 433, "", 1, 0 +unusedAtTheEnd75 = scalar, U08, 434, "", 1, 0 +unusedAtTheEnd76 = scalar, U08, 435, "", 1, 0 +unusedAtTheEnd77 = scalar, U08, 436, "", 1, 0 +unusedAtTheEnd78 = scalar, U08, 437, "", 1, 0 +unusedAtTheEnd79 = scalar, U08, 438, "", 1, 0 +unusedAtTheEnd80 = scalar, U08, 439, "", 1, 0 +unusedAtTheEnd81 = scalar, U08, 440, "", 1, 0 +unusedAtTheEnd82 = scalar, U08, 441, "", 1, 0 +unusedAtTheEnd83 = scalar, U08, 442, "", 1, 0 +unusedAtTheEnd84 = scalar, U08, 443, "", 1, 0 +unusedAtTheEnd85 = scalar, U08, 444, "", 1, 0 +unusedAtTheEnd86 = scalar, U08, 445, "", 1, 0 +unusedAtTheEnd87 = scalar, U08, 446, "", 1, 0 +unusedAtTheEnd88 = scalar, U08, 447, "", 1, 0 +unusedAtTheEnd89 = scalar, U08, 448, "", 1, 0 +unusedAtTheEnd90 = scalar, U08, 449, "", 1, 0 +unusedAtTheEnd91 = scalar, U08, 450, "", 1, 0 +unusedAtTheEnd92 = scalar, U08, 451, "", 1, 0 +unusedAtTheEnd93 = scalar, U08, 452, "", 1, 0 +unusedAtTheEnd94 = scalar, U08, 453, "", 1, 0 +unusedAtTheEnd95 = scalar, U08, 454, "", 1, 0 +unusedAtTheEnd96 = scalar, U08, 455, "", 1, 0 +unusedAtTheEnd97 = scalar, U08, 456, "", 1, 0 +unusedAtTheEnd98 = scalar, U08, 457, "", 1, 0 +unusedAtTheEnd99 = scalar, U08, 458, "", 1, 0 +unusedAtTheEnd100 = scalar, U08, 459, "", 1, 0 +unusedAtTheEnd101 = scalar, U08, 460, "", 1, 0 +unusedAtTheEnd102 = scalar, U08, 461, "", 1, 0 +unusedAtTheEnd103 = scalar, U08, 462, "", 1, 0 +unusedAtTheEnd104 = scalar, U08, 463, "", 1, 0 +unusedAtTheEnd105 = scalar, U08, 464, "", 1, 0 +unusedAtTheEnd106 = scalar, U08, 465, "", 1, 0 +unusedAtTheEnd107 = scalar, U08, 466, "", 1, 0 +unusedAtTheEnd108 = scalar, U08, 467, "", 1, 0 launchSpeedCondition = bits, U32, 468, [0:0] launchRpmCondition = bits, U32, 468, [1:1] launchTpsCondition = bits, U32, 468, [2:2] @@ -2151,31 +2233,31 @@ 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_179_7 = bits, U32, 468, [7:7] -unusedBit_179_8 = bits, U32, 468, [8:8] -unusedBit_179_9 = bits, U32, 468, [9:9] -unusedBit_179_10 = bits, U32, 468, [10:10] -unusedBit_179_11 = bits, U32, 468, [11:11] -unusedBit_179_12 = bits, U32, 468, [12:12] -unusedBit_179_13 = bits, U32, 468, [13:13] -unusedBit_179_14 = bits, U32, 468, [14:14] -unusedBit_179_15 = bits, U32, 468, [15:15] -unusedBit_179_16 = bits, U32, 468, [16:16] -unusedBit_179_17 = bits, U32, 468, [17:17] -unusedBit_179_18 = bits, U32, 468, [18:18] -unusedBit_179_19 = bits, U32, 468, [19:19] -unusedBit_179_20 = bits, U32, 468, [20:20] -unusedBit_179_21 = bits, U32, 468, [21:21] -unusedBit_179_22 = bits, U32, 468, [22:22] -unusedBit_179_23 = bits, U32, 468, [23:23] -unusedBit_179_24 = bits, U32, 468, [24:24] -unusedBit_179_25 = bits, U32, 468, [25:25] -unusedBit_179_26 = bits, U32, 468, [26:26] -unusedBit_179_27 = bits, U32, 468, [27:27] -unusedBit_179_28 = bits, U32, 468, [28:28] -unusedBit_179_29 = bits, U32, 468, [29:29] -unusedBit_179_30 = bits, U32, 468, [30:30] -unusedBit_179_31 = bits, U32, 468, [31:31] +unusedBit_181_7 = bits, U32, 468, [7:7] +unusedBit_181_8 = bits, U32, 468, [8:8] +unusedBit_181_9 = bits, U32, 468, [9:9] +unusedBit_181_10 = bits, U32, 468, [10:10] +unusedBit_181_11 = bits, U32, 468, [11:11] +unusedBit_181_12 = bits, U32, 468, [12:12] +unusedBit_181_13 = bits, U32, 468, [13:13] +unusedBit_181_14 = bits, U32, 468, [14:14] +unusedBit_181_15 = bits, U32, 468, [15:15] +unusedBit_181_16 = bits, U32, 468, [16:16] +unusedBit_181_17 = bits, U32, 468, [17:17] +unusedBit_181_18 = bits, U32, 468, [18:18] +unusedBit_181_19 = bits, U32, 468, [19:19] +unusedBit_181_20 = bits, U32, 468, [20:20] +unusedBit_181_21 = bits, U32, 468, [21:21] +unusedBit_181_22 = bits, U32, 468, [22:22] +unusedBit_181_23 = bits, U32, 468, [23:23] +unusedBit_181_24 = bits, U32, 468, [24:24] +unusedBit_181_25 = bits, U32, 468, [25:25] +unusedBit_181_26 = bits, U32, 468, [26:26] +unusedBit_181_27 = bits, U32, 468, [27:27] +unusedBit_181_28 = bits, U32, 468, [28:28] +unusedBit_181_29 = bits, U32, 468, [29:29] +unusedBit_181_30 = bits, U32, 468, [30:30] +unusedBit_181_31 = bits, U32, 468, [31:31] TEMPLOG_MAP_AT_CYCLE_COUNT = scalar, U08, 472, "", 1, 0 boostControllerOutput = scalar, U08, 473, "", 1, 0 boostControllerClosedLoopPart = scalar, U08, 474, "", 1, 0 @@ -2514,9 +2596,9 @@ etbStatus_resetCounter = scalar, S32, 636, "", 1, 0 columnLabel = "Voltage", "kg/hour" xAxis = -1, 6, 10 yAxis = -30, 1300, 10 - xBins = mafDecodingBins, MAFValue + xBins = mafDecodingBins, rawMaf yBins = mafDecoding - gauge = MAFGauge + gauge = rawMafGauge curve = iatFuelCorrCurve, "Intake air temperature fuel Multiplier" columnLabel = "Air Temp", "Multiplier" @@ -3082,10 +3164,9 @@ gaugeCategory = Sensors - Basic afr2Gauge = AFRValue2, "Air/Fuel Ratio 2", "", 10, 19.4, 12, 13, 15, 16, 2, 2 lambda1Gauge = lambdaValue, "Lambda", "", 0.65, 1.2, 0.7, 0.75, 1.1, 1.15, 3, 2 lambda2Gauge = lambdaValue2, "Lambda 2", "", 0.65, 1.2, 0.7, 0.75, 1.1, 1.15, 3, 2 - MAFGauge = MAFValue, "Mass air flow", "V", 0, 5, 0, 1, 3, 4, 1, 1 VBattGauge = VBatt, "Battery", "V", 8, 21, 9, 10, 17, 19, 1, 1 MAPGauge = MAPValue, "MAP", "kPa", 0, 300, 10, 10, 200, 200, 0, 0 - massAirFlowValueGa = massAirFlowValue,"Mass air flow", "kg/hr", 0, 50, -999, -999, 999, 999, 1, 1 + massAirFlowValueGa = mafMeasured, "MAF sensor", "kg/h", 0, 50, -999, -999, 999, 999, 1, 1 gaugeCategory = Sensors - Extra 1 @@ -3175,6 +3256,8 @@ gaugeCategory = Sensors - Raw rawWastegatePositionGauge = rawWastegatePosition,"Raw Wastegate Position","V", 0, 5, 0, 0, 5, 5, 3, 0 rawLowFuelPressureGauge = rawLowFuelPressure,"Raw fuel pressure (low) voltage","V", 0, 5, 0, 0, 5, 5, 3, 0 rawHighFuelPressureGauge = rawHighFuelPressure,"Raw fuel pressure (high) voltage","V", 0, 5, 0, 0, 5, 5, 3, 0 + rawMafGauge = rawMaf , "Raw MAF", "V", 0, 5, 0, 0, 5, 5, 3, 0 + gaugeCategory = Transmission desiredGearGauge = tcuDesiredGear, "Desired Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 @@ -3352,8 +3435,8 @@ entry = auxTemp2, "auxTemp2", float, "%.3f" entry = TPSValue, "TPS", float, "%.3f" entry = throttlePedalPosition, "Throttle pedal position", float, "%.3f" entry = tpsADC, "tpsADC", int, "%d" -entry = MAFValue, "MAF", float, "%.3f" -entry = massAirFlowValue, "MAF air flow", float, "%.3f" +entry = rawMaf, "rawMaf", float, "%.3f" +entry = mafMeasured, "MAF sensor", float, "%.3f" entry = MAPValue, "MAP", float, "%.3f" entry = baroPressure, "baroPressure", float, "%.3f" entry = lambdaValue, "Lambda", float, "%.3f" @@ -3510,6 +3593,8 @@ 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 = mafEstimate, "MAF estimate", float, "%.3f" +entry = instantRpm, "instantRpm", int, "%d" 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 8628de14bb..a81a746385 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.12.atlas.1337576443" + signature = "rusEFI 2022.01.12.atlas.1991707484" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.01.12.atlas.1337576443" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.01.12.atlas.1991707484" ; 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 (unknown script) integration/rusefi_config.txt Wed Jan 12 01:51:28 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 12 21:36:58 UTC 2022 pageSize = 20996 page = 1 @@ -1958,8 +1958,8 @@ auxTemp2 = scalar, S16, 18, "deg C", 0.01, 0 TPSValue = scalar, S16, 20, "%", 0.01, 0 throttlePedalPosition = scalar, S16, 22, "%", 0.01, 0 tpsADC = scalar, U16, 24, "ADC", 1, 0 -MAFValue = scalar, U16, 26, "V", 0.001, 0 -massAirFlowValue = scalar, U16, 28, "Kg/h", 0.1, 0 +rawMaf = scalar, U16, 26, "V", 0.001, 0 +mafMeasured = scalar, U16, 28, "kg/h", 0.1, 0 MAPValue = scalar, U16, 30, "kPa", 0.03333333333333333, 0 baroPressure = scalar, U16, 32, "kPa", 0.03333333333333333, 0 lambdaValue = scalar, U16, 34, "", 1.0E-4, 0 @@ -2116,34 +2116,116 @@ 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 +mafEstimate = scalar, U16, 356, "kg/h", 0.1, 0 +instantRpm = scalar, U16, 358, "rpm", 1, 0 +unusedAtTheEnd1 = scalar, U08, 360, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 361, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 362, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 363, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 364, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 365, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 366, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 367, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 368, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 369, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 370, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 371, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 372, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 373, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 374, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 375, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 376, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 377, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 378, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 379, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 380, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 381, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 382, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 383, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 384, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 385, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 386, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 387, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 388, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 389, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 390, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 391, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 392, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 393, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 394, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 395, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 396, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 397, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 398, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 399, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 400, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 401, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 402, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 403, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 404, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 405, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 406, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 407, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 408, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 409, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 410, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 411, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 412, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 413, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 414, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 415, "", 1, 0 +unusedAtTheEnd57 = scalar, U08, 416, "", 1, 0 +unusedAtTheEnd58 = scalar, U08, 417, "", 1, 0 +unusedAtTheEnd59 = scalar, U08, 418, "", 1, 0 +unusedAtTheEnd60 = scalar, U08, 419, "", 1, 0 +unusedAtTheEnd61 = scalar, U08, 420, "", 1, 0 +unusedAtTheEnd62 = scalar, U08, 421, "", 1, 0 +unusedAtTheEnd63 = scalar, U08, 422, "", 1, 0 +unusedAtTheEnd64 = scalar, U08, 423, "", 1, 0 +unusedAtTheEnd65 = scalar, U08, 424, "", 1, 0 +unusedAtTheEnd66 = scalar, U08, 425, "", 1, 0 +unusedAtTheEnd67 = scalar, U08, 426, "", 1, 0 +unusedAtTheEnd68 = scalar, U08, 427, "", 1, 0 +unusedAtTheEnd69 = scalar, U08, 428, "", 1, 0 +unusedAtTheEnd70 = scalar, U08, 429, "", 1, 0 +unusedAtTheEnd71 = scalar, U08, 430, "", 1, 0 +unusedAtTheEnd72 = scalar, U08, 431, "", 1, 0 +unusedAtTheEnd73 = scalar, U08, 432, "", 1, 0 +unusedAtTheEnd74 = scalar, U08, 433, "", 1, 0 +unusedAtTheEnd75 = scalar, U08, 434, "", 1, 0 +unusedAtTheEnd76 = scalar, U08, 435, "", 1, 0 +unusedAtTheEnd77 = scalar, U08, 436, "", 1, 0 +unusedAtTheEnd78 = scalar, U08, 437, "", 1, 0 +unusedAtTheEnd79 = scalar, U08, 438, "", 1, 0 +unusedAtTheEnd80 = scalar, U08, 439, "", 1, 0 +unusedAtTheEnd81 = scalar, U08, 440, "", 1, 0 +unusedAtTheEnd82 = scalar, U08, 441, "", 1, 0 +unusedAtTheEnd83 = scalar, U08, 442, "", 1, 0 +unusedAtTheEnd84 = scalar, U08, 443, "", 1, 0 +unusedAtTheEnd85 = scalar, U08, 444, "", 1, 0 +unusedAtTheEnd86 = scalar, U08, 445, "", 1, 0 +unusedAtTheEnd87 = scalar, U08, 446, "", 1, 0 +unusedAtTheEnd88 = scalar, U08, 447, "", 1, 0 +unusedAtTheEnd89 = scalar, U08, 448, "", 1, 0 +unusedAtTheEnd90 = scalar, U08, 449, "", 1, 0 +unusedAtTheEnd91 = scalar, U08, 450, "", 1, 0 +unusedAtTheEnd92 = scalar, U08, 451, "", 1, 0 +unusedAtTheEnd93 = scalar, U08, 452, "", 1, 0 +unusedAtTheEnd94 = scalar, U08, 453, "", 1, 0 +unusedAtTheEnd95 = scalar, U08, 454, "", 1, 0 +unusedAtTheEnd96 = scalar, U08, 455, "", 1, 0 +unusedAtTheEnd97 = scalar, U08, 456, "", 1, 0 +unusedAtTheEnd98 = scalar, U08, 457, "", 1, 0 +unusedAtTheEnd99 = scalar, U08, 458, "", 1, 0 +unusedAtTheEnd100 = scalar, U08, 459, "", 1, 0 +unusedAtTheEnd101 = scalar, U08, 460, "", 1, 0 +unusedAtTheEnd102 = scalar, U08, 461, "", 1, 0 +unusedAtTheEnd103 = scalar, U08, 462, "", 1, 0 +unusedAtTheEnd104 = scalar, U08, 463, "", 1, 0 +unusedAtTheEnd105 = scalar, U08, 464, "", 1, 0 +unusedAtTheEnd106 = scalar, U08, 465, "", 1, 0 +unusedAtTheEnd107 = scalar, U08, 466, "", 1, 0 +unusedAtTheEnd108 = scalar, U08, 467, "", 1, 0 launchSpeedCondition = bits, U32, 468, [0:0] launchRpmCondition = bits, U32, 468, [1:1] launchTpsCondition = bits, U32, 468, [2:2] @@ -2151,31 +2233,31 @@ 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_179_7 = bits, U32, 468, [7:7] -unusedBit_179_8 = bits, U32, 468, [8:8] -unusedBit_179_9 = bits, U32, 468, [9:9] -unusedBit_179_10 = bits, U32, 468, [10:10] -unusedBit_179_11 = bits, U32, 468, [11:11] -unusedBit_179_12 = bits, U32, 468, [12:12] -unusedBit_179_13 = bits, U32, 468, [13:13] -unusedBit_179_14 = bits, U32, 468, [14:14] -unusedBit_179_15 = bits, U32, 468, [15:15] -unusedBit_179_16 = bits, U32, 468, [16:16] -unusedBit_179_17 = bits, U32, 468, [17:17] -unusedBit_179_18 = bits, U32, 468, [18:18] -unusedBit_179_19 = bits, U32, 468, [19:19] -unusedBit_179_20 = bits, U32, 468, [20:20] -unusedBit_179_21 = bits, U32, 468, [21:21] -unusedBit_179_22 = bits, U32, 468, [22:22] -unusedBit_179_23 = bits, U32, 468, [23:23] -unusedBit_179_24 = bits, U32, 468, [24:24] -unusedBit_179_25 = bits, U32, 468, [25:25] -unusedBit_179_26 = bits, U32, 468, [26:26] -unusedBit_179_27 = bits, U32, 468, [27:27] -unusedBit_179_28 = bits, U32, 468, [28:28] -unusedBit_179_29 = bits, U32, 468, [29:29] -unusedBit_179_30 = bits, U32, 468, [30:30] -unusedBit_179_31 = bits, U32, 468, [31:31] +unusedBit_181_7 = bits, U32, 468, [7:7] +unusedBit_181_8 = bits, U32, 468, [8:8] +unusedBit_181_9 = bits, U32, 468, [9:9] +unusedBit_181_10 = bits, U32, 468, [10:10] +unusedBit_181_11 = bits, U32, 468, [11:11] +unusedBit_181_12 = bits, U32, 468, [12:12] +unusedBit_181_13 = bits, U32, 468, [13:13] +unusedBit_181_14 = bits, U32, 468, [14:14] +unusedBit_181_15 = bits, U32, 468, [15:15] +unusedBit_181_16 = bits, U32, 468, [16:16] +unusedBit_181_17 = bits, U32, 468, [17:17] +unusedBit_181_18 = bits, U32, 468, [18:18] +unusedBit_181_19 = bits, U32, 468, [19:19] +unusedBit_181_20 = bits, U32, 468, [20:20] +unusedBit_181_21 = bits, U32, 468, [21:21] +unusedBit_181_22 = bits, U32, 468, [22:22] +unusedBit_181_23 = bits, U32, 468, [23:23] +unusedBit_181_24 = bits, U32, 468, [24:24] +unusedBit_181_25 = bits, U32, 468, [25:25] +unusedBit_181_26 = bits, U32, 468, [26:26] +unusedBit_181_27 = bits, U32, 468, [27:27] +unusedBit_181_28 = bits, U32, 468, [28:28] +unusedBit_181_29 = bits, U32, 468, [29:29] +unusedBit_181_30 = bits, U32, 468, [30:30] +unusedBit_181_31 = bits, U32, 468, [31:31] TEMPLOG_MAP_AT_CYCLE_COUNT = scalar, U08, 472, "", 1, 0 boostControllerOutput = scalar, U08, 473, "", 1, 0 boostControllerClosedLoopPart = scalar, U08, 474, "", 1, 0 @@ -2514,9 +2596,9 @@ etbStatus_resetCounter = scalar, S32, 636, "", 1, 0 columnLabel = "Voltage", "kg/hour" xAxis = -1, 6, 10 yAxis = -30, 1300, 10 - xBins = mafDecodingBins, MAFValue + xBins = mafDecodingBins, rawMaf yBins = mafDecoding - gauge = MAFGauge + gauge = rawMafGauge curve = iatFuelCorrCurve, "Intake air temperature fuel Multiplier" columnLabel = "Air Temp", "Multiplier" @@ -3082,10 +3164,9 @@ gaugeCategory = Sensors - Basic afr2Gauge = AFRValue2, "Air/Fuel Ratio 2", "", 10, 19.4, 12, 13, 15, 16, 2, 2 lambda1Gauge = lambdaValue, "Lambda", "", 0.65, 1.2, 0.7, 0.75, 1.1, 1.15, 3, 2 lambda2Gauge = lambdaValue2, "Lambda 2", "", 0.65, 1.2, 0.7, 0.75, 1.1, 1.15, 3, 2 - MAFGauge = MAFValue, "Mass air flow", "V", 0, 5, 0, 1, 3, 4, 1, 1 VBattGauge = VBatt, "Battery", "V", 8, 21, 9, 10, 17, 19, 1, 1 MAPGauge = MAPValue, "MAP", "kPa", 0, 300, 10, 10, 200, 200, 0, 0 - massAirFlowValueGa = massAirFlowValue,"Mass air flow", "kg/hr", 0, 50, -999, -999, 999, 999, 1, 1 + massAirFlowValueGa = mafMeasured, "MAF sensor", "kg/h", 0, 50, -999, -999, 999, 999, 1, 1 gaugeCategory = Sensors - Extra 1 @@ -3175,6 +3256,8 @@ gaugeCategory = Sensors - Raw rawWastegatePositionGauge = rawWastegatePosition,"Raw Wastegate Position","V", 0, 5, 0, 0, 5, 5, 3, 0 rawLowFuelPressureGauge = rawLowFuelPressure,"Raw fuel pressure (low) voltage","V", 0, 5, 0, 0, 5, 5, 3, 0 rawHighFuelPressureGauge = rawHighFuelPressure,"Raw fuel pressure (high) voltage","V", 0, 5, 0, 0, 5, 5, 3, 0 + rawMafGauge = rawMaf , "Raw MAF", "V", 0, 5, 0, 0, 5, 5, 3, 0 + gaugeCategory = Transmission desiredGearGauge = tcuDesiredGear, "Desired Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 @@ -3352,8 +3435,8 @@ entry = auxTemp2, "auxTemp2", float, "%.3f" entry = TPSValue, "TPS", float, "%.3f" entry = throttlePedalPosition, "Throttle pedal position", float, "%.3f" entry = tpsADC, "tpsADC", int, "%d" -entry = MAFValue, "MAF", float, "%.3f" -entry = massAirFlowValue, "MAF air flow", float, "%.3f" +entry = rawMaf, "rawMaf", float, "%.3f" +entry = mafMeasured, "MAF sensor", float, "%.3f" entry = MAPValue, "MAP", float, "%.3f" entry = baroPressure, "baroPressure", float, "%.3f" entry = lambdaValue, "Lambda", float, "%.3f" @@ -3510,6 +3593,8 @@ 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 = mafEstimate, "MAF estimate", float, "%.3f" +entry = instantRpm, "instantRpm", int, "%d" 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 2ec2e32dbd..64f573cb61 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.12.f429-discovery.1400061660" + signature = "rusEFI 2022.01.12.f429-discovery.1786642043" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.01.12.f429-discovery.1400061660" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.01.12.f429-discovery.1786642043" ; 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 (unknown script) integration/rusefi_config.txt Wed Jan 12 01:50:58 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 12 21:36:24 UTC 2022 pageSize = 20996 page = 1 @@ -1958,8 +1958,8 @@ auxTemp2 = scalar, S16, 18, "deg C", 0.01, 0 TPSValue = scalar, S16, 20, "%", 0.01, 0 throttlePedalPosition = scalar, S16, 22, "%", 0.01, 0 tpsADC = scalar, U16, 24, "ADC", 1, 0 -MAFValue = scalar, U16, 26, "V", 0.001, 0 -massAirFlowValue = scalar, U16, 28, "Kg/h", 0.1, 0 +rawMaf = scalar, U16, 26, "V", 0.001, 0 +mafMeasured = scalar, U16, 28, "kg/h", 0.1, 0 MAPValue = scalar, U16, 30, "kPa", 0.03333333333333333, 0 baroPressure = scalar, U16, 32, "kPa", 0.03333333333333333, 0 lambdaValue = scalar, U16, 34, "", 1.0E-4, 0 @@ -2116,34 +2116,116 @@ 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 +mafEstimate = scalar, U16, 356, "kg/h", 0.1, 0 +instantRpm = scalar, U16, 358, "rpm", 1, 0 +unusedAtTheEnd1 = scalar, U08, 360, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 361, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 362, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 363, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 364, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 365, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 366, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 367, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 368, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 369, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 370, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 371, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 372, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 373, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 374, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 375, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 376, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 377, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 378, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 379, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 380, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 381, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 382, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 383, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 384, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 385, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 386, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 387, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 388, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 389, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 390, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 391, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 392, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 393, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 394, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 395, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 396, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 397, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 398, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 399, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 400, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 401, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 402, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 403, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 404, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 405, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 406, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 407, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 408, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 409, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 410, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 411, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 412, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 413, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 414, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 415, "", 1, 0 +unusedAtTheEnd57 = scalar, U08, 416, "", 1, 0 +unusedAtTheEnd58 = scalar, U08, 417, "", 1, 0 +unusedAtTheEnd59 = scalar, U08, 418, "", 1, 0 +unusedAtTheEnd60 = scalar, U08, 419, "", 1, 0 +unusedAtTheEnd61 = scalar, U08, 420, "", 1, 0 +unusedAtTheEnd62 = scalar, U08, 421, "", 1, 0 +unusedAtTheEnd63 = scalar, U08, 422, "", 1, 0 +unusedAtTheEnd64 = scalar, U08, 423, "", 1, 0 +unusedAtTheEnd65 = scalar, U08, 424, "", 1, 0 +unusedAtTheEnd66 = scalar, U08, 425, "", 1, 0 +unusedAtTheEnd67 = scalar, U08, 426, "", 1, 0 +unusedAtTheEnd68 = scalar, U08, 427, "", 1, 0 +unusedAtTheEnd69 = scalar, U08, 428, "", 1, 0 +unusedAtTheEnd70 = scalar, U08, 429, "", 1, 0 +unusedAtTheEnd71 = scalar, U08, 430, "", 1, 0 +unusedAtTheEnd72 = scalar, U08, 431, "", 1, 0 +unusedAtTheEnd73 = scalar, U08, 432, "", 1, 0 +unusedAtTheEnd74 = scalar, U08, 433, "", 1, 0 +unusedAtTheEnd75 = scalar, U08, 434, "", 1, 0 +unusedAtTheEnd76 = scalar, U08, 435, "", 1, 0 +unusedAtTheEnd77 = scalar, U08, 436, "", 1, 0 +unusedAtTheEnd78 = scalar, U08, 437, "", 1, 0 +unusedAtTheEnd79 = scalar, U08, 438, "", 1, 0 +unusedAtTheEnd80 = scalar, U08, 439, "", 1, 0 +unusedAtTheEnd81 = scalar, U08, 440, "", 1, 0 +unusedAtTheEnd82 = scalar, U08, 441, "", 1, 0 +unusedAtTheEnd83 = scalar, U08, 442, "", 1, 0 +unusedAtTheEnd84 = scalar, U08, 443, "", 1, 0 +unusedAtTheEnd85 = scalar, U08, 444, "", 1, 0 +unusedAtTheEnd86 = scalar, U08, 445, "", 1, 0 +unusedAtTheEnd87 = scalar, U08, 446, "", 1, 0 +unusedAtTheEnd88 = scalar, U08, 447, "", 1, 0 +unusedAtTheEnd89 = scalar, U08, 448, "", 1, 0 +unusedAtTheEnd90 = scalar, U08, 449, "", 1, 0 +unusedAtTheEnd91 = scalar, U08, 450, "", 1, 0 +unusedAtTheEnd92 = scalar, U08, 451, "", 1, 0 +unusedAtTheEnd93 = scalar, U08, 452, "", 1, 0 +unusedAtTheEnd94 = scalar, U08, 453, "", 1, 0 +unusedAtTheEnd95 = scalar, U08, 454, "", 1, 0 +unusedAtTheEnd96 = scalar, U08, 455, "", 1, 0 +unusedAtTheEnd97 = scalar, U08, 456, "", 1, 0 +unusedAtTheEnd98 = scalar, U08, 457, "", 1, 0 +unusedAtTheEnd99 = scalar, U08, 458, "", 1, 0 +unusedAtTheEnd100 = scalar, U08, 459, "", 1, 0 +unusedAtTheEnd101 = scalar, U08, 460, "", 1, 0 +unusedAtTheEnd102 = scalar, U08, 461, "", 1, 0 +unusedAtTheEnd103 = scalar, U08, 462, "", 1, 0 +unusedAtTheEnd104 = scalar, U08, 463, "", 1, 0 +unusedAtTheEnd105 = scalar, U08, 464, "", 1, 0 +unusedAtTheEnd106 = scalar, U08, 465, "", 1, 0 +unusedAtTheEnd107 = scalar, U08, 466, "", 1, 0 +unusedAtTheEnd108 = scalar, U08, 467, "", 1, 0 launchSpeedCondition = bits, U32, 468, [0:0] launchRpmCondition = bits, U32, 468, [1:1] launchTpsCondition = bits, U32, 468, [2:2] @@ -2151,31 +2233,31 @@ 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_179_7 = bits, U32, 468, [7:7] -unusedBit_179_8 = bits, U32, 468, [8:8] -unusedBit_179_9 = bits, U32, 468, [9:9] -unusedBit_179_10 = bits, U32, 468, [10:10] -unusedBit_179_11 = bits, U32, 468, [11:11] -unusedBit_179_12 = bits, U32, 468, [12:12] -unusedBit_179_13 = bits, U32, 468, [13:13] -unusedBit_179_14 = bits, U32, 468, [14:14] -unusedBit_179_15 = bits, U32, 468, [15:15] -unusedBit_179_16 = bits, U32, 468, [16:16] -unusedBit_179_17 = bits, U32, 468, [17:17] -unusedBit_179_18 = bits, U32, 468, [18:18] -unusedBit_179_19 = bits, U32, 468, [19:19] -unusedBit_179_20 = bits, U32, 468, [20:20] -unusedBit_179_21 = bits, U32, 468, [21:21] -unusedBit_179_22 = bits, U32, 468, [22:22] -unusedBit_179_23 = bits, U32, 468, [23:23] -unusedBit_179_24 = bits, U32, 468, [24:24] -unusedBit_179_25 = bits, U32, 468, [25:25] -unusedBit_179_26 = bits, U32, 468, [26:26] -unusedBit_179_27 = bits, U32, 468, [27:27] -unusedBit_179_28 = bits, U32, 468, [28:28] -unusedBit_179_29 = bits, U32, 468, [29:29] -unusedBit_179_30 = bits, U32, 468, [30:30] -unusedBit_179_31 = bits, U32, 468, [31:31] +unusedBit_181_7 = bits, U32, 468, [7:7] +unusedBit_181_8 = bits, U32, 468, [8:8] +unusedBit_181_9 = bits, U32, 468, [9:9] +unusedBit_181_10 = bits, U32, 468, [10:10] +unusedBit_181_11 = bits, U32, 468, [11:11] +unusedBit_181_12 = bits, U32, 468, [12:12] +unusedBit_181_13 = bits, U32, 468, [13:13] +unusedBit_181_14 = bits, U32, 468, [14:14] +unusedBit_181_15 = bits, U32, 468, [15:15] +unusedBit_181_16 = bits, U32, 468, [16:16] +unusedBit_181_17 = bits, U32, 468, [17:17] +unusedBit_181_18 = bits, U32, 468, [18:18] +unusedBit_181_19 = bits, U32, 468, [19:19] +unusedBit_181_20 = bits, U32, 468, [20:20] +unusedBit_181_21 = bits, U32, 468, [21:21] +unusedBit_181_22 = bits, U32, 468, [22:22] +unusedBit_181_23 = bits, U32, 468, [23:23] +unusedBit_181_24 = bits, U32, 468, [24:24] +unusedBit_181_25 = bits, U32, 468, [25:25] +unusedBit_181_26 = bits, U32, 468, [26:26] +unusedBit_181_27 = bits, U32, 468, [27:27] +unusedBit_181_28 = bits, U32, 468, [28:28] +unusedBit_181_29 = bits, U32, 468, [29:29] +unusedBit_181_30 = bits, U32, 468, [30:30] +unusedBit_181_31 = bits, U32, 468, [31:31] TEMPLOG_MAP_AT_CYCLE_COUNT = scalar, U08, 472, "", 1, 0 boostControllerOutput = scalar, U08, 473, "", 1, 0 boostControllerClosedLoopPart = scalar, U08, 474, "", 1, 0 @@ -2514,9 +2596,9 @@ etbStatus_resetCounter = scalar, S32, 636, "", 1, 0 columnLabel = "Voltage", "kg/hour" xAxis = -1, 6, 10 yAxis = -30, 1300, 10 - xBins = mafDecodingBins, MAFValue + xBins = mafDecodingBins, rawMaf yBins = mafDecoding - gauge = MAFGauge + gauge = rawMafGauge curve = iatFuelCorrCurve, "Intake air temperature fuel Multiplier" columnLabel = "Air Temp", "Multiplier" @@ -3082,10 +3164,9 @@ gaugeCategory = Sensors - Basic afr2Gauge = AFRValue2, "Air/Fuel Ratio 2", "", 10, 19.4, 12, 13, 15, 16, 2, 2 lambda1Gauge = lambdaValue, "Lambda", "", 0.65, 1.2, 0.7, 0.75, 1.1, 1.15, 3, 2 lambda2Gauge = lambdaValue2, "Lambda 2", "", 0.65, 1.2, 0.7, 0.75, 1.1, 1.15, 3, 2 - MAFGauge = MAFValue, "Mass air flow", "V", 0, 5, 0, 1, 3, 4, 1, 1 VBattGauge = VBatt, "Battery", "V", 8, 21, 9, 10, 17, 19, 1, 1 MAPGauge = MAPValue, "MAP", "kPa", 0, 300, 10, 10, 200, 200, 0, 0 - massAirFlowValueGa = massAirFlowValue,"Mass air flow", "kg/hr", 0, 50, -999, -999, 999, 999, 1, 1 + massAirFlowValueGa = mafMeasured, "MAF sensor", "kg/h", 0, 50, -999, -999, 999, 999, 1, 1 gaugeCategory = Sensors - Extra 1 @@ -3175,6 +3256,8 @@ gaugeCategory = Sensors - Raw rawWastegatePositionGauge = rawWastegatePosition,"Raw Wastegate Position","V", 0, 5, 0, 0, 5, 5, 3, 0 rawLowFuelPressureGauge = rawLowFuelPressure,"Raw fuel pressure (low) voltage","V", 0, 5, 0, 0, 5, 5, 3, 0 rawHighFuelPressureGauge = rawHighFuelPressure,"Raw fuel pressure (high) voltage","V", 0, 5, 0, 0, 5, 5, 3, 0 + rawMafGauge = rawMaf , "Raw MAF", "V", 0, 5, 0, 0, 5, 5, 3, 0 + gaugeCategory = Transmission desiredGearGauge = tcuDesiredGear, "Desired Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 @@ -3352,8 +3435,8 @@ entry = auxTemp2, "auxTemp2", float, "%.3f" entry = TPSValue, "TPS", float, "%.3f" entry = throttlePedalPosition, "Throttle pedal position", float, "%.3f" entry = tpsADC, "tpsADC", int, "%d" -entry = MAFValue, "MAF", float, "%.3f" -entry = massAirFlowValue, "MAF air flow", float, "%.3f" +entry = rawMaf, "rawMaf", float, "%.3f" +entry = mafMeasured, "MAF sensor", float, "%.3f" entry = MAPValue, "MAP", float, "%.3f" entry = baroPressure, "baroPressure", float, "%.3f" entry = lambdaValue, "Lambda", float, "%.3f" @@ -3510,6 +3593,8 @@ 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 = mafEstimate, "MAF estimate", float, "%.3f" +entry = instantRpm, "instantRpm", int, "%d" 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 8c74439f74..f2577e88f3 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.12.frankenso_na6.692153141" + signature = "rusEFI 2022.01.12.frankenso_na6.273656722" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.01.12.frankenso_na6.692153141" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.01.12.frankenso_na6.273656722" ; 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 (unknown script) integration/rusefi_config.txt Wed Jan 12 01:51:20 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 12 21:36:50 UTC 2022 pageSize = 20996 page = 1 @@ -1958,8 +1958,8 @@ auxTemp2 = scalar, S16, 18, "deg C", 0.01, 0 TPSValue = scalar, S16, 20, "%", 0.01, 0 throttlePedalPosition = scalar, S16, 22, "%", 0.01, 0 tpsADC = scalar, U16, 24, "ADC", 1, 0 -MAFValue = scalar, U16, 26, "V", 0.001, 0 -massAirFlowValue = scalar, U16, 28, "Kg/h", 0.1, 0 +rawMaf = scalar, U16, 26, "V", 0.001, 0 +mafMeasured = scalar, U16, 28, "kg/h", 0.1, 0 MAPValue = scalar, U16, 30, "kPa", 0.03333333333333333, 0 baroPressure = scalar, U16, 32, "kPa", 0.03333333333333333, 0 lambdaValue = scalar, U16, 34, "", 1.0E-4, 0 @@ -2116,34 +2116,116 @@ 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 +mafEstimate = scalar, U16, 356, "kg/h", 0.1, 0 +instantRpm = scalar, U16, 358, "rpm", 1, 0 +unusedAtTheEnd1 = scalar, U08, 360, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 361, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 362, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 363, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 364, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 365, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 366, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 367, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 368, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 369, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 370, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 371, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 372, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 373, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 374, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 375, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 376, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 377, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 378, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 379, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 380, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 381, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 382, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 383, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 384, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 385, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 386, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 387, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 388, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 389, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 390, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 391, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 392, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 393, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 394, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 395, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 396, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 397, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 398, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 399, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 400, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 401, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 402, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 403, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 404, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 405, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 406, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 407, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 408, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 409, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 410, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 411, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 412, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 413, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 414, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 415, "", 1, 0 +unusedAtTheEnd57 = scalar, U08, 416, "", 1, 0 +unusedAtTheEnd58 = scalar, U08, 417, "", 1, 0 +unusedAtTheEnd59 = scalar, U08, 418, "", 1, 0 +unusedAtTheEnd60 = scalar, U08, 419, "", 1, 0 +unusedAtTheEnd61 = scalar, U08, 420, "", 1, 0 +unusedAtTheEnd62 = scalar, U08, 421, "", 1, 0 +unusedAtTheEnd63 = scalar, U08, 422, "", 1, 0 +unusedAtTheEnd64 = scalar, U08, 423, "", 1, 0 +unusedAtTheEnd65 = scalar, U08, 424, "", 1, 0 +unusedAtTheEnd66 = scalar, U08, 425, "", 1, 0 +unusedAtTheEnd67 = scalar, U08, 426, "", 1, 0 +unusedAtTheEnd68 = scalar, U08, 427, "", 1, 0 +unusedAtTheEnd69 = scalar, U08, 428, "", 1, 0 +unusedAtTheEnd70 = scalar, U08, 429, "", 1, 0 +unusedAtTheEnd71 = scalar, U08, 430, "", 1, 0 +unusedAtTheEnd72 = scalar, U08, 431, "", 1, 0 +unusedAtTheEnd73 = scalar, U08, 432, "", 1, 0 +unusedAtTheEnd74 = scalar, U08, 433, "", 1, 0 +unusedAtTheEnd75 = scalar, U08, 434, "", 1, 0 +unusedAtTheEnd76 = scalar, U08, 435, "", 1, 0 +unusedAtTheEnd77 = scalar, U08, 436, "", 1, 0 +unusedAtTheEnd78 = scalar, U08, 437, "", 1, 0 +unusedAtTheEnd79 = scalar, U08, 438, "", 1, 0 +unusedAtTheEnd80 = scalar, U08, 439, "", 1, 0 +unusedAtTheEnd81 = scalar, U08, 440, "", 1, 0 +unusedAtTheEnd82 = scalar, U08, 441, "", 1, 0 +unusedAtTheEnd83 = scalar, U08, 442, "", 1, 0 +unusedAtTheEnd84 = scalar, U08, 443, "", 1, 0 +unusedAtTheEnd85 = scalar, U08, 444, "", 1, 0 +unusedAtTheEnd86 = scalar, U08, 445, "", 1, 0 +unusedAtTheEnd87 = scalar, U08, 446, "", 1, 0 +unusedAtTheEnd88 = scalar, U08, 447, "", 1, 0 +unusedAtTheEnd89 = scalar, U08, 448, "", 1, 0 +unusedAtTheEnd90 = scalar, U08, 449, "", 1, 0 +unusedAtTheEnd91 = scalar, U08, 450, "", 1, 0 +unusedAtTheEnd92 = scalar, U08, 451, "", 1, 0 +unusedAtTheEnd93 = scalar, U08, 452, "", 1, 0 +unusedAtTheEnd94 = scalar, U08, 453, "", 1, 0 +unusedAtTheEnd95 = scalar, U08, 454, "", 1, 0 +unusedAtTheEnd96 = scalar, U08, 455, "", 1, 0 +unusedAtTheEnd97 = scalar, U08, 456, "", 1, 0 +unusedAtTheEnd98 = scalar, U08, 457, "", 1, 0 +unusedAtTheEnd99 = scalar, U08, 458, "", 1, 0 +unusedAtTheEnd100 = scalar, U08, 459, "", 1, 0 +unusedAtTheEnd101 = scalar, U08, 460, "", 1, 0 +unusedAtTheEnd102 = scalar, U08, 461, "", 1, 0 +unusedAtTheEnd103 = scalar, U08, 462, "", 1, 0 +unusedAtTheEnd104 = scalar, U08, 463, "", 1, 0 +unusedAtTheEnd105 = scalar, U08, 464, "", 1, 0 +unusedAtTheEnd106 = scalar, U08, 465, "", 1, 0 +unusedAtTheEnd107 = scalar, U08, 466, "", 1, 0 +unusedAtTheEnd108 = scalar, U08, 467, "", 1, 0 launchSpeedCondition = bits, U32, 468, [0:0] launchRpmCondition = bits, U32, 468, [1:1] launchTpsCondition = bits, U32, 468, [2:2] @@ -2151,31 +2233,31 @@ 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_179_7 = bits, U32, 468, [7:7] -unusedBit_179_8 = bits, U32, 468, [8:8] -unusedBit_179_9 = bits, U32, 468, [9:9] -unusedBit_179_10 = bits, U32, 468, [10:10] -unusedBit_179_11 = bits, U32, 468, [11:11] -unusedBit_179_12 = bits, U32, 468, [12:12] -unusedBit_179_13 = bits, U32, 468, [13:13] -unusedBit_179_14 = bits, U32, 468, [14:14] -unusedBit_179_15 = bits, U32, 468, [15:15] -unusedBit_179_16 = bits, U32, 468, [16:16] -unusedBit_179_17 = bits, U32, 468, [17:17] -unusedBit_179_18 = bits, U32, 468, [18:18] -unusedBit_179_19 = bits, U32, 468, [19:19] -unusedBit_179_20 = bits, U32, 468, [20:20] -unusedBit_179_21 = bits, U32, 468, [21:21] -unusedBit_179_22 = bits, U32, 468, [22:22] -unusedBit_179_23 = bits, U32, 468, [23:23] -unusedBit_179_24 = bits, U32, 468, [24:24] -unusedBit_179_25 = bits, U32, 468, [25:25] -unusedBit_179_26 = bits, U32, 468, [26:26] -unusedBit_179_27 = bits, U32, 468, [27:27] -unusedBit_179_28 = bits, U32, 468, [28:28] -unusedBit_179_29 = bits, U32, 468, [29:29] -unusedBit_179_30 = bits, U32, 468, [30:30] -unusedBit_179_31 = bits, U32, 468, [31:31] +unusedBit_181_7 = bits, U32, 468, [7:7] +unusedBit_181_8 = bits, U32, 468, [8:8] +unusedBit_181_9 = bits, U32, 468, [9:9] +unusedBit_181_10 = bits, U32, 468, [10:10] +unusedBit_181_11 = bits, U32, 468, [11:11] +unusedBit_181_12 = bits, U32, 468, [12:12] +unusedBit_181_13 = bits, U32, 468, [13:13] +unusedBit_181_14 = bits, U32, 468, [14:14] +unusedBit_181_15 = bits, U32, 468, [15:15] +unusedBit_181_16 = bits, U32, 468, [16:16] +unusedBit_181_17 = bits, U32, 468, [17:17] +unusedBit_181_18 = bits, U32, 468, [18:18] +unusedBit_181_19 = bits, U32, 468, [19:19] +unusedBit_181_20 = bits, U32, 468, [20:20] +unusedBit_181_21 = bits, U32, 468, [21:21] +unusedBit_181_22 = bits, U32, 468, [22:22] +unusedBit_181_23 = bits, U32, 468, [23:23] +unusedBit_181_24 = bits, U32, 468, [24:24] +unusedBit_181_25 = bits, U32, 468, [25:25] +unusedBit_181_26 = bits, U32, 468, [26:26] +unusedBit_181_27 = bits, U32, 468, [27:27] +unusedBit_181_28 = bits, U32, 468, [28:28] +unusedBit_181_29 = bits, U32, 468, [29:29] +unusedBit_181_30 = bits, U32, 468, [30:30] +unusedBit_181_31 = bits, U32, 468, [31:31] TEMPLOG_MAP_AT_CYCLE_COUNT = scalar, U08, 472, "", 1, 0 boostControllerOutput = scalar, U08, 473, "", 1, 0 boostControllerClosedLoopPart = scalar, U08, 474, "", 1, 0 @@ -2514,9 +2596,9 @@ etbStatus_resetCounter = scalar, S32, 636, "", 1, 0 columnLabel = "Voltage", "kg/hour" xAxis = -1, 6, 10 yAxis = -30, 1300, 10 - xBins = mafDecodingBins, MAFValue + xBins = mafDecodingBins, rawMaf yBins = mafDecoding - gauge = MAFGauge + gauge = rawMafGauge curve = iatFuelCorrCurve, "Intake air temperature fuel Multiplier" columnLabel = "Air Temp", "Multiplier" @@ -3082,10 +3164,9 @@ gaugeCategory = Sensors - Basic afr2Gauge = AFRValue2, "Air/Fuel Ratio 2", "", 10, 19.4, 12, 13, 15, 16, 2, 2 lambda1Gauge = lambdaValue, "Lambda", "", 0.65, 1.2, 0.7, 0.75, 1.1, 1.15, 3, 2 lambda2Gauge = lambdaValue2, "Lambda 2", "", 0.65, 1.2, 0.7, 0.75, 1.1, 1.15, 3, 2 - MAFGauge = MAFValue, "Mass air flow", "V", 0, 5, 0, 1, 3, 4, 1, 1 VBattGauge = VBatt, "Battery", "V", 8, 21, 9, 10, 17, 19, 1, 1 MAPGauge = MAPValue, "MAP", "kPa", 0, 300, 10, 10, 200, 200, 0, 0 - massAirFlowValueGa = massAirFlowValue,"Mass air flow", "kg/hr", 0, 50, -999, -999, 999, 999, 1, 1 + massAirFlowValueGa = mafMeasured, "MAF sensor", "kg/h", 0, 50, -999, -999, 999, 999, 1, 1 gaugeCategory = Sensors - Extra 1 @@ -3175,6 +3256,8 @@ gaugeCategory = Sensors - Raw rawWastegatePositionGauge = rawWastegatePosition,"Raw Wastegate Position","V", 0, 5, 0, 0, 5, 5, 3, 0 rawLowFuelPressureGauge = rawLowFuelPressure,"Raw fuel pressure (low) voltage","V", 0, 5, 0, 0, 5, 5, 3, 0 rawHighFuelPressureGauge = rawHighFuelPressure,"Raw fuel pressure (high) voltage","V", 0, 5, 0, 0, 5, 5, 3, 0 + rawMafGauge = rawMaf , "Raw MAF", "V", 0, 5, 0, 0, 5, 5, 3, 0 + gaugeCategory = Transmission desiredGearGauge = tcuDesiredGear, "Desired Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 @@ -3352,8 +3435,8 @@ entry = auxTemp2, "auxTemp2", float, "%.3f" entry = TPSValue, "TPS", float, "%.3f" entry = throttlePedalPosition, "Throttle pedal position", float, "%.3f" entry = tpsADC, "tpsADC", int, "%d" -entry = MAFValue, "MAF", float, "%.3f" -entry = massAirFlowValue, "MAF air flow", float, "%.3f" +entry = rawMaf, "rawMaf", float, "%.3f" +entry = mafMeasured, "MAF sensor", float, "%.3f" entry = MAPValue, "MAP", float, "%.3f" entry = baroPressure, "baroPressure", float, "%.3f" entry = lambdaValue, "Lambda", float, "%.3f" @@ -3510,6 +3593,8 @@ 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 = mafEstimate, "MAF estimate", float, "%.3f" +entry = instantRpm, "instantRpm", int, "%d" 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 86ebf4f15d..996bed29bc 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.12.hellen-nb1.2948251653" + signature = "rusEFI 2022.01.12.hellen-nb1.2528379042" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.01.12.hellen-nb1.2948251653" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.01.12.hellen-nb1.2528379042" ; 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 (unknown script) integration/rusefi_config.txt Wed Jan 12 01:51:13 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 12 21:36:41 UTC 2022 pageSize = 20996 page = 1 @@ -1958,8 +1958,8 @@ auxTemp2 = scalar, S16, 18, "deg C", 0.01, 0 TPSValue = scalar, S16, 20, "%", 0.01, 0 throttlePedalPosition = scalar, S16, 22, "%", 0.01, 0 tpsADC = scalar, U16, 24, "ADC", 1, 0 -MAFValue = scalar, U16, 26, "V", 0.001, 0 -massAirFlowValue = scalar, U16, 28, "Kg/h", 0.1, 0 +rawMaf = scalar, U16, 26, "V", 0.001, 0 +mafMeasured = scalar, U16, 28, "kg/h", 0.1, 0 MAPValue = scalar, U16, 30, "kPa", 0.03333333333333333, 0 baroPressure = scalar, U16, 32, "kPa", 0.03333333333333333, 0 lambdaValue = scalar, U16, 34, "", 1.0E-4, 0 @@ -2116,34 +2116,116 @@ 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 +mafEstimate = scalar, U16, 356, "kg/h", 0.1, 0 +instantRpm = scalar, U16, 358, "rpm", 1, 0 +unusedAtTheEnd1 = scalar, U08, 360, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 361, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 362, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 363, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 364, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 365, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 366, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 367, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 368, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 369, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 370, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 371, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 372, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 373, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 374, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 375, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 376, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 377, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 378, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 379, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 380, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 381, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 382, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 383, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 384, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 385, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 386, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 387, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 388, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 389, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 390, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 391, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 392, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 393, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 394, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 395, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 396, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 397, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 398, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 399, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 400, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 401, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 402, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 403, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 404, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 405, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 406, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 407, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 408, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 409, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 410, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 411, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 412, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 413, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 414, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 415, "", 1, 0 +unusedAtTheEnd57 = scalar, U08, 416, "", 1, 0 +unusedAtTheEnd58 = scalar, U08, 417, "", 1, 0 +unusedAtTheEnd59 = scalar, U08, 418, "", 1, 0 +unusedAtTheEnd60 = scalar, U08, 419, "", 1, 0 +unusedAtTheEnd61 = scalar, U08, 420, "", 1, 0 +unusedAtTheEnd62 = scalar, U08, 421, "", 1, 0 +unusedAtTheEnd63 = scalar, U08, 422, "", 1, 0 +unusedAtTheEnd64 = scalar, U08, 423, "", 1, 0 +unusedAtTheEnd65 = scalar, U08, 424, "", 1, 0 +unusedAtTheEnd66 = scalar, U08, 425, "", 1, 0 +unusedAtTheEnd67 = scalar, U08, 426, "", 1, 0 +unusedAtTheEnd68 = scalar, U08, 427, "", 1, 0 +unusedAtTheEnd69 = scalar, U08, 428, "", 1, 0 +unusedAtTheEnd70 = scalar, U08, 429, "", 1, 0 +unusedAtTheEnd71 = scalar, U08, 430, "", 1, 0 +unusedAtTheEnd72 = scalar, U08, 431, "", 1, 0 +unusedAtTheEnd73 = scalar, U08, 432, "", 1, 0 +unusedAtTheEnd74 = scalar, U08, 433, "", 1, 0 +unusedAtTheEnd75 = scalar, U08, 434, "", 1, 0 +unusedAtTheEnd76 = scalar, U08, 435, "", 1, 0 +unusedAtTheEnd77 = scalar, U08, 436, "", 1, 0 +unusedAtTheEnd78 = scalar, U08, 437, "", 1, 0 +unusedAtTheEnd79 = scalar, U08, 438, "", 1, 0 +unusedAtTheEnd80 = scalar, U08, 439, "", 1, 0 +unusedAtTheEnd81 = scalar, U08, 440, "", 1, 0 +unusedAtTheEnd82 = scalar, U08, 441, "", 1, 0 +unusedAtTheEnd83 = scalar, U08, 442, "", 1, 0 +unusedAtTheEnd84 = scalar, U08, 443, "", 1, 0 +unusedAtTheEnd85 = scalar, U08, 444, "", 1, 0 +unusedAtTheEnd86 = scalar, U08, 445, "", 1, 0 +unusedAtTheEnd87 = scalar, U08, 446, "", 1, 0 +unusedAtTheEnd88 = scalar, U08, 447, "", 1, 0 +unusedAtTheEnd89 = scalar, U08, 448, "", 1, 0 +unusedAtTheEnd90 = scalar, U08, 449, "", 1, 0 +unusedAtTheEnd91 = scalar, U08, 450, "", 1, 0 +unusedAtTheEnd92 = scalar, U08, 451, "", 1, 0 +unusedAtTheEnd93 = scalar, U08, 452, "", 1, 0 +unusedAtTheEnd94 = scalar, U08, 453, "", 1, 0 +unusedAtTheEnd95 = scalar, U08, 454, "", 1, 0 +unusedAtTheEnd96 = scalar, U08, 455, "", 1, 0 +unusedAtTheEnd97 = scalar, U08, 456, "", 1, 0 +unusedAtTheEnd98 = scalar, U08, 457, "", 1, 0 +unusedAtTheEnd99 = scalar, U08, 458, "", 1, 0 +unusedAtTheEnd100 = scalar, U08, 459, "", 1, 0 +unusedAtTheEnd101 = scalar, U08, 460, "", 1, 0 +unusedAtTheEnd102 = scalar, U08, 461, "", 1, 0 +unusedAtTheEnd103 = scalar, U08, 462, "", 1, 0 +unusedAtTheEnd104 = scalar, U08, 463, "", 1, 0 +unusedAtTheEnd105 = scalar, U08, 464, "", 1, 0 +unusedAtTheEnd106 = scalar, U08, 465, "", 1, 0 +unusedAtTheEnd107 = scalar, U08, 466, "", 1, 0 +unusedAtTheEnd108 = scalar, U08, 467, "", 1, 0 launchSpeedCondition = bits, U32, 468, [0:0] launchRpmCondition = bits, U32, 468, [1:1] launchTpsCondition = bits, U32, 468, [2:2] @@ -2151,31 +2233,31 @@ 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_179_7 = bits, U32, 468, [7:7] -unusedBit_179_8 = bits, U32, 468, [8:8] -unusedBit_179_9 = bits, U32, 468, [9:9] -unusedBit_179_10 = bits, U32, 468, [10:10] -unusedBit_179_11 = bits, U32, 468, [11:11] -unusedBit_179_12 = bits, U32, 468, [12:12] -unusedBit_179_13 = bits, U32, 468, [13:13] -unusedBit_179_14 = bits, U32, 468, [14:14] -unusedBit_179_15 = bits, U32, 468, [15:15] -unusedBit_179_16 = bits, U32, 468, [16:16] -unusedBit_179_17 = bits, U32, 468, [17:17] -unusedBit_179_18 = bits, U32, 468, [18:18] -unusedBit_179_19 = bits, U32, 468, [19:19] -unusedBit_179_20 = bits, U32, 468, [20:20] -unusedBit_179_21 = bits, U32, 468, [21:21] -unusedBit_179_22 = bits, U32, 468, [22:22] -unusedBit_179_23 = bits, U32, 468, [23:23] -unusedBit_179_24 = bits, U32, 468, [24:24] -unusedBit_179_25 = bits, U32, 468, [25:25] -unusedBit_179_26 = bits, U32, 468, [26:26] -unusedBit_179_27 = bits, U32, 468, [27:27] -unusedBit_179_28 = bits, U32, 468, [28:28] -unusedBit_179_29 = bits, U32, 468, [29:29] -unusedBit_179_30 = bits, U32, 468, [30:30] -unusedBit_179_31 = bits, U32, 468, [31:31] +unusedBit_181_7 = bits, U32, 468, [7:7] +unusedBit_181_8 = bits, U32, 468, [8:8] +unusedBit_181_9 = bits, U32, 468, [9:9] +unusedBit_181_10 = bits, U32, 468, [10:10] +unusedBit_181_11 = bits, U32, 468, [11:11] +unusedBit_181_12 = bits, U32, 468, [12:12] +unusedBit_181_13 = bits, U32, 468, [13:13] +unusedBit_181_14 = bits, U32, 468, [14:14] +unusedBit_181_15 = bits, U32, 468, [15:15] +unusedBit_181_16 = bits, U32, 468, [16:16] +unusedBit_181_17 = bits, U32, 468, [17:17] +unusedBit_181_18 = bits, U32, 468, [18:18] +unusedBit_181_19 = bits, U32, 468, [19:19] +unusedBit_181_20 = bits, U32, 468, [20:20] +unusedBit_181_21 = bits, U32, 468, [21:21] +unusedBit_181_22 = bits, U32, 468, [22:22] +unusedBit_181_23 = bits, U32, 468, [23:23] +unusedBit_181_24 = bits, U32, 468, [24:24] +unusedBit_181_25 = bits, U32, 468, [25:25] +unusedBit_181_26 = bits, U32, 468, [26:26] +unusedBit_181_27 = bits, U32, 468, [27:27] +unusedBit_181_28 = bits, U32, 468, [28:28] +unusedBit_181_29 = bits, U32, 468, [29:29] +unusedBit_181_30 = bits, U32, 468, [30:30] +unusedBit_181_31 = bits, U32, 468, [31:31] TEMPLOG_MAP_AT_CYCLE_COUNT = scalar, U08, 472, "", 1, 0 boostControllerOutput = scalar, U08, 473, "", 1, 0 boostControllerClosedLoopPart = scalar, U08, 474, "", 1, 0 @@ -2514,9 +2596,9 @@ etbStatus_resetCounter = scalar, S32, 636, "", 1, 0 columnLabel = "Voltage", "kg/hour" xAxis = -1, 6, 10 yAxis = -30, 1300, 10 - xBins = mafDecodingBins, MAFValue + xBins = mafDecodingBins, rawMaf yBins = mafDecoding - gauge = MAFGauge + gauge = rawMafGauge curve = iatFuelCorrCurve, "Intake air temperature fuel Multiplier" columnLabel = "Air Temp", "Multiplier" @@ -3082,10 +3164,9 @@ gaugeCategory = Sensors - Basic afr2Gauge = AFRValue2, "Air/Fuel Ratio 2", "", 10, 19.4, 12, 13, 15, 16, 2, 2 lambda1Gauge = lambdaValue, "Lambda", "", 0.65, 1.2, 0.7, 0.75, 1.1, 1.15, 3, 2 lambda2Gauge = lambdaValue2, "Lambda 2", "", 0.65, 1.2, 0.7, 0.75, 1.1, 1.15, 3, 2 - MAFGauge = MAFValue, "Mass air flow", "V", 0, 5, 0, 1, 3, 4, 1, 1 VBattGauge = VBatt, "Battery", "V", 8, 21, 9, 10, 17, 19, 1, 1 MAPGauge = MAPValue, "MAP", "kPa", 0, 300, 10, 10, 200, 200, 0, 0 - massAirFlowValueGa = massAirFlowValue,"Mass air flow", "kg/hr", 0, 50, -999, -999, 999, 999, 1, 1 + massAirFlowValueGa = mafMeasured, "MAF sensor", "kg/h", 0, 50, -999, -999, 999, 999, 1, 1 gaugeCategory = Sensors - Extra 1 @@ -3175,6 +3256,8 @@ gaugeCategory = Sensors - Raw rawWastegatePositionGauge = rawWastegatePosition,"Raw Wastegate Position","V", 0, 5, 0, 0, 5, 5, 3, 0 rawLowFuelPressureGauge = rawLowFuelPressure,"Raw fuel pressure (low) voltage","V", 0, 5, 0, 0, 5, 5, 3, 0 rawHighFuelPressureGauge = rawHighFuelPressure,"Raw fuel pressure (high) voltage","V", 0, 5, 0, 0, 5, 5, 3, 0 + rawMafGauge = rawMaf , "Raw MAF", "V", 0, 5, 0, 0, 5, 5, 3, 0 + gaugeCategory = Transmission desiredGearGauge = tcuDesiredGear, "Desired Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 @@ -3352,8 +3435,8 @@ entry = auxTemp2, "auxTemp2", float, "%.3f" entry = TPSValue, "TPS", float, "%.3f" entry = throttlePedalPosition, "Throttle pedal position", float, "%.3f" entry = tpsADC, "tpsADC", int, "%d" -entry = MAFValue, "MAF", float, "%.3f" -entry = massAirFlowValue, "MAF air flow", float, "%.3f" +entry = rawMaf, "rawMaf", float, "%.3f" +entry = mafMeasured, "MAF sensor", float, "%.3f" entry = MAPValue, "MAP", float, "%.3f" entry = baroPressure, "baroPressure", float, "%.3f" entry = lambdaValue, "Lambda", float, "%.3f" @@ -3510,6 +3593,8 @@ 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 = mafEstimate, "MAF estimate", float, "%.3f" +entry = instantRpm, "instantRpm", int, "%d" 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 45c0f8be37..a989e55fb9 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.12.hellen121nissan.4156714415" + signature = "rusEFI 2022.01.12.hellen121nissan.3469520136" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.01.12.hellen121nissan.4156714415" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.01.12.hellen121nissan.3469520136" ; 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 (unknown script) integration/rusefi_config.txt Wed Jan 12 18:42:25 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 12 21:36:32 UTC 2022 pageSize = 20996 page = 1 @@ -1958,8 +1958,8 @@ auxTemp2 = scalar, S16, 18, "deg C", 0.01, 0 TPSValue = scalar, S16, 20, "%", 0.01, 0 throttlePedalPosition = scalar, S16, 22, "%", 0.01, 0 tpsADC = scalar, U16, 24, "ADC", 1, 0 -MAFValue = scalar, U16, 26, "V", 0.001, 0 -massAirFlowValue = scalar, U16, 28, "Kg/h", 0.1, 0 +rawMaf = scalar, U16, 26, "V", 0.001, 0 +mafMeasured = scalar, U16, 28, "kg/h", 0.1, 0 MAPValue = scalar, U16, 30, "kPa", 0.03333333333333333, 0 baroPressure = scalar, U16, 32, "kPa", 0.03333333333333333, 0 lambdaValue = scalar, U16, 34, "", 1.0E-4, 0 @@ -2116,34 +2116,116 @@ 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 +mafEstimate = scalar, U16, 356, "kg/h", 0.1, 0 +instantRpm = scalar, U16, 358, "rpm", 1, 0 +unusedAtTheEnd1 = scalar, U08, 360, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 361, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 362, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 363, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 364, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 365, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 366, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 367, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 368, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 369, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 370, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 371, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 372, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 373, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 374, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 375, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 376, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 377, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 378, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 379, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 380, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 381, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 382, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 383, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 384, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 385, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 386, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 387, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 388, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 389, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 390, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 391, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 392, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 393, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 394, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 395, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 396, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 397, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 398, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 399, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 400, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 401, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 402, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 403, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 404, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 405, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 406, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 407, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 408, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 409, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 410, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 411, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 412, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 413, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 414, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 415, "", 1, 0 +unusedAtTheEnd57 = scalar, U08, 416, "", 1, 0 +unusedAtTheEnd58 = scalar, U08, 417, "", 1, 0 +unusedAtTheEnd59 = scalar, U08, 418, "", 1, 0 +unusedAtTheEnd60 = scalar, U08, 419, "", 1, 0 +unusedAtTheEnd61 = scalar, U08, 420, "", 1, 0 +unusedAtTheEnd62 = scalar, U08, 421, "", 1, 0 +unusedAtTheEnd63 = scalar, U08, 422, "", 1, 0 +unusedAtTheEnd64 = scalar, U08, 423, "", 1, 0 +unusedAtTheEnd65 = scalar, U08, 424, "", 1, 0 +unusedAtTheEnd66 = scalar, U08, 425, "", 1, 0 +unusedAtTheEnd67 = scalar, U08, 426, "", 1, 0 +unusedAtTheEnd68 = scalar, U08, 427, "", 1, 0 +unusedAtTheEnd69 = scalar, U08, 428, "", 1, 0 +unusedAtTheEnd70 = scalar, U08, 429, "", 1, 0 +unusedAtTheEnd71 = scalar, U08, 430, "", 1, 0 +unusedAtTheEnd72 = scalar, U08, 431, "", 1, 0 +unusedAtTheEnd73 = scalar, U08, 432, "", 1, 0 +unusedAtTheEnd74 = scalar, U08, 433, "", 1, 0 +unusedAtTheEnd75 = scalar, U08, 434, "", 1, 0 +unusedAtTheEnd76 = scalar, U08, 435, "", 1, 0 +unusedAtTheEnd77 = scalar, U08, 436, "", 1, 0 +unusedAtTheEnd78 = scalar, U08, 437, "", 1, 0 +unusedAtTheEnd79 = scalar, U08, 438, "", 1, 0 +unusedAtTheEnd80 = scalar, U08, 439, "", 1, 0 +unusedAtTheEnd81 = scalar, U08, 440, "", 1, 0 +unusedAtTheEnd82 = scalar, U08, 441, "", 1, 0 +unusedAtTheEnd83 = scalar, U08, 442, "", 1, 0 +unusedAtTheEnd84 = scalar, U08, 443, "", 1, 0 +unusedAtTheEnd85 = scalar, U08, 444, "", 1, 0 +unusedAtTheEnd86 = scalar, U08, 445, "", 1, 0 +unusedAtTheEnd87 = scalar, U08, 446, "", 1, 0 +unusedAtTheEnd88 = scalar, U08, 447, "", 1, 0 +unusedAtTheEnd89 = scalar, U08, 448, "", 1, 0 +unusedAtTheEnd90 = scalar, U08, 449, "", 1, 0 +unusedAtTheEnd91 = scalar, U08, 450, "", 1, 0 +unusedAtTheEnd92 = scalar, U08, 451, "", 1, 0 +unusedAtTheEnd93 = scalar, U08, 452, "", 1, 0 +unusedAtTheEnd94 = scalar, U08, 453, "", 1, 0 +unusedAtTheEnd95 = scalar, U08, 454, "", 1, 0 +unusedAtTheEnd96 = scalar, U08, 455, "", 1, 0 +unusedAtTheEnd97 = scalar, U08, 456, "", 1, 0 +unusedAtTheEnd98 = scalar, U08, 457, "", 1, 0 +unusedAtTheEnd99 = scalar, U08, 458, "", 1, 0 +unusedAtTheEnd100 = scalar, U08, 459, "", 1, 0 +unusedAtTheEnd101 = scalar, U08, 460, "", 1, 0 +unusedAtTheEnd102 = scalar, U08, 461, "", 1, 0 +unusedAtTheEnd103 = scalar, U08, 462, "", 1, 0 +unusedAtTheEnd104 = scalar, U08, 463, "", 1, 0 +unusedAtTheEnd105 = scalar, U08, 464, "", 1, 0 +unusedAtTheEnd106 = scalar, U08, 465, "", 1, 0 +unusedAtTheEnd107 = scalar, U08, 466, "", 1, 0 +unusedAtTheEnd108 = scalar, U08, 467, "", 1, 0 launchSpeedCondition = bits, U32, 468, [0:0] launchRpmCondition = bits, U32, 468, [1:1] launchTpsCondition = bits, U32, 468, [2:2] @@ -2151,31 +2233,31 @@ 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_179_7 = bits, U32, 468, [7:7] -unusedBit_179_8 = bits, U32, 468, [8:8] -unusedBit_179_9 = bits, U32, 468, [9:9] -unusedBit_179_10 = bits, U32, 468, [10:10] -unusedBit_179_11 = bits, U32, 468, [11:11] -unusedBit_179_12 = bits, U32, 468, [12:12] -unusedBit_179_13 = bits, U32, 468, [13:13] -unusedBit_179_14 = bits, U32, 468, [14:14] -unusedBit_179_15 = bits, U32, 468, [15:15] -unusedBit_179_16 = bits, U32, 468, [16:16] -unusedBit_179_17 = bits, U32, 468, [17:17] -unusedBit_179_18 = bits, U32, 468, [18:18] -unusedBit_179_19 = bits, U32, 468, [19:19] -unusedBit_179_20 = bits, U32, 468, [20:20] -unusedBit_179_21 = bits, U32, 468, [21:21] -unusedBit_179_22 = bits, U32, 468, [22:22] -unusedBit_179_23 = bits, U32, 468, [23:23] -unusedBit_179_24 = bits, U32, 468, [24:24] -unusedBit_179_25 = bits, U32, 468, [25:25] -unusedBit_179_26 = bits, U32, 468, [26:26] -unusedBit_179_27 = bits, U32, 468, [27:27] -unusedBit_179_28 = bits, U32, 468, [28:28] -unusedBit_179_29 = bits, U32, 468, [29:29] -unusedBit_179_30 = bits, U32, 468, [30:30] -unusedBit_179_31 = bits, U32, 468, [31:31] +unusedBit_181_7 = bits, U32, 468, [7:7] +unusedBit_181_8 = bits, U32, 468, [8:8] +unusedBit_181_9 = bits, U32, 468, [9:9] +unusedBit_181_10 = bits, U32, 468, [10:10] +unusedBit_181_11 = bits, U32, 468, [11:11] +unusedBit_181_12 = bits, U32, 468, [12:12] +unusedBit_181_13 = bits, U32, 468, [13:13] +unusedBit_181_14 = bits, U32, 468, [14:14] +unusedBit_181_15 = bits, U32, 468, [15:15] +unusedBit_181_16 = bits, U32, 468, [16:16] +unusedBit_181_17 = bits, U32, 468, [17:17] +unusedBit_181_18 = bits, U32, 468, [18:18] +unusedBit_181_19 = bits, U32, 468, [19:19] +unusedBit_181_20 = bits, U32, 468, [20:20] +unusedBit_181_21 = bits, U32, 468, [21:21] +unusedBit_181_22 = bits, U32, 468, [22:22] +unusedBit_181_23 = bits, U32, 468, [23:23] +unusedBit_181_24 = bits, U32, 468, [24:24] +unusedBit_181_25 = bits, U32, 468, [25:25] +unusedBit_181_26 = bits, U32, 468, [26:26] +unusedBit_181_27 = bits, U32, 468, [27:27] +unusedBit_181_28 = bits, U32, 468, [28:28] +unusedBit_181_29 = bits, U32, 468, [29:29] +unusedBit_181_30 = bits, U32, 468, [30:30] +unusedBit_181_31 = bits, U32, 468, [31:31] TEMPLOG_MAP_AT_CYCLE_COUNT = scalar, U08, 472, "", 1, 0 boostControllerOutput = scalar, U08, 473, "", 1, 0 boostControllerClosedLoopPart = scalar, U08, 474, "", 1, 0 @@ -2514,9 +2596,9 @@ etbStatus_resetCounter = scalar, S32, 636, "", 1, 0 columnLabel = "Voltage", "kg/hour" xAxis = -1, 6, 10 yAxis = -30, 1300, 10 - xBins = mafDecodingBins, MAFValue + xBins = mafDecodingBins, rawMaf yBins = mafDecoding - gauge = MAFGauge + gauge = rawMafGauge curve = iatFuelCorrCurve, "Intake air temperature fuel Multiplier" columnLabel = "Air Temp", "Multiplier" @@ -3082,10 +3164,9 @@ gaugeCategory = Sensors - Basic afr2Gauge = AFRValue2, "Air/Fuel Ratio 2", "", 10, 19.4, 12, 13, 15, 16, 2, 2 lambda1Gauge = lambdaValue, "Lambda", "", 0.65, 1.2, 0.7, 0.75, 1.1, 1.15, 3, 2 lambda2Gauge = lambdaValue2, "Lambda 2", "", 0.65, 1.2, 0.7, 0.75, 1.1, 1.15, 3, 2 - MAFGauge = MAFValue, "Mass air flow", "V", 0, 5, 0, 1, 3, 4, 1, 1 VBattGauge = VBatt, "Battery", "V", 8, 21, 9, 10, 17, 19, 1, 1 MAPGauge = MAPValue, "MAP", "kPa", 0, 300, 10, 10, 200, 200, 0, 0 - massAirFlowValueGa = massAirFlowValue,"Mass air flow", "kg/hr", 0, 50, -999, -999, 999, 999, 1, 1 + massAirFlowValueGa = mafMeasured, "MAF sensor", "kg/h", 0, 50, -999, -999, 999, 999, 1, 1 gaugeCategory = Sensors - Extra 1 @@ -3175,6 +3256,8 @@ gaugeCategory = Sensors - Raw rawWastegatePositionGauge = rawWastegatePosition,"Raw Wastegate Position","V", 0, 5, 0, 0, 5, 5, 3, 0 rawLowFuelPressureGauge = rawLowFuelPressure,"Raw fuel pressure (low) voltage","V", 0, 5, 0, 0, 5, 5, 3, 0 rawHighFuelPressureGauge = rawHighFuelPressure,"Raw fuel pressure (high) voltage","V", 0, 5, 0, 0, 5, 5, 3, 0 + rawMafGauge = rawMaf , "Raw MAF", "V", 0, 5, 0, 0, 5, 5, 3, 0 + gaugeCategory = Transmission desiredGearGauge = tcuDesiredGear, "Desired Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 @@ -3352,8 +3435,8 @@ entry = auxTemp2, "auxTemp2", float, "%.3f" entry = TPSValue, "TPS", float, "%.3f" entry = throttlePedalPosition, "Throttle pedal position", float, "%.3f" entry = tpsADC, "tpsADC", int, "%d" -entry = MAFValue, "MAF", float, "%.3f" -entry = massAirFlowValue, "MAF air flow", float, "%.3f" +entry = rawMaf, "rawMaf", float, "%.3f" +entry = mafMeasured, "MAF sensor", float, "%.3f" entry = MAPValue, "MAP", float, "%.3f" entry = baroPressure, "baroPressure", float, "%.3f" entry = lambdaValue, "Lambda", float, "%.3f" @@ -3510,6 +3593,8 @@ 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 = mafEstimate, "MAF estimate", float, "%.3f" +entry = instantRpm, "instantRpm", int, "%d" 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 cdf8896d87..89af654279 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.12.hellen121vag.214964950" + signature = "rusEFI 2022.01.12.hellen121vag.903797361" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.01.12.hellen121vag.214964950" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.01.12.hellen121vag.903797361" ; 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 (unknown script) integration/rusefi_config.txt Wed Jan 12 01:51:04 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 12 21:36:30 UTC 2022 pageSize = 20996 page = 1 @@ -1958,8 +1958,8 @@ auxTemp2 = scalar, S16, 18, "deg C", 0.01, 0 TPSValue = scalar, S16, 20, "%", 0.01, 0 throttlePedalPosition = scalar, S16, 22, "%", 0.01, 0 tpsADC = scalar, U16, 24, "ADC", 1, 0 -MAFValue = scalar, U16, 26, "V", 0.001, 0 -massAirFlowValue = scalar, U16, 28, "Kg/h", 0.1, 0 +rawMaf = scalar, U16, 26, "V", 0.001, 0 +mafMeasured = scalar, U16, 28, "kg/h", 0.1, 0 MAPValue = scalar, U16, 30, "kPa", 0.03333333333333333, 0 baroPressure = scalar, U16, 32, "kPa", 0.03333333333333333, 0 lambdaValue = scalar, U16, 34, "", 1.0E-4, 0 @@ -2116,34 +2116,116 @@ 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 +mafEstimate = scalar, U16, 356, "kg/h", 0.1, 0 +instantRpm = scalar, U16, 358, "rpm", 1, 0 +unusedAtTheEnd1 = scalar, U08, 360, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 361, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 362, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 363, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 364, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 365, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 366, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 367, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 368, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 369, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 370, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 371, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 372, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 373, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 374, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 375, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 376, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 377, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 378, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 379, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 380, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 381, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 382, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 383, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 384, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 385, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 386, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 387, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 388, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 389, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 390, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 391, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 392, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 393, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 394, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 395, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 396, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 397, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 398, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 399, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 400, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 401, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 402, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 403, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 404, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 405, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 406, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 407, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 408, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 409, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 410, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 411, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 412, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 413, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 414, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 415, "", 1, 0 +unusedAtTheEnd57 = scalar, U08, 416, "", 1, 0 +unusedAtTheEnd58 = scalar, U08, 417, "", 1, 0 +unusedAtTheEnd59 = scalar, U08, 418, "", 1, 0 +unusedAtTheEnd60 = scalar, U08, 419, "", 1, 0 +unusedAtTheEnd61 = scalar, U08, 420, "", 1, 0 +unusedAtTheEnd62 = scalar, U08, 421, "", 1, 0 +unusedAtTheEnd63 = scalar, U08, 422, "", 1, 0 +unusedAtTheEnd64 = scalar, U08, 423, "", 1, 0 +unusedAtTheEnd65 = scalar, U08, 424, "", 1, 0 +unusedAtTheEnd66 = scalar, U08, 425, "", 1, 0 +unusedAtTheEnd67 = scalar, U08, 426, "", 1, 0 +unusedAtTheEnd68 = scalar, U08, 427, "", 1, 0 +unusedAtTheEnd69 = scalar, U08, 428, "", 1, 0 +unusedAtTheEnd70 = scalar, U08, 429, "", 1, 0 +unusedAtTheEnd71 = scalar, U08, 430, "", 1, 0 +unusedAtTheEnd72 = scalar, U08, 431, "", 1, 0 +unusedAtTheEnd73 = scalar, U08, 432, "", 1, 0 +unusedAtTheEnd74 = scalar, U08, 433, "", 1, 0 +unusedAtTheEnd75 = scalar, U08, 434, "", 1, 0 +unusedAtTheEnd76 = scalar, U08, 435, "", 1, 0 +unusedAtTheEnd77 = scalar, U08, 436, "", 1, 0 +unusedAtTheEnd78 = scalar, U08, 437, "", 1, 0 +unusedAtTheEnd79 = scalar, U08, 438, "", 1, 0 +unusedAtTheEnd80 = scalar, U08, 439, "", 1, 0 +unusedAtTheEnd81 = scalar, U08, 440, "", 1, 0 +unusedAtTheEnd82 = scalar, U08, 441, "", 1, 0 +unusedAtTheEnd83 = scalar, U08, 442, "", 1, 0 +unusedAtTheEnd84 = scalar, U08, 443, "", 1, 0 +unusedAtTheEnd85 = scalar, U08, 444, "", 1, 0 +unusedAtTheEnd86 = scalar, U08, 445, "", 1, 0 +unusedAtTheEnd87 = scalar, U08, 446, "", 1, 0 +unusedAtTheEnd88 = scalar, U08, 447, "", 1, 0 +unusedAtTheEnd89 = scalar, U08, 448, "", 1, 0 +unusedAtTheEnd90 = scalar, U08, 449, "", 1, 0 +unusedAtTheEnd91 = scalar, U08, 450, "", 1, 0 +unusedAtTheEnd92 = scalar, U08, 451, "", 1, 0 +unusedAtTheEnd93 = scalar, U08, 452, "", 1, 0 +unusedAtTheEnd94 = scalar, U08, 453, "", 1, 0 +unusedAtTheEnd95 = scalar, U08, 454, "", 1, 0 +unusedAtTheEnd96 = scalar, U08, 455, "", 1, 0 +unusedAtTheEnd97 = scalar, U08, 456, "", 1, 0 +unusedAtTheEnd98 = scalar, U08, 457, "", 1, 0 +unusedAtTheEnd99 = scalar, U08, 458, "", 1, 0 +unusedAtTheEnd100 = scalar, U08, 459, "", 1, 0 +unusedAtTheEnd101 = scalar, U08, 460, "", 1, 0 +unusedAtTheEnd102 = scalar, U08, 461, "", 1, 0 +unusedAtTheEnd103 = scalar, U08, 462, "", 1, 0 +unusedAtTheEnd104 = scalar, U08, 463, "", 1, 0 +unusedAtTheEnd105 = scalar, U08, 464, "", 1, 0 +unusedAtTheEnd106 = scalar, U08, 465, "", 1, 0 +unusedAtTheEnd107 = scalar, U08, 466, "", 1, 0 +unusedAtTheEnd108 = scalar, U08, 467, "", 1, 0 launchSpeedCondition = bits, U32, 468, [0:0] launchRpmCondition = bits, U32, 468, [1:1] launchTpsCondition = bits, U32, 468, [2:2] @@ -2151,31 +2233,31 @@ 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_179_7 = bits, U32, 468, [7:7] -unusedBit_179_8 = bits, U32, 468, [8:8] -unusedBit_179_9 = bits, U32, 468, [9:9] -unusedBit_179_10 = bits, U32, 468, [10:10] -unusedBit_179_11 = bits, U32, 468, [11:11] -unusedBit_179_12 = bits, U32, 468, [12:12] -unusedBit_179_13 = bits, U32, 468, [13:13] -unusedBit_179_14 = bits, U32, 468, [14:14] -unusedBit_179_15 = bits, U32, 468, [15:15] -unusedBit_179_16 = bits, U32, 468, [16:16] -unusedBit_179_17 = bits, U32, 468, [17:17] -unusedBit_179_18 = bits, U32, 468, [18:18] -unusedBit_179_19 = bits, U32, 468, [19:19] -unusedBit_179_20 = bits, U32, 468, [20:20] -unusedBit_179_21 = bits, U32, 468, [21:21] -unusedBit_179_22 = bits, U32, 468, [22:22] -unusedBit_179_23 = bits, U32, 468, [23:23] -unusedBit_179_24 = bits, U32, 468, [24:24] -unusedBit_179_25 = bits, U32, 468, [25:25] -unusedBit_179_26 = bits, U32, 468, [26:26] -unusedBit_179_27 = bits, U32, 468, [27:27] -unusedBit_179_28 = bits, U32, 468, [28:28] -unusedBit_179_29 = bits, U32, 468, [29:29] -unusedBit_179_30 = bits, U32, 468, [30:30] -unusedBit_179_31 = bits, U32, 468, [31:31] +unusedBit_181_7 = bits, U32, 468, [7:7] +unusedBit_181_8 = bits, U32, 468, [8:8] +unusedBit_181_9 = bits, U32, 468, [9:9] +unusedBit_181_10 = bits, U32, 468, [10:10] +unusedBit_181_11 = bits, U32, 468, [11:11] +unusedBit_181_12 = bits, U32, 468, [12:12] +unusedBit_181_13 = bits, U32, 468, [13:13] +unusedBit_181_14 = bits, U32, 468, [14:14] +unusedBit_181_15 = bits, U32, 468, [15:15] +unusedBit_181_16 = bits, U32, 468, [16:16] +unusedBit_181_17 = bits, U32, 468, [17:17] +unusedBit_181_18 = bits, U32, 468, [18:18] +unusedBit_181_19 = bits, U32, 468, [19:19] +unusedBit_181_20 = bits, U32, 468, [20:20] +unusedBit_181_21 = bits, U32, 468, [21:21] +unusedBit_181_22 = bits, U32, 468, [22:22] +unusedBit_181_23 = bits, U32, 468, [23:23] +unusedBit_181_24 = bits, U32, 468, [24:24] +unusedBit_181_25 = bits, U32, 468, [25:25] +unusedBit_181_26 = bits, U32, 468, [26:26] +unusedBit_181_27 = bits, U32, 468, [27:27] +unusedBit_181_28 = bits, U32, 468, [28:28] +unusedBit_181_29 = bits, U32, 468, [29:29] +unusedBit_181_30 = bits, U32, 468, [30:30] +unusedBit_181_31 = bits, U32, 468, [31:31] TEMPLOG_MAP_AT_CYCLE_COUNT = scalar, U08, 472, "", 1, 0 boostControllerOutput = scalar, U08, 473, "", 1, 0 boostControllerClosedLoopPart = scalar, U08, 474, "", 1, 0 @@ -2514,9 +2596,9 @@ etbStatus_resetCounter = scalar, S32, 636, "", 1, 0 columnLabel = "Voltage", "kg/hour" xAxis = -1, 6, 10 yAxis = -30, 1300, 10 - xBins = mafDecodingBins, MAFValue + xBins = mafDecodingBins, rawMaf yBins = mafDecoding - gauge = MAFGauge + gauge = rawMafGauge curve = iatFuelCorrCurve, "Intake air temperature fuel Multiplier" columnLabel = "Air Temp", "Multiplier" @@ -3082,10 +3164,9 @@ gaugeCategory = Sensors - Basic afr2Gauge = AFRValue2, "Air/Fuel Ratio 2", "", 10, 19.4, 12, 13, 15, 16, 2, 2 lambda1Gauge = lambdaValue, "Lambda", "", 0.65, 1.2, 0.7, 0.75, 1.1, 1.15, 3, 2 lambda2Gauge = lambdaValue2, "Lambda 2", "", 0.65, 1.2, 0.7, 0.75, 1.1, 1.15, 3, 2 - MAFGauge = MAFValue, "Mass air flow", "V", 0, 5, 0, 1, 3, 4, 1, 1 VBattGauge = VBatt, "Battery", "V", 8, 21, 9, 10, 17, 19, 1, 1 MAPGauge = MAPValue, "MAP", "kPa", 0, 300, 10, 10, 200, 200, 0, 0 - massAirFlowValueGa = massAirFlowValue,"Mass air flow", "kg/hr", 0, 50, -999, -999, 999, 999, 1, 1 + massAirFlowValueGa = mafMeasured, "MAF sensor", "kg/h", 0, 50, -999, -999, 999, 999, 1, 1 gaugeCategory = Sensors - Extra 1 @@ -3175,6 +3256,8 @@ gaugeCategory = Sensors - Raw rawWastegatePositionGauge = rawWastegatePosition,"Raw Wastegate Position","V", 0, 5, 0, 0, 5, 5, 3, 0 rawLowFuelPressureGauge = rawLowFuelPressure,"Raw fuel pressure (low) voltage","V", 0, 5, 0, 0, 5, 5, 3, 0 rawHighFuelPressureGauge = rawHighFuelPressure,"Raw fuel pressure (high) voltage","V", 0, 5, 0, 0, 5, 5, 3, 0 + rawMafGauge = rawMaf , "Raw MAF", "V", 0, 5, 0, 0, 5, 5, 3, 0 + gaugeCategory = Transmission desiredGearGauge = tcuDesiredGear, "Desired Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 @@ -3352,8 +3435,8 @@ entry = auxTemp2, "auxTemp2", float, "%.3f" entry = TPSValue, "TPS", float, "%.3f" entry = throttlePedalPosition, "Throttle pedal position", float, "%.3f" entry = tpsADC, "tpsADC", int, "%d" -entry = MAFValue, "MAF", float, "%.3f" -entry = massAirFlowValue, "MAF air flow", float, "%.3f" +entry = rawMaf, "rawMaf", float, "%.3f" +entry = mafMeasured, "MAF sensor", float, "%.3f" entry = MAPValue, "MAP", float, "%.3f" entry = baroPressure, "baroPressure", float, "%.3f" entry = lambdaValue, "Lambda", float, "%.3f" @@ -3510,6 +3593,8 @@ 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 = mafEstimate, "MAF estimate", float, "%.3f" +entry = instantRpm, "instantRpm", int, "%d" 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 3dde1e47c1..202efbd0a4 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.12.hellen128.1300858191" + signature = "rusEFI 2022.01.12.hellen128.1955022312" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.01.12.hellen128.1300858191" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.01.12.hellen128.1955022312" ; 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 (unknown script) integration/rusefi_config.txt Wed Jan 12 19:21:07 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 12 21:36:29 UTC 2022 pageSize = 20996 page = 1 @@ -1958,8 +1958,8 @@ auxTemp2 = scalar, S16, 18, "deg C", 0.01, 0 TPSValue = scalar, S16, 20, "%", 0.01, 0 throttlePedalPosition = scalar, S16, 22, "%", 0.01, 0 tpsADC = scalar, U16, 24, "ADC", 1, 0 -MAFValue = scalar, U16, 26, "V", 0.001, 0 -massAirFlowValue = scalar, U16, 28, "Kg/h", 0.1, 0 +rawMaf = scalar, U16, 26, "V", 0.001, 0 +mafMeasured = scalar, U16, 28, "kg/h", 0.1, 0 MAPValue = scalar, U16, 30, "kPa", 0.03333333333333333, 0 baroPressure = scalar, U16, 32, "kPa", 0.03333333333333333, 0 lambdaValue = scalar, U16, 34, "", 1.0E-4, 0 @@ -2116,34 +2116,116 @@ 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 +mafEstimate = scalar, U16, 356, "kg/h", 0.1, 0 +instantRpm = scalar, U16, 358, "rpm", 1, 0 +unusedAtTheEnd1 = scalar, U08, 360, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 361, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 362, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 363, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 364, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 365, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 366, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 367, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 368, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 369, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 370, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 371, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 372, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 373, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 374, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 375, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 376, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 377, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 378, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 379, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 380, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 381, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 382, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 383, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 384, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 385, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 386, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 387, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 388, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 389, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 390, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 391, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 392, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 393, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 394, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 395, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 396, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 397, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 398, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 399, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 400, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 401, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 402, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 403, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 404, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 405, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 406, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 407, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 408, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 409, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 410, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 411, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 412, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 413, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 414, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 415, "", 1, 0 +unusedAtTheEnd57 = scalar, U08, 416, "", 1, 0 +unusedAtTheEnd58 = scalar, U08, 417, "", 1, 0 +unusedAtTheEnd59 = scalar, U08, 418, "", 1, 0 +unusedAtTheEnd60 = scalar, U08, 419, "", 1, 0 +unusedAtTheEnd61 = scalar, U08, 420, "", 1, 0 +unusedAtTheEnd62 = scalar, U08, 421, "", 1, 0 +unusedAtTheEnd63 = scalar, U08, 422, "", 1, 0 +unusedAtTheEnd64 = scalar, U08, 423, "", 1, 0 +unusedAtTheEnd65 = scalar, U08, 424, "", 1, 0 +unusedAtTheEnd66 = scalar, U08, 425, "", 1, 0 +unusedAtTheEnd67 = scalar, U08, 426, "", 1, 0 +unusedAtTheEnd68 = scalar, U08, 427, "", 1, 0 +unusedAtTheEnd69 = scalar, U08, 428, "", 1, 0 +unusedAtTheEnd70 = scalar, U08, 429, "", 1, 0 +unusedAtTheEnd71 = scalar, U08, 430, "", 1, 0 +unusedAtTheEnd72 = scalar, U08, 431, "", 1, 0 +unusedAtTheEnd73 = scalar, U08, 432, "", 1, 0 +unusedAtTheEnd74 = scalar, U08, 433, "", 1, 0 +unusedAtTheEnd75 = scalar, U08, 434, "", 1, 0 +unusedAtTheEnd76 = scalar, U08, 435, "", 1, 0 +unusedAtTheEnd77 = scalar, U08, 436, "", 1, 0 +unusedAtTheEnd78 = scalar, U08, 437, "", 1, 0 +unusedAtTheEnd79 = scalar, U08, 438, "", 1, 0 +unusedAtTheEnd80 = scalar, U08, 439, "", 1, 0 +unusedAtTheEnd81 = scalar, U08, 440, "", 1, 0 +unusedAtTheEnd82 = scalar, U08, 441, "", 1, 0 +unusedAtTheEnd83 = scalar, U08, 442, "", 1, 0 +unusedAtTheEnd84 = scalar, U08, 443, "", 1, 0 +unusedAtTheEnd85 = scalar, U08, 444, "", 1, 0 +unusedAtTheEnd86 = scalar, U08, 445, "", 1, 0 +unusedAtTheEnd87 = scalar, U08, 446, "", 1, 0 +unusedAtTheEnd88 = scalar, U08, 447, "", 1, 0 +unusedAtTheEnd89 = scalar, U08, 448, "", 1, 0 +unusedAtTheEnd90 = scalar, U08, 449, "", 1, 0 +unusedAtTheEnd91 = scalar, U08, 450, "", 1, 0 +unusedAtTheEnd92 = scalar, U08, 451, "", 1, 0 +unusedAtTheEnd93 = scalar, U08, 452, "", 1, 0 +unusedAtTheEnd94 = scalar, U08, 453, "", 1, 0 +unusedAtTheEnd95 = scalar, U08, 454, "", 1, 0 +unusedAtTheEnd96 = scalar, U08, 455, "", 1, 0 +unusedAtTheEnd97 = scalar, U08, 456, "", 1, 0 +unusedAtTheEnd98 = scalar, U08, 457, "", 1, 0 +unusedAtTheEnd99 = scalar, U08, 458, "", 1, 0 +unusedAtTheEnd100 = scalar, U08, 459, "", 1, 0 +unusedAtTheEnd101 = scalar, U08, 460, "", 1, 0 +unusedAtTheEnd102 = scalar, U08, 461, "", 1, 0 +unusedAtTheEnd103 = scalar, U08, 462, "", 1, 0 +unusedAtTheEnd104 = scalar, U08, 463, "", 1, 0 +unusedAtTheEnd105 = scalar, U08, 464, "", 1, 0 +unusedAtTheEnd106 = scalar, U08, 465, "", 1, 0 +unusedAtTheEnd107 = scalar, U08, 466, "", 1, 0 +unusedAtTheEnd108 = scalar, U08, 467, "", 1, 0 launchSpeedCondition = bits, U32, 468, [0:0] launchRpmCondition = bits, U32, 468, [1:1] launchTpsCondition = bits, U32, 468, [2:2] @@ -2151,31 +2233,31 @@ 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_179_7 = bits, U32, 468, [7:7] -unusedBit_179_8 = bits, U32, 468, [8:8] -unusedBit_179_9 = bits, U32, 468, [9:9] -unusedBit_179_10 = bits, U32, 468, [10:10] -unusedBit_179_11 = bits, U32, 468, [11:11] -unusedBit_179_12 = bits, U32, 468, [12:12] -unusedBit_179_13 = bits, U32, 468, [13:13] -unusedBit_179_14 = bits, U32, 468, [14:14] -unusedBit_179_15 = bits, U32, 468, [15:15] -unusedBit_179_16 = bits, U32, 468, [16:16] -unusedBit_179_17 = bits, U32, 468, [17:17] -unusedBit_179_18 = bits, U32, 468, [18:18] -unusedBit_179_19 = bits, U32, 468, [19:19] -unusedBit_179_20 = bits, U32, 468, [20:20] -unusedBit_179_21 = bits, U32, 468, [21:21] -unusedBit_179_22 = bits, U32, 468, [22:22] -unusedBit_179_23 = bits, U32, 468, [23:23] -unusedBit_179_24 = bits, U32, 468, [24:24] -unusedBit_179_25 = bits, U32, 468, [25:25] -unusedBit_179_26 = bits, U32, 468, [26:26] -unusedBit_179_27 = bits, U32, 468, [27:27] -unusedBit_179_28 = bits, U32, 468, [28:28] -unusedBit_179_29 = bits, U32, 468, [29:29] -unusedBit_179_30 = bits, U32, 468, [30:30] -unusedBit_179_31 = bits, U32, 468, [31:31] +unusedBit_181_7 = bits, U32, 468, [7:7] +unusedBit_181_8 = bits, U32, 468, [8:8] +unusedBit_181_9 = bits, U32, 468, [9:9] +unusedBit_181_10 = bits, U32, 468, [10:10] +unusedBit_181_11 = bits, U32, 468, [11:11] +unusedBit_181_12 = bits, U32, 468, [12:12] +unusedBit_181_13 = bits, U32, 468, [13:13] +unusedBit_181_14 = bits, U32, 468, [14:14] +unusedBit_181_15 = bits, U32, 468, [15:15] +unusedBit_181_16 = bits, U32, 468, [16:16] +unusedBit_181_17 = bits, U32, 468, [17:17] +unusedBit_181_18 = bits, U32, 468, [18:18] +unusedBit_181_19 = bits, U32, 468, [19:19] +unusedBit_181_20 = bits, U32, 468, [20:20] +unusedBit_181_21 = bits, U32, 468, [21:21] +unusedBit_181_22 = bits, U32, 468, [22:22] +unusedBit_181_23 = bits, U32, 468, [23:23] +unusedBit_181_24 = bits, U32, 468, [24:24] +unusedBit_181_25 = bits, U32, 468, [25:25] +unusedBit_181_26 = bits, U32, 468, [26:26] +unusedBit_181_27 = bits, U32, 468, [27:27] +unusedBit_181_28 = bits, U32, 468, [28:28] +unusedBit_181_29 = bits, U32, 468, [29:29] +unusedBit_181_30 = bits, U32, 468, [30:30] +unusedBit_181_31 = bits, U32, 468, [31:31] TEMPLOG_MAP_AT_CYCLE_COUNT = scalar, U08, 472, "", 1, 0 boostControllerOutput = scalar, U08, 473, "", 1, 0 boostControllerClosedLoopPart = scalar, U08, 474, "", 1, 0 @@ -2514,9 +2596,9 @@ etbStatus_resetCounter = scalar, S32, 636, "", 1, 0 columnLabel = "Voltage", "kg/hour" xAxis = -1, 6, 10 yAxis = -30, 1300, 10 - xBins = mafDecodingBins, MAFValue + xBins = mafDecodingBins, rawMaf yBins = mafDecoding - gauge = MAFGauge + gauge = rawMafGauge curve = iatFuelCorrCurve, "Intake air temperature fuel Multiplier" columnLabel = "Air Temp", "Multiplier" @@ -3082,10 +3164,9 @@ gaugeCategory = Sensors - Basic afr2Gauge = AFRValue2, "Air/Fuel Ratio 2", "", 10, 19.4, 12, 13, 15, 16, 2, 2 lambda1Gauge = lambdaValue, "Lambda", "", 0.65, 1.2, 0.7, 0.75, 1.1, 1.15, 3, 2 lambda2Gauge = lambdaValue2, "Lambda 2", "", 0.65, 1.2, 0.7, 0.75, 1.1, 1.15, 3, 2 - MAFGauge = MAFValue, "Mass air flow", "V", 0, 5, 0, 1, 3, 4, 1, 1 VBattGauge = VBatt, "Battery", "V", 8, 21, 9, 10, 17, 19, 1, 1 MAPGauge = MAPValue, "MAP", "kPa", 0, 300, 10, 10, 200, 200, 0, 0 - massAirFlowValueGa = massAirFlowValue,"Mass air flow", "kg/hr", 0, 50, -999, -999, 999, 999, 1, 1 + massAirFlowValueGa = mafMeasured, "MAF sensor", "kg/h", 0, 50, -999, -999, 999, 999, 1, 1 gaugeCategory = Sensors - Extra 1 @@ -3175,6 +3256,8 @@ gaugeCategory = Sensors - Raw rawWastegatePositionGauge = rawWastegatePosition,"Raw Wastegate Position","V", 0, 5, 0, 0, 5, 5, 3, 0 rawLowFuelPressureGauge = rawLowFuelPressure,"Raw fuel pressure (low) voltage","V", 0, 5, 0, 0, 5, 5, 3, 0 rawHighFuelPressureGauge = rawHighFuelPressure,"Raw fuel pressure (high) voltage","V", 0, 5, 0, 0, 5, 5, 3, 0 + rawMafGauge = rawMaf , "Raw MAF", "V", 0, 5, 0, 0, 5, 5, 3, 0 + gaugeCategory = Transmission desiredGearGauge = tcuDesiredGear, "Desired Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 @@ -3352,8 +3435,8 @@ entry = auxTemp2, "auxTemp2", float, "%.3f" entry = TPSValue, "TPS", float, "%.3f" entry = throttlePedalPosition, "Throttle pedal position", float, "%.3f" entry = tpsADC, "tpsADC", int, "%d" -entry = MAFValue, "MAF", float, "%.3f" -entry = massAirFlowValue, "MAF air flow", float, "%.3f" +entry = rawMaf, "rawMaf", float, "%.3f" +entry = mafMeasured, "MAF sensor", float, "%.3f" entry = MAPValue, "MAP", float, "%.3f" entry = baroPressure, "baroPressure", float, "%.3f" entry = lambdaValue, "Lambda", float, "%.3f" @@ -3510,6 +3593,8 @@ 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 = mafEstimate, "MAF estimate", float, "%.3f" +entry = instantRpm, "instantRpm", int, "%d" 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 53d01719cc..a602d8474f 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.12.hellen154hyundai.2674860656" + signature = "rusEFI 2022.01.12.hellen154hyundai.2791432919" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.01.12.hellen154hyundai.2674860656" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.01.12.hellen154hyundai.2791432919" ; 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 (unknown script) integration/rusefi_config.txt Wed Jan 12 01:51:07 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 12 21:36:35 UTC 2022 pageSize = 20996 page = 1 @@ -1958,8 +1958,8 @@ auxTemp2 = scalar, S16, 18, "deg C", 0.01, 0 TPSValue = scalar, S16, 20, "%", 0.01, 0 throttlePedalPosition = scalar, S16, 22, "%", 0.01, 0 tpsADC = scalar, U16, 24, "ADC", 1, 0 -MAFValue = scalar, U16, 26, "V", 0.001, 0 -massAirFlowValue = scalar, U16, 28, "Kg/h", 0.1, 0 +rawMaf = scalar, U16, 26, "V", 0.001, 0 +mafMeasured = scalar, U16, 28, "kg/h", 0.1, 0 MAPValue = scalar, U16, 30, "kPa", 0.03333333333333333, 0 baroPressure = scalar, U16, 32, "kPa", 0.03333333333333333, 0 lambdaValue = scalar, U16, 34, "", 1.0E-4, 0 @@ -2116,34 +2116,116 @@ 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 +mafEstimate = scalar, U16, 356, "kg/h", 0.1, 0 +instantRpm = scalar, U16, 358, "rpm", 1, 0 +unusedAtTheEnd1 = scalar, U08, 360, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 361, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 362, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 363, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 364, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 365, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 366, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 367, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 368, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 369, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 370, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 371, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 372, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 373, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 374, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 375, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 376, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 377, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 378, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 379, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 380, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 381, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 382, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 383, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 384, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 385, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 386, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 387, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 388, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 389, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 390, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 391, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 392, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 393, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 394, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 395, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 396, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 397, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 398, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 399, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 400, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 401, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 402, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 403, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 404, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 405, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 406, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 407, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 408, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 409, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 410, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 411, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 412, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 413, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 414, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 415, "", 1, 0 +unusedAtTheEnd57 = scalar, U08, 416, "", 1, 0 +unusedAtTheEnd58 = scalar, U08, 417, "", 1, 0 +unusedAtTheEnd59 = scalar, U08, 418, "", 1, 0 +unusedAtTheEnd60 = scalar, U08, 419, "", 1, 0 +unusedAtTheEnd61 = scalar, U08, 420, "", 1, 0 +unusedAtTheEnd62 = scalar, U08, 421, "", 1, 0 +unusedAtTheEnd63 = scalar, U08, 422, "", 1, 0 +unusedAtTheEnd64 = scalar, U08, 423, "", 1, 0 +unusedAtTheEnd65 = scalar, U08, 424, "", 1, 0 +unusedAtTheEnd66 = scalar, U08, 425, "", 1, 0 +unusedAtTheEnd67 = scalar, U08, 426, "", 1, 0 +unusedAtTheEnd68 = scalar, U08, 427, "", 1, 0 +unusedAtTheEnd69 = scalar, U08, 428, "", 1, 0 +unusedAtTheEnd70 = scalar, U08, 429, "", 1, 0 +unusedAtTheEnd71 = scalar, U08, 430, "", 1, 0 +unusedAtTheEnd72 = scalar, U08, 431, "", 1, 0 +unusedAtTheEnd73 = scalar, U08, 432, "", 1, 0 +unusedAtTheEnd74 = scalar, U08, 433, "", 1, 0 +unusedAtTheEnd75 = scalar, U08, 434, "", 1, 0 +unusedAtTheEnd76 = scalar, U08, 435, "", 1, 0 +unusedAtTheEnd77 = scalar, U08, 436, "", 1, 0 +unusedAtTheEnd78 = scalar, U08, 437, "", 1, 0 +unusedAtTheEnd79 = scalar, U08, 438, "", 1, 0 +unusedAtTheEnd80 = scalar, U08, 439, "", 1, 0 +unusedAtTheEnd81 = scalar, U08, 440, "", 1, 0 +unusedAtTheEnd82 = scalar, U08, 441, "", 1, 0 +unusedAtTheEnd83 = scalar, U08, 442, "", 1, 0 +unusedAtTheEnd84 = scalar, U08, 443, "", 1, 0 +unusedAtTheEnd85 = scalar, U08, 444, "", 1, 0 +unusedAtTheEnd86 = scalar, U08, 445, "", 1, 0 +unusedAtTheEnd87 = scalar, U08, 446, "", 1, 0 +unusedAtTheEnd88 = scalar, U08, 447, "", 1, 0 +unusedAtTheEnd89 = scalar, U08, 448, "", 1, 0 +unusedAtTheEnd90 = scalar, U08, 449, "", 1, 0 +unusedAtTheEnd91 = scalar, U08, 450, "", 1, 0 +unusedAtTheEnd92 = scalar, U08, 451, "", 1, 0 +unusedAtTheEnd93 = scalar, U08, 452, "", 1, 0 +unusedAtTheEnd94 = scalar, U08, 453, "", 1, 0 +unusedAtTheEnd95 = scalar, U08, 454, "", 1, 0 +unusedAtTheEnd96 = scalar, U08, 455, "", 1, 0 +unusedAtTheEnd97 = scalar, U08, 456, "", 1, 0 +unusedAtTheEnd98 = scalar, U08, 457, "", 1, 0 +unusedAtTheEnd99 = scalar, U08, 458, "", 1, 0 +unusedAtTheEnd100 = scalar, U08, 459, "", 1, 0 +unusedAtTheEnd101 = scalar, U08, 460, "", 1, 0 +unusedAtTheEnd102 = scalar, U08, 461, "", 1, 0 +unusedAtTheEnd103 = scalar, U08, 462, "", 1, 0 +unusedAtTheEnd104 = scalar, U08, 463, "", 1, 0 +unusedAtTheEnd105 = scalar, U08, 464, "", 1, 0 +unusedAtTheEnd106 = scalar, U08, 465, "", 1, 0 +unusedAtTheEnd107 = scalar, U08, 466, "", 1, 0 +unusedAtTheEnd108 = scalar, U08, 467, "", 1, 0 launchSpeedCondition = bits, U32, 468, [0:0] launchRpmCondition = bits, U32, 468, [1:1] launchTpsCondition = bits, U32, 468, [2:2] @@ -2151,31 +2233,31 @@ 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_179_7 = bits, U32, 468, [7:7] -unusedBit_179_8 = bits, U32, 468, [8:8] -unusedBit_179_9 = bits, U32, 468, [9:9] -unusedBit_179_10 = bits, U32, 468, [10:10] -unusedBit_179_11 = bits, U32, 468, [11:11] -unusedBit_179_12 = bits, U32, 468, [12:12] -unusedBit_179_13 = bits, U32, 468, [13:13] -unusedBit_179_14 = bits, U32, 468, [14:14] -unusedBit_179_15 = bits, U32, 468, [15:15] -unusedBit_179_16 = bits, U32, 468, [16:16] -unusedBit_179_17 = bits, U32, 468, [17:17] -unusedBit_179_18 = bits, U32, 468, [18:18] -unusedBit_179_19 = bits, U32, 468, [19:19] -unusedBit_179_20 = bits, U32, 468, [20:20] -unusedBit_179_21 = bits, U32, 468, [21:21] -unusedBit_179_22 = bits, U32, 468, [22:22] -unusedBit_179_23 = bits, U32, 468, [23:23] -unusedBit_179_24 = bits, U32, 468, [24:24] -unusedBit_179_25 = bits, U32, 468, [25:25] -unusedBit_179_26 = bits, U32, 468, [26:26] -unusedBit_179_27 = bits, U32, 468, [27:27] -unusedBit_179_28 = bits, U32, 468, [28:28] -unusedBit_179_29 = bits, U32, 468, [29:29] -unusedBit_179_30 = bits, U32, 468, [30:30] -unusedBit_179_31 = bits, U32, 468, [31:31] +unusedBit_181_7 = bits, U32, 468, [7:7] +unusedBit_181_8 = bits, U32, 468, [8:8] +unusedBit_181_9 = bits, U32, 468, [9:9] +unusedBit_181_10 = bits, U32, 468, [10:10] +unusedBit_181_11 = bits, U32, 468, [11:11] +unusedBit_181_12 = bits, U32, 468, [12:12] +unusedBit_181_13 = bits, U32, 468, [13:13] +unusedBit_181_14 = bits, U32, 468, [14:14] +unusedBit_181_15 = bits, U32, 468, [15:15] +unusedBit_181_16 = bits, U32, 468, [16:16] +unusedBit_181_17 = bits, U32, 468, [17:17] +unusedBit_181_18 = bits, U32, 468, [18:18] +unusedBit_181_19 = bits, U32, 468, [19:19] +unusedBit_181_20 = bits, U32, 468, [20:20] +unusedBit_181_21 = bits, U32, 468, [21:21] +unusedBit_181_22 = bits, U32, 468, [22:22] +unusedBit_181_23 = bits, U32, 468, [23:23] +unusedBit_181_24 = bits, U32, 468, [24:24] +unusedBit_181_25 = bits, U32, 468, [25:25] +unusedBit_181_26 = bits, U32, 468, [26:26] +unusedBit_181_27 = bits, U32, 468, [27:27] +unusedBit_181_28 = bits, U32, 468, [28:28] +unusedBit_181_29 = bits, U32, 468, [29:29] +unusedBit_181_30 = bits, U32, 468, [30:30] +unusedBit_181_31 = bits, U32, 468, [31:31] TEMPLOG_MAP_AT_CYCLE_COUNT = scalar, U08, 472, "", 1, 0 boostControllerOutput = scalar, U08, 473, "", 1, 0 boostControllerClosedLoopPart = scalar, U08, 474, "", 1, 0 @@ -2514,9 +2596,9 @@ etbStatus_resetCounter = scalar, S32, 636, "", 1, 0 columnLabel = "Voltage", "kg/hour" xAxis = -1, 6, 10 yAxis = -30, 1300, 10 - xBins = mafDecodingBins, MAFValue + xBins = mafDecodingBins, rawMaf yBins = mafDecoding - gauge = MAFGauge + gauge = rawMafGauge curve = iatFuelCorrCurve, "Intake air temperature fuel Multiplier" columnLabel = "Air Temp", "Multiplier" @@ -3082,10 +3164,9 @@ gaugeCategory = Sensors - Basic afr2Gauge = AFRValue2, "Air/Fuel Ratio 2", "", 10, 19.4, 12, 13, 15, 16, 2, 2 lambda1Gauge = lambdaValue, "Lambda", "", 0.65, 1.2, 0.7, 0.75, 1.1, 1.15, 3, 2 lambda2Gauge = lambdaValue2, "Lambda 2", "", 0.65, 1.2, 0.7, 0.75, 1.1, 1.15, 3, 2 - MAFGauge = MAFValue, "Mass air flow", "V", 0, 5, 0, 1, 3, 4, 1, 1 VBattGauge = VBatt, "Battery", "V", 8, 21, 9, 10, 17, 19, 1, 1 MAPGauge = MAPValue, "MAP", "kPa", 0, 300, 10, 10, 200, 200, 0, 0 - massAirFlowValueGa = massAirFlowValue,"Mass air flow", "kg/hr", 0, 50, -999, -999, 999, 999, 1, 1 + massAirFlowValueGa = mafMeasured, "MAF sensor", "kg/h", 0, 50, -999, -999, 999, 999, 1, 1 gaugeCategory = Sensors - Extra 1 @@ -3175,6 +3256,8 @@ gaugeCategory = Sensors - Raw rawWastegatePositionGauge = rawWastegatePosition,"Raw Wastegate Position","V", 0, 5, 0, 0, 5, 5, 3, 0 rawLowFuelPressureGauge = rawLowFuelPressure,"Raw fuel pressure (low) voltage","V", 0, 5, 0, 0, 5, 5, 3, 0 rawHighFuelPressureGauge = rawHighFuelPressure,"Raw fuel pressure (high) voltage","V", 0, 5, 0, 0, 5, 5, 3, 0 + rawMafGauge = rawMaf , "Raw MAF", "V", 0, 5, 0, 0, 5, 5, 3, 0 + gaugeCategory = Transmission desiredGearGauge = tcuDesiredGear, "Desired Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 @@ -3352,8 +3435,8 @@ entry = auxTemp2, "auxTemp2", float, "%.3f" entry = TPSValue, "TPS", float, "%.3f" entry = throttlePedalPosition, "Throttle pedal position", float, "%.3f" entry = tpsADC, "tpsADC", int, "%d" -entry = MAFValue, "MAF", float, "%.3f" -entry = massAirFlowValue, "MAF air flow", float, "%.3f" +entry = rawMaf, "rawMaf", float, "%.3f" +entry = mafMeasured, "MAF sensor", float, "%.3f" entry = MAPValue, "MAP", float, "%.3f" entry = baroPressure, "baroPressure", float, "%.3f" entry = lambdaValue, "Lambda", float, "%.3f" @@ -3510,6 +3593,8 @@ 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 = mafEstimate, "MAF estimate", float, "%.3f" +entry = instantRpm, "instantRpm", int, "%d" 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 03c476e2b5..3a434c69d8 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.12.hellen72.2815342956" + signature = "rusEFI 2022.01.12.hellen72.2663414219" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.01.12.hellen72.2815342956" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.01.12.hellen72.2663414219" ; 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 (unknown script) integration/rusefi_config.txt Wed Jan 12 01:51:10 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 12 21:36:38 UTC 2022 pageSize = 20996 page = 1 @@ -1958,8 +1958,8 @@ auxTemp2 = scalar, S16, 18, "deg C", 0.01, 0 TPSValue = scalar, S16, 20, "%", 0.01, 0 throttlePedalPosition = scalar, S16, 22, "%", 0.01, 0 tpsADC = scalar, U16, 24, "ADC", 1, 0 -MAFValue = scalar, U16, 26, "V", 0.001, 0 -massAirFlowValue = scalar, U16, 28, "Kg/h", 0.1, 0 +rawMaf = scalar, U16, 26, "V", 0.001, 0 +mafMeasured = scalar, U16, 28, "kg/h", 0.1, 0 MAPValue = scalar, U16, 30, "kPa", 0.03333333333333333, 0 baroPressure = scalar, U16, 32, "kPa", 0.03333333333333333, 0 lambdaValue = scalar, U16, 34, "", 1.0E-4, 0 @@ -2116,34 +2116,116 @@ 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 +mafEstimate = scalar, U16, 356, "kg/h", 0.1, 0 +instantRpm = scalar, U16, 358, "rpm", 1, 0 +unusedAtTheEnd1 = scalar, U08, 360, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 361, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 362, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 363, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 364, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 365, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 366, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 367, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 368, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 369, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 370, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 371, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 372, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 373, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 374, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 375, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 376, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 377, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 378, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 379, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 380, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 381, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 382, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 383, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 384, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 385, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 386, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 387, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 388, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 389, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 390, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 391, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 392, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 393, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 394, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 395, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 396, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 397, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 398, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 399, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 400, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 401, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 402, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 403, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 404, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 405, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 406, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 407, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 408, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 409, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 410, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 411, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 412, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 413, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 414, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 415, "", 1, 0 +unusedAtTheEnd57 = scalar, U08, 416, "", 1, 0 +unusedAtTheEnd58 = scalar, U08, 417, "", 1, 0 +unusedAtTheEnd59 = scalar, U08, 418, "", 1, 0 +unusedAtTheEnd60 = scalar, U08, 419, "", 1, 0 +unusedAtTheEnd61 = scalar, U08, 420, "", 1, 0 +unusedAtTheEnd62 = scalar, U08, 421, "", 1, 0 +unusedAtTheEnd63 = scalar, U08, 422, "", 1, 0 +unusedAtTheEnd64 = scalar, U08, 423, "", 1, 0 +unusedAtTheEnd65 = scalar, U08, 424, "", 1, 0 +unusedAtTheEnd66 = scalar, U08, 425, "", 1, 0 +unusedAtTheEnd67 = scalar, U08, 426, "", 1, 0 +unusedAtTheEnd68 = scalar, U08, 427, "", 1, 0 +unusedAtTheEnd69 = scalar, U08, 428, "", 1, 0 +unusedAtTheEnd70 = scalar, U08, 429, "", 1, 0 +unusedAtTheEnd71 = scalar, U08, 430, "", 1, 0 +unusedAtTheEnd72 = scalar, U08, 431, "", 1, 0 +unusedAtTheEnd73 = scalar, U08, 432, "", 1, 0 +unusedAtTheEnd74 = scalar, U08, 433, "", 1, 0 +unusedAtTheEnd75 = scalar, U08, 434, "", 1, 0 +unusedAtTheEnd76 = scalar, U08, 435, "", 1, 0 +unusedAtTheEnd77 = scalar, U08, 436, "", 1, 0 +unusedAtTheEnd78 = scalar, U08, 437, "", 1, 0 +unusedAtTheEnd79 = scalar, U08, 438, "", 1, 0 +unusedAtTheEnd80 = scalar, U08, 439, "", 1, 0 +unusedAtTheEnd81 = scalar, U08, 440, "", 1, 0 +unusedAtTheEnd82 = scalar, U08, 441, "", 1, 0 +unusedAtTheEnd83 = scalar, U08, 442, "", 1, 0 +unusedAtTheEnd84 = scalar, U08, 443, "", 1, 0 +unusedAtTheEnd85 = scalar, U08, 444, "", 1, 0 +unusedAtTheEnd86 = scalar, U08, 445, "", 1, 0 +unusedAtTheEnd87 = scalar, U08, 446, "", 1, 0 +unusedAtTheEnd88 = scalar, U08, 447, "", 1, 0 +unusedAtTheEnd89 = scalar, U08, 448, "", 1, 0 +unusedAtTheEnd90 = scalar, U08, 449, "", 1, 0 +unusedAtTheEnd91 = scalar, U08, 450, "", 1, 0 +unusedAtTheEnd92 = scalar, U08, 451, "", 1, 0 +unusedAtTheEnd93 = scalar, U08, 452, "", 1, 0 +unusedAtTheEnd94 = scalar, U08, 453, "", 1, 0 +unusedAtTheEnd95 = scalar, U08, 454, "", 1, 0 +unusedAtTheEnd96 = scalar, U08, 455, "", 1, 0 +unusedAtTheEnd97 = scalar, U08, 456, "", 1, 0 +unusedAtTheEnd98 = scalar, U08, 457, "", 1, 0 +unusedAtTheEnd99 = scalar, U08, 458, "", 1, 0 +unusedAtTheEnd100 = scalar, U08, 459, "", 1, 0 +unusedAtTheEnd101 = scalar, U08, 460, "", 1, 0 +unusedAtTheEnd102 = scalar, U08, 461, "", 1, 0 +unusedAtTheEnd103 = scalar, U08, 462, "", 1, 0 +unusedAtTheEnd104 = scalar, U08, 463, "", 1, 0 +unusedAtTheEnd105 = scalar, U08, 464, "", 1, 0 +unusedAtTheEnd106 = scalar, U08, 465, "", 1, 0 +unusedAtTheEnd107 = scalar, U08, 466, "", 1, 0 +unusedAtTheEnd108 = scalar, U08, 467, "", 1, 0 launchSpeedCondition = bits, U32, 468, [0:0] launchRpmCondition = bits, U32, 468, [1:1] launchTpsCondition = bits, U32, 468, [2:2] @@ -2151,31 +2233,31 @@ 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_179_7 = bits, U32, 468, [7:7] -unusedBit_179_8 = bits, U32, 468, [8:8] -unusedBit_179_9 = bits, U32, 468, [9:9] -unusedBit_179_10 = bits, U32, 468, [10:10] -unusedBit_179_11 = bits, U32, 468, [11:11] -unusedBit_179_12 = bits, U32, 468, [12:12] -unusedBit_179_13 = bits, U32, 468, [13:13] -unusedBit_179_14 = bits, U32, 468, [14:14] -unusedBit_179_15 = bits, U32, 468, [15:15] -unusedBit_179_16 = bits, U32, 468, [16:16] -unusedBit_179_17 = bits, U32, 468, [17:17] -unusedBit_179_18 = bits, U32, 468, [18:18] -unusedBit_179_19 = bits, U32, 468, [19:19] -unusedBit_179_20 = bits, U32, 468, [20:20] -unusedBit_179_21 = bits, U32, 468, [21:21] -unusedBit_179_22 = bits, U32, 468, [22:22] -unusedBit_179_23 = bits, U32, 468, [23:23] -unusedBit_179_24 = bits, U32, 468, [24:24] -unusedBit_179_25 = bits, U32, 468, [25:25] -unusedBit_179_26 = bits, U32, 468, [26:26] -unusedBit_179_27 = bits, U32, 468, [27:27] -unusedBit_179_28 = bits, U32, 468, [28:28] -unusedBit_179_29 = bits, U32, 468, [29:29] -unusedBit_179_30 = bits, U32, 468, [30:30] -unusedBit_179_31 = bits, U32, 468, [31:31] +unusedBit_181_7 = bits, U32, 468, [7:7] +unusedBit_181_8 = bits, U32, 468, [8:8] +unusedBit_181_9 = bits, U32, 468, [9:9] +unusedBit_181_10 = bits, U32, 468, [10:10] +unusedBit_181_11 = bits, U32, 468, [11:11] +unusedBit_181_12 = bits, U32, 468, [12:12] +unusedBit_181_13 = bits, U32, 468, [13:13] +unusedBit_181_14 = bits, U32, 468, [14:14] +unusedBit_181_15 = bits, U32, 468, [15:15] +unusedBit_181_16 = bits, U32, 468, [16:16] +unusedBit_181_17 = bits, U32, 468, [17:17] +unusedBit_181_18 = bits, U32, 468, [18:18] +unusedBit_181_19 = bits, U32, 468, [19:19] +unusedBit_181_20 = bits, U32, 468, [20:20] +unusedBit_181_21 = bits, U32, 468, [21:21] +unusedBit_181_22 = bits, U32, 468, [22:22] +unusedBit_181_23 = bits, U32, 468, [23:23] +unusedBit_181_24 = bits, U32, 468, [24:24] +unusedBit_181_25 = bits, U32, 468, [25:25] +unusedBit_181_26 = bits, U32, 468, [26:26] +unusedBit_181_27 = bits, U32, 468, [27:27] +unusedBit_181_28 = bits, U32, 468, [28:28] +unusedBit_181_29 = bits, U32, 468, [29:29] +unusedBit_181_30 = bits, U32, 468, [30:30] +unusedBit_181_31 = bits, U32, 468, [31:31] TEMPLOG_MAP_AT_CYCLE_COUNT = scalar, U08, 472, "", 1, 0 boostControllerOutput = scalar, U08, 473, "", 1, 0 boostControllerClosedLoopPart = scalar, U08, 474, "", 1, 0 @@ -2514,9 +2596,9 @@ etbStatus_resetCounter = scalar, S32, 636, "", 1, 0 columnLabel = "Voltage", "kg/hour" xAxis = -1, 6, 10 yAxis = -30, 1300, 10 - xBins = mafDecodingBins, MAFValue + xBins = mafDecodingBins, rawMaf yBins = mafDecoding - gauge = MAFGauge + gauge = rawMafGauge curve = iatFuelCorrCurve, "Intake air temperature fuel Multiplier" columnLabel = "Air Temp", "Multiplier" @@ -3082,10 +3164,9 @@ gaugeCategory = Sensors - Basic afr2Gauge = AFRValue2, "Air/Fuel Ratio 2", "", 10, 19.4, 12, 13, 15, 16, 2, 2 lambda1Gauge = lambdaValue, "Lambda", "", 0.65, 1.2, 0.7, 0.75, 1.1, 1.15, 3, 2 lambda2Gauge = lambdaValue2, "Lambda 2", "", 0.65, 1.2, 0.7, 0.75, 1.1, 1.15, 3, 2 - MAFGauge = MAFValue, "Mass air flow", "V", 0, 5, 0, 1, 3, 4, 1, 1 VBattGauge = VBatt, "Battery", "V", 8, 21, 9, 10, 17, 19, 1, 1 MAPGauge = MAPValue, "MAP", "kPa", 0, 300, 10, 10, 200, 200, 0, 0 - massAirFlowValueGa = massAirFlowValue,"Mass air flow", "kg/hr", 0, 50, -999, -999, 999, 999, 1, 1 + massAirFlowValueGa = mafMeasured, "MAF sensor", "kg/h", 0, 50, -999, -999, 999, 999, 1, 1 gaugeCategory = Sensors - Extra 1 @@ -3175,6 +3256,8 @@ gaugeCategory = Sensors - Raw rawWastegatePositionGauge = rawWastegatePosition,"Raw Wastegate Position","V", 0, 5, 0, 0, 5, 5, 3, 0 rawLowFuelPressureGauge = rawLowFuelPressure,"Raw fuel pressure (low) voltage","V", 0, 5, 0, 0, 5, 5, 3, 0 rawHighFuelPressureGauge = rawHighFuelPressure,"Raw fuel pressure (high) voltage","V", 0, 5, 0, 0, 5, 5, 3, 0 + rawMafGauge = rawMaf , "Raw MAF", "V", 0, 5, 0, 0, 5, 5, 3, 0 + gaugeCategory = Transmission desiredGearGauge = tcuDesiredGear, "Desired Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 @@ -3352,8 +3435,8 @@ entry = auxTemp2, "auxTemp2", float, "%.3f" entry = TPSValue, "TPS", float, "%.3f" entry = throttlePedalPosition, "Throttle pedal position", float, "%.3f" entry = tpsADC, "tpsADC", int, "%d" -entry = MAFValue, "MAF", float, "%.3f" -entry = massAirFlowValue, "MAF air flow", float, "%.3f" +entry = rawMaf, "rawMaf", float, "%.3f" +entry = mafMeasured, "MAF sensor", float, "%.3f" entry = MAPValue, "MAP", float, "%.3f" entry = baroPressure, "baroPressure", float, "%.3f" entry = lambdaValue, "Lambda", float, "%.3f" @@ -3510,6 +3593,8 @@ 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 = mafEstimate, "MAF estimate", float, "%.3f" +entry = instantRpm, "instantRpm", int, "%d" 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 3c66f29316..d5d4a7be62 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.12.hellen81.331555999" + signature = "rusEFI 2022.01.12.hellen81.718136376" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.01.12.hellen81.331555999" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.01.12.hellen81.718136376" ; 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 (unknown script) integration/rusefi_config.txt Wed Jan 12 01:51:12 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 12 21:36:40 UTC 2022 pageSize = 20996 page = 1 @@ -1958,8 +1958,8 @@ auxTemp2 = scalar, S16, 18, "deg C", 0.01, 0 TPSValue = scalar, S16, 20, "%", 0.01, 0 throttlePedalPosition = scalar, S16, 22, "%", 0.01, 0 tpsADC = scalar, U16, 24, "ADC", 1, 0 -MAFValue = scalar, U16, 26, "V", 0.001, 0 -massAirFlowValue = scalar, U16, 28, "Kg/h", 0.1, 0 +rawMaf = scalar, U16, 26, "V", 0.001, 0 +mafMeasured = scalar, U16, 28, "kg/h", 0.1, 0 MAPValue = scalar, U16, 30, "kPa", 0.03333333333333333, 0 baroPressure = scalar, U16, 32, "kPa", 0.03333333333333333, 0 lambdaValue = scalar, U16, 34, "", 1.0E-4, 0 @@ -2116,34 +2116,116 @@ 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 +mafEstimate = scalar, U16, 356, "kg/h", 0.1, 0 +instantRpm = scalar, U16, 358, "rpm", 1, 0 +unusedAtTheEnd1 = scalar, U08, 360, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 361, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 362, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 363, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 364, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 365, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 366, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 367, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 368, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 369, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 370, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 371, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 372, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 373, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 374, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 375, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 376, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 377, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 378, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 379, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 380, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 381, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 382, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 383, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 384, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 385, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 386, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 387, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 388, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 389, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 390, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 391, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 392, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 393, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 394, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 395, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 396, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 397, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 398, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 399, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 400, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 401, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 402, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 403, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 404, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 405, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 406, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 407, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 408, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 409, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 410, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 411, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 412, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 413, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 414, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 415, "", 1, 0 +unusedAtTheEnd57 = scalar, U08, 416, "", 1, 0 +unusedAtTheEnd58 = scalar, U08, 417, "", 1, 0 +unusedAtTheEnd59 = scalar, U08, 418, "", 1, 0 +unusedAtTheEnd60 = scalar, U08, 419, "", 1, 0 +unusedAtTheEnd61 = scalar, U08, 420, "", 1, 0 +unusedAtTheEnd62 = scalar, U08, 421, "", 1, 0 +unusedAtTheEnd63 = scalar, U08, 422, "", 1, 0 +unusedAtTheEnd64 = scalar, U08, 423, "", 1, 0 +unusedAtTheEnd65 = scalar, U08, 424, "", 1, 0 +unusedAtTheEnd66 = scalar, U08, 425, "", 1, 0 +unusedAtTheEnd67 = scalar, U08, 426, "", 1, 0 +unusedAtTheEnd68 = scalar, U08, 427, "", 1, 0 +unusedAtTheEnd69 = scalar, U08, 428, "", 1, 0 +unusedAtTheEnd70 = scalar, U08, 429, "", 1, 0 +unusedAtTheEnd71 = scalar, U08, 430, "", 1, 0 +unusedAtTheEnd72 = scalar, U08, 431, "", 1, 0 +unusedAtTheEnd73 = scalar, U08, 432, "", 1, 0 +unusedAtTheEnd74 = scalar, U08, 433, "", 1, 0 +unusedAtTheEnd75 = scalar, U08, 434, "", 1, 0 +unusedAtTheEnd76 = scalar, U08, 435, "", 1, 0 +unusedAtTheEnd77 = scalar, U08, 436, "", 1, 0 +unusedAtTheEnd78 = scalar, U08, 437, "", 1, 0 +unusedAtTheEnd79 = scalar, U08, 438, "", 1, 0 +unusedAtTheEnd80 = scalar, U08, 439, "", 1, 0 +unusedAtTheEnd81 = scalar, U08, 440, "", 1, 0 +unusedAtTheEnd82 = scalar, U08, 441, "", 1, 0 +unusedAtTheEnd83 = scalar, U08, 442, "", 1, 0 +unusedAtTheEnd84 = scalar, U08, 443, "", 1, 0 +unusedAtTheEnd85 = scalar, U08, 444, "", 1, 0 +unusedAtTheEnd86 = scalar, U08, 445, "", 1, 0 +unusedAtTheEnd87 = scalar, U08, 446, "", 1, 0 +unusedAtTheEnd88 = scalar, U08, 447, "", 1, 0 +unusedAtTheEnd89 = scalar, U08, 448, "", 1, 0 +unusedAtTheEnd90 = scalar, U08, 449, "", 1, 0 +unusedAtTheEnd91 = scalar, U08, 450, "", 1, 0 +unusedAtTheEnd92 = scalar, U08, 451, "", 1, 0 +unusedAtTheEnd93 = scalar, U08, 452, "", 1, 0 +unusedAtTheEnd94 = scalar, U08, 453, "", 1, 0 +unusedAtTheEnd95 = scalar, U08, 454, "", 1, 0 +unusedAtTheEnd96 = scalar, U08, 455, "", 1, 0 +unusedAtTheEnd97 = scalar, U08, 456, "", 1, 0 +unusedAtTheEnd98 = scalar, U08, 457, "", 1, 0 +unusedAtTheEnd99 = scalar, U08, 458, "", 1, 0 +unusedAtTheEnd100 = scalar, U08, 459, "", 1, 0 +unusedAtTheEnd101 = scalar, U08, 460, "", 1, 0 +unusedAtTheEnd102 = scalar, U08, 461, "", 1, 0 +unusedAtTheEnd103 = scalar, U08, 462, "", 1, 0 +unusedAtTheEnd104 = scalar, U08, 463, "", 1, 0 +unusedAtTheEnd105 = scalar, U08, 464, "", 1, 0 +unusedAtTheEnd106 = scalar, U08, 465, "", 1, 0 +unusedAtTheEnd107 = scalar, U08, 466, "", 1, 0 +unusedAtTheEnd108 = scalar, U08, 467, "", 1, 0 launchSpeedCondition = bits, U32, 468, [0:0] launchRpmCondition = bits, U32, 468, [1:1] launchTpsCondition = bits, U32, 468, [2:2] @@ -2151,31 +2233,31 @@ 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_179_7 = bits, U32, 468, [7:7] -unusedBit_179_8 = bits, U32, 468, [8:8] -unusedBit_179_9 = bits, U32, 468, [9:9] -unusedBit_179_10 = bits, U32, 468, [10:10] -unusedBit_179_11 = bits, U32, 468, [11:11] -unusedBit_179_12 = bits, U32, 468, [12:12] -unusedBit_179_13 = bits, U32, 468, [13:13] -unusedBit_179_14 = bits, U32, 468, [14:14] -unusedBit_179_15 = bits, U32, 468, [15:15] -unusedBit_179_16 = bits, U32, 468, [16:16] -unusedBit_179_17 = bits, U32, 468, [17:17] -unusedBit_179_18 = bits, U32, 468, [18:18] -unusedBit_179_19 = bits, U32, 468, [19:19] -unusedBit_179_20 = bits, U32, 468, [20:20] -unusedBit_179_21 = bits, U32, 468, [21:21] -unusedBit_179_22 = bits, U32, 468, [22:22] -unusedBit_179_23 = bits, U32, 468, [23:23] -unusedBit_179_24 = bits, U32, 468, [24:24] -unusedBit_179_25 = bits, U32, 468, [25:25] -unusedBit_179_26 = bits, U32, 468, [26:26] -unusedBit_179_27 = bits, U32, 468, [27:27] -unusedBit_179_28 = bits, U32, 468, [28:28] -unusedBit_179_29 = bits, U32, 468, [29:29] -unusedBit_179_30 = bits, U32, 468, [30:30] -unusedBit_179_31 = bits, U32, 468, [31:31] +unusedBit_181_7 = bits, U32, 468, [7:7] +unusedBit_181_8 = bits, U32, 468, [8:8] +unusedBit_181_9 = bits, U32, 468, [9:9] +unusedBit_181_10 = bits, U32, 468, [10:10] +unusedBit_181_11 = bits, U32, 468, [11:11] +unusedBit_181_12 = bits, U32, 468, [12:12] +unusedBit_181_13 = bits, U32, 468, [13:13] +unusedBit_181_14 = bits, U32, 468, [14:14] +unusedBit_181_15 = bits, U32, 468, [15:15] +unusedBit_181_16 = bits, U32, 468, [16:16] +unusedBit_181_17 = bits, U32, 468, [17:17] +unusedBit_181_18 = bits, U32, 468, [18:18] +unusedBit_181_19 = bits, U32, 468, [19:19] +unusedBit_181_20 = bits, U32, 468, [20:20] +unusedBit_181_21 = bits, U32, 468, [21:21] +unusedBit_181_22 = bits, U32, 468, [22:22] +unusedBit_181_23 = bits, U32, 468, [23:23] +unusedBit_181_24 = bits, U32, 468, [24:24] +unusedBit_181_25 = bits, U32, 468, [25:25] +unusedBit_181_26 = bits, U32, 468, [26:26] +unusedBit_181_27 = bits, U32, 468, [27:27] +unusedBit_181_28 = bits, U32, 468, [28:28] +unusedBit_181_29 = bits, U32, 468, [29:29] +unusedBit_181_30 = bits, U32, 468, [30:30] +unusedBit_181_31 = bits, U32, 468, [31:31] TEMPLOG_MAP_AT_CYCLE_COUNT = scalar, U08, 472, "", 1, 0 boostControllerOutput = scalar, U08, 473, "", 1, 0 boostControllerClosedLoopPart = scalar, U08, 474, "", 1, 0 @@ -2514,9 +2596,9 @@ etbStatus_resetCounter = scalar, S32, 636, "", 1, 0 columnLabel = "Voltage", "kg/hour" xAxis = -1, 6, 10 yAxis = -30, 1300, 10 - xBins = mafDecodingBins, MAFValue + xBins = mafDecodingBins, rawMaf yBins = mafDecoding - gauge = MAFGauge + gauge = rawMafGauge curve = iatFuelCorrCurve, "Intake air temperature fuel Multiplier" columnLabel = "Air Temp", "Multiplier" @@ -3082,10 +3164,9 @@ gaugeCategory = Sensors - Basic afr2Gauge = AFRValue2, "Air/Fuel Ratio 2", "", 10, 19.4, 12, 13, 15, 16, 2, 2 lambda1Gauge = lambdaValue, "Lambda", "", 0.65, 1.2, 0.7, 0.75, 1.1, 1.15, 3, 2 lambda2Gauge = lambdaValue2, "Lambda 2", "", 0.65, 1.2, 0.7, 0.75, 1.1, 1.15, 3, 2 - MAFGauge = MAFValue, "Mass air flow", "V", 0, 5, 0, 1, 3, 4, 1, 1 VBattGauge = VBatt, "Battery", "V", 8, 21, 9, 10, 17, 19, 1, 1 MAPGauge = MAPValue, "MAP", "kPa", 0, 300, 10, 10, 200, 200, 0, 0 - massAirFlowValueGa = massAirFlowValue,"Mass air flow", "kg/hr", 0, 50, -999, -999, 999, 999, 1, 1 + massAirFlowValueGa = mafMeasured, "MAF sensor", "kg/h", 0, 50, -999, -999, 999, 999, 1, 1 gaugeCategory = Sensors - Extra 1 @@ -3175,6 +3256,8 @@ gaugeCategory = Sensors - Raw rawWastegatePositionGauge = rawWastegatePosition,"Raw Wastegate Position","V", 0, 5, 0, 0, 5, 5, 3, 0 rawLowFuelPressureGauge = rawLowFuelPressure,"Raw fuel pressure (low) voltage","V", 0, 5, 0, 0, 5, 5, 3, 0 rawHighFuelPressureGauge = rawHighFuelPressure,"Raw fuel pressure (high) voltage","V", 0, 5, 0, 0, 5, 5, 3, 0 + rawMafGauge = rawMaf , "Raw MAF", "V", 0, 5, 0, 0, 5, 5, 3, 0 + gaugeCategory = Transmission desiredGearGauge = tcuDesiredGear, "Desired Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 @@ -3352,8 +3435,8 @@ entry = auxTemp2, "auxTemp2", float, "%.3f" entry = TPSValue, "TPS", float, "%.3f" entry = throttlePedalPosition, "Throttle pedal position", float, "%.3f" entry = tpsADC, "tpsADC", int, "%d" -entry = MAFValue, "MAF", float, "%.3f" -entry = massAirFlowValue, "MAF air flow", float, "%.3f" +entry = rawMaf, "rawMaf", float, "%.3f" +entry = mafMeasured, "MAF sensor", float, "%.3f" entry = MAPValue, "MAP", float, "%.3f" entry = baroPressure, "baroPressure", float, "%.3f" entry = lambdaValue, "Lambda", float, "%.3f" @@ -3510,6 +3593,8 @@ 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 = mafEstimate, "MAF estimate", float, "%.3f" +entry = instantRpm, "instantRpm", int, "%d" 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 621f79e62c..638da68627 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.12.hellen88bmw.4071862147" + signature = "rusEFI 2022.01.12.hellen88bmw.3418189604" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.01.12.hellen88bmw.4071862147" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.01.12.hellen88bmw.3418189604" ; 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 (unknown script) integration/rusefi_config.txt Wed Jan 12 01:51:08 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 12 21:36:36 UTC 2022 pageSize = 20996 page = 1 @@ -1958,8 +1958,8 @@ auxTemp2 = scalar, S16, 18, "deg C", 0.01, 0 TPSValue = scalar, S16, 20, "%", 0.01, 0 throttlePedalPosition = scalar, S16, 22, "%", 0.01, 0 tpsADC = scalar, U16, 24, "ADC", 1, 0 -MAFValue = scalar, U16, 26, "V", 0.001, 0 -massAirFlowValue = scalar, U16, 28, "Kg/h", 0.1, 0 +rawMaf = scalar, U16, 26, "V", 0.001, 0 +mafMeasured = scalar, U16, 28, "kg/h", 0.1, 0 MAPValue = scalar, U16, 30, "kPa", 0.03333333333333333, 0 baroPressure = scalar, U16, 32, "kPa", 0.03333333333333333, 0 lambdaValue = scalar, U16, 34, "", 1.0E-4, 0 @@ -2116,34 +2116,116 @@ 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 +mafEstimate = scalar, U16, 356, "kg/h", 0.1, 0 +instantRpm = scalar, U16, 358, "rpm", 1, 0 +unusedAtTheEnd1 = scalar, U08, 360, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 361, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 362, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 363, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 364, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 365, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 366, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 367, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 368, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 369, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 370, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 371, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 372, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 373, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 374, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 375, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 376, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 377, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 378, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 379, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 380, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 381, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 382, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 383, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 384, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 385, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 386, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 387, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 388, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 389, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 390, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 391, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 392, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 393, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 394, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 395, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 396, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 397, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 398, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 399, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 400, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 401, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 402, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 403, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 404, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 405, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 406, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 407, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 408, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 409, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 410, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 411, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 412, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 413, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 414, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 415, "", 1, 0 +unusedAtTheEnd57 = scalar, U08, 416, "", 1, 0 +unusedAtTheEnd58 = scalar, U08, 417, "", 1, 0 +unusedAtTheEnd59 = scalar, U08, 418, "", 1, 0 +unusedAtTheEnd60 = scalar, U08, 419, "", 1, 0 +unusedAtTheEnd61 = scalar, U08, 420, "", 1, 0 +unusedAtTheEnd62 = scalar, U08, 421, "", 1, 0 +unusedAtTheEnd63 = scalar, U08, 422, "", 1, 0 +unusedAtTheEnd64 = scalar, U08, 423, "", 1, 0 +unusedAtTheEnd65 = scalar, U08, 424, "", 1, 0 +unusedAtTheEnd66 = scalar, U08, 425, "", 1, 0 +unusedAtTheEnd67 = scalar, U08, 426, "", 1, 0 +unusedAtTheEnd68 = scalar, U08, 427, "", 1, 0 +unusedAtTheEnd69 = scalar, U08, 428, "", 1, 0 +unusedAtTheEnd70 = scalar, U08, 429, "", 1, 0 +unusedAtTheEnd71 = scalar, U08, 430, "", 1, 0 +unusedAtTheEnd72 = scalar, U08, 431, "", 1, 0 +unusedAtTheEnd73 = scalar, U08, 432, "", 1, 0 +unusedAtTheEnd74 = scalar, U08, 433, "", 1, 0 +unusedAtTheEnd75 = scalar, U08, 434, "", 1, 0 +unusedAtTheEnd76 = scalar, U08, 435, "", 1, 0 +unusedAtTheEnd77 = scalar, U08, 436, "", 1, 0 +unusedAtTheEnd78 = scalar, U08, 437, "", 1, 0 +unusedAtTheEnd79 = scalar, U08, 438, "", 1, 0 +unusedAtTheEnd80 = scalar, U08, 439, "", 1, 0 +unusedAtTheEnd81 = scalar, U08, 440, "", 1, 0 +unusedAtTheEnd82 = scalar, U08, 441, "", 1, 0 +unusedAtTheEnd83 = scalar, U08, 442, "", 1, 0 +unusedAtTheEnd84 = scalar, U08, 443, "", 1, 0 +unusedAtTheEnd85 = scalar, U08, 444, "", 1, 0 +unusedAtTheEnd86 = scalar, U08, 445, "", 1, 0 +unusedAtTheEnd87 = scalar, U08, 446, "", 1, 0 +unusedAtTheEnd88 = scalar, U08, 447, "", 1, 0 +unusedAtTheEnd89 = scalar, U08, 448, "", 1, 0 +unusedAtTheEnd90 = scalar, U08, 449, "", 1, 0 +unusedAtTheEnd91 = scalar, U08, 450, "", 1, 0 +unusedAtTheEnd92 = scalar, U08, 451, "", 1, 0 +unusedAtTheEnd93 = scalar, U08, 452, "", 1, 0 +unusedAtTheEnd94 = scalar, U08, 453, "", 1, 0 +unusedAtTheEnd95 = scalar, U08, 454, "", 1, 0 +unusedAtTheEnd96 = scalar, U08, 455, "", 1, 0 +unusedAtTheEnd97 = scalar, U08, 456, "", 1, 0 +unusedAtTheEnd98 = scalar, U08, 457, "", 1, 0 +unusedAtTheEnd99 = scalar, U08, 458, "", 1, 0 +unusedAtTheEnd100 = scalar, U08, 459, "", 1, 0 +unusedAtTheEnd101 = scalar, U08, 460, "", 1, 0 +unusedAtTheEnd102 = scalar, U08, 461, "", 1, 0 +unusedAtTheEnd103 = scalar, U08, 462, "", 1, 0 +unusedAtTheEnd104 = scalar, U08, 463, "", 1, 0 +unusedAtTheEnd105 = scalar, U08, 464, "", 1, 0 +unusedAtTheEnd106 = scalar, U08, 465, "", 1, 0 +unusedAtTheEnd107 = scalar, U08, 466, "", 1, 0 +unusedAtTheEnd108 = scalar, U08, 467, "", 1, 0 launchSpeedCondition = bits, U32, 468, [0:0] launchRpmCondition = bits, U32, 468, [1:1] launchTpsCondition = bits, U32, 468, [2:2] @@ -2151,31 +2233,31 @@ 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_179_7 = bits, U32, 468, [7:7] -unusedBit_179_8 = bits, U32, 468, [8:8] -unusedBit_179_9 = bits, U32, 468, [9:9] -unusedBit_179_10 = bits, U32, 468, [10:10] -unusedBit_179_11 = bits, U32, 468, [11:11] -unusedBit_179_12 = bits, U32, 468, [12:12] -unusedBit_179_13 = bits, U32, 468, [13:13] -unusedBit_179_14 = bits, U32, 468, [14:14] -unusedBit_179_15 = bits, U32, 468, [15:15] -unusedBit_179_16 = bits, U32, 468, [16:16] -unusedBit_179_17 = bits, U32, 468, [17:17] -unusedBit_179_18 = bits, U32, 468, [18:18] -unusedBit_179_19 = bits, U32, 468, [19:19] -unusedBit_179_20 = bits, U32, 468, [20:20] -unusedBit_179_21 = bits, U32, 468, [21:21] -unusedBit_179_22 = bits, U32, 468, [22:22] -unusedBit_179_23 = bits, U32, 468, [23:23] -unusedBit_179_24 = bits, U32, 468, [24:24] -unusedBit_179_25 = bits, U32, 468, [25:25] -unusedBit_179_26 = bits, U32, 468, [26:26] -unusedBit_179_27 = bits, U32, 468, [27:27] -unusedBit_179_28 = bits, U32, 468, [28:28] -unusedBit_179_29 = bits, U32, 468, [29:29] -unusedBit_179_30 = bits, U32, 468, [30:30] -unusedBit_179_31 = bits, U32, 468, [31:31] +unusedBit_181_7 = bits, U32, 468, [7:7] +unusedBit_181_8 = bits, U32, 468, [8:8] +unusedBit_181_9 = bits, U32, 468, [9:9] +unusedBit_181_10 = bits, U32, 468, [10:10] +unusedBit_181_11 = bits, U32, 468, [11:11] +unusedBit_181_12 = bits, U32, 468, [12:12] +unusedBit_181_13 = bits, U32, 468, [13:13] +unusedBit_181_14 = bits, U32, 468, [14:14] +unusedBit_181_15 = bits, U32, 468, [15:15] +unusedBit_181_16 = bits, U32, 468, [16:16] +unusedBit_181_17 = bits, U32, 468, [17:17] +unusedBit_181_18 = bits, U32, 468, [18:18] +unusedBit_181_19 = bits, U32, 468, [19:19] +unusedBit_181_20 = bits, U32, 468, [20:20] +unusedBit_181_21 = bits, U32, 468, [21:21] +unusedBit_181_22 = bits, U32, 468, [22:22] +unusedBit_181_23 = bits, U32, 468, [23:23] +unusedBit_181_24 = bits, U32, 468, [24:24] +unusedBit_181_25 = bits, U32, 468, [25:25] +unusedBit_181_26 = bits, U32, 468, [26:26] +unusedBit_181_27 = bits, U32, 468, [27:27] +unusedBit_181_28 = bits, U32, 468, [28:28] +unusedBit_181_29 = bits, U32, 468, [29:29] +unusedBit_181_30 = bits, U32, 468, [30:30] +unusedBit_181_31 = bits, U32, 468, [31:31] TEMPLOG_MAP_AT_CYCLE_COUNT = scalar, U08, 472, "", 1, 0 boostControllerOutput = scalar, U08, 473, "", 1, 0 boostControllerClosedLoopPart = scalar, U08, 474, "", 1, 0 @@ -2514,9 +2596,9 @@ etbStatus_resetCounter = scalar, S32, 636, "", 1, 0 columnLabel = "Voltage", "kg/hour" xAxis = -1, 6, 10 yAxis = -30, 1300, 10 - xBins = mafDecodingBins, MAFValue + xBins = mafDecodingBins, rawMaf yBins = mafDecoding - gauge = MAFGauge + gauge = rawMafGauge curve = iatFuelCorrCurve, "Intake air temperature fuel Multiplier" columnLabel = "Air Temp", "Multiplier" @@ -3082,10 +3164,9 @@ gaugeCategory = Sensors - Basic afr2Gauge = AFRValue2, "Air/Fuel Ratio 2", "", 10, 19.4, 12, 13, 15, 16, 2, 2 lambda1Gauge = lambdaValue, "Lambda", "", 0.65, 1.2, 0.7, 0.75, 1.1, 1.15, 3, 2 lambda2Gauge = lambdaValue2, "Lambda 2", "", 0.65, 1.2, 0.7, 0.75, 1.1, 1.15, 3, 2 - MAFGauge = MAFValue, "Mass air flow", "V", 0, 5, 0, 1, 3, 4, 1, 1 VBattGauge = VBatt, "Battery", "V", 8, 21, 9, 10, 17, 19, 1, 1 MAPGauge = MAPValue, "MAP", "kPa", 0, 300, 10, 10, 200, 200, 0, 0 - massAirFlowValueGa = massAirFlowValue,"Mass air flow", "kg/hr", 0, 50, -999, -999, 999, 999, 1, 1 + massAirFlowValueGa = mafMeasured, "MAF sensor", "kg/h", 0, 50, -999, -999, 999, 999, 1, 1 gaugeCategory = Sensors - Extra 1 @@ -3175,6 +3256,8 @@ gaugeCategory = Sensors - Raw rawWastegatePositionGauge = rawWastegatePosition,"Raw Wastegate Position","V", 0, 5, 0, 0, 5, 5, 3, 0 rawLowFuelPressureGauge = rawLowFuelPressure,"Raw fuel pressure (low) voltage","V", 0, 5, 0, 0, 5, 5, 3, 0 rawHighFuelPressureGauge = rawHighFuelPressure,"Raw fuel pressure (high) voltage","V", 0, 5, 0, 0, 5, 5, 3, 0 + rawMafGauge = rawMaf , "Raw MAF", "V", 0, 5, 0, 0, 5, 5, 3, 0 + gaugeCategory = Transmission desiredGearGauge = tcuDesiredGear, "Desired Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 @@ -3352,8 +3435,8 @@ entry = auxTemp2, "auxTemp2", float, "%.3f" entry = TPSValue, "TPS", float, "%.3f" entry = throttlePedalPosition, "Throttle pedal position", float, "%.3f" entry = tpsADC, "tpsADC", int, "%d" -entry = MAFValue, "MAF", float, "%.3f" -entry = massAirFlowValue, "MAF air flow", float, "%.3f" +entry = rawMaf, "rawMaf", float, "%.3f" +entry = mafMeasured, "MAF sensor", float, "%.3f" entry = MAPValue, "MAP", float, "%.3f" entry = baroPressure, "baroPressure", float, "%.3f" entry = lambdaValue, "Lambda", float, "%.3f" @@ -3510,6 +3593,8 @@ 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 = mafEstimate, "MAF estimate", float, "%.3f" +entry = instantRpm, "instantRpm", int, "%d" 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 c231826dc9..31bd63bae2 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.12.hellenNA6.625899636" + signature = "rusEFI 2022.01.12.hellenNA6.474003667" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.01.12.hellenNA6.625899636" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.01.12.hellenNA6.474003667" ; 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 (unknown script) integration/rusefi_config.txt Wed Jan 12 01:51:15 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 12 21:36:43 UTC 2022 pageSize = 20996 page = 1 @@ -1958,8 +1958,8 @@ auxTemp2 = scalar, S16, 18, "deg C", 0.01, 0 TPSValue = scalar, S16, 20, "%", 0.01, 0 throttlePedalPosition = scalar, S16, 22, "%", 0.01, 0 tpsADC = scalar, U16, 24, "ADC", 1, 0 -MAFValue = scalar, U16, 26, "V", 0.001, 0 -massAirFlowValue = scalar, U16, 28, "Kg/h", 0.1, 0 +rawMaf = scalar, U16, 26, "V", 0.001, 0 +mafMeasured = scalar, U16, 28, "kg/h", 0.1, 0 MAPValue = scalar, U16, 30, "kPa", 0.03333333333333333, 0 baroPressure = scalar, U16, 32, "kPa", 0.03333333333333333, 0 lambdaValue = scalar, U16, 34, "", 1.0E-4, 0 @@ -2116,34 +2116,116 @@ 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 +mafEstimate = scalar, U16, 356, "kg/h", 0.1, 0 +instantRpm = scalar, U16, 358, "rpm", 1, 0 +unusedAtTheEnd1 = scalar, U08, 360, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 361, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 362, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 363, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 364, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 365, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 366, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 367, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 368, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 369, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 370, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 371, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 372, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 373, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 374, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 375, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 376, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 377, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 378, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 379, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 380, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 381, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 382, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 383, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 384, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 385, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 386, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 387, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 388, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 389, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 390, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 391, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 392, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 393, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 394, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 395, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 396, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 397, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 398, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 399, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 400, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 401, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 402, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 403, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 404, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 405, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 406, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 407, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 408, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 409, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 410, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 411, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 412, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 413, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 414, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 415, "", 1, 0 +unusedAtTheEnd57 = scalar, U08, 416, "", 1, 0 +unusedAtTheEnd58 = scalar, U08, 417, "", 1, 0 +unusedAtTheEnd59 = scalar, U08, 418, "", 1, 0 +unusedAtTheEnd60 = scalar, U08, 419, "", 1, 0 +unusedAtTheEnd61 = scalar, U08, 420, "", 1, 0 +unusedAtTheEnd62 = scalar, U08, 421, "", 1, 0 +unusedAtTheEnd63 = scalar, U08, 422, "", 1, 0 +unusedAtTheEnd64 = scalar, U08, 423, "", 1, 0 +unusedAtTheEnd65 = scalar, U08, 424, "", 1, 0 +unusedAtTheEnd66 = scalar, U08, 425, "", 1, 0 +unusedAtTheEnd67 = scalar, U08, 426, "", 1, 0 +unusedAtTheEnd68 = scalar, U08, 427, "", 1, 0 +unusedAtTheEnd69 = scalar, U08, 428, "", 1, 0 +unusedAtTheEnd70 = scalar, U08, 429, "", 1, 0 +unusedAtTheEnd71 = scalar, U08, 430, "", 1, 0 +unusedAtTheEnd72 = scalar, U08, 431, "", 1, 0 +unusedAtTheEnd73 = scalar, U08, 432, "", 1, 0 +unusedAtTheEnd74 = scalar, U08, 433, "", 1, 0 +unusedAtTheEnd75 = scalar, U08, 434, "", 1, 0 +unusedAtTheEnd76 = scalar, U08, 435, "", 1, 0 +unusedAtTheEnd77 = scalar, U08, 436, "", 1, 0 +unusedAtTheEnd78 = scalar, U08, 437, "", 1, 0 +unusedAtTheEnd79 = scalar, U08, 438, "", 1, 0 +unusedAtTheEnd80 = scalar, U08, 439, "", 1, 0 +unusedAtTheEnd81 = scalar, U08, 440, "", 1, 0 +unusedAtTheEnd82 = scalar, U08, 441, "", 1, 0 +unusedAtTheEnd83 = scalar, U08, 442, "", 1, 0 +unusedAtTheEnd84 = scalar, U08, 443, "", 1, 0 +unusedAtTheEnd85 = scalar, U08, 444, "", 1, 0 +unusedAtTheEnd86 = scalar, U08, 445, "", 1, 0 +unusedAtTheEnd87 = scalar, U08, 446, "", 1, 0 +unusedAtTheEnd88 = scalar, U08, 447, "", 1, 0 +unusedAtTheEnd89 = scalar, U08, 448, "", 1, 0 +unusedAtTheEnd90 = scalar, U08, 449, "", 1, 0 +unusedAtTheEnd91 = scalar, U08, 450, "", 1, 0 +unusedAtTheEnd92 = scalar, U08, 451, "", 1, 0 +unusedAtTheEnd93 = scalar, U08, 452, "", 1, 0 +unusedAtTheEnd94 = scalar, U08, 453, "", 1, 0 +unusedAtTheEnd95 = scalar, U08, 454, "", 1, 0 +unusedAtTheEnd96 = scalar, U08, 455, "", 1, 0 +unusedAtTheEnd97 = scalar, U08, 456, "", 1, 0 +unusedAtTheEnd98 = scalar, U08, 457, "", 1, 0 +unusedAtTheEnd99 = scalar, U08, 458, "", 1, 0 +unusedAtTheEnd100 = scalar, U08, 459, "", 1, 0 +unusedAtTheEnd101 = scalar, U08, 460, "", 1, 0 +unusedAtTheEnd102 = scalar, U08, 461, "", 1, 0 +unusedAtTheEnd103 = scalar, U08, 462, "", 1, 0 +unusedAtTheEnd104 = scalar, U08, 463, "", 1, 0 +unusedAtTheEnd105 = scalar, U08, 464, "", 1, 0 +unusedAtTheEnd106 = scalar, U08, 465, "", 1, 0 +unusedAtTheEnd107 = scalar, U08, 466, "", 1, 0 +unusedAtTheEnd108 = scalar, U08, 467, "", 1, 0 launchSpeedCondition = bits, U32, 468, [0:0] launchRpmCondition = bits, U32, 468, [1:1] launchTpsCondition = bits, U32, 468, [2:2] @@ -2151,31 +2233,31 @@ 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_179_7 = bits, U32, 468, [7:7] -unusedBit_179_8 = bits, U32, 468, [8:8] -unusedBit_179_9 = bits, U32, 468, [9:9] -unusedBit_179_10 = bits, U32, 468, [10:10] -unusedBit_179_11 = bits, U32, 468, [11:11] -unusedBit_179_12 = bits, U32, 468, [12:12] -unusedBit_179_13 = bits, U32, 468, [13:13] -unusedBit_179_14 = bits, U32, 468, [14:14] -unusedBit_179_15 = bits, U32, 468, [15:15] -unusedBit_179_16 = bits, U32, 468, [16:16] -unusedBit_179_17 = bits, U32, 468, [17:17] -unusedBit_179_18 = bits, U32, 468, [18:18] -unusedBit_179_19 = bits, U32, 468, [19:19] -unusedBit_179_20 = bits, U32, 468, [20:20] -unusedBit_179_21 = bits, U32, 468, [21:21] -unusedBit_179_22 = bits, U32, 468, [22:22] -unusedBit_179_23 = bits, U32, 468, [23:23] -unusedBit_179_24 = bits, U32, 468, [24:24] -unusedBit_179_25 = bits, U32, 468, [25:25] -unusedBit_179_26 = bits, U32, 468, [26:26] -unusedBit_179_27 = bits, U32, 468, [27:27] -unusedBit_179_28 = bits, U32, 468, [28:28] -unusedBit_179_29 = bits, U32, 468, [29:29] -unusedBit_179_30 = bits, U32, 468, [30:30] -unusedBit_179_31 = bits, U32, 468, [31:31] +unusedBit_181_7 = bits, U32, 468, [7:7] +unusedBit_181_8 = bits, U32, 468, [8:8] +unusedBit_181_9 = bits, U32, 468, [9:9] +unusedBit_181_10 = bits, U32, 468, [10:10] +unusedBit_181_11 = bits, U32, 468, [11:11] +unusedBit_181_12 = bits, U32, 468, [12:12] +unusedBit_181_13 = bits, U32, 468, [13:13] +unusedBit_181_14 = bits, U32, 468, [14:14] +unusedBit_181_15 = bits, U32, 468, [15:15] +unusedBit_181_16 = bits, U32, 468, [16:16] +unusedBit_181_17 = bits, U32, 468, [17:17] +unusedBit_181_18 = bits, U32, 468, [18:18] +unusedBit_181_19 = bits, U32, 468, [19:19] +unusedBit_181_20 = bits, U32, 468, [20:20] +unusedBit_181_21 = bits, U32, 468, [21:21] +unusedBit_181_22 = bits, U32, 468, [22:22] +unusedBit_181_23 = bits, U32, 468, [23:23] +unusedBit_181_24 = bits, U32, 468, [24:24] +unusedBit_181_25 = bits, U32, 468, [25:25] +unusedBit_181_26 = bits, U32, 468, [26:26] +unusedBit_181_27 = bits, U32, 468, [27:27] +unusedBit_181_28 = bits, U32, 468, [28:28] +unusedBit_181_29 = bits, U32, 468, [29:29] +unusedBit_181_30 = bits, U32, 468, [30:30] +unusedBit_181_31 = bits, U32, 468, [31:31] TEMPLOG_MAP_AT_CYCLE_COUNT = scalar, U08, 472, "", 1, 0 boostControllerOutput = scalar, U08, 473, "", 1, 0 boostControllerClosedLoopPart = scalar, U08, 474, "", 1, 0 @@ -2514,9 +2596,9 @@ etbStatus_resetCounter = scalar, S32, 636, "", 1, 0 columnLabel = "Voltage", "kg/hour" xAxis = -1, 6, 10 yAxis = -30, 1300, 10 - xBins = mafDecodingBins, MAFValue + xBins = mafDecodingBins, rawMaf yBins = mafDecoding - gauge = MAFGauge + gauge = rawMafGauge curve = iatFuelCorrCurve, "Intake air temperature fuel Multiplier" columnLabel = "Air Temp", "Multiplier" @@ -3082,10 +3164,9 @@ gaugeCategory = Sensors - Basic afr2Gauge = AFRValue2, "Air/Fuel Ratio 2", "", 10, 19.4, 12, 13, 15, 16, 2, 2 lambda1Gauge = lambdaValue, "Lambda", "", 0.65, 1.2, 0.7, 0.75, 1.1, 1.15, 3, 2 lambda2Gauge = lambdaValue2, "Lambda 2", "", 0.65, 1.2, 0.7, 0.75, 1.1, 1.15, 3, 2 - MAFGauge = MAFValue, "Mass air flow", "V", 0, 5, 0, 1, 3, 4, 1, 1 VBattGauge = VBatt, "Battery", "V", 8, 21, 9, 10, 17, 19, 1, 1 MAPGauge = MAPValue, "MAP", "kPa", 0, 300, 10, 10, 200, 200, 0, 0 - massAirFlowValueGa = massAirFlowValue,"Mass air flow", "kg/hr", 0, 50, -999, -999, 999, 999, 1, 1 + massAirFlowValueGa = mafMeasured, "MAF sensor", "kg/h", 0, 50, -999, -999, 999, 999, 1, 1 gaugeCategory = Sensors - Extra 1 @@ -3175,6 +3256,8 @@ gaugeCategory = Sensors - Raw rawWastegatePositionGauge = rawWastegatePosition,"Raw Wastegate Position","V", 0, 5, 0, 0, 5, 5, 3, 0 rawLowFuelPressureGauge = rawLowFuelPressure,"Raw fuel pressure (low) voltage","V", 0, 5, 0, 0, 5, 5, 3, 0 rawHighFuelPressureGauge = rawHighFuelPressure,"Raw fuel pressure (high) voltage","V", 0, 5, 0, 0, 5, 5, 3, 0 + rawMafGauge = rawMaf , "Raw MAF", "V", 0, 5, 0, 0, 5, 5, 3, 0 + gaugeCategory = Transmission desiredGearGauge = tcuDesiredGear, "Desired Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 @@ -3352,8 +3435,8 @@ entry = auxTemp2, "auxTemp2", float, "%.3f" entry = TPSValue, "TPS", float, "%.3f" entry = throttlePedalPosition, "Throttle pedal position", float, "%.3f" entry = tpsADC, "tpsADC", int, "%d" -entry = MAFValue, "MAF", float, "%.3f" -entry = massAirFlowValue, "MAF air flow", float, "%.3f" +entry = rawMaf, "rawMaf", float, "%.3f" +entry = mafMeasured, "MAF sensor", float, "%.3f" entry = MAPValue, "MAP", float, "%.3f" entry = baroPressure, "baroPressure", float, "%.3f" entry = lambdaValue, "Lambda", float, "%.3f" @@ -3510,6 +3593,8 @@ 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 = mafEstimate, "MAF estimate", float, "%.3f" +entry = instantRpm, "instantRpm", int, "%d" 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 3cdddb9da8..c82d0b42f5 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.12.hellenNA8_96.2025803527" + signature = "rusEFI 2022.01.12.hellenNA8_96.1102155680" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.01.12.hellenNA8_96.2025803527" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.01.12.hellenNA8_96.1102155680" ; 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 (unknown script) integration/rusefi_config.txt Wed Jan 12 01:51:16 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 12 21:36:45 UTC 2022 pageSize = 20996 page = 1 @@ -1958,8 +1958,8 @@ auxTemp2 = scalar, S16, 18, "deg C", 0.01, 0 TPSValue = scalar, S16, 20, "%", 0.01, 0 throttlePedalPosition = scalar, S16, 22, "%", 0.01, 0 tpsADC = scalar, U16, 24, "ADC", 1, 0 -MAFValue = scalar, U16, 26, "V", 0.001, 0 -massAirFlowValue = scalar, U16, 28, "Kg/h", 0.1, 0 +rawMaf = scalar, U16, 26, "V", 0.001, 0 +mafMeasured = scalar, U16, 28, "kg/h", 0.1, 0 MAPValue = scalar, U16, 30, "kPa", 0.03333333333333333, 0 baroPressure = scalar, U16, 32, "kPa", 0.03333333333333333, 0 lambdaValue = scalar, U16, 34, "", 1.0E-4, 0 @@ -2116,34 +2116,116 @@ 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 +mafEstimate = scalar, U16, 356, "kg/h", 0.1, 0 +instantRpm = scalar, U16, 358, "rpm", 1, 0 +unusedAtTheEnd1 = scalar, U08, 360, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 361, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 362, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 363, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 364, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 365, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 366, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 367, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 368, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 369, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 370, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 371, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 372, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 373, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 374, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 375, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 376, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 377, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 378, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 379, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 380, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 381, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 382, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 383, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 384, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 385, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 386, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 387, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 388, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 389, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 390, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 391, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 392, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 393, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 394, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 395, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 396, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 397, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 398, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 399, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 400, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 401, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 402, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 403, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 404, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 405, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 406, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 407, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 408, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 409, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 410, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 411, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 412, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 413, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 414, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 415, "", 1, 0 +unusedAtTheEnd57 = scalar, U08, 416, "", 1, 0 +unusedAtTheEnd58 = scalar, U08, 417, "", 1, 0 +unusedAtTheEnd59 = scalar, U08, 418, "", 1, 0 +unusedAtTheEnd60 = scalar, U08, 419, "", 1, 0 +unusedAtTheEnd61 = scalar, U08, 420, "", 1, 0 +unusedAtTheEnd62 = scalar, U08, 421, "", 1, 0 +unusedAtTheEnd63 = scalar, U08, 422, "", 1, 0 +unusedAtTheEnd64 = scalar, U08, 423, "", 1, 0 +unusedAtTheEnd65 = scalar, U08, 424, "", 1, 0 +unusedAtTheEnd66 = scalar, U08, 425, "", 1, 0 +unusedAtTheEnd67 = scalar, U08, 426, "", 1, 0 +unusedAtTheEnd68 = scalar, U08, 427, "", 1, 0 +unusedAtTheEnd69 = scalar, U08, 428, "", 1, 0 +unusedAtTheEnd70 = scalar, U08, 429, "", 1, 0 +unusedAtTheEnd71 = scalar, U08, 430, "", 1, 0 +unusedAtTheEnd72 = scalar, U08, 431, "", 1, 0 +unusedAtTheEnd73 = scalar, U08, 432, "", 1, 0 +unusedAtTheEnd74 = scalar, U08, 433, "", 1, 0 +unusedAtTheEnd75 = scalar, U08, 434, "", 1, 0 +unusedAtTheEnd76 = scalar, U08, 435, "", 1, 0 +unusedAtTheEnd77 = scalar, U08, 436, "", 1, 0 +unusedAtTheEnd78 = scalar, U08, 437, "", 1, 0 +unusedAtTheEnd79 = scalar, U08, 438, "", 1, 0 +unusedAtTheEnd80 = scalar, U08, 439, "", 1, 0 +unusedAtTheEnd81 = scalar, U08, 440, "", 1, 0 +unusedAtTheEnd82 = scalar, U08, 441, "", 1, 0 +unusedAtTheEnd83 = scalar, U08, 442, "", 1, 0 +unusedAtTheEnd84 = scalar, U08, 443, "", 1, 0 +unusedAtTheEnd85 = scalar, U08, 444, "", 1, 0 +unusedAtTheEnd86 = scalar, U08, 445, "", 1, 0 +unusedAtTheEnd87 = scalar, U08, 446, "", 1, 0 +unusedAtTheEnd88 = scalar, U08, 447, "", 1, 0 +unusedAtTheEnd89 = scalar, U08, 448, "", 1, 0 +unusedAtTheEnd90 = scalar, U08, 449, "", 1, 0 +unusedAtTheEnd91 = scalar, U08, 450, "", 1, 0 +unusedAtTheEnd92 = scalar, U08, 451, "", 1, 0 +unusedAtTheEnd93 = scalar, U08, 452, "", 1, 0 +unusedAtTheEnd94 = scalar, U08, 453, "", 1, 0 +unusedAtTheEnd95 = scalar, U08, 454, "", 1, 0 +unusedAtTheEnd96 = scalar, U08, 455, "", 1, 0 +unusedAtTheEnd97 = scalar, U08, 456, "", 1, 0 +unusedAtTheEnd98 = scalar, U08, 457, "", 1, 0 +unusedAtTheEnd99 = scalar, U08, 458, "", 1, 0 +unusedAtTheEnd100 = scalar, U08, 459, "", 1, 0 +unusedAtTheEnd101 = scalar, U08, 460, "", 1, 0 +unusedAtTheEnd102 = scalar, U08, 461, "", 1, 0 +unusedAtTheEnd103 = scalar, U08, 462, "", 1, 0 +unusedAtTheEnd104 = scalar, U08, 463, "", 1, 0 +unusedAtTheEnd105 = scalar, U08, 464, "", 1, 0 +unusedAtTheEnd106 = scalar, U08, 465, "", 1, 0 +unusedAtTheEnd107 = scalar, U08, 466, "", 1, 0 +unusedAtTheEnd108 = scalar, U08, 467, "", 1, 0 launchSpeedCondition = bits, U32, 468, [0:0] launchRpmCondition = bits, U32, 468, [1:1] launchTpsCondition = bits, U32, 468, [2:2] @@ -2151,31 +2233,31 @@ 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_179_7 = bits, U32, 468, [7:7] -unusedBit_179_8 = bits, U32, 468, [8:8] -unusedBit_179_9 = bits, U32, 468, [9:9] -unusedBit_179_10 = bits, U32, 468, [10:10] -unusedBit_179_11 = bits, U32, 468, [11:11] -unusedBit_179_12 = bits, U32, 468, [12:12] -unusedBit_179_13 = bits, U32, 468, [13:13] -unusedBit_179_14 = bits, U32, 468, [14:14] -unusedBit_179_15 = bits, U32, 468, [15:15] -unusedBit_179_16 = bits, U32, 468, [16:16] -unusedBit_179_17 = bits, U32, 468, [17:17] -unusedBit_179_18 = bits, U32, 468, [18:18] -unusedBit_179_19 = bits, U32, 468, [19:19] -unusedBit_179_20 = bits, U32, 468, [20:20] -unusedBit_179_21 = bits, U32, 468, [21:21] -unusedBit_179_22 = bits, U32, 468, [22:22] -unusedBit_179_23 = bits, U32, 468, [23:23] -unusedBit_179_24 = bits, U32, 468, [24:24] -unusedBit_179_25 = bits, U32, 468, [25:25] -unusedBit_179_26 = bits, U32, 468, [26:26] -unusedBit_179_27 = bits, U32, 468, [27:27] -unusedBit_179_28 = bits, U32, 468, [28:28] -unusedBit_179_29 = bits, U32, 468, [29:29] -unusedBit_179_30 = bits, U32, 468, [30:30] -unusedBit_179_31 = bits, U32, 468, [31:31] +unusedBit_181_7 = bits, U32, 468, [7:7] +unusedBit_181_8 = bits, U32, 468, [8:8] +unusedBit_181_9 = bits, U32, 468, [9:9] +unusedBit_181_10 = bits, U32, 468, [10:10] +unusedBit_181_11 = bits, U32, 468, [11:11] +unusedBit_181_12 = bits, U32, 468, [12:12] +unusedBit_181_13 = bits, U32, 468, [13:13] +unusedBit_181_14 = bits, U32, 468, [14:14] +unusedBit_181_15 = bits, U32, 468, [15:15] +unusedBit_181_16 = bits, U32, 468, [16:16] +unusedBit_181_17 = bits, U32, 468, [17:17] +unusedBit_181_18 = bits, U32, 468, [18:18] +unusedBit_181_19 = bits, U32, 468, [19:19] +unusedBit_181_20 = bits, U32, 468, [20:20] +unusedBit_181_21 = bits, U32, 468, [21:21] +unusedBit_181_22 = bits, U32, 468, [22:22] +unusedBit_181_23 = bits, U32, 468, [23:23] +unusedBit_181_24 = bits, U32, 468, [24:24] +unusedBit_181_25 = bits, U32, 468, [25:25] +unusedBit_181_26 = bits, U32, 468, [26:26] +unusedBit_181_27 = bits, U32, 468, [27:27] +unusedBit_181_28 = bits, U32, 468, [28:28] +unusedBit_181_29 = bits, U32, 468, [29:29] +unusedBit_181_30 = bits, U32, 468, [30:30] +unusedBit_181_31 = bits, U32, 468, [31:31] TEMPLOG_MAP_AT_CYCLE_COUNT = scalar, U08, 472, "", 1, 0 boostControllerOutput = scalar, U08, 473, "", 1, 0 boostControllerClosedLoopPart = scalar, U08, 474, "", 1, 0 @@ -2514,9 +2596,9 @@ etbStatus_resetCounter = scalar, S32, 636, "", 1, 0 columnLabel = "Voltage", "kg/hour" xAxis = -1, 6, 10 yAxis = -30, 1300, 10 - xBins = mafDecodingBins, MAFValue + xBins = mafDecodingBins, rawMaf yBins = mafDecoding - gauge = MAFGauge + gauge = rawMafGauge curve = iatFuelCorrCurve, "Intake air temperature fuel Multiplier" columnLabel = "Air Temp", "Multiplier" @@ -3082,10 +3164,9 @@ gaugeCategory = Sensors - Basic afr2Gauge = AFRValue2, "Air/Fuel Ratio 2", "", 10, 19.4, 12, 13, 15, 16, 2, 2 lambda1Gauge = lambdaValue, "Lambda", "", 0.65, 1.2, 0.7, 0.75, 1.1, 1.15, 3, 2 lambda2Gauge = lambdaValue2, "Lambda 2", "", 0.65, 1.2, 0.7, 0.75, 1.1, 1.15, 3, 2 - MAFGauge = MAFValue, "Mass air flow", "V", 0, 5, 0, 1, 3, 4, 1, 1 VBattGauge = VBatt, "Battery", "V", 8, 21, 9, 10, 17, 19, 1, 1 MAPGauge = MAPValue, "MAP", "kPa", 0, 300, 10, 10, 200, 200, 0, 0 - massAirFlowValueGa = massAirFlowValue,"Mass air flow", "kg/hr", 0, 50, -999, -999, 999, 999, 1, 1 + massAirFlowValueGa = mafMeasured, "MAF sensor", "kg/h", 0, 50, -999, -999, 999, 999, 1, 1 gaugeCategory = Sensors - Extra 1 @@ -3175,6 +3256,8 @@ gaugeCategory = Sensors - Raw rawWastegatePositionGauge = rawWastegatePosition,"Raw Wastegate Position","V", 0, 5, 0, 0, 5, 5, 3, 0 rawLowFuelPressureGauge = rawLowFuelPressure,"Raw fuel pressure (low) voltage","V", 0, 5, 0, 0, 5, 5, 3, 0 rawHighFuelPressureGauge = rawHighFuelPressure,"Raw fuel pressure (high) voltage","V", 0, 5, 0, 0, 5, 5, 3, 0 + rawMafGauge = rawMaf , "Raw MAF", "V", 0, 5, 0, 0, 5, 5, 3, 0 + gaugeCategory = Transmission desiredGearGauge = tcuDesiredGear, "Desired Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 @@ -3352,8 +3435,8 @@ entry = auxTemp2, "auxTemp2", float, "%.3f" entry = TPSValue, "TPS", float, "%.3f" entry = throttlePedalPosition, "Throttle pedal position", float, "%.3f" entry = tpsADC, "tpsADC", int, "%d" -entry = MAFValue, "MAF", float, "%.3f" -entry = massAirFlowValue, "MAF air flow", float, "%.3f" +entry = rawMaf, "rawMaf", float, "%.3f" +entry = mafMeasured, "MAF sensor", float, "%.3f" entry = MAPValue, "MAP", float, "%.3f" entry = baroPressure, "baroPressure", float, "%.3f" entry = lambdaValue, "Lambda", float, "%.3f" @@ -3510,6 +3593,8 @@ 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 = mafEstimate, "MAF estimate", float, "%.3f" +entry = instantRpm, "instantRpm", int, "%d" 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 212a1c4cce..1b689c6307 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.12.hellen_cypress.1770445152" + signature = "rusEFI 2022.01.12.hellen_cypress.1351096775" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.01.12.hellen_cypress.1770445152" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.01.12.hellen_cypress.1351096775" ; 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 (unknown script) integration/rusefi_config.txt Wed Jan 12 01:51:32 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 12 21:37:02 UTC 2022 pageSize = 20996 page = 1 @@ -1958,8 +1958,8 @@ auxTemp2 = scalar, S16, 18, "deg C", 0.01, 0 TPSValue = scalar, S16, 20, "%", 0.01, 0 throttlePedalPosition = scalar, S16, 22, "%", 0.01, 0 tpsADC = scalar, U16, 24, "ADC", 1, 0 -MAFValue = scalar, U16, 26, "V", 0.001, 0 -massAirFlowValue = scalar, U16, 28, "Kg/h", 0.1, 0 +rawMaf = scalar, U16, 26, "V", 0.001, 0 +mafMeasured = scalar, U16, 28, "kg/h", 0.1, 0 MAPValue = scalar, U16, 30, "kPa", 0.03333333333333333, 0 baroPressure = scalar, U16, 32, "kPa", 0.03333333333333333, 0 lambdaValue = scalar, U16, 34, "", 1.0E-4, 0 @@ -2116,34 +2116,116 @@ 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 +mafEstimate = scalar, U16, 356, "kg/h", 0.1, 0 +instantRpm = scalar, U16, 358, "rpm", 1, 0 +unusedAtTheEnd1 = scalar, U08, 360, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 361, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 362, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 363, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 364, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 365, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 366, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 367, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 368, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 369, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 370, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 371, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 372, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 373, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 374, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 375, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 376, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 377, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 378, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 379, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 380, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 381, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 382, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 383, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 384, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 385, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 386, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 387, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 388, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 389, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 390, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 391, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 392, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 393, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 394, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 395, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 396, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 397, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 398, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 399, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 400, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 401, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 402, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 403, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 404, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 405, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 406, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 407, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 408, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 409, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 410, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 411, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 412, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 413, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 414, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 415, "", 1, 0 +unusedAtTheEnd57 = scalar, U08, 416, "", 1, 0 +unusedAtTheEnd58 = scalar, U08, 417, "", 1, 0 +unusedAtTheEnd59 = scalar, U08, 418, "", 1, 0 +unusedAtTheEnd60 = scalar, U08, 419, "", 1, 0 +unusedAtTheEnd61 = scalar, U08, 420, "", 1, 0 +unusedAtTheEnd62 = scalar, U08, 421, "", 1, 0 +unusedAtTheEnd63 = scalar, U08, 422, "", 1, 0 +unusedAtTheEnd64 = scalar, U08, 423, "", 1, 0 +unusedAtTheEnd65 = scalar, U08, 424, "", 1, 0 +unusedAtTheEnd66 = scalar, U08, 425, "", 1, 0 +unusedAtTheEnd67 = scalar, U08, 426, "", 1, 0 +unusedAtTheEnd68 = scalar, U08, 427, "", 1, 0 +unusedAtTheEnd69 = scalar, U08, 428, "", 1, 0 +unusedAtTheEnd70 = scalar, U08, 429, "", 1, 0 +unusedAtTheEnd71 = scalar, U08, 430, "", 1, 0 +unusedAtTheEnd72 = scalar, U08, 431, "", 1, 0 +unusedAtTheEnd73 = scalar, U08, 432, "", 1, 0 +unusedAtTheEnd74 = scalar, U08, 433, "", 1, 0 +unusedAtTheEnd75 = scalar, U08, 434, "", 1, 0 +unusedAtTheEnd76 = scalar, U08, 435, "", 1, 0 +unusedAtTheEnd77 = scalar, U08, 436, "", 1, 0 +unusedAtTheEnd78 = scalar, U08, 437, "", 1, 0 +unusedAtTheEnd79 = scalar, U08, 438, "", 1, 0 +unusedAtTheEnd80 = scalar, U08, 439, "", 1, 0 +unusedAtTheEnd81 = scalar, U08, 440, "", 1, 0 +unusedAtTheEnd82 = scalar, U08, 441, "", 1, 0 +unusedAtTheEnd83 = scalar, U08, 442, "", 1, 0 +unusedAtTheEnd84 = scalar, U08, 443, "", 1, 0 +unusedAtTheEnd85 = scalar, U08, 444, "", 1, 0 +unusedAtTheEnd86 = scalar, U08, 445, "", 1, 0 +unusedAtTheEnd87 = scalar, U08, 446, "", 1, 0 +unusedAtTheEnd88 = scalar, U08, 447, "", 1, 0 +unusedAtTheEnd89 = scalar, U08, 448, "", 1, 0 +unusedAtTheEnd90 = scalar, U08, 449, "", 1, 0 +unusedAtTheEnd91 = scalar, U08, 450, "", 1, 0 +unusedAtTheEnd92 = scalar, U08, 451, "", 1, 0 +unusedAtTheEnd93 = scalar, U08, 452, "", 1, 0 +unusedAtTheEnd94 = scalar, U08, 453, "", 1, 0 +unusedAtTheEnd95 = scalar, U08, 454, "", 1, 0 +unusedAtTheEnd96 = scalar, U08, 455, "", 1, 0 +unusedAtTheEnd97 = scalar, U08, 456, "", 1, 0 +unusedAtTheEnd98 = scalar, U08, 457, "", 1, 0 +unusedAtTheEnd99 = scalar, U08, 458, "", 1, 0 +unusedAtTheEnd100 = scalar, U08, 459, "", 1, 0 +unusedAtTheEnd101 = scalar, U08, 460, "", 1, 0 +unusedAtTheEnd102 = scalar, U08, 461, "", 1, 0 +unusedAtTheEnd103 = scalar, U08, 462, "", 1, 0 +unusedAtTheEnd104 = scalar, U08, 463, "", 1, 0 +unusedAtTheEnd105 = scalar, U08, 464, "", 1, 0 +unusedAtTheEnd106 = scalar, U08, 465, "", 1, 0 +unusedAtTheEnd107 = scalar, U08, 466, "", 1, 0 +unusedAtTheEnd108 = scalar, U08, 467, "", 1, 0 launchSpeedCondition = bits, U32, 468, [0:0] launchRpmCondition = bits, U32, 468, [1:1] launchTpsCondition = bits, U32, 468, [2:2] @@ -2151,31 +2233,31 @@ 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_179_7 = bits, U32, 468, [7:7] -unusedBit_179_8 = bits, U32, 468, [8:8] -unusedBit_179_9 = bits, U32, 468, [9:9] -unusedBit_179_10 = bits, U32, 468, [10:10] -unusedBit_179_11 = bits, U32, 468, [11:11] -unusedBit_179_12 = bits, U32, 468, [12:12] -unusedBit_179_13 = bits, U32, 468, [13:13] -unusedBit_179_14 = bits, U32, 468, [14:14] -unusedBit_179_15 = bits, U32, 468, [15:15] -unusedBit_179_16 = bits, U32, 468, [16:16] -unusedBit_179_17 = bits, U32, 468, [17:17] -unusedBit_179_18 = bits, U32, 468, [18:18] -unusedBit_179_19 = bits, U32, 468, [19:19] -unusedBit_179_20 = bits, U32, 468, [20:20] -unusedBit_179_21 = bits, U32, 468, [21:21] -unusedBit_179_22 = bits, U32, 468, [22:22] -unusedBit_179_23 = bits, U32, 468, [23:23] -unusedBit_179_24 = bits, U32, 468, [24:24] -unusedBit_179_25 = bits, U32, 468, [25:25] -unusedBit_179_26 = bits, U32, 468, [26:26] -unusedBit_179_27 = bits, U32, 468, [27:27] -unusedBit_179_28 = bits, U32, 468, [28:28] -unusedBit_179_29 = bits, U32, 468, [29:29] -unusedBit_179_30 = bits, U32, 468, [30:30] -unusedBit_179_31 = bits, U32, 468, [31:31] +unusedBit_181_7 = bits, U32, 468, [7:7] +unusedBit_181_8 = bits, U32, 468, [8:8] +unusedBit_181_9 = bits, U32, 468, [9:9] +unusedBit_181_10 = bits, U32, 468, [10:10] +unusedBit_181_11 = bits, U32, 468, [11:11] +unusedBit_181_12 = bits, U32, 468, [12:12] +unusedBit_181_13 = bits, U32, 468, [13:13] +unusedBit_181_14 = bits, U32, 468, [14:14] +unusedBit_181_15 = bits, U32, 468, [15:15] +unusedBit_181_16 = bits, U32, 468, [16:16] +unusedBit_181_17 = bits, U32, 468, [17:17] +unusedBit_181_18 = bits, U32, 468, [18:18] +unusedBit_181_19 = bits, U32, 468, [19:19] +unusedBit_181_20 = bits, U32, 468, [20:20] +unusedBit_181_21 = bits, U32, 468, [21:21] +unusedBit_181_22 = bits, U32, 468, [22:22] +unusedBit_181_23 = bits, U32, 468, [23:23] +unusedBit_181_24 = bits, U32, 468, [24:24] +unusedBit_181_25 = bits, U32, 468, [25:25] +unusedBit_181_26 = bits, U32, 468, [26:26] +unusedBit_181_27 = bits, U32, 468, [27:27] +unusedBit_181_28 = bits, U32, 468, [28:28] +unusedBit_181_29 = bits, U32, 468, [29:29] +unusedBit_181_30 = bits, U32, 468, [30:30] +unusedBit_181_31 = bits, U32, 468, [31:31] TEMPLOG_MAP_AT_CYCLE_COUNT = scalar, U08, 472, "", 1, 0 boostControllerOutput = scalar, U08, 473, "", 1, 0 boostControllerClosedLoopPart = scalar, U08, 474, "", 1, 0 @@ -2514,9 +2596,9 @@ etbStatus_resetCounter = scalar, S32, 636, "", 1, 0 columnLabel = "Voltage", "kg/hour" xAxis = -1, 6, 10 yAxis = -30, 1300, 10 - xBins = mafDecodingBins, MAFValue + xBins = mafDecodingBins, rawMaf yBins = mafDecoding - gauge = MAFGauge + gauge = rawMafGauge curve = iatFuelCorrCurve, "Intake air temperature fuel Multiplier" columnLabel = "Air Temp", "Multiplier" @@ -3082,10 +3164,9 @@ gaugeCategory = Sensors - Basic afr2Gauge = AFRValue2, "Air/Fuel Ratio 2", "", 10, 19.4, 12, 13, 15, 16, 2, 2 lambda1Gauge = lambdaValue, "Lambda", "", 0.65, 1.2, 0.7, 0.75, 1.1, 1.15, 3, 2 lambda2Gauge = lambdaValue2, "Lambda 2", "", 0.65, 1.2, 0.7, 0.75, 1.1, 1.15, 3, 2 - MAFGauge = MAFValue, "Mass air flow", "V", 0, 5, 0, 1, 3, 4, 1, 1 VBattGauge = VBatt, "Battery", "V", 8, 21, 9, 10, 17, 19, 1, 1 MAPGauge = MAPValue, "MAP", "kPa", 0, 300, 10, 10, 200, 200, 0, 0 - massAirFlowValueGa = massAirFlowValue,"Mass air flow", "kg/hr", 0, 50, -999, -999, 999, 999, 1, 1 + massAirFlowValueGa = mafMeasured, "MAF sensor", "kg/h", 0, 50, -999, -999, 999, 999, 1, 1 gaugeCategory = Sensors - Extra 1 @@ -3175,6 +3256,8 @@ gaugeCategory = Sensors - Raw rawWastegatePositionGauge = rawWastegatePosition,"Raw Wastegate Position","V", 0, 5, 0, 0, 5, 5, 3, 0 rawLowFuelPressureGauge = rawLowFuelPressure,"Raw fuel pressure (low) voltage","V", 0, 5, 0, 0, 5, 5, 3, 0 rawHighFuelPressureGauge = rawHighFuelPressure,"Raw fuel pressure (high) voltage","V", 0, 5, 0, 0, 5, 5, 3, 0 + rawMafGauge = rawMaf , "Raw MAF", "V", 0, 5, 0, 0, 5, 5, 3, 0 + gaugeCategory = Transmission desiredGearGauge = tcuDesiredGear, "Desired Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 @@ -3352,8 +3435,8 @@ entry = auxTemp2, "auxTemp2", float, "%.3f" entry = TPSValue, "TPS", float, "%.3f" entry = throttlePedalPosition, "Throttle pedal position", float, "%.3f" entry = tpsADC, "tpsADC", int, "%d" -entry = MAFValue, "MAF", float, "%.3f" -entry = massAirFlowValue, "MAF air flow", float, "%.3f" +entry = rawMaf, "rawMaf", float, "%.3f" +entry = mafMeasured, "MAF sensor", float, "%.3f" entry = MAPValue, "MAP", float, "%.3f" entry = baroPressure, "baroPressure", float, "%.3f" entry = lambdaValue, "Lambda", float, "%.3f" @@ -3510,6 +3593,8 @@ 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 = mafEstimate, "MAF estimate", float, "%.3f" +entry = instantRpm, "instantRpm", int, "%d" 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 18e5bfe01f..710732d375 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.12.kin.2518881692" + signature = "rusEFI 2022.01.12.kin.2939016507" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.01.12.kin.2518881692" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.01.12.kin.2939016507" ; 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 (unknown script) integration/rusefi_config.txt Wed Jan 12 01:51:31 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 12 21:37:01 UTC 2022 pageSize = 20968 page = 1 @@ -1924,8 +1924,8 @@ auxTemp2 = scalar, S16, 18, "deg C", 0.01, 0 TPSValue = scalar, S16, 20, "%", 0.01, 0 throttlePedalPosition = scalar, S16, 22, "%", 0.01, 0 tpsADC = scalar, U16, 24, "ADC", 1, 0 -MAFValue = scalar, U16, 26, "V", 0.001, 0 -massAirFlowValue = scalar, U16, 28, "Kg/h", 0.1, 0 +rawMaf = scalar, U16, 26, "V", 0.001, 0 +mafMeasured = scalar, U16, 28, "kg/h", 0.1, 0 MAPValue = scalar, U16, 30, "kPa", 0.03333333333333333, 0 baroPressure = scalar, U16, 32, "kPa", 0.03333333333333333, 0 lambdaValue = scalar, U16, 34, "", 1.0E-4, 0 @@ -2082,34 +2082,116 @@ 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 +mafEstimate = scalar, U16, 356, "kg/h", 0.1, 0 +instantRpm = scalar, U16, 358, "rpm", 1, 0 +unusedAtTheEnd1 = scalar, U08, 360, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 361, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 362, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 363, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 364, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 365, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 366, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 367, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 368, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 369, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 370, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 371, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 372, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 373, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 374, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 375, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 376, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 377, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 378, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 379, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 380, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 381, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 382, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 383, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 384, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 385, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 386, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 387, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 388, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 389, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 390, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 391, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 392, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 393, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 394, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 395, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 396, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 397, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 398, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 399, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 400, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 401, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 402, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 403, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 404, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 405, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 406, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 407, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 408, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 409, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 410, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 411, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 412, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 413, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 414, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 415, "", 1, 0 +unusedAtTheEnd57 = scalar, U08, 416, "", 1, 0 +unusedAtTheEnd58 = scalar, U08, 417, "", 1, 0 +unusedAtTheEnd59 = scalar, U08, 418, "", 1, 0 +unusedAtTheEnd60 = scalar, U08, 419, "", 1, 0 +unusedAtTheEnd61 = scalar, U08, 420, "", 1, 0 +unusedAtTheEnd62 = scalar, U08, 421, "", 1, 0 +unusedAtTheEnd63 = scalar, U08, 422, "", 1, 0 +unusedAtTheEnd64 = scalar, U08, 423, "", 1, 0 +unusedAtTheEnd65 = scalar, U08, 424, "", 1, 0 +unusedAtTheEnd66 = scalar, U08, 425, "", 1, 0 +unusedAtTheEnd67 = scalar, U08, 426, "", 1, 0 +unusedAtTheEnd68 = scalar, U08, 427, "", 1, 0 +unusedAtTheEnd69 = scalar, U08, 428, "", 1, 0 +unusedAtTheEnd70 = scalar, U08, 429, "", 1, 0 +unusedAtTheEnd71 = scalar, U08, 430, "", 1, 0 +unusedAtTheEnd72 = scalar, U08, 431, "", 1, 0 +unusedAtTheEnd73 = scalar, U08, 432, "", 1, 0 +unusedAtTheEnd74 = scalar, U08, 433, "", 1, 0 +unusedAtTheEnd75 = scalar, U08, 434, "", 1, 0 +unusedAtTheEnd76 = scalar, U08, 435, "", 1, 0 +unusedAtTheEnd77 = scalar, U08, 436, "", 1, 0 +unusedAtTheEnd78 = scalar, U08, 437, "", 1, 0 +unusedAtTheEnd79 = scalar, U08, 438, "", 1, 0 +unusedAtTheEnd80 = scalar, U08, 439, "", 1, 0 +unusedAtTheEnd81 = scalar, U08, 440, "", 1, 0 +unusedAtTheEnd82 = scalar, U08, 441, "", 1, 0 +unusedAtTheEnd83 = scalar, U08, 442, "", 1, 0 +unusedAtTheEnd84 = scalar, U08, 443, "", 1, 0 +unusedAtTheEnd85 = scalar, U08, 444, "", 1, 0 +unusedAtTheEnd86 = scalar, U08, 445, "", 1, 0 +unusedAtTheEnd87 = scalar, U08, 446, "", 1, 0 +unusedAtTheEnd88 = scalar, U08, 447, "", 1, 0 +unusedAtTheEnd89 = scalar, U08, 448, "", 1, 0 +unusedAtTheEnd90 = scalar, U08, 449, "", 1, 0 +unusedAtTheEnd91 = scalar, U08, 450, "", 1, 0 +unusedAtTheEnd92 = scalar, U08, 451, "", 1, 0 +unusedAtTheEnd93 = scalar, U08, 452, "", 1, 0 +unusedAtTheEnd94 = scalar, U08, 453, "", 1, 0 +unusedAtTheEnd95 = scalar, U08, 454, "", 1, 0 +unusedAtTheEnd96 = scalar, U08, 455, "", 1, 0 +unusedAtTheEnd97 = scalar, U08, 456, "", 1, 0 +unusedAtTheEnd98 = scalar, U08, 457, "", 1, 0 +unusedAtTheEnd99 = scalar, U08, 458, "", 1, 0 +unusedAtTheEnd100 = scalar, U08, 459, "", 1, 0 +unusedAtTheEnd101 = scalar, U08, 460, "", 1, 0 +unusedAtTheEnd102 = scalar, U08, 461, "", 1, 0 +unusedAtTheEnd103 = scalar, U08, 462, "", 1, 0 +unusedAtTheEnd104 = scalar, U08, 463, "", 1, 0 +unusedAtTheEnd105 = scalar, U08, 464, "", 1, 0 +unusedAtTheEnd106 = scalar, U08, 465, "", 1, 0 +unusedAtTheEnd107 = scalar, U08, 466, "", 1, 0 +unusedAtTheEnd108 = scalar, U08, 467, "", 1, 0 launchSpeedCondition = bits, U32, 468, [0:0] launchRpmCondition = bits, U32, 468, [1:1] launchTpsCondition = bits, U32, 468, [2:2] @@ -2117,31 +2199,31 @@ 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_179_7 = bits, U32, 468, [7:7] -unusedBit_179_8 = bits, U32, 468, [8:8] -unusedBit_179_9 = bits, U32, 468, [9:9] -unusedBit_179_10 = bits, U32, 468, [10:10] -unusedBit_179_11 = bits, U32, 468, [11:11] -unusedBit_179_12 = bits, U32, 468, [12:12] -unusedBit_179_13 = bits, U32, 468, [13:13] -unusedBit_179_14 = bits, U32, 468, [14:14] -unusedBit_179_15 = bits, U32, 468, [15:15] -unusedBit_179_16 = bits, U32, 468, [16:16] -unusedBit_179_17 = bits, U32, 468, [17:17] -unusedBit_179_18 = bits, U32, 468, [18:18] -unusedBit_179_19 = bits, U32, 468, [19:19] -unusedBit_179_20 = bits, U32, 468, [20:20] -unusedBit_179_21 = bits, U32, 468, [21:21] -unusedBit_179_22 = bits, U32, 468, [22:22] -unusedBit_179_23 = bits, U32, 468, [23:23] -unusedBit_179_24 = bits, U32, 468, [24:24] -unusedBit_179_25 = bits, U32, 468, [25:25] -unusedBit_179_26 = bits, U32, 468, [26:26] -unusedBit_179_27 = bits, U32, 468, [27:27] -unusedBit_179_28 = bits, U32, 468, [28:28] -unusedBit_179_29 = bits, U32, 468, [29:29] -unusedBit_179_30 = bits, U32, 468, [30:30] -unusedBit_179_31 = bits, U32, 468, [31:31] +unusedBit_181_7 = bits, U32, 468, [7:7] +unusedBit_181_8 = bits, U32, 468, [8:8] +unusedBit_181_9 = bits, U32, 468, [9:9] +unusedBit_181_10 = bits, U32, 468, [10:10] +unusedBit_181_11 = bits, U32, 468, [11:11] +unusedBit_181_12 = bits, U32, 468, [12:12] +unusedBit_181_13 = bits, U32, 468, [13:13] +unusedBit_181_14 = bits, U32, 468, [14:14] +unusedBit_181_15 = bits, U32, 468, [15:15] +unusedBit_181_16 = bits, U32, 468, [16:16] +unusedBit_181_17 = bits, U32, 468, [17:17] +unusedBit_181_18 = bits, U32, 468, [18:18] +unusedBit_181_19 = bits, U32, 468, [19:19] +unusedBit_181_20 = bits, U32, 468, [20:20] +unusedBit_181_21 = bits, U32, 468, [21:21] +unusedBit_181_22 = bits, U32, 468, [22:22] +unusedBit_181_23 = bits, U32, 468, [23:23] +unusedBit_181_24 = bits, U32, 468, [24:24] +unusedBit_181_25 = bits, U32, 468, [25:25] +unusedBit_181_26 = bits, U32, 468, [26:26] +unusedBit_181_27 = bits, U32, 468, [27:27] +unusedBit_181_28 = bits, U32, 468, [28:28] +unusedBit_181_29 = bits, U32, 468, [29:29] +unusedBit_181_30 = bits, U32, 468, [30:30] +unusedBit_181_31 = bits, U32, 468, [31:31] TEMPLOG_MAP_AT_CYCLE_COUNT = scalar, U08, 472, "", 1, 0 boostControllerOutput = scalar, U08, 473, "", 1, 0 boostControllerClosedLoopPart = scalar, U08, 474, "", 1, 0 @@ -2480,9 +2562,9 @@ etbStatus_resetCounter = scalar, S32, 636, "", 1, 0 columnLabel = "Voltage", "kg/hour" xAxis = -1, 6, 10 yAxis = -30, 1300, 10 - xBins = mafDecodingBins, MAFValue + xBins = mafDecodingBins, rawMaf yBins = mafDecoding - gauge = MAFGauge + gauge = rawMafGauge curve = iatFuelCorrCurve, "Intake air temperature fuel Multiplier" columnLabel = "Air Temp", "Multiplier" @@ -3048,10 +3130,9 @@ gaugeCategory = Sensors - Basic afr2Gauge = AFRValue2, "Air/Fuel Ratio 2", "", 10, 19.4, 12, 13, 15, 16, 2, 2 lambda1Gauge = lambdaValue, "Lambda", "", 0.65, 1.2, 0.7, 0.75, 1.1, 1.15, 3, 2 lambda2Gauge = lambdaValue2, "Lambda 2", "", 0.65, 1.2, 0.7, 0.75, 1.1, 1.15, 3, 2 - MAFGauge = MAFValue, "Mass air flow", "V", 0, 5, 0, 1, 3, 4, 1, 1 VBattGauge = VBatt, "Battery", "V", 8, 21, 9, 10, 17, 19, 1, 1 MAPGauge = MAPValue, "MAP", "kPa", 0, 300, 10, 10, 200, 200, 0, 0 - massAirFlowValueGa = massAirFlowValue,"Mass air flow", "kg/hr", 0, 50, -999, -999, 999, 999, 1, 1 + massAirFlowValueGa = mafMeasured, "MAF sensor", "kg/h", 0, 50, -999, -999, 999, 999, 1, 1 gaugeCategory = Sensors - Extra 1 @@ -3141,6 +3222,8 @@ gaugeCategory = Sensors - Raw rawWastegatePositionGauge = rawWastegatePosition,"Raw Wastegate Position","V", 0, 5, 0, 0, 5, 5, 3, 0 rawLowFuelPressureGauge = rawLowFuelPressure,"Raw fuel pressure (low) voltage","V", 0, 5, 0, 0, 5, 5, 3, 0 rawHighFuelPressureGauge = rawHighFuelPressure,"Raw fuel pressure (high) voltage","V", 0, 5, 0, 0, 5, 5, 3, 0 + rawMafGauge = rawMaf , "Raw MAF", "V", 0, 5, 0, 0, 5, 5, 3, 0 + gaugeCategory = Transmission desiredGearGauge = tcuDesiredGear, "Desired Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 @@ -3318,8 +3401,8 @@ entry = auxTemp2, "auxTemp2", float, "%.3f" entry = TPSValue, "TPS", float, "%.3f" entry = throttlePedalPosition, "Throttle pedal position", float, "%.3f" entry = tpsADC, "tpsADC", int, "%d" -entry = MAFValue, "MAF", float, "%.3f" -entry = massAirFlowValue, "MAF air flow", float, "%.3f" +entry = rawMaf, "rawMaf", float, "%.3f" +entry = mafMeasured, "MAF sensor", float, "%.3f" entry = MAPValue, "MAP", float, "%.3f" entry = baroPressure, "baroPressure", float, "%.3f" entry = lambdaValue, "Lambda", float, "%.3f" @@ -3476,6 +3559,8 @@ 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 = mafEstimate, "MAF estimate", float, "%.3f" +entry = instantRpm, "instantRpm", int, "%d" 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 b6f64db6ba..51d29ef7e4 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.12.mre_f4.1447585560" + signature = "rusEFI 2022.01.12.mre_f4.1866901439" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.01.12.mre_f4.1447585560" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.01.12.mre_f4.1866901439" ; 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 (unknown script) integration/rusefi_config.txt Wed Jan 12 01:51:19 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 12 21:36:48 UTC 2022 pageSize = 20996 page = 1 @@ -1958,8 +1958,8 @@ auxTemp2 = scalar, S16, 18, "deg C", 0.01, 0 TPSValue = scalar, S16, 20, "%", 0.01, 0 throttlePedalPosition = scalar, S16, 22, "%", 0.01, 0 tpsADC = scalar, U16, 24, "ADC", 1, 0 -MAFValue = scalar, U16, 26, "V", 0.001, 0 -massAirFlowValue = scalar, U16, 28, "Kg/h", 0.1, 0 +rawMaf = scalar, U16, 26, "V", 0.001, 0 +mafMeasured = scalar, U16, 28, "kg/h", 0.1, 0 MAPValue = scalar, U16, 30, "kPa", 0.03333333333333333, 0 baroPressure = scalar, U16, 32, "kPa", 0.03333333333333333, 0 lambdaValue = scalar, U16, 34, "", 1.0E-4, 0 @@ -2116,34 +2116,116 @@ 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 +mafEstimate = scalar, U16, 356, "kg/h", 0.1, 0 +instantRpm = scalar, U16, 358, "rpm", 1, 0 +unusedAtTheEnd1 = scalar, U08, 360, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 361, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 362, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 363, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 364, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 365, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 366, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 367, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 368, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 369, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 370, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 371, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 372, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 373, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 374, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 375, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 376, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 377, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 378, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 379, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 380, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 381, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 382, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 383, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 384, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 385, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 386, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 387, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 388, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 389, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 390, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 391, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 392, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 393, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 394, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 395, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 396, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 397, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 398, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 399, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 400, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 401, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 402, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 403, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 404, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 405, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 406, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 407, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 408, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 409, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 410, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 411, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 412, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 413, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 414, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 415, "", 1, 0 +unusedAtTheEnd57 = scalar, U08, 416, "", 1, 0 +unusedAtTheEnd58 = scalar, U08, 417, "", 1, 0 +unusedAtTheEnd59 = scalar, U08, 418, "", 1, 0 +unusedAtTheEnd60 = scalar, U08, 419, "", 1, 0 +unusedAtTheEnd61 = scalar, U08, 420, "", 1, 0 +unusedAtTheEnd62 = scalar, U08, 421, "", 1, 0 +unusedAtTheEnd63 = scalar, U08, 422, "", 1, 0 +unusedAtTheEnd64 = scalar, U08, 423, "", 1, 0 +unusedAtTheEnd65 = scalar, U08, 424, "", 1, 0 +unusedAtTheEnd66 = scalar, U08, 425, "", 1, 0 +unusedAtTheEnd67 = scalar, U08, 426, "", 1, 0 +unusedAtTheEnd68 = scalar, U08, 427, "", 1, 0 +unusedAtTheEnd69 = scalar, U08, 428, "", 1, 0 +unusedAtTheEnd70 = scalar, U08, 429, "", 1, 0 +unusedAtTheEnd71 = scalar, U08, 430, "", 1, 0 +unusedAtTheEnd72 = scalar, U08, 431, "", 1, 0 +unusedAtTheEnd73 = scalar, U08, 432, "", 1, 0 +unusedAtTheEnd74 = scalar, U08, 433, "", 1, 0 +unusedAtTheEnd75 = scalar, U08, 434, "", 1, 0 +unusedAtTheEnd76 = scalar, U08, 435, "", 1, 0 +unusedAtTheEnd77 = scalar, U08, 436, "", 1, 0 +unusedAtTheEnd78 = scalar, U08, 437, "", 1, 0 +unusedAtTheEnd79 = scalar, U08, 438, "", 1, 0 +unusedAtTheEnd80 = scalar, U08, 439, "", 1, 0 +unusedAtTheEnd81 = scalar, U08, 440, "", 1, 0 +unusedAtTheEnd82 = scalar, U08, 441, "", 1, 0 +unusedAtTheEnd83 = scalar, U08, 442, "", 1, 0 +unusedAtTheEnd84 = scalar, U08, 443, "", 1, 0 +unusedAtTheEnd85 = scalar, U08, 444, "", 1, 0 +unusedAtTheEnd86 = scalar, U08, 445, "", 1, 0 +unusedAtTheEnd87 = scalar, U08, 446, "", 1, 0 +unusedAtTheEnd88 = scalar, U08, 447, "", 1, 0 +unusedAtTheEnd89 = scalar, U08, 448, "", 1, 0 +unusedAtTheEnd90 = scalar, U08, 449, "", 1, 0 +unusedAtTheEnd91 = scalar, U08, 450, "", 1, 0 +unusedAtTheEnd92 = scalar, U08, 451, "", 1, 0 +unusedAtTheEnd93 = scalar, U08, 452, "", 1, 0 +unusedAtTheEnd94 = scalar, U08, 453, "", 1, 0 +unusedAtTheEnd95 = scalar, U08, 454, "", 1, 0 +unusedAtTheEnd96 = scalar, U08, 455, "", 1, 0 +unusedAtTheEnd97 = scalar, U08, 456, "", 1, 0 +unusedAtTheEnd98 = scalar, U08, 457, "", 1, 0 +unusedAtTheEnd99 = scalar, U08, 458, "", 1, 0 +unusedAtTheEnd100 = scalar, U08, 459, "", 1, 0 +unusedAtTheEnd101 = scalar, U08, 460, "", 1, 0 +unusedAtTheEnd102 = scalar, U08, 461, "", 1, 0 +unusedAtTheEnd103 = scalar, U08, 462, "", 1, 0 +unusedAtTheEnd104 = scalar, U08, 463, "", 1, 0 +unusedAtTheEnd105 = scalar, U08, 464, "", 1, 0 +unusedAtTheEnd106 = scalar, U08, 465, "", 1, 0 +unusedAtTheEnd107 = scalar, U08, 466, "", 1, 0 +unusedAtTheEnd108 = scalar, U08, 467, "", 1, 0 launchSpeedCondition = bits, U32, 468, [0:0] launchRpmCondition = bits, U32, 468, [1:1] launchTpsCondition = bits, U32, 468, [2:2] @@ -2151,31 +2233,31 @@ 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_179_7 = bits, U32, 468, [7:7] -unusedBit_179_8 = bits, U32, 468, [8:8] -unusedBit_179_9 = bits, U32, 468, [9:9] -unusedBit_179_10 = bits, U32, 468, [10:10] -unusedBit_179_11 = bits, U32, 468, [11:11] -unusedBit_179_12 = bits, U32, 468, [12:12] -unusedBit_179_13 = bits, U32, 468, [13:13] -unusedBit_179_14 = bits, U32, 468, [14:14] -unusedBit_179_15 = bits, U32, 468, [15:15] -unusedBit_179_16 = bits, U32, 468, [16:16] -unusedBit_179_17 = bits, U32, 468, [17:17] -unusedBit_179_18 = bits, U32, 468, [18:18] -unusedBit_179_19 = bits, U32, 468, [19:19] -unusedBit_179_20 = bits, U32, 468, [20:20] -unusedBit_179_21 = bits, U32, 468, [21:21] -unusedBit_179_22 = bits, U32, 468, [22:22] -unusedBit_179_23 = bits, U32, 468, [23:23] -unusedBit_179_24 = bits, U32, 468, [24:24] -unusedBit_179_25 = bits, U32, 468, [25:25] -unusedBit_179_26 = bits, U32, 468, [26:26] -unusedBit_179_27 = bits, U32, 468, [27:27] -unusedBit_179_28 = bits, U32, 468, [28:28] -unusedBit_179_29 = bits, U32, 468, [29:29] -unusedBit_179_30 = bits, U32, 468, [30:30] -unusedBit_179_31 = bits, U32, 468, [31:31] +unusedBit_181_7 = bits, U32, 468, [7:7] +unusedBit_181_8 = bits, U32, 468, [8:8] +unusedBit_181_9 = bits, U32, 468, [9:9] +unusedBit_181_10 = bits, U32, 468, [10:10] +unusedBit_181_11 = bits, U32, 468, [11:11] +unusedBit_181_12 = bits, U32, 468, [12:12] +unusedBit_181_13 = bits, U32, 468, [13:13] +unusedBit_181_14 = bits, U32, 468, [14:14] +unusedBit_181_15 = bits, U32, 468, [15:15] +unusedBit_181_16 = bits, U32, 468, [16:16] +unusedBit_181_17 = bits, U32, 468, [17:17] +unusedBit_181_18 = bits, U32, 468, [18:18] +unusedBit_181_19 = bits, U32, 468, [19:19] +unusedBit_181_20 = bits, U32, 468, [20:20] +unusedBit_181_21 = bits, U32, 468, [21:21] +unusedBit_181_22 = bits, U32, 468, [22:22] +unusedBit_181_23 = bits, U32, 468, [23:23] +unusedBit_181_24 = bits, U32, 468, [24:24] +unusedBit_181_25 = bits, U32, 468, [25:25] +unusedBit_181_26 = bits, U32, 468, [26:26] +unusedBit_181_27 = bits, U32, 468, [27:27] +unusedBit_181_28 = bits, U32, 468, [28:28] +unusedBit_181_29 = bits, U32, 468, [29:29] +unusedBit_181_30 = bits, U32, 468, [30:30] +unusedBit_181_31 = bits, U32, 468, [31:31] TEMPLOG_MAP_AT_CYCLE_COUNT = scalar, U08, 472, "", 1, 0 boostControllerOutput = scalar, U08, 473, "", 1, 0 boostControllerClosedLoopPart = scalar, U08, 474, "", 1, 0 @@ -2514,9 +2596,9 @@ etbStatus_resetCounter = scalar, S32, 636, "", 1, 0 columnLabel = "Voltage", "kg/hour" xAxis = -1, 6, 10 yAxis = -30, 1300, 10 - xBins = mafDecodingBins, MAFValue + xBins = mafDecodingBins, rawMaf yBins = mafDecoding - gauge = MAFGauge + gauge = rawMafGauge curve = iatFuelCorrCurve, "Intake air temperature fuel Multiplier" columnLabel = "Air Temp", "Multiplier" @@ -3082,10 +3164,9 @@ gaugeCategory = Sensors - Basic afr2Gauge = AFRValue2, "Air/Fuel Ratio 2", "", 10, 19.4, 12, 13, 15, 16, 2, 2 lambda1Gauge = lambdaValue, "Lambda", "", 0.65, 1.2, 0.7, 0.75, 1.1, 1.15, 3, 2 lambda2Gauge = lambdaValue2, "Lambda 2", "", 0.65, 1.2, 0.7, 0.75, 1.1, 1.15, 3, 2 - MAFGauge = MAFValue, "Mass air flow", "V", 0, 5, 0, 1, 3, 4, 1, 1 VBattGauge = VBatt, "Battery", "V", 8, 21, 9, 10, 17, 19, 1, 1 MAPGauge = MAPValue, "MAP", "kPa", 0, 300, 10, 10, 200, 200, 0, 0 - massAirFlowValueGa = massAirFlowValue,"Mass air flow", "kg/hr", 0, 50, -999, -999, 999, 999, 1, 1 + massAirFlowValueGa = mafMeasured, "MAF sensor", "kg/h", 0, 50, -999, -999, 999, 999, 1, 1 gaugeCategory = Sensors - Extra 1 @@ -3175,6 +3256,8 @@ gaugeCategory = Sensors - Raw rawWastegatePositionGauge = rawWastegatePosition,"Raw Wastegate Position","V", 0, 5, 0, 0, 5, 5, 3, 0 rawLowFuelPressureGauge = rawLowFuelPressure,"Raw fuel pressure (low) voltage","V", 0, 5, 0, 0, 5, 5, 3, 0 rawHighFuelPressureGauge = rawHighFuelPressure,"Raw fuel pressure (high) voltage","V", 0, 5, 0, 0, 5, 5, 3, 0 + rawMafGauge = rawMaf , "Raw MAF", "V", 0, 5, 0, 0, 5, 5, 3, 0 + gaugeCategory = Transmission desiredGearGauge = tcuDesiredGear, "Desired Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 @@ -3352,8 +3435,8 @@ entry = auxTemp2, "auxTemp2", float, "%.3f" entry = TPSValue, "TPS", float, "%.3f" entry = throttlePedalPosition, "Throttle pedal position", float, "%.3f" entry = tpsADC, "tpsADC", int, "%d" -entry = MAFValue, "MAF", float, "%.3f" -entry = massAirFlowValue, "MAF air flow", float, "%.3f" +entry = rawMaf, "rawMaf", float, "%.3f" +entry = mafMeasured, "MAF sensor", float, "%.3f" entry = MAPValue, "MAP", float, "%.3f" entry = baroPressure, "baroPressure", float, "%.3f" entry = lambdaValue, "Lambda", float, "%.3f" @@ -3510,6 +3593,8 @@ 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 = mafEstimate, "MAF estimate", float, "%.3f" +entry = instantRpm, "instantRpm", int, "%d" 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 4c397eb547..a1b48f6c03 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.12.mre_f7.1447585560" + signature = "rusEFI 2022.01.12.mre_f7.1866901439" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.01.12.mre_f7.1447585560" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.01.12.mre_f7.1866901439" ; 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 (unknown script) integration/rusefi_config.txt Wed Jan 12 01:51:17 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 12 21:36:46 UTC 2022 pageSize = 20996 page = 1 @@ -1958,8 +1958,8 @@ auxTemp2 = scalar, S16, 18, "deg C", 0.01, 0 TPSValue = scalar, S16, 20, "%", 0.01, 0 throttlePedalPosition = scalar, S16, 22, "%", 0.01, 0 tpsADC = scalar, U16, 24, "ADC", 1, 0 -MAFValue = scalar, U16, 26, "V", 0.001, 0 -massAirFlowValue = scalar, U16, 28, "Kg/h", 0.1, 0 +rawMaf = scalar, U16, 26, "V", 0.001, 0 +mafMeasured = scalar, U16, 28, "kg/h", 0.1, 0 MAPValue = scalar, U16, 30, "kPa", 0.03333333333333333, 0 baroPressure = scalar, U16, 32, "kPa", 0.03333333333333333, 0 lambdaValue = scalar, U16, 34, "", 1.0E-4, 0 @@ -2116,34 +2116,116 @@ 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 +mafEstimate = scalar, U16, 356, "kg/h", 0.1, 0 +instantRpm = scalar, U16, 358, "rpm", 1, 0 +unusedAtTheEnd1 = scalar, U08, 360, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 361, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 362, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 363, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 364, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 365, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 366, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 367, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 368, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 369, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 370, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 371, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 372, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 373, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 374, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 375, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 376, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 377, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 378, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 379, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 380, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 381, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 382, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 383, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 384, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 385, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 386, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 387, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 388, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 389, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 390, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 391, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 392, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 393, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 394, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 395, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 396, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 397, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 398, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 399, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 400, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 401, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 402, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 403, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 404, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 405, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 406, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 407, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 408, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 409, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 410, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 411, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 412, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 413, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 414, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 415, "", 1, 0 +unusedAtTheEnd57 = scalar, U08, 416, "", 1, 0 +unusedAtTheEnd58 = scalar, U08, 417, "", 1, 0 +unusedAtTheEnd59 = scalar, U08, 418, "", 1, 0 +unusedAtTheEnd60 = scalar, U08, 419, "", 1, 0 +unusedAtTheEnd61 = scalar, U08, 420, "", 1, 0 +unusedAtTheEnd62 = scalar, U08, 421, "", 1, 0 +unusedAtTheEnd63 = scalar, U08, 422, "", 1, 0 +unusedAtTheEnd64 = scalar, U08, 423, "", 1, 0 +unusedAtTheEnd65 = scalar, U08, 424, "", 1, 0 +unusedAtTheEnd66 = scalar, U08, 425, "", 1, 0 +unusedAtTheEnd67 = scalar, U08, 426, "", 1, 0 +unusedAtTheEnd68 = scalar, U08, 427, "", 1, 0 +unusedAtTheEnd69 = scalar, U08, 428, "", 1, 0 +unusedAtTheEnd70 = scalar, U08, 429, "", 1, 0 +unusedAtTheEnd71 = scalar, U08, 430, "", 1, 0 +unusedAtTheEnd72 = scalar, U08, 431, "", 1, 0 +unusedAtTheEnd73 = scalar, U08, 432, "", 1, 0 +unusedAtTheEnd74 = scalar, U08, 433, "", 1, 0 +unusedAtTheEnd75 = scalar, U08, 434, "", 1, 0 +unusedAtTheEnd76 = scalar, U08, 435, "", 1, 0 +unusedAtTheEnd77 = scalar, U08, 436, "", 1, 0 +unusedAtTheEnd78 = scalar, U08, 437, "", 1, 0 +unusedAtTheEnd79 = scalar, U08, 438, "", 1, 0 +unusedAtTheEnd80 = scalar, U08, 439, "", 1, 0 +unusedAtTheEnd81 = scalar, U08, 440, "", 1, 0 +unusedAtTheEnd82 = scalar, U08, 441, "", 1, 0 +unusedAtTheEnd83 = scalar, U08, 442, "", 1, 0 +unusedAtTheEnd84 = scalar, U08, 443, "", 1, 0 +unusedAtTheEnd85 = scalar, U08, 444, "", 1, 0 +unusedAtTheEnd86 = scalar, U08, 445, "", 1, 0 +unusedAtTheEnd87 = scalar, U08, 446, "", 1, 0 +unusedAtTheEnd88 = scalar, U08, 447, "", 1, 0 +unusedAtTheEnd89 = scalar, U08, 448, "", 1, 0 +unusedAtTheEnd90 = scalar, U08, 449, "", 1, 0 +unusedAtTheEnd91 = scalar, U08, 450, "", 1, 0 +unusedAtTheEnd92 = scalar, U08, 451, "", 1, 0 +unusedAtTheEnd93 = scalar, U08, 452, "", 1, 0 +unusedAtTheEnd94 = scalar, U08, 453, "", 1, 0 +unusedAtTheEnd95 = scalar, U08, 454, "", 1, 0 +unusedAtTheEnd96 = scalar, U08, 455, "", 1, 0 +unusedAtTheEnd97 = scalar, U08, 456, "", 1, 0 +unusedAtTheEnd98 = scalar, U08, 457, "", 1, 0 +unusedAtTheEnd99 = scalar, U08, 458, "", 1, 0 +unusedAtTheEnd100 = scalar, U08, 459, "", 1, 0 +unusedAtTheEnd101 = scalar, U08, 460, "", 1, 0 +unusedAtTheEnd102 = scalar, U08, 461, "", 1, 0 +unusedAtTheEnd103 = scalar, U08, 462, "", 1, 0 +unusedAtTheEnd104 = scalar, U08, 463, "", 1, 0 +unusedAtTheEnd105 = scalar, U08, 464, "", 1, 0 +unusedAtTheEnd106 = scalar, U08, 465, "", 1, 0 +unusedAtTheEnd107 = scalar, U08, 466, "", 1, 0 +unusedAtTheEnd108 = scalar, U08, 467, "", 1, 0 launchSpeedCondition = bits, U32, 468, [0:0] launchRpmCondition = bits, U32, 468, [1:1] launchTpsCondition = bits, U32, 468, [2:2] @@ -2151,31 +2233,31 @@ 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_179_7 = bits, U32, 468, [7:7] -unusedBit_179_8 = bits, U32, 468, [8:8] -unusedBit_179_9 = bits, U32, 468, [9:9] -unusedBit_179_10 = bits, U32, 468, [10:10] -unusedBit_179_11 = bits, U32, 468, [11:11] -unusedBit_179_12 = bits, U32, 468, [12:12] -unusedBit_179_13 = bits, U32, 468, [13:13] -unusedBit_179_14 = bits, U32, 468, [14:14] -unusedBit_179_15 = bits, U32, 468, [15:15] -unusedBit_179_16 = bits, U32, 468, [16:16] -unusedBit_179_17 = bits, U32, 468, [17:17] -unusedBit_179_18 = bits, U32, 468, [18:18] -unusedBit_179_19 = bits, U32, 468, [19:19] -unusedBit_179_20 = bits, U32, 468, [20:20] -unusedBit_179_21 = bits, U32, 468, [21:21] -unusedBit_179_22 = bits, U32, 468, [22:22] -unusedBit_179_23 = bits, U32, 468, [23:23] -unusedBit_179_24 = bits, U32, 468, [24:24] -unusedBit_179_25 = bits, U32, 468, [25:25] -unusedBit_179_26 = bits, U32, 468, [26:26] -unusedBit_179_27 = bits, U32, 468, [27:27] -unusedBit_179_28 = bits, U32, 468, [28:28] -unusedBit_179_29 = bits, U32, 468, [29:29] -unusedBit_179_30 = bits, U32, 468, [30:30] -unusedBit_179_31 = bits, U32, 468, [31:31] +unusedBit_181_7 = bits, U32, 468, [7:7] +unusedBit_181_8 = bits, U32, 468, [8:8] +unusedBit_181_9 = bits, U32, 468, [9:9] +unusedBit_181_10 = bits, U32, 468, [10:10] +unusedBit_181_11 = bits, U32, 468, [11:11] +unusedBit_181_12 = bits, U32, 468, [12:12] +unusedBit_181_13 = bits, U32, 468, [13:13] +unusedBit_181_14 = bits, U32, 468, [14:14] +unusedBit_181_15 = bits, U32, 468, [15:15] +unusedBit_181_16 = bits, U32, 468, [16:16] +unusedBit_181_17 = bits, U32, 468, [17:17] +unusedBit_181_18 = bits, U32, 468, [18:18] +unusedBit_181_19 = bits, U32, 468, [19:19] +unusedBit_181_20 = bits, U32, 468, [20:20] +unusedBit_181_21 = bits, U32, 468, [21:21] +unusedBit_181_22 = bits, U32, 468, [22:22] +unusedBit_181_23 = bits, U32, 468, [23:23] +unusedBit_181_24 = bits, U32, 468, [24:24] +unusedBit_181_25 = bits, U32, 468, [25:25] +unusedBit_181_26 = bits, U32, 468, [26:26] +unusedBit_181_27 = bits, U32, 468, [27:27] +unusedBit_181_28 = bits, U32, 468, [28:28] +unusedBit_181_29 = bits, U32, 468, [29:29] +unusedBit_181_30 = bits, U32, 468, [30:30] +unusedBit_181_31 = bits, U32, 468, [31:31] TEMPLOG_MAP_AT_CYCLE_COUNT = scalar, U08, 472, "", 1, 0 boostControllerOutput = scalar, U08, 473, "", 1, 0 boostControllerClosedLoopPart = scalar, U08, 474, "", 1, 0 @@ -2514,9 +2596,9 @@ etbStatus_resetCounter = scalar, S32, 636, "", 1, 0 columnLabel = "Voltage", "kg/hour" xAxis = -1, 6, 10 yAxis = -30, 1300, 10 - xBins = mafDecodingBins, MAFValue + xBins = mafDecodingBins, rawMaf yBins = mafDecoding - gauge = MAFGauge + gauge = rawMafGauge curve = iatFuelCorrCurve, "Intake air temperature fuel Multiplier" columnLabel = "Air Temp", "Multiplier" @@ -3082,10 +3164,9 @@ gaugeCategory = Sensors - Basic afr2Gauge = AFRValue2, "Air/Fuel Ratio 2", "", 10, 19.4, 12, 13, 15, 16, 2, 2 lambda1Gauge = lambdaValue, "Lambda", "", 0.65, 1.2, 0.7, 0.75, 1.1, 1.15, 3, 2 lambda2Gauge = lambdaValue2, "Lambda 2", "", 0.65, 1.2, 0.7, 0.75, 1.1, 1.15, 3, 2 - MAFGauge = MAFValue, "Mass air flow", "V", 0, 5, 0, 1, 3, 4, 1, 1 VBattGauge = VBatt, "Battery", "V", 8, 21, 9, 10, 17, 19, 1, 1 MAPGauge = MAPValue, "MAP", "kPa", 0, 300, 10, 10, 200, 200, 0, 0 - massAirFlowValueGa = massAirFlowValue,"Mass air flow", "kg/hr", 0, 50, -999, -999, 999, 999, 1, 1 + massAirFlowValueGa = mafMeasured, "MAF sensor", "kg/h", 0, 50, -999, -999, 999, 999, 1, 1 gaugeCategory = Sensors - Extra 1 @@ -3175,6 +3256,8 @@ gaugeCategory = Sensors - Raw rawWastegatePositionGauge = rawWastegatePosition,"Raw Wastegate Position","V", 0, 5, 0, 0, 5, 5, 3, 0 rawLowFuelPressureGauge = rawLowFuelPressure,"Raw fuel pressure (low) voltage","V", 0, 5, 0, 0, 5, 5, 3, 0 rawHighFuelPressureGauge = rawHighFuelPressure,"Raw fuel pressure (high) voltage","V", 0, 5, 0, 0, 5, 5, 3, 0 + rawMafGauge = rawMaf , "Raw MAF", "V", 0, 5, 0, 0, 5, 5, 3, 0 + gaugeCategory = Transmission desiredGearGauge = tcuDesiredGear, "Desired Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 @@ -3352,8 +3435,8 @@ entry = auxTemp2, "auxTemp2", float, "%.3f" entry = TPSValue, "TPS", float, "%.3f" entry = throttlePedalPosition, "Throttle pedal position", float, "%.3f" entry = tpsADC, "tpsADC", int, "%d" -entry = MAFValue, "MAF", float, "%.3f" -entry = massAirFlowValue, "MAF air flow", float, "%.3f" +entry = rawMaf, "rawMaf", float, "%.3f" +entry = mafMeasured, "MAF sensor", float, "%.3f" entry = MAPValue, "MAP", float, "%.3f" entry = baroPressure, "baroPressure", float, "%.3f" entry = lambdaValue, "Lambda", float, "%.3f" @@ -3510,6 +3593,8 @@ 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 = mafEstimate, "MAF estimate", float, "%.3f" +entry = instantRpm, "instantRpm", int, "%d" 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 c064c851d8..811c80c470 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.12.prometheus_405.60417850" + signature = "rusEFI 2022.01.12.prometheus_405.982984605" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.01.12.prometheus_405.60417850" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.01.12.prometheus_405.982984605" ; 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 (unknown script) integration/rusefi_config.txt Wed Jan 12 01:51:23 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 12 21:36:53 UTC 2022 pageSize = 20996 page = 1 @@ -1958,8 +1958,8 @@ auxTemp2 = scalar, S16, 18, "deg C", 0.01, 0 TPSValue = scalar, S16, 20, "%", 0.01, 0 throttlePedalPosition = scalar, S16, 22, "%", 0.01, 0 tpsADC = scalar, U16, 24, "ADC", 1, 0 -MAFValue = scalar, U16, 26, "V", 0.001, 0 -massAirFlowValue = scalar, U16, 28, "Kg/h", 0.1, 0 +rawMaf = scalar, U16, 26, "V", 0.001, 0 +mafMeasured = scalar, U16, 28, "kg/h", 0.1, 0 MAPValue = scalar, U16, 30, "kPa", 0.03333333333333333, 0 baroPressure = scalar, U16, 32, "kPa", 0.03333333333333333, 0 lambdaValue = scalar, U16, 34, "", 1.0E-4, 0 @@ -2116,34 +2116,116 @@ 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 +mafEstimate = scalar, U16, 356, "kg/h", 0.1, 0 +instantRpm = scalar, U16, 358, "rpm", 1, 0 +unusedAtTheEnd1 = scalar, U08, 360, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 361, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 362, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 363, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 364, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 365, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 366, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 367, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 368, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 369, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 370, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 371, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 372, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 373, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 374, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 375, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 376, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 377, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 378, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 379, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 380, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 381, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 382, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 383, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 384, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 385, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 386, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 387, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 388, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 389, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 390, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 391, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 392, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 393, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 394, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 395, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 396, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 397, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 398, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 399, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 400, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 401, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 402, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 403, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 404, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 405, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 406, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 407, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 408, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 409, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 410, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 411, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 412, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 413, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 414, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 415, "", 1, 0 +unusedAtTheEnd57 = scalar, U08, 416, "", 1, 0 +unusedAtTheEnd58 = scalar, U08, 417, "", 1, 0 +unusedAtTheEnd59 = scalar, U08, 418, "", 1, 0 +unusedAtTheEnd60 = scalar, U08, 419, "", 1, 0 +unusedAtTheEnd61 = scalar, U08, 420, "", 1, 0 +unusedAtTheEnd62 = scalar, U08, 421, "", 1, 0 +unusedAtTheEnd63 = scalar, U08, 422, "", 1, 0 +unusedAtTheEnd64 = scalar, U08, 423, "", 1, 0 +unusedAtTheEnd65 = scalar, U08, 424, "", 1, 0 +unusedAtTheEnd66 = scalar, U08, 425, "", 1, 0 +unusedAtTheEnd67 = scalar, U08, 426, "", 1, 0 +unusedAtTheEnd68 = scalar, U08, 427, "", 1, 0 +unusedAtTheEnd69 = scalar, U08, 428, "", 1, 0 +unusedAtTheEnd70 = scalar, U08, 429, "", 1, 0 +unusedAtTheEnd71 = scalar, U08, 430, "", 1, 0 +unusedAtTheEnd72 = scalar, U08, 431, "", 1, 0 +unusedAtTheEnd73 = scalar, U08, 432, "", 1, 0 +unusedAtTheEnd74 = scalar, U08, 433, "", 1, 0 +unusedAtTheEnd75 = scalar, U08, 434, "", 1, 0 +unusedAtTheEnd76 = scalar, U08, 435, "", 1, 0 +unusedAtTheEnd77 = scalar, U08, 436, "", 1, 0 +unusedAtTheEnd78 = scalar, U08, 437, "", 1, 0 +unusedAtTheEnd79 = scalar, U08, 438, "", 1, 0 +unusedAtTheEnd80 = scalar, U08, 439, "", 1, 0 +unusedAtTheEnd81 = scalar, U08, 440, "", 1, 0 +unusedAtTheEnd82 = scalar, U08, 441, "", 1, 0 +unusedAtTheEnd83 = scalar, U08, 442, "", 1, 0 +unusedAtTheEnd84 = scalar, U08, 443, "", 1, 0 +unusedAtTheEnd85 = scalar, U08, 444, "", 1, 0 +unusedAtTheEnd86 = scalar, U08, 445, "", 1, 0 +unusedAtTheEnd87 = scalar, U08, 446, "", 1, 0 +unusedAtTheEnd88 = scalar, U08, 447, "", 1, 0 +unusedAtTheEnd89 = scalar, U08, 448, "", 1, 0 +unusedAtTheEnd90 = scalar, U08, 449, "", 1, 0 +unusedAtTheEnd91 = scalar, U08, 450, "", 1, 0 +unusedAtTheEnd92 = scalar, U08, 451, "", 1, 0 +unusedAtTheEnd93 = scalar, U08, 452, "", 1, 0 +unusedAtTheEnd94 = scalar, U08, 453, "", 1, 0 +unusedAtTheEnd95 = scalar, U08, 454, "", 1, 0 +unusedAtTheEnd96 = scalar, U08, 455, "", 1, 0 +unusedAtTheEnd97 = scalar, U08, 456, "", 1, 0 +unusedAtTheEnd98 = scalar, U08, 457, "", 1, 0 +unusedAtTheEnd99 = scalar, U08, 458, "", 1, 0 +unusedAtTheEnd100 = scalar, U08, 459, "", 1, 0 +unusedAtTheEnd101 = scalar, U08, 460, "", 1, 0 +unusedAtTheEnd102 = scalar, U08, 461, "", 1, 0 +unusedAtTheEnd103 = scalar, U08, 462, "", 1, 0 +unusedAtTheEnd104 = scalar, U08, 463, "", 1, 0 +unusedAtTheEnd105 = scalar, U08, 464, "", 1, 0 +unusedAtTheEnd106 = scalar, U08, 465, "", 1, 0 +unusedAtTheEnd107 = scalar, U08, 466, "", 1, 0 +unusedAtTheEnd108 = scalar, U08, 467, "", 1, 0 launchSpeedCondition = bits, U32, 468, [0:0] launchRpmCondition = bits, U32, 468, [1:1] launchTpsCondition = bits, U32, 468, [2:2] @@ -2151,31 +2233,31 @@ 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_179_7 = bits, U32, 468, [7:7] -unusedBit_179_8 = bits, U32, 468, [8:8] -unusedBit_179_9 = bits, U32, 468, [9:9] -unusedBit_179_10 = bits, U32, 468, [10:10] -unusedBit_179_11 = bits, U32, 468, [11:11] -unusedBit_179_12 = bits, U32, 468, [12:12] -unusedBit_179_13 = bits, U32, 468, [13:13] -unusedBit_179_14 = bits, U32, 468, [14:14] -unusedBit_179_15 = bits, U32, 468, [15:15] -unusedBit_179_16 = bits, U32, 468, [16:16] -unusedBit_179_17 = bits, U32, 468, [17:17] -unusedBit_179_18 = bits, U32, 468, [18:18] -unusedBit_179_19 = bits, U32, 468, [19:19] -unusedBit_179_20 = bits, U32, 468, [20:20] -unusedBit_179_21 = bits, U32, 468, [21:21] -unusedBit_179_22 = bits, U32, 468, [22:22] -unusedBit_179_23 = bits, U32, 468, [23:23] -unusedBit_179_24 = bits, U32, 468, [24:24] -unusedBit_179_25 = bits, U32, 468, [25:25] -unusedBit_179_26 = bits, U32, 468, [26:26] -unusedBit_179_27 = bits, U32, 468, [27:27] -unusedBit_179_28 = bits, U32, 468, [28:28] -unusedBit_179_29 = bits, U32, 468, [29:29] -unusedBit_179_30 = bits, U32, 468, [30:30] -unusedBit_179_31 = bits, U32, 468, [31:31] +unusedBit_181_7 = bits, U32, 468, [7:7] +unusedBit_181_8 = bits, U32, 468, [8:8] +unusedBit_181_9 = bits, U32, 468, [9:9] +unusedBit_181_10 = bits, U32, 468, [10:10] +unusedBit_181_11 = bits, U32, 468, [11:11] +unusedBit_181_12 = bits, U32, 468, [12:12] +unusedBit_181_13 = bits, U32, 468, [13:13] +unusedBit_181_14 = bits, U32, 468, [14:14] +unusedBit_181_15 = bits, U32, 468, [15:15] +unusedBit_181_16 = bits, U32, 468, [16:16] +unusedBit_181_17 = bits, U32, 468, [17:17] +unusedBit_181_18 = bits, U32, 468, [18:18] +unusedBit_181_19 = bits, U32, 468, [19:19] +unusedBit_181_20 = bits, U32, 468, [20:20] +unusedBit_181_21 = bits, U32, 468, [21:21] +unusedBit_181_22 = bits, U32, 468, [22:22] +unusedBit_181_23 = bits, U32, 468, [23:23] +unusedBit_181_24 = bits, U32, 468, [24:24] +unusedBit_181_25 = bits, U32, 468, [25:25] +unusedBit_181_26 = bits, U32, 468, [26:26] +unusedBit_181_27 = bits, U32, 468, [27:27] +unusedBit_181_28 = bits, U32, 468, [28:28] +unusedBit_181_29 = bits, U32, 468, [29:29] +unusedBit_181_30 = bits, U32, 468, [30:30] +unusedBit_181_31 = bits, U32, 468, [31:31] TEMPLOG_MAP_AT_CYCLE_COUNT = scalar, U08, 472, "", 1, 0 boostControllerOutput = scalar, U08, 473, "", 1, 0 boostControllerClosedLoopPart = scalar, U08, 474, "", 1, 0 @@ -2514,9 +2596,9 @@ etbStatus_resetCounter = scalar, S32, 636, "", 1, 0 columnLabel = "Voltage", "kg/hour" xAxis = -1, 6, 10 yAxis = -30, 1300, 10 - xBins = mafDecodingBins, MAFValue + xBins = mafDecodingBins, rawMaf yBins = mafDecoding - gauge = MAFGauge + gauge = rawMafGauge curve = iatFuelCorrCurve, "Intake air temperature fuel Multiplier" columnLabel = "Air Temp", "Multiplier" @@ -3082,10 +3164,9 @@ gaugeCategory = Sensors - Basic afr2Gauge = AFRValue2, "Air/Fuel Ratio 2", "", 10, 19.4, 12, 13, 15, 16, 2, 2 lambda1Gauge = lambdaValue, "Lambda", "", 0.65, 1.2, 0.7, 0.75, 1.1, 1.15, 3, 2 lambda2Gauge = lambdaValue2, "Lambda 2", "", 0.65, 1.2, 0.7, 0.75, 1.1, 1.15, 3, 2 - MAFGauge = MAFValue, "Mass air flow", "V", 0, 5, 0, 1, 3, 4, 1, 1 VBattGauge = VBatt, "Battery", "V", 8, 21, 9, 10, 17, 19, 1, 1 MAPGauge = MAPValue, "MAP", "kPa", 0, 300, 10, 10, 200, 200, 0, 0 - massAirFlowValueGa = massAirFlowValue,"Mass air flow", "kg/hr", 0, 50, -999, -999, 999, 999, 1, 1 + massAirFlowValueGa = mafMeasured, "MAF sensor", "kg/h", 0, 50, -999, -999, 999, 999, 1, 1 gaugeCategory = Sensors - Extra 1 @@ -3175,6 +3256,8 @@ gaugeCategory = Sensors - Raw rawWastegatePositionGauge = rawWastegatePosition,"Raw Wastegate Position","V", 0, 5, 0, 0, 5, 5, 3, 0 rawLowFuelPressureGauge = rawLowFuelPressure,"Raw fuel pressure (low) voltage","V", 0, 5, 0, 0, 5, 5, 3, 0 rawHighFuelPressureGauge = rawHighFuelPressure,"Raw fuel pressure (high) voltage","V", 0, 5, 0, 0, 5, 5, 3, 0 + rawMafGauge = rawMaf , "Raw MAF", "V", 0, 5, 0, 0, 5, 5, 3, 0 + gaugeCategory = Transmission desiredGearGauge = tcuDesiredGear, "Desired Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 @@ -3352,8 +3435,8 @@ entry = auxTemp2, "auxTemp2", float, "%.3f" entry = TPSValue, "TPS", float, "%.3f" entry = throttlePedalPosition, "Throttle pedal position", float, "%.3f" entry = tpsADC, "tpsADC", int, "%d" -entry = MAFValue, "MAF", float, "%.3f" -entry = massAirFlowValue, "MAF air flow", float, "%.3f" +entry = rawMaf, "rawMaf", float, "%.3f" +entry = mafMeasured, "MAF sensor", float, "%.3f" entry = MAPValue, "MAP", float, "%.3f" entry = baroPressure, "baroPressure", float, "%.3f" entry = lambdaValue, "Lambda", float, "%.3f" @@ -3510,6 +3593,8 @@ 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 = mafEstimate, "MAF estimate", float, "%.3f" +entry = instantRpm, "instantRpm", int, "%d" 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 9855500ae9..11e5b2ba5b 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.12.prometheus_469.60417850" + signature = "rusEFI 2022.01.12.prometheus_469.982984605" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.01.12.prometheus_469.60417850" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.01.12.prometheus_469.982984605" ; 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 (unknown script) integration/rusefi_config.txt Wed Jan 12 01:51:22 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 12 21:36:51 UTC 2022 pageSize = 20996 page = 1 @@ -1958,8 +1958,8 @@ auxTemp2 = scalar, S16, 18, "deg C", 0.01, 0 TPSValue = scalar, S16, 20, "%", 0.01, 0 throttlePedalPosition = scalar, S16, 22, "%", 0.01, 0 tpsADC = scalar, U16, 24, "ADC", 1, 0 -MAFValue = scalar, U16, 26, "V", 0.001, 0 -massAirFlowValue = scalar, U16, 28, "Kg/h", 0.1, 0 +rawMaf = scalar, U16, 26, "V", 0.001, 0 +mafMeasured = scalar, U16, 28, "kg/h", 0.1, 0 MAPValue = scalar, U16, 30, "kPa", 0.03333333333333333, 0 baroPressure = scalar, U16, 32, "kPa", 0.03333333333333333, 0 lambdaValue = scalar, U16, 34, "", 1.0E-4, 0 @@ -2116,34 +2116,116 @@ 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 +mafEstimate = scalar, U16, 356, "kg/h", 0.1, 0 +instantRpm = scalar, U16, 358, "rpm", 1, 0 +unusedAtTheEnd1 = scalar, U08, 360, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 361, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 362, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 363, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 364, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 365, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 366, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 367, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 368, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 369, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 370, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 371, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 372, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 373, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 374, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 375, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 376, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 377, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 378, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 379, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 380, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 381, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 382, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 383, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 384, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 385, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 386, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 387, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 388, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 389, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 390, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 391, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 392, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 393, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 394, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 395, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 396, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 397, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 398, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 399, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 400, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 401, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 402, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 403, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 404, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 405, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 406, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 407, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 408, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 409, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 410, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 411, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 412, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 413, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 414, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 415, "", 1, 0 +unusedAtTheEnd57 = scalar, U08, 416, "", 1, 0 +unusedAtTheEnd58 = scalar, U08, 417, "", 1, 0 +unusedAtTheEnd59 = scalar, U08, 418, "", 1, 0 +unusedAtTheEnd60 = scalar, U08, 419, "", 1, 0 +unusedAtTheEnd61 = scalar, U08, 420, "", 1, 0 +unusedAtTheEnd62 = scalar, U08, 421, "", 1, 0 +unusedAtTheEnd63 = scalar, U08, 422, "", 1, 0 +unusedAtTheEnd64 = scalar, U08, 423, "", 1, 0 +unusedAtTheEnd65 = scalar, U08, 424, "", 1, 0 +unusedAtTheEnd66 = scalar, U08, 425, "", 1, 0 +unusedAtTheEnd67 = scalar, U08, 426, "", 1, 0 +unusedAtTheEnd68 = scalar, U08, 427, "", 1, 0 +unusedAtTheEnd69 = scalar, U08, 428, "", 1, 0 +unusedAtTheEnd70 = scalar, U08, 429, "", 1, 0 +unusedAtTheEnd71 = scalar, U08, 430, "", 1, 0 +unusedAtTheEnd72 = scalar, U08, 431, "", 1, 0 +unusedAtTheEnd73 = scalar, U08, 432, "", 1, 0 +unusedAtTheEnd74 = scalar, U08, 433, "", 1, 0 +unusedAtTheEnd75 = scalar, U08, 434, "", 1, 0 +unusedAtTheEnd76 = scalar, U08, 435, "", 1, 0 +unusedAtTheEnd77 = scalar, U08, 436, "", 1, 0 +unusedAtTheEnd78 = scalar, U08, 437, "", 1, 0 +unusedAtTheEnd79 = scalar, U08, 438, "", 1, 0 +unusedAtTheEnd80 = scalar, U08, 439, "", 1, 0 +unusedAtTheEnd81 = scalar, U08, 440, "", 1, 0 +unusedAtTheEnd82 = scalar, U08, 441, "", 1, 0 +unusedAtTheEnd83 = scalar, U08, 442, "", 1, 0 +unusedAtTheEnd84 = scalar, U08, 443, "", 1, 0 +unusedAtTheEnd85 = scalar, U08, 444, "", 1, 0 +unusedAtTheEnd86 = scalar, U08, 445, "", 1, 0 +unusedAtTheEnd87 = scalar, U08, 446, "", 1, 0 +unusedAtTheEnd88 = scalar, U08, 447, "", 1, 0 +unusedAtTheEnd89 = scalar, U08, 448, "", 1, 0 +unusedAtTheEnd90 = scalar, U08, 449, "", 1, 0 +unusedAtTheEnd91 = scalar, U08, 450, "", 1, 0 +unusedAtTheEnd92 = scalar, U08, 451, "", 1, 0 +unusedAtTheEnd93 = scalar, U08, 452, "", 1, 0 +unusedAtTheEnd94 = scalar, U08, 453, "", 1, 0 +unusedAtTheEnd95 = scalar, U08, 454, "", 1, 0 +unusedAtTheEnd96 = scalar, U08, 455, "", 1, 0 +unusedAtTheEnd97 = scalar, U08, 456, "", 1, 0 +unusedAtTheEnd98 = scalar, U08, 457, "", 1, 0 +unusedAtTheEnd99 = scalar, U08, 458, "", 1, 0 +unusedAtTheEnd100 = scalar, U08, 459, "", 1, 0 +unusedAtTheEnd101 = scalar, U08, 460, "", 1, 0 +unusedAtTheEnd102 = scalar, U08, 461, "", 1, 0 +unusedAtTheEnd103 = scalar, U08, 462, "", 1, 0 +unusedAtTheEnd104 = scalar, U08, 463, "", 1, 0 +unusedAtTheEnd105 = scalar, U08, 464, "", 1, 0 +unusedAtTheEnd106 = scalar, U08, 465, "", 1, 0 +unusedAtTheEnd107 = scalar, U08, 466, "", 1, 0 +unusedAtTheEnd108 = scalar, U08, 467, "", 1, 0 launchSpeedCondition = bits, U32, 468, [0:0] launchRpmCondition = bits, U32, 468, [1:1] launchTpsCondition = bits, U32, 468, [2:2] @@ -2151,31 +2233,31 @@ 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_179_7 = bits, U32, 468, [7:7] -unusedBit_179_8 = bits, U32, 468, [8:8] -unusedBit_179_9 = bits, U32, 468, [9:9] -unusedBit_179_10 = bits, U32, 468, [10:10] -unusedBit_179_11 = bits, U32, 468, [11:11] -unusedBit_179_12 = bits, U32, 468, [12:12] -unusedBit_179_13 = bits, U32, 468, [13:13] -unusedBit_179_14 = bits, U32, 468, [14:14] -unusedBit_179_15 = bits, U32, 468, [15:15] -unusedBit_179_16 = bits, U32, 468, [16:16] -unusedBit_179_17 = bits, U32, 468, [17:17] -unusedBit_179_18 = bits, U32, 468, [18:18] -unusedBit_179_19 = bits, U32, 468, [19:19] -unusedBit_179_20 = bits, U32, 468, [20:20] -unusedBit_179_21 = bits, U32, 468, [21:21] -unusedBit_179_22 = bits, U32, 468, [22:22] -unusedBit_179_23 = bits, U32, 468, [23:23] -unusedBit_179_24 = bits, U32, 468, [24:24] -unusedBit_179_25 = bits, U32, 468, [25:25] -unusedBit_179_26 = bits, U32, 468, [26:26] -unusedBit_179_27 = bits, U32, 468, [27:27] -unusedBit_179_28 = bits, U32, 468, [28:28] -unusedBit_179_29 = bits, U32, 468, [29:29] -unusedBit_179_30 = bits, U32, 468, [30:30] -unusedBit_179_31 = bits, U32, 468, [31:31] +unusedBit_181_7 = bits, U32, 468, [7:7] +unusedBit_181_8 = bits, U32, 468, [8:8] +unusedBit_181_9 = bits, U32, 468, [9:9] +unusedBit_181_10 = bits, U32, 468, [10:10] +unusedBit_181_11 = bits, U32, 468, [11:11] +unusedBit_181_12 = bits, U32, 468, [12:12] +unusedBit_181_13 = bits, U32, 468, [13:13] +unusedBit_181_14 = bits, U32, 468, [14:14] +unusedBit_181_15 = bits, U32, 468, [15:15] +unusedBit_181_16 = bits, U32, 468, [16:16] +unusedBit_181_17 = bits, U32, 468, [17:17] +unusedBit_181_18 = bits, U32, 468, [18:18] +unusedBit_181_19 = bits, U32, 468, [19:19] +unusedBit_181_20 = bits, U32, 468, [20:20] +unusedBit_181_21 = bits, U32, 468, [21:21] +unusedBit_181_22 = bits, U32, 468, [22:22] +unusedBit_181_23 = bits, U32, 468, [23:23] +unusedBit_181_24 = bits, U32, 468, [24:24] +unusedBit_181_25 = bits, U32, 468, [25:25] +unusedBit_181_26 = bits, U32, 468, [26:26] +unusedBit_181_27 = bits, U32, 468, [27:27] +unusedBit_181_28 = bits, U32, 468, [28:28] +unusedBit_181_29 = bits, U32, 468, [29:29] +unusedBit_181_30 = bits, U32, 468, [30:30] +unusedBit_181_31 = bits, U32, 468, [31:31] TEMPLOG_MAP_AT_CYCLE_COUNT = scalar, U08, 472, "", 1, 0 boostControllerOutput = scalar, U08, 473, "", 1, 0 boostControllerClosedLoopPart = scalar, U08, 474, "", 1, 0 @@ -2514,9 +2596,9 @@ etbStatus_resetCounter = scalar, S32, 636, "", 1, 0 columnLabel = "Voltage", "kg/hour" xAxis = -1, 6, 10 yAxis = -30, 1300, 10 - xBins = mafDecodingBins, MAFValue + xBins = mafDecodingBins, rawMaf yBins = mafDecoding - gauge = MAFGauge + gauge = rawMafGauge curve = iatFuelCorrCurve, "Intake air temperature fuel Multiplier" columnLabel = "Air Temp", "Multiplier" @@ -3082,10 +3164,9 @@ gaugeCategory = Sensors - Basic afr2Gauge = AFRValue2, "Air/Fuel Ratio 2", "", 10, 19.4, 12, 13, 15, 16, 2, 2 lambda1Gauge = lambdaValue, "Lambda", "", 0.65, 1.2, 0.7, 0.75, 1.1, 1.15, 3, 2 lambda2Gauge = lambdaValue2, "Lambda 2", "", 0.65, 1.2, 0.7, 0.75, 1.1, 1.15, 3, 2 - MAFGauge = MAFValue, "Mass air flow", "V", 0, 5, 0, 1, 3, 4, 1, 1 VBattGauge = VBatt, "Battery", "V", 8, 21, 9, 10, 17, 19, 1, 1 MAPGauge = MAPValue, "MAP", "kPa", 0, 300, 10, 10, 200, 200, 0, 0 - massAirFlowValueGa = massAirFlowValue,"Mass air flow", "kg/hr", 0, 50, -999, -999, 999, 999, 1, 1 + massAirFlowValueGa = mafMeasured, "MAF sensor", "kg/h", 0, 50, -999, -999, 999, 999, 1, 1 gaugeCategory = Sensors - Extra 1 @@ -3175,6 +3256,8 @@ gaugeCategory = Sensors - Raw rawWastegatePositionGauge = rawWastegatePosition,"Raw Wastegate Position","V", 0, 5, 0, 0, 5, 5, 3, 0 rawLowFuelPressureGauge = rawLowFuelPressure,"Raw fuel pressure (low) voltage","V", 0, 5, 0, 0, 5, 5, 3, 0 rawHighFuelPressureGauge = rawHighFuelPressure,"Raw fuel pressure (high) voltage","V", 0, 5, 0, 0, 5, 5, 3, 0 + rawMafGauge = rawMaf , "Raw MAF", "V", 0, 5, 0, 0, 5, 5, 3, 0 + gaugeCategory = Transmission desiredGearGauge = tcuDesiredGear, "Desired Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 @@ -3352,8 +3435,8 @@ entry = auxTemp2, "auxTemp2", float, "%.3f" entry = TPSValue, "TPS", float, "%.3f" entry = throttlePedalPosition, "Throttle pedal position", float, "%.3f" entry = tpsADC, "tpsADC", int, "%d" -entry = MAFValue, "MAF", float, "%.3f" -entry = massAirFlowValue, "MAF air flow", float, "%.3f" +entry = rawMaf, "rawMaf", float, "%.3f" +entry = mafMeasured, "MAF sensor", float, "%.3f" entry = MAPValue, "MAP", float, "%.3f" entry = baroPressure, "baroPressure", float, "%.3f" entry = lambdaValue, "Lambda", float, "%.3f" @@ -3510,6 +3593,8 @@ 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 = mafEstimate, "MAF estimate", float, "%.3f" +entry = instantRpm, "instantRpm", int, "%d" 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 61291901c9..d265f0dd9a 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.12.proteus_f4.2442057728" + signature = "rusEFI 2022.01.12.proteus_f4.2826967207" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.01.12.proteus_f4.2442057728" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.01.12.proteus_f4.2826967207" ; 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 (unknown script) integration/rusefi_config.txt Wed Jan 12 01:51:26 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 12 21:36:56 UTC 2022 pageSize = 20996 page = 1 @@ -1958,8 +1958,8 @@ auxTemp2 = scalar, S16, 18, "deg C", 0.01, 0 TPSValue = scalar, S16, 20, "%", 0.01, 0 throttlePedalPosition = scalar, S16, 22, "%", 0.01, 0 tpsADC = scalar, U16, 24, "ADC", 1, 0 -MAFValue = scalar, U16, 26, "V", 0.001, 0 -massAirFlowValue = scalar, U16, 28, "Kg/h", 0.1, 0 +rawMaf = scalar, U16, 26, "V", 0.001, 0 +mafMeasured = scalar, U16, 28, "kg/h", 0.1, 0 MAPValue = scalar, U16, 30, "kPa", 0.03333333333333333, 0 baroPressure = scalar, U16, 32, "kPa", 0.03333333333333333, 0 lambdaValue = scalar, U16, 34, "", 1.0E-4, 0 @@ -2116,34 +2116,116 @@ 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 +mafEstimate = scalar, U16, 356, "kg/h", 0.1, 0 +instantRpm = scalar, U16, 358, "rpm", 1, 0 +unusedAtTheEnd1 = scalar, U08, 360, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 361, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 362, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 363, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 364, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 365, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 366, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 367, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 368, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 369, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 370, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 371, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 372, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 373, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 374, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 375, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 376, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 377, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 378, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 379, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 380, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 381, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 382, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 383, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 384, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 385, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 386, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 387, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 388, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 389, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 390, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 391, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 392, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 393, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 394, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 395, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 396, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 397, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 398, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 399, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 400, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 401, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 402, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 403, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 404, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 405, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 406, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 407, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 408, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 409, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 410, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 411, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 412, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 413, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 414, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 415, "", 1, 0 +unusedAtTheEnd57 = scalar, U08, 416, "", 1, 0 +unusedAtTheEnd58 = scalar, U08, 417, "", 1, 0 +unusedAtTheEnd59 = scalar, U08, 418, "", 1, 0 +unusedAtTheEnd60 = scalar, U08, 419, "", 1, 0 +unusedAtTheEnd61 = scalar, U08, 420, "", 1, 0 +unusedAtTheEnd62 = scalar, U08, 421, "", 1, 0 +unusedAtTheEnd63 = scalar, U08, 422, "", 1, 0 +unusedAtTheEnd64 = scalar, U08, 423, "", 1, 0 +unusedAtTheEnd65 = scalar, U08, 424, "", 1, 0 +unusedAtTheEnd66 = scalar, U08, 425, "", 1, 0 +unusedAtTheEnd67 = scalar, U08, 426, "", 1, 0 +unusedAtTheEnd68 = scalar, U08, 427, "", 1, 0 +unusedAtTheEnd69 = scalar, U08, 428, "", 1, 0 +unusedAtTheEnd70 = scalar, U08, 429, "", 1, 0 +unusedAtTheEnd71 = scalar, U08, 430, "", 1, 0 +unusedAtTheEnd72 = scalar, U08, 431, "", 1, 0 +unusedAtTheEnd73 = scalar, U08, 432, "", 1, 0 +unusedAtTheEnd74 = scalar, U08, 433, "", 1, 0 +unusedAtTheEnd75 = scalar, U08, 434, "", 1, 0 +unusedAtTheEnd76 = scalar, U08, 435, "", 1, 0 +unusedAtTheEnd77 = scalar, U08, 436, "", 1, 0 +unusedAtTheEnd78 = scalar, U08, 437, "", 1, 0 +unusedAtTheEnd79 = scalar, U08, 438, "", 1, 0 +unusedAtTheEnd80 = scalar, U08, 439, "", 1, 0 +unusedAtTheEnd81 = scalar, U08, 440, "", 1, 0 +unusedAtTheEnd82 = scalar, U08, 441, "", 1, 0 +unusedAtTheEnd83 = scalar, U08, 442, "", 1, 0 +unusedAtTheEnd84 = scalar, U08, 443, "", 1, 0 +unusedAtTheEnd85 = scalar, U08, 444, "", 1, 0 +unusedAtTheEnd86 = scalar, U08, 445, "", 1, 0 +unusedAtTheEnd87 = scalar, U08, 446, "", 1, 0 +unusedAtTheEnd88 = scalar, U08, 447, "", 1, 0 +unusedAtTheEnd89 = scalar, U08, 448, "", 1, 0 +unusedAtTheEnd90 = scalar, U08, 449, "", 1, 0 +unusedAtTheEnd91 = scalar, U08, 450, "", 1, 0 +unusedAtTheEnd92 = scalar, U08, 451, "", 1, 0 +unusedAtTheEnd93 = scalar, U08, 452, "", 1, 0 +unusedAtTheEnd94 = scalar, U08, 453, "", 1, 0 +unusedAtTheEnd95 = scalar, U08, 454, "", 1, 0 +unusedAtTheEnd96 = scalar, U08, 455, "", 1, 0 +unusedAtTheEnd97 = scalar, U08, 456, "", 1, 0 +unusedAtTheEnd98 = scalar, U08, 457, "", 1, 0 +unusedAtTheEnd99 = scalar, U08, 458, "", 1, 0 +unusedAtTheEnd100 = scalar, U08, 459, "", 1, 0 +unusedAtTheEnd101 = scalar, U08, 460, "", 1, 0 +unusedAtTheEnd102 = scalar, U08, 461, "", 1, 0 +unusedAtTheEnd103 = scalar, U08, 462, "", 1, 0 +unusedAtTheEnd104 = scalar, U08, 463, "", 1, 0 +unusedAtTheEnd105 = scalar, U08, 464, "", 1, 0 +unusedAtTheEnd106 = scalar, U08, 465, "", 1, 0 +unusedAtTheEnd107 = scalar, U08, 466, "", 1, 0 +unusedAtTheEnd108 = scalar, U08, 467, "", 1, 0 launchSpeedCondition = bits, U32, 468, [0:0] launchRpmCondition = bits, U32, 468, [1:1] launchTpsCondition = bits, U32, 468, [2:2] @@ -2151,31 +2233,31 @@ 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_179_7 = bits, U32, 468, [7:7] -unusedBit_179_8 = bits, U32, 468, [8:8] -unusedBit_179_9 = bits, U32, 468, [9:9] -unusedBit_179_10 = bits, U32, 468, [10:10] -unusedBit_179_11 = bits, U32, 468, [11:11] -unusedBit_179_12 = bits, U32, 468, [12:12] -unusedBit_179_13 = bits, U32, 468, [13:13] -unusedBit_179_14 = bits, U32, 468, [14:14] -unusedBit_179_15 = bits, U32, 468, [15:15] -unusedBit_179_16 = bits, U32, 468, [16:16] -unusedBit_179_17 = bits, U32, 468, [17:17] -unusedBit_179_18 = bits, U32, 468, [18:18] -unusedBit_179_19 = bits, U32, 468, [19:19] -unusedBit_179_20 = bits, U32, 468, [20:20] -unusedBit_179_21 = bits, U32, 468, [21:21] -unusedBit_179_22 = bits, U32, 468, [22:22] -unusedBit_179_23 = bits, U32, 468, [23:23] -unusedBit_179_24 = bits, U32, 468, [24:24] -unusedBit_179_25 = bits, U32, 468, [25:25] -unusedBit_179_26 = bits, U32, 468, [26:26] -unusedBit_179_27 = bits, U32, 468, [27:27] -unusedBit_179_28 = bits, U32, 468, [28:28] -unusedBit_179_29 = bits, U32, 468, [29:29] -unusedBit_179_30 = bits, U32, 468, [30:30] -unusedBit_179_31 = bits, U32, 468, [31:31] +unusedBit_181_7 = bits, U32, 468, [7:7] +unusedBit_181_8 = bits, U32, 468, [8:8] +unusedBit_181_9 = bits, U32, 468, [9:9] +unusedBit_181_10 = bits, U32, 468, [10:10] +unusedBit_181_11 = bits, U32, 468, [11:11] +unusedBit_181_12 = bits, U32, 468, [12:12] +unusedBit_181_13 = bits, U32, 468, [13:13] +unusedBit_181_14 = bits, U32, 468, [14:14] +unusedBit_181_15 = bits, U32, 468, [15:15] +unusedBit_181_16 = bits, U32, 468, [16:16] +unusedBit_181_17 = bits, U32, 468, [17:17] +unusedBit_181_18 = bits, U32, 468, [18:18] +unusedBit_181_19 = bits, U32, 468, [19:19] +unusedBit_181_20 = bits, U32, 468, [20:20] +unusedBit_181_21 = bits, U32, 468, [21:21] +unusedBit_181_22 = bits, U32, 468, [22:22] +unusedBit_181_23 = bits, U32, 468, [23:23] +unusedBit_181_24 = bits, U32, 468, [24:24] +unusedBit_181_25 = bits, U32, 468, [25:25] +unusedBit_181_26 = bits, U32, 468, [26:26] +unusedBit_181_27 = bits, U32, 468, [27:27] +unusedBit_181_28 = bits, U32, 468, [28:28] +unusedBit_181_29 = bits, U32, 468, [29:29] +unusedBit_181_30 = bits, U32, 468, [30:30] +unusedBit_181_31 = bits, U32, 468, [31:31] TEMPLOG_MAP_AT_CYCLE_COUNT = scalar, U08, 472, "", 1, 0 boostControllerOutput = scalar, U08, 473, "", 1, 0 boostControllerClosedLoopPart = scalar, U08, 474, "", 1, 0 @@ -2514,9 +2596,9 @@ etbStatus_resetCounter = scalar, S32, 636, "", 1, 0 columnLabel = "Voltage", "kg/hour" xAxis = -1, 6, 10 yAxis = -30, 1300, 10 - xBins = mafDecodingBins, MAFValue + xBins = mafDecodingBins, rawMaf yBins = mafDecoding - gauge = MAFGauge + gauge = rawMafGauge curve = iatFuelCorrCurve, "Intake air temperature fuel Multiplier" columnLabel = "Air Temp", "Multiplier" @@ -3082,10 +3164,9 @@ gaugeCategory = Sensors - Basic afr2Gauge = AFRValue2, "Air/Fuel Ratio 2", "", 10, 19.4, 12, 13, 15, 16, 2, 2 lambda1Gauge = lambdaValue, "Lambda", "", 0.65, 1.2, 0.7, 0.75, 1.1, 1.15, 3, 2 lambda2Gauge = lambdaValue2, "Lambda 2", "", 0.65, 1.2, 0.7, 0.75, 1.1, 1.15, 3, 2 - MAFGauge = MAFValue, "Mass air flow", "V", 0, 5, 0, 1, 3, 4, 1, 1 VBattGauge = VBatt, "Battery", "V", 8, 21, 9, 10, 17, 19, 1, 1 MAPGauge = MAPValue, "MAP", "kPa", 0, 300, 10, 10, 200, 200, 0, 0 - massAirFlowValueGa = massAirFlowValue,"Mass air flow", "kg/hr", 0, 50, -999, -999, 999, 999, 1, 1 + massAirFlowValueGa = mafMeasured, "MAF sensor", "kg/h", 0, 50, -999, -999, 999, 999, 1, 1 gaugeCategory = Sensors - Extra 1 @@ -3175,6 +3256,8 @@ gaugeCategory = Sensors - Raw rawWastegatePositionGauge = rawWastegatePosition,"Raw Wastegate Position","V", 0, 5, 0, 0, 5, 5, 3, 0 rawLowFuelPressureGauge = rawLowFuelPressure,"Raw fuel pressure (low) voltage","V", 0, 5, 0, 0, 5, 5, 3, 0 rawHighFuelPressureGauge = rawHighFuelPressure,"Raw fuel pressure (high) voltage","V", 0, 5, 0, 0, 5, 5, 3, 0 + rawMafGauge = rawMaf , "Raw MAF", "V", 0, 5, 0, 0, 5, 5, 3, 0 + gaugeCategory = Transmission desiredGearGauge = tcuDesiredGear, "Desired Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 @@ -3352,8 +3435,8 @@ entry = auxTemp2, "auxTemp2", float, "%.3f" entry = TPSValue, "TPS", float, "%.3f" entry = throttlePedalPosition, "Throttle pedal position", float, "%.3f" entry = tpsADC, "tpsADC", int, "%d" -entry = MAFValue, "MAF", float, "%.3f" -entry = massAirFlowValue, "MAF air flow", float, "%.3f" +entry = rawMaf, "rawMaf", float, "%.3f" +entry = mafMeasured, "MAF sensor", float, "%.3f" entry = MAPValue, "MAP", float, "%.3f" entry = baroPressure, "baroPressure", float, "%.3f" entry = lambdaValue, "Lambda", float, "%.3f" @@ -3510,6 +3593,8 @@ 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 = mafEstimate, "MAF estimate", float, "%.3f" +entry = instantRpm, "instantRpm", int, "%d" 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 9ad727835d..ac321a6a18 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.12.proteus_f7.2442057728" + signature = "rusEFI 2022.01.12.proteus_f7.2826967207" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.01.12.proteus_f7.2442057728" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.01.12.proteus_f7.2826967207" ; 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 (unknown script) integration/rusefi_config.txt Wed Jan 12 01:51:25 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 12 21:36:54 UTC 2022 pageSize = 20996 page = 1 @@ -1958,8 +1958,8 @@ auxTemp2 = scalar, S16, 18, "deg C", 0.01, 0 TPSValue = scalar, S16, 20, "%", 0.01, 0 throttlePedalPosition = scalar, S16, 22, "%", 0.01, 0 tpsADC = scalar, U16, 24, "ADC", 1, 0 -MAFValue = scalar, U16, 26, "V", 0.001, 0 -massAirFlowValue = scalar, U16, 28, "Kg/h", 0.1, 0 +rawMaf = scalar, U16, 26, "V", 0.001, 0 +mafMeasured = scalar, U16, 28, "kg/h", 0.1, 0 MAPValue = scalar, U16, 30, "kPa", 0.03333333333333333, 0 baroPressure = scalar, U16, 32, "kPa", 0.03333333333333333, 0 lambdaValue = scalar, U16, 34, "", 1.0E-4, 0 @@ -2116,34 +2116,116 @@ 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 +mafEstimate = scalar, U16, 356, "kg/h", 0.1, 0 +instantRpm = scalar, U16, 358, "rpm", 1, 0 +unusedAtTheEnd1 = scalar, U08, 360, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 361, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 362, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 363, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 364, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 365, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 366, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 367, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 368, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 369, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 370, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 371, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 372, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 373, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 374, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 375, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 376, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 377, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 378, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 379, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 380, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 381, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 382, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 383, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 384, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 385, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 386, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 387, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 388, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 389, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 390, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 391, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 392, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 393, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 394, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 395, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 396, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 397, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 398, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 399, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 400, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 401, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 402, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 403, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 404, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 405, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 406, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 407, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 408, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 409, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 410, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 411, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 412, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 413, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 414, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 415, "", 1, 0 +unusedAtTheEnd57 = scalar, U08, 416, "", 1, 0 +unusedAtTheEnd58 = scalar, U08, 417, "", 1, 0 +unusedAtTheEnd59 = scalar, U08, 418, "", 1, 0 +unusedAtTheEnd60 = scalar, U08, 419, "", 1, 0 +unusedAtTheEnd61 = scalar, U08, 420, "", 1, 0 +unusedAtTheEnd62 = scalar, U08, 421, "", 1, 0 +unusedAtTheEnd63 = scalar, U08, 422, "", 1, 0 +unusedAtTheEnd64 = scalar, U08, 423, "", 1, 0 +unusedAtTheEnd65 = scalar, U08, 424, "", 1, 0 +unusedAtTheEnd66 = scalar, U08, 425, "", 1, 0 +unusedAtTheEnd67 = scalar, U08, 426, "", 1, 0 +unusedAtTheEnd68 = scalar, U08, 427, "", 1, 0 +unusedAtTheEnd69 = scalar, U08, 428, "", 1, 0 +unusedAtTheEnd70 = scalar, U08, 429, "", 1, 0 +unusedAtTheEnd71 = scalar, U08, 430, "", 1, 0 +unusedAtTheEnd72 = scalar, U08, 431, "", 1, 0 +unusedAtTheEnd73 = scalar, U08, 432, "", 1, 0 +unusedAtTheEnd74 = scalar, U08, 433, "", 1, 0 +unusedAtTheEnd75 = scalar, U08, 434, "", 1, 0 +unusedAtTheEnd76 = scalar, U08, 435, "", 1, 0 +unusedAtTheEnd77 = scalar, U08, 436, "", 1, 0 +unusedAtTheEnd78 = scalar, U08, 437, "", 1, 0 +unusedAtTheEnd79 = scalar, U08, 438, "", 1, 0 +unusedAtTheEnd80 = scalar, U08, 439, "", 1, 0 +unusedAtTheEnd81 = scalar, U08, 440, "", 1, 0 +unusedAtTheEnd82 = scalar, U08, 441, "", 1, 0 +unusedAtTheEnd83 = scalar, U08, 442, "", 1, 0 +unusedAtTheEnd84 = scalar, U08, 443, "", 1, 0 +unusedAtTheEnd85 = scalar, U08, 444, "", 1, 0 +unusedAtTheEnd86 = scalar, U08, 445, "", 1, 0 +unusedAtTheEnd87 = scalar, U08, 446, "", 1, 0 +unusedAtTheEnd88 = scalar, U08, 447, "", 1, 0 +unusedAtTheEnd89 = scalar, U08, 448, "", 1, 0 +unusedAtTheEnd90 = scalar, U08, 449, "", 1, 0 +unusedAtTheEnd91 = scalar, U08, 450, "", 1, 0 +unusedAtTheEnd92 = scalar, U08, 451, "", 1, 0 +unusedAtTheEnd93 = scalar, U08, 452, "", 1, 0 +unusedAtTheEnd94 = scalar, U08, 453, "", 1, 0 +unusedAtTheEnd95 = scalar, U08, 454, "", 1, 0 +unusedAtTheEnd96 = scalar, U08, 455, "", 1, 0 +unusedAtTheEnd97 = scalar, U08, 456, "", 1, 0 +unusedAtTheEnd98 = scalar, U08, 457, "", 1, 0 +unusedAtTheEnd99 = scalar, U08, 458, "", 1, 0 +unusedAtTheEnd100 = scalar, U08, 459, "", 1, 0 +unusedAtTheEnd101 = scalar, U08, 460, "", 1, 0 +unusedAtTheEnd102 = scalar, U08, 461, "", 1, 0 +unusedAtTheEnd103 = scalar, U08, 462, "", 1, 0 +unusedAtTheEnd104 = scalar, U08, 463, "", 1, 0 +unusedAtTheEnd105 = scalar, U08, 464, "", 1, 0 +unusedAtTheEnd106 = scalar, U08, 465, "", 1, 0 +unusedAtTheEnd107 = scalar, U08, 466, "", 1, 0 +unusedAtTheEnd108 = scalar, U08, 467, "", 1, 0 launchSpeedCondition = bits, U32, 468, [0:0] launchRpmCondition = bits, U32, 468, [1:1] launchTpsCondition = bits, U32, 468, [2:2] @@ -2151,31 +2233,31 @@ 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_179_7 = bits, U32, 468, [7:7] -unusedBit_179_8 = bits, U32, 468, [8:8] -unusedBit_179_9 = bits, U32, 468, [9:9] -unusedBit_179_10 = bits, U32, 468, [10:10] -unusedBit_179_11 = bits, U32, 468, [11:11] -unusedBit_179_12 = bits, U32, 468, [12:12] -unusedBit_179_13 = bits, U32, 468, [13:13] -unusedBit_179_14 = bits, U32, 468, [14:14] -unusedBit_179_15 = bits, U32, 468, [15:15] -unusedBit_179_16 = bits, U32, 468, [16:16] -unusedBit_179_17 = bits, U32, 468, [17:17] -unusedBit_179_18 = bits, U32, 468, [18:18] -unusedBit_179_19 = bits, U32, 468, [19:19] -unusedBit_179_20 = bits, U32, 468, [20:20] -unusedBit_179_21 = bits, U32, 468, [21:21] -unusedBit_179_22 = bits, U32, 468, [22:22] -unusedBit_179_23 = bits, U32, 468, [23:23] -unusedBit_179_24 = bits, U32, 468, [24:24] -unusedBit_179_25 = bits, U32, 468, [25:25] -unusedBit_179_26 = bits, U32, 468, [26:26] -unusedBit_179_27 = bits, U32, 468, [27:27] -unusedBit_179_28 = bits, U32, 468, [28:28] -unusedBit_179_29 = bits, U32, 468, [29:29] -unusedBit_179_30 = bits, U32, 468, [30:30] -unusedBit_179_31 = bits, U32, 468, [31:31] +unusedBit_181_7 = bits, U32, 468, [7:7] +unusedBit_181_8 = bits, U32, 468, [8:8] +unusedBit_181_9 = bits, U32, 468, [9:9] +unusedBit_181_10 = bits, U32, 468, [10:10] +unusedBit_181_11 = bits, U32, 468, [11:11] +unusedBit_181_12 = bits, U32, 468, [12:12] +unusedBit_181_13 = bits, U32, 468, [13:13] +unusedBit_181_14 = bits, U32, 468, [14:14] +unusedBit_181_15 = bits, U32, 468, [15:15] +unusedBit_181_16 = bits, U32, 468, [16:16] +unusedBit_181_17 = bits, U32, 468, [17:17] +unusedBit_181_18 = bits, U32, 468, [18:18] +unusedBit_181_19 = bits, U32, 468, [19:19] +unusedBit_181_20 = bits, U32, 468, [20:20] +unusedBit_181_21 = bits, U32, 468, [21:21] +unusedBit_181_22 = bits, U32, 468, [22:22] +unusedBit_181_23 = bits, U32, 468, [23:23] +unusedBit_181_24 = bits, U32, 468, [24:24] +unusedBit_181_25 = bits, U32, 468, [25:25] +unusedBit_181_26 = bits, U32, 468, [26:26] +unusedBit_181_27 = bits, U32, 468, [27:27] +unusedBit_181_28 = bits, U32, 468, [28:28] +unusedBit_181_29 = bits, U32, 468, [29:29] +unusedBit_181_30 = bits, U32, 468, [30:30] +unusedBit_181_31 = bits, U32, 468, [31:31] TEMPLOG_MAP_AT_CYCLE_COUNT = scalar, U08, 472, "", 1, 0 boostControllerOutput = scalar, U08, 473, "", 1, 0 boostControllerClosedLoopPart = scalar, U08, 474, "", 1, 0 @@ -2514,9 +2596,9 @@ etbStatus_resetCounter = scalar, S32, 636, "", 1, 0 columnLabel = "Voltage", "kg/hour" xAxis = -1, 6, 10 yAxis = -30, 1300, 10 - xBins = mafDecodingBins, MAFValue + xBins = mafDecodingBins, rawMaf yBins = mafDecoding - gauge = MAFGauge + gauge = rawMafGauge curve = iatFuelCorrCurve, "Intake air temperature fuel Multiplier" columnLabel = "Air Temp", "Multiplier" @@ -3082,10 +3164,9 @@ gaugeCategory = Sensors - Basic afr2Gauge = AFRValue2, "Air/Fuel Ratio 2", "", 10, 19.4, 12, 13, 15, 16, 2, 2 lambda1Gauge = lambdaValue, "Lambda", "", 0.65, 1.2, 0.7, 0.75, 1.1, 1.15, 3, 2 lambda2Gauge = lambdaValue2, "Lambda 2", "", 0.65, 1.2, 0.7, 0.75, 1.1, 1.15, 3, 2 - MAFGauge = MAFValue, "Mass air flow", "V", 0, 5, 0, 1, 3, 4, 1, 1 VBattGauge = VBatt, "Battery", "V", 8, 21, 9, 10, 17, 19, 1, 1 MAPGauge = MAPValue, "MAP", "kPa", 0, 300, 10, 10, 200, 200, 0, 0 - massAirFlowValueGa = massAirFlowValue,"Mass air flow", "kg/hr", 0, 50, -999, -999, 999, 999, 1, 1 + massAirFlowValueGa = mafMeasured, "MAF sensor", "kg/h", 0, 50, -999, -999, 999, 999, 1, 1 gaugeCategory = Sensors - Extra 1 @@ -3175,6 +3256,8 @@ gaugeCategory = Sensors - Raw rawWastegatePositionGauge = rawWastegatePosition,"Raw Wastegate Position","V", 0, 5, 0, 0, 5, 5, 3, 0 rawLowFuelPressureGauge = rawLowFuelPressure,"Raw fuel pressure (low) voltage","V", 0, 5, 0, 0, 5, 5, 3, 0 rawHighFuelPressureGauge = rawHighFuelPressure,"Raw fuel pressure (high) voltage","V", 0, 5, 0, 0, 5, 5, 3, 0 + rawMafGauge = rawMaf , "Raw MAF", "V", 0, 5, 0, 0, 5, 5, 3, 0 + gaugeCategory = Transmission desiredGearGauge = tcuDesiredGear, "Desired Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 @@ -3352,8 +3435,8 @@ entry = auxTemp2, "auxTemp2", float, "%.3f" entry = TPSValue, "TPS", float, "%.3f" entry = throttlePedalPosition, "Throttle pedal position", float, "%.3f" entry = tpsADC, "tpsADC", int, "%d" -entry = MAFValue, "MAF", float, "%.3f" -entry = massAirFlowValue, "MAF air flow", float, "%.3f" +entry = rawMaf, "rawMaf", float, "%.3f" +entry = mafMeasured, "MAF sensor", float, "%.3f" entry = MAPValue, "MAP", float, "%.3f" entry = baroPressure, "baroPressure", float, "%.3f" entry = lambdaValue, "Lambda", float, "%.3f" @@ -3510,6 +3593,8 @@ 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 = mafEstimate, "MAF estimate", float, "%.3f" +entry = instantRpm, "instantRpm", int, "%d" 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 c85cf9726f..5e5067ea09 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.12.subaru_eg33_f7.2429102220" + signature = "rusEFI 2022.01.12.subaru_eg33_f7.2848450603" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.01.12.subaru_eg33_f7.2429102220" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.01.12.subaru_eg33_f7.2848450603" ; 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 (unknown script) integration/rusefi_config.txt Wed Jan 12 01:51:33 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 12 21:37:04 UTC 2022 pageSize = 20996 page = 1 @@ -1958,8 +1958,8 @@ auxTemp2 = scalar, S16, 18, "deg C", 0.01, 0 TPSValue = scalar, S16, 20, "%", 0.01, 0 throttlePedalPosition = scalar, S16, 22, "%", 0.01, 0 tpsADC = scalar, U16, 24, "ADC", 1, 0 -MAFValue = scalar, U16, 26, "V", 0.001, 0 -massAirFlowValue = scalar, U16, 28, "Kg/h", 0.1, 0 +rawMaf = scalar, U16, 26, "V", 0.001, 0 +mafMeasured = scalar, U16, 28, "kg/h", 0.1, 0 MAPValue = scalar, U16, 30, "kPa", 0.03333333333333333, 0 baroPressure = scalar, U16, 32, "kPa", 0.03333333333333333, 0 lambdaValue = scalar, U16, 34, "", 1.0E-4, 0 @@ -2116,34 +2116,116 @@ 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 +mafEstimate = scalar, U16, 356, "kg/h", 0.1, 0 +instantRpm = scalar, U16, 358, "rpm", 1, 0 +unusedAtTheEnd1 = scalar, U08, 360, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 361, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 362, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 363, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 364, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 365, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 366, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 367, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 368, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 369, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 370, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 371, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 372, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 373, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 374, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 375, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 376, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 377, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 378, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 379, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 380, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 381, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 382, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 383, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 384, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 385, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 386, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 387, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 388, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 389, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 390, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 391, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 392, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 393, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 394, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 395, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 396, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 397, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 398, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 399, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 400, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 401, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 402, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 403, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 404, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 405, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 406, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 407, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 408, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 409, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 410, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 411, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 412, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 413, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 414, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 415, "", 1, 0 +unusedAtTheEnd57 = scalar, U08, 416, "", 1, 0 +unusedAtTheEnd58 = scalar, U08, 417, "", 1, 0 +unusedAtTheEnd59 = scalar, U08, 418, "", 1, 0 +unusedAtTheEnd60 = scalar, U08, 419, "", 1, 0 +unusedAtTheEnd61 = scalar, U08, 420, "", 1, 0 +unusedAtTheEnd62 = scalar, U08, 421, "", 1, 0 +unusedAtTheEnd63 = scalar, U08, 422, "", 1, 0 +unusedAtTheEnd64 = scalar, U08, 423, "", 1, 0 +unusedAtTheEnd65 = scalar, U08, 424, "", 1, 0 +unusedAtTheEnd66 = scalar, U08, 425, "", 1, 0 +unusedAtTheEnd67 = scalar, U08, 426, "", 1, 0 +unusedAtTheEnd68 = scalar, U08, 427, "", 1, 0 +unusedAtTheEnd69 = scalar, U08, 428, "", 1, 0 +unusedAtTheEnd70 = scalar, U08, 429, "", 1, 0 +unusedAtTheEnd71 = scalar, U08, 430, "", 1, 0 +unusedAtTheEnd72 = scalar, U08, 431, "", 1, 0 +unusedAtTheEnd73 = scalar, U08, 432, "", 1, 0 +unusedAtTheEnd74 = scalar, U08, 433, "", 1, 0 +unusedAtTheEnd75 = scalar, U08, 434, "", 1, 0 +unusedAtTheEnd76 = scalar, U08, 435, "", 1, 0 +unusedAtTheEnd77 = scalar, U08, 436, "", 1, 0 +unusedAtTheEnd78 = scalar, U08, 437, "", 1, 0 +unusedAtTheEnd79 = scalar, U08, 438, "", 1, 0 +unusedAtTheEnd80 = scalar, U08, 439, "", 1, 0 +unusedAtTheEnd81 = scalar, U08, 440, "", 1, 0 +unusedAtTheEnd82 = scalar, U08, 441, "", 1, 0 +unusedAtTheEnd83 = scalar, U08, 442, "", 1, 0 +unusedAtTheEnd84 = scalar, U08, 443, "", 1, 0 +unusedAtTheEnd85 = scalar, U08, 444, "", 1, 0 +unusedAtTheEnd86 = scalar, U08, 445, "", 1, 0 +unusedAtTheEnd87 = scalar, U08, 446, "", 1, 0 +unusedAtTheEnd88 = scalar, U08, 447, "", 1, 0 +unusedAtTheEnd89 = scalar, U08, 448, "", 1, 0 +unusedAtTheEnd90 = scalar, U08, 449, "", 1, 0 +unusedAtTheEnd91 = scalar, U08, 450, "", 1, 0 +unusedAtTheEnd92 = scalar, U08, 451, "", 1, 0 +unusedAtTheEnd93 = scalar, U08, 452, "", 1, 0 +unusedAtTheEnd94 = scalar, U08, 453, "", 1, 0 +unusedAtTheEnd95 = scalar, U08, 454, "", 1, 0 +unusedAtTheEnd96 = scalar, U08, 455, "", 1, 0 +unusedAtTheEnd97 = scalar, U08, 456, "", 1, 0 +unusedAtTheEnd98 = scalar, U08, 457, "", 1, 0 +unusedAtTheEnd99 = scalar, U08, 458, "", 1, 0 +unusedAtTheEnd100 = scalar, U08, 459, "", 1, 0 +unusedAtTheEnd101 = scalar, U08, 460, "", 1, 0 +unusedAtTheEnd102 = scalar, U08, 461, "", 1, 0 +unusedAtTheEnd103 = scalar, U08, 462, "", 1, 0 +unusedAtTheEnd104 = scalar, U08, 463, "", 1, 0 +unusedAtTheEnd105 = scalar, U08, 464, "", 1, 0 +unusedAtTheEnd106 = scalar, U08, 465, "", 1, 0 +unusedAtTheEnd107 = scalar, U08, 466, "", 1, 0 +unusedAtTheEnd108 = scalar, U08, 467, "", 1, 0 launchSpeedCondition = bits, U32, 468, [0:0] launchRpmCondition = bits, U32, 468, [1:1] launchTpsCondition = bits, U32, 468, [2:2] @@ -2151,31 +2233,31 @@ 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_179_7 = bits, U32, 468, [7:7] -unusedBit_179_8 = bits, U32, 468, [8:8] -unusedBit_179_9 = bits, U32, 468, [9:9] -unusedBit_179_10 = bits, U32, 468, [10:10] -unusedBit_179_11 = bits, U32, 468, [11:11] -unusedBit_179_12 = bits, U32, 468, [12:12] -unusedBit_179_13 = bits, U32, 468, [13:13] -unusedBit_179_14 = bits, U32, 468, [14:14] -unusedBit_179_15 = bits, U32, 468, [15:15] -unusedBit_179_16 = bits, U32, 468, [16:16] -unusedBit_179_17 = bits, U32, 468, [17:17] -unusedBit_179_18 = bits, U32, 468, [18:18] -unusedBit_179_19 = bits, U32, 468, [19:19] -unusedBit_179_20 = bits, U32, 468, [20:20] -unusedBit_179_21 = bits, U32, 468, [21:21] -unusedBit_179_22 = bits, U32, 468, [22:22] -unusedBit_179_23 = bits, U32, 468, [23:23] -unusedBit_179_24 = bits, U32, 468, [24:24] -unusedBit_179_25 = bits, U32, 468, [25:25] -unusedBit_179_26 = bits, U32, 468, [26:26] -unusedBit_179_27 = bits, U32, 468, [27:27] -unusedBit_179_28 = bits, U32, 468, [28:28] -unusedBit_179_29 = bits, U32, 468, [29:29] -unusedBit_179_30 = bits, U32, 468, [30:30] -unusedBit_179_31 = bits, U32, 468, [31:31] +unusedBit_181_7 = bits, U32, 468, [7:7] +unusedBit_181_8 = bits, U32, 468, [8:8] +unusedBit_181_9 = bits, U32, 468, [9:9] +unusedBit_181_10 = bits, U32, 468, [10:10] +unusedBit_181_11 = bits, U32, 468, [11:11] +unusedBit_181_12 = bits, U32, 468, [12:12] +unusedBit_181_13 = bits, U32, 468, [13:13] +unusedBit_181_14 = bits, U32, 468, [14:14] +unusedBit_181_15 = bits, U32, 468, [15:15] +unusedBit_181_16 = bits, U32, 468, [16:16] +unusedBit_181_17 = bits, U32, 468, [17:17] +unusedBit_181_18 = bits, U32, 468, [18:18] +unusedBit_181_19 = bits, U32, 468, [19:19] +unusedBit_181_20 = bits, U32, 468, [20:20] +unusedBit_181_21 = bits, U32, 468, [21:21] +unusedBit_181_22 = bits, U32, 468, [22:22] +unusedBit_181_23 = bits, U32, 468, [23:23] +unusedBit_181_24 = bits, U32, 468, [24:24] +unusedBit_181_25 = bits, U32, 468, [25:25] +unusedBit_181_26 = bits, U32, 468, [26:26] +unusedBit_181_27 = bits, U32, 468, [27:27] +unusedBit_181_28 = bits, U32, 468, [28:28] +unusedBit_181_29 = bits, U32, 468, [29:29] +unusedBit_181_30 = bits, U32, 468, [30:30] +unusedBit_181_31 = bits, U32, 468, [31:31] TEMPLOG_MAP_AT_CYCLE_COUNT = scalar, U08, 472, "", 1, 0 boostControllerOutput = scalar, U08, 473, "", 1, 0 boostControllerClosedLoopPart = scalar, U08, 474, "", 1, 0 @@ -2514,9 +2596,9 @@ etbStatus_resetCounter = scalar, S32, 636, "", 1, 0 columnLabel = "Voltage", "kg/hour" xAxis = -1, 6, 10 yAxis = -30, 1300, 10 - xBins = mafDecodingBins, MAFValue + xBins = mafDecodingBins, rawMaf yBins = mafDecoding - gauge = MAFGauge + gauge = rawMafGauge curve = iatFuelCorrCurve, "Intake air temperature fuel Multiplier" columnLabel = "Air Temp", "Multiplier" @@ -3082,10 +3164,9 @@ gaugeCategory = Sensors - Basic afr2Gauge = AFRValue2, "Air/Fuel Ratio 2", "", 10, 19.4, 12, 13, 15, 16, 2, 2 lambda1Gauge = lambdaValue, "Lambda", "", 0.65, 1.2, 0.7, 0.75, 1.1, 1.15, 3, 2 lambda2Gauge = lambdaValue2, "Lambda 2", "", 0.65, 1.2, 0.7, 0.75, 1.1, 1.15, 3, 2 - MAFGauge = MAFValue, "Mass air flow", "V", 0, 5, 0, 1, 3, 4, 1, 1 VBattGauge = VBatt, "Battery", "V", 8, 21, 9, 10, 17, 19, 1, 1 MAPGauge = MAPValue, "MAP", "kPa", 0, 300, 10, 10, 200, 200, 0, 0 - massAirFlowValueGa = massAirFlowValue,"Mass air flow", "kg/hr", 0, 50, -999, -999, 999, 999, 1, 1 + massAirFlowValueGa = mafMeasured, "MAF sensor", "kg/h", 0, 50, -999, -999, 999, 999, 1, 1 gaugeCategory = Sensors - Extra 1 @@ -3175,6 +3256,8 @@ gaugeCategory = Sensors - Raw rawWastegatePositionGauge = rawWastegatePosition,"Raw Wastegate Position","V", 0, 5, 0, 0, 5, 5, 3, 0 rawLowFuelPressureGauge = rawLowFuelPressure,"Raw fuel pressure (low) voltage","V", 0, 5, 0, 0, 5, 5, 3, 0 rawHighFuelPressureGauge = rawHighFuelPressure,"Raw fuel pressure (high) voltage","V", 0, 5, 0, 0, 5, 5, 3, 0 + rawMafGauge = rawMaf , "Raw MAF", "V", 0, 5, 0, 0, 5, 5, 3, 0 + gaugeCategory = Transmission desiredGearGauge = tcuDesiredGear, "Desired Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 @@ -3352,8 +3435,8 @@ entry = auxTemp2, "auxTemp2", float, "%.3f" entry = TPSValue, "TPS", float, "%.3f" entry = throttlePedalPosition, "Throttle pedal position", float, "%.3f" entry = tpsADC, "tpsADC", int, "%d" -entry = MAFValue, "MAF", float, "%.3f" -entry = massAirFlowValue, "MAF air flow", float, "%.3f" +entry = rawMaf, "rawMaf", float, "%.3f" +entry = mafMeasured, "MAF sensor", float, "%.3f" entry = MAPValue, "MAP", float, "%.3f" entry = baroPressure, "baroPressure", float, "%.3f" entry = lambdaValue, "Lambda", float, "%.3f" @@ -3510,6 +3593,8 @@ 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 = mafEstimate, "MAF estimate", float, "%.3f" +entry = instantRpm, "instantRpm", int, "%d" 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 8fb4460c4a..9ad4725988 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 (unknown script) integration/rusefi_config.txt Wed Jan 12 04:07:08 UTC 2022 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) integration/rusefi_config.txt Wed Jan 12 21:37:06 UTC 2022 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -983,7 +983,8 @@ public class Fields { public static final String GAUGE_NAME_ACCEL_Z = "Acceleration: Z"; public static final String GAUGE_NAME_AFR = "Air/Fuel Ratio"; public static final String GAUGE_NAME_AFR2 = "Air/Fuel Ratio 2"; - public static final String GAUGE_NAME_AIR_FLOW = "MAF air flow"; + public static final String GAUGE_NAME_AIR_FLOW_ESTIMATE = "MAF estimate"; + public static final String GAUGE_NAME_AIR_FLOW_MEASURED = "MAF sensor"; public static final String GAUGE_NAME_AIR_MASS = "air mass"; public static final String GAUGE_NAME_AUX_TEMP1 = "Aux temp 1"; public static final String GAUGE_NAME_AUX_TEMP2 = "Aux temp 2"; @@ -1808,7 +1809,7 @@ 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 = 1400061660; + public static final int SIGNATURE_HASH = 1786642043; public static final int silentTriggerError_offset = 1260; public static final int slowAdcAlpha_offset = 1712; public static final int sparkDwellRpmBins_offset = 54; @@ -2277,7 +2278,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.12.all.1400061660"; + public static final String TS_SIGNATURE = "rusEFI 2022.01.12.all.1786642043"; public static final char TS_SINGLE_WRITE_COMMAND = 'W'; public static final char TS_TEST_COMMAND = 't'; public static final int tunerStudioSerialSpeed_offset = 732;