From ba8841250ad2d1b951dfcfaa098d3b498eef3da2 Mon Sep 17 00:00:00 2001 From: GitHub build-firmware Action Date: Thu, 7 Apr 2022 13:29:42 +0000 Subject: [PATCH] Auto-generated configs and docs --- .../controllers/algo/rusefi_generated.h | 5 +++-- .../controllers/algo/rusefi_generated.h | 5 +++-- .../controllers/algo/rusefi_generated.h | 5 +++-- .../console/binary/generated/data_logs.ini | 1 + firmware/console/binary/generated/gauges.ini | 2 +- .../binary/generated/output_channels.ini | 2 +- .../console/binary/ts_outputs_generated.h | 7 ++++--- .../controllers/generated/rusefi_generated.h | 5 +++-- .../controllers/generated/signature_all.h | 4 ++-- .../generated/signature_alphax-2chan.h | 4 ++-- .../generated/signature_alphax-4chan.h | 4 ++-- .../controllers/generated/signature_atlas.h | 4 ++-- .../controllers/generated/signature_core8.h | 4 ++-- .../generated/signature_f429-discovery.h | 4 ++-- .../generated/signature_frankenso_na6.h | 4 ++-- .../generated/signature_harley81.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_proteus_h7.h | 4 ++-- .../generated/signature_subaru_eg33_f7.h | 4 ++-- .../generated/signature_tdg-pdm8.h | 4 ++-- .../lua/generated/output_lookup_generated.cpp | 2 ++ firmware/tunerstudio/generated/rusefi.ini | 21 ++++++++++--------- .../generated/rusefi_alphax-2chan.ini | 21 ++++++++++--------- .../generated/rusefi_alphax-4chan.ini | 21 ++++++++++--------- .../tunerstudio/generated/rusefi_atlas.ini | 21 ++++++++++--------- .../tunerstudio/generated/rusefi_core8.ini | 21 ++++++++++--------- .../generated/rusefi_f429-discovery.ini | 21 ++++++++++--------- .../generated/rusefi_frankenso_na6.ini | 21 ++++++++++--------- .../tunerstudio/generated/rusefi_harley81.ini | 21 ++++++++++--------- .../generated/rusefi_hellen-nb1.ini | 21 ++++++++++--------- .../generated/rusefi_hellen121nissan.ini | 21 ++++++++++--------- .../generated/rusefi_hellen121vag.ini | 21 ++++++++++--------- .../generated/rusefi_hellen128mercedes.ini | 21 ++++++++++--------- .../generated/rusefi_hellen154hyundai.ini | 21 ++++++++++--------- .../tunerstudio/generated/rusefi_hellen72.ini | 21 ++++++++++--------- .../tunerstudio/generated/rusefi_hellen81.ini | 21 ++++++++++--------- .../generated/rusefi_hellen88bmw.ini | 21 ++++++++++--------- .../generated/rusefi_hellenNA6.ini | 21 ++++++++++--------- .../generated/rusefi_hellenNA8_96.ini | 21 ++++++++++--------- .../generated/rusefi_hellen_cypress.ini | 21 ++++++++++--------- .../tunerstudio/generated/rusefi_kinetis.ini | 21 ++++++++++--------- .../tunerstudio/generated/rusefi_mre_f4.ini | 21 ++++++++++--------- .../tunerstudio/generated/rusefi_mre_f7.ini | 21 ++++++++++--------- .../generated/rusefi_prometheus_405.ini | 21 ++++++++++--------- .../generated/rusefi_prometheus_469.ini | 21 ++++++++++--------- .../generated/rusefi_proteus_f4.ini | 21 ++++++++++--------- .../generated/rusefi_proteus_f7.ini | 21 ++++++++++--------- .../generated/rusefi_proteus_h7.ini | 21 ++++++++++--------- .../generated/rusefi_subaru_eg33_f7.ini | 21 ++++++++++--------- .../tunerstudio/generated/rusefi_tdg-pdm8.ini | 21 ++++++++++--------- .../com/rusefi/config/generated/Fields.java | 6 ++++-- 68 files changed, 402 insertions(+), 363 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 9a8071f52d..faa160802d 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 @@ -1090,6 +1090,7 @@ #define GAUGE_NAME_DEBUG_I4 "debug i4" #define GAUGE_NAME_DEBUG_I5 "debug i5" #define GAUGE_NAME_DESIRED_GEAR "Desired Gear" +#define GAUGE_NAME_DETECTED_GEAR "Detected Gear" #define GAUGE_NAME_DWELL_DUTY "dwell: coil duty cycle" #define GAUGE_NAME_ECU_TEMPERATURE "ECU temperature" #define GAUGE_NAME_ENGINE_CRC16 "Engine CRC16" @@ -1944,7 +1945,7 @@ #define show_Frankenso_presets true #define show_test_presets true #define showHumanReadableWarning_offset 896 -#define SIGNATURE_HASH 2709779298 +#define SIGNATURE_HASH 170194075 #define silentTriggerError_offset 1260 #define skippedWheelOnCam_offset 1260 #define slowAdcAlpha_offset 1712 @@ -2496,7 +2497,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2022.04.07.hellen_cypress.2709779298" +#define TS_SIGNATURE "rusEFI 2022.04.07.hellen_cypress.170194075" #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 57896f672b..1a18a8c3cf 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -1075,6 +1075,7 @@ #define GAUGE_NAME_DEBUG_I4 "debug i4" #define GAUGE_NAME_DEBUG_I5 "debug i5" #define GAUGE_NAME_DESIRED_GEAR "Desired Gear" +#define GAUGE_NAME_DETECTED_GEAR "Detected Gear" #define GAUGE_NAME_DWELL_DUTY "dwell: coil duty cycle" #define GAUGE_NAME_ECU_TEMPERATURE "ECU temperature" #define GAUGE_NAME_ENGINE_CRC16 "Engine CRC16" @@ -1929,7 +1930,7 @@ #define show_Frankenso_presets true #define show_test_presets true #define showHumanReadableWarning_offset 896 -#define SIGNATURE_HASH 1579564958 +#define SIGNATURE_HASH 4118886503 #define silentTriggerError_offset 1260 #define skippedWheelOnCam_offset 1260 #define slowAdcAlpha_offset 1712 @@ -2481,7 +2482,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator true #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2022.04.07.kin.1579564958" +#define TS_SIGNATURE "rusEFI 2022.04.07.kin.4118886503" #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 7c3b535812..a770ceacdf 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 @@ -1068,6 +1068,7 @@ #define GAUGE_NAME_DEBUG_I4 "debug i4" #define GAUGE_NAME_DEBUG_I5 "debug i5" #define GAUGE_NAME_DESIRED_GEAR "Desired Gear" +#define GAUGE_NAME_DETECTED_GEAR "Detected Gear" #define GAUGE_NAME_DWELL_DUTY "dwell: coil duty cycle" #define GAUGE_NAME_ECU_TEMPERATURE "ECU temperature" #define GAUGE_NAME_ENGINE_CRC16 "Engine CRC16" @@ -1923,7 +1924,7 @@ #define show_Proteus_presets false #define show_test_presets false #define showHumanReadableWarning_offset 896 -#define SIGNATURE_HASH 4206982495 +#define SIGNATURE_HASH 1365668518 #define silentTriggerError_offset 1260 #define skippedWheelOnCam_offset 1260 #define slowAdcAlpha_offset 1712 @@ -2475,7 +2476,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port false -#define TS_SIGNATURE "rusEFI 2022.04.07.subaru_eg33_f7.4206982495" +#define TS_SIGNATURE "rusEFI 2022.04.07.subaru_eg33_f7.1365668518" #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 ac822ba2e7..b9d82b3e32 100644 --- a/firmware/console/binary/generated/data_logs.ini +++ b/firmware/console/binary/generated/data_logs.ini @@ -239,6 +239,7 @@ entry = vvtSyncCounter, "vvtSyncCounter", int, "%d" entry = vvtStateIndex, "vvtStateIndex", int, "%d" entry = fallbackMap, "fallbackMap", float, "%.3f" entry = boostControllerClosedLoopPart, "Boost Closed Loop", float, "%.3f" +entry = detectedGear, "Detected Gear", int, "%d" entry = timingCltCorrection, "timingCltCorrection", float, "%.3f" entry = timingIatCorrection, "timingIatCorrection", float, "%.3f" entry = timingPidCorrection, "timingPidCorrection", float, "%.3f" diff --git a/firmware/console/binary/generated/gauges.ini b/firmware/console/binary/generated/gauges.ini index ec1d643adc..5c8bf31279 100644 --- a/firmware/console/binary/generated/gauges.ini +++ b/firmware/console/binary/generated/gauges.ini @@ -308,7 +308,7 @@ vvtSyncCounterGauge = vvtSyncCounter,"vvtSyncCounter", "", -10000.0,10000.0, -10 vvtStateIndexGauge = vvtStateIndex,"vvtStateIndex", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 fallbackMapGauge = fallbackMap,"fallbackMap", "kPa", 0.0,1000.0, 0.0,1000.0, 0.0,1000.0, 1,1 boostControllerClosedLoopPartGauge = boostControllerClosedLoopPart,"Boost Closed Loop", "%", -50.0,50.0, -50.0,50.0, -50.0,50.0, 1,1 -unused503Gauge = unused503,"unused503", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +detectedGearGauge = detectedGear,"Detected Gear", "", 0.0,8.0, 0.0,8.0, 0.0,8.0, 0,0 timingCltCorrectionGauge = timingCltCorrection,"timingCltCorrection", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 timingIatCorrectionGauge = timingIatCorrection,"timingIatCorrection", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 timingPidCorrectionGauge = timingPidCorrection,"timingPidCorrection", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 diff --git a/firmware/console/binary/generated/output_channels.ini b/firmware/console/binary/generated/output_channels.ini index d947c4c5f0..a95b3366ff 100644 --- a/firmware/console/binary/generated/output_channels.ini +++ b/firmware/console/binary/generated/output_channels.ini @@ -308,7 +308,7 @@ vvtSyncCounter = scalar, U08, 438, "", 1, 0 vvtStateIndex = scalar, U08, 439, "", 1, 0 fallbackMap = scalar, U16, 440, "kPa", 0.1, 0 boostControllerClosedLoopPart = scalar, S08, 442, "%", 0.5, 0 -unused503 = scalar, U08, 443, "", 1, 0 +detectedGear = scalar, U08, 443, "", 1, 0 timingCltCorrection = scalar, S16, 444, "deg", 0.01, 0 timingIatCorrection = scalar, S16, 446, "deg", 0.01, 0 timingPidCorrection = scalar, S16, 448, "deg", 0.01, 0 diff --git a/firmware/console/binary/ts_outputs_generated.h b/firmware/console/binary/ts_outputs_generated.h index 32c66c555d..8e995b4463 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 Sun Apr 03 22:03:23 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Thu Apr 07 13:26:35 UTC 2022 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -1239,9 +1239,10 @@ struct ts_outputs_s { */ scaled_channel boostControllerClosedLoopPart = (int8_t)0; /** + * @@GAUGE_NAME_DETECTED_GEAR@@ * offset 443 */ - uint8_t unused503 = (uint8_t)0; + uint8_t detectedGear = (uint8_t)0; /** deg * offset 444 @@ -1390,4 +1391,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 Sun Apr 03 22:03:23 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Thu Apr 07 13:26:35 UTC 2022 diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h index af1495c232..aaa45cceef 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -1090,6 +1090,7 @@ #define GAUGE_NAME_DEBUG_I4 "debug i4" #define GAUGE_NAME_DEBUG_I5 "debug i5" #define GAUGE_NAME_DESIRED_GEAR "Desired Gear" +#define GAUGE_NAME_DETECTED_GEAR "Detected Gear" #define GAUGE_NAME_DWELL_DUTY "dwell: coil duty cycle" #define GAUGE_NAME_ECU_TEMPERATURE "ECU temperature" #define GAUGE_NAME_ENGINE_CRC16 "Engine CRC16" @@ -1944,7 +1945,7 @@ #define show_Frankenso_presets true #define show_test_presets true #define showHumanReadableWarning_offset 896 -#define SIGNATURE_HASH 2608207070 +#define SIGNATURE_HASH 819008295 #define silentTriggerError_offset 1260 #define skippedWheelOnCam_offset 1260 #define slowAdcAlpha_offset 1712 @@ -2496,7 +2497,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2022.04.07.all.2608207070" +#define TS_SIGNATURE "rusEFI 2022.04.07.all.819008295" #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 1d86432224..49ff3be891 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 2608207070 -#define TS_SIGNATURE "rusEFI 2022.04.07.all.2608207070" +#define SIGNATURE_HASH 819008295 +#define TS_SIGNATURE "rusEFI 2022.04.07.all.819008295" diff --git a/firmware/controllers/generated/signature_alphax-2chan.h b/firmware/controllers/generated/signature_alphax-2chan.h index 0be21da9d1..c5691988d6 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 2253769089 -#define TS_SIGNATURE "rusEFI 2022.04.07.alphax-2chan.2253769089" +#define SIGNATURE_HASH 770887288 +#define TS_SIGNATURE "rusEFI 2022.04.07.alphax-2chan.770887288" diff --git a/firmware/controllers/generated/signature_alphax-4chan.h b/firmware/controllers/generated/signature_alphax-4chan.h index 50451ef2fa..2886303d2e 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 314952490 -#define TS_SIGNATURE "rusEFI 2022.04.07.alphax-4chan.314952490" +#define SIGNATURE_HASH 3110259923 +#define TS_SIGNATURE "rusEFI 2022.04.07.alphax-4chan.3110259923" diff --git a/firmware/controllers/generated/signature_atlas.h b/firmware/controllers/generated/signature_atlas.h index 64986d1d42..4e28b2ed65 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 2277302777 -#define TS_SIGNATURE "rusEFI 2022.04.07.atlas.2277302777" +#define SIGNATURE_HASH 740025856 +#define TS_SIGNATURE "rusEFI 2022.04.07.atlas.740025856" diff --git a/firmware/controllers/generated/signature_core8.h b/firmware/controllers/generated/signature_core8.h index 02b8966cb3..72290c2b83 100644 --- a/firmware/controllers/generated/signature_core8.h +++ b/firmware/controllers/generated/signature_core8.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3058277812 -#define TS_SIGNATURE "rusEFI 2022.04.07.core8.3058277812" +#define SIGNATURE_HASH 502176333 +#define TS_SIGNATURE "rusEFI 2022.04.07.core8.502176333" diff --git a/firmware/controllers/generated/signature_f429-discovery.h b/firmware/controllers/generated/signature_f429-discovery.h index 95f09731c9..c5ac839721 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 2608207070 -#define TS_SIGNATURE "rusEFI 2022.04.07.f429-discovery.2608207070" +#define SIGNATURE_HASH 819008295 +#define TS_SIGNATURE "rusEFI 2022.04.07.f429-discovery.819008295" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index 84e35afa32..24957c6aeb 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 4071591151 -#define TS_SIGNATURE "rusEFI 2022.04.07.frankenso_na6.4071591151" +#define SIGNATURE_HASH 1493732118 +#define TS_SIGNATURE "rusEFI 2022.04.07.frankenso_na6.1493732118" diff --git a/firmware/controllers/generated/signature_harley81.h b/firmware/controllers/generated/signature_harley81.h index 2eb906c6a2..5a1d430af9 100644 --- a/firmware/controllers/generated/signature_harley81.h +++ b/firmware/controllers/generated/signature_harley81.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 785570865 -#define TS_SIGNATURE "rusEFI 2022.04.07.harley81.785570865" +#define SIGNATURE_HASH 2239093704 +#define TS_SIGNATURE "rusEFI 2022.04.07.harley81.2239093704" diff --git a/firmware/controllers/generated/signature_hellen-nb1.h b/firmware/controllers/generated/signature_hellen-nb1.h index fd829725b2..0f8053bfab 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 3130935443 -#define TS_SIGNATURE "rusEFI 2022.04.07.hellen-nb1.3130935443" +#define SIGNATURE_HASH 288968554 +#define TS_SIGNATURE "rusEFI 2022.04.07.hellen-nb1.288968554" diff --git a/firmware/controllers/generated/signature_hellen121nissan.h b/firmware/controllers/generated/signature_hellen121nissan.h index ac62edf94c..1f114b4494 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 3334550176 -#define TS_SIGNATURE "rusEFI 2022.04.07.hellen121nissan.3334550176" +#define SIGNATURE_HASH 1835414873 +#define TS_SIGNATURE "rusEFI 2022.04.07.hellen121nissan.1835414873" diff --git a/firmware/controllers/generated/signature_hellen121vag.h b/firmware/controllers/generated/signature_hellen121vag.h index 8fded07716..ec34158381 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 1177561733 -#define TS_SIGNATURE "rusEFI 2022.04.07.hellen121vag.1177561733" +#define SIGNATURE_HASH 3986107772 +#define TS_SIGNATURE "rusEFI 2022.04.07.hellen121vag.3986107772" diff --git a/firmware/controllers/generated/signature_hellen128.h b/firmware/controllers/generated/signature_hellen128.h index b79a86b187..a311fc3077 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 2246316467 -#define TS_SIGNATURE "rusEFI 2022.04.07.hellen128.2246316467" +#define SIGNATURE_HASH 776148554 +#define TS_SIGNATURE "rusEFI 2022.04.07.hellen128.776148554" diff --git a/firmware/controllers/generated/signature_hellen154hyundai.h b/firmware/controllers/generated/signature_hellen154hyundai.h index f294df0353..75038da0aa 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 414361951 -#define TS_SIGNATURE "rusEFI 2022.04.07.hellen154hyundai.414361951" +#define SIGNATURE_HASH 3004542630 +#define TS_SIGNATURE "rusEFI 2022.04.07.hellen154hyundai.3004542630" diff --git a/firmware/controllers/generated/signature_hellen72.h b/firmware/controllers/generated/signature_hellen72.h index f4536520cf..474fec05fc 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 1411376834 -#define TS_SIGNATURE "rusEFI 2022.04.07.hellen72.1411376834" +#define SIGNATURE_HASH 4290306363 +#define TS_SIGNATURE "rusEFI 2022.04.07.hellen72.4290306363" diff --git a/firmware/controllers/generated/signature_hellen81.h b/firmware/controllers/generated/signature_hellen81.h index c4b1b9bf29..4c1267aedb 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 1597111989 -#define TS_SIGNATURE "rusEFI 2022.04.07.hellen81.1597111989" +#define SIGNATURE_HASH 4103534924 +#define TS_SIGNATURE "rusEFI 2022.04.07.hellen81.4103534924" diff --git a/firmware/controllers/generated/signature_hellen88bmw.h b/firmware/controllers/generated/signature_hellen88bmw.h index 8bab1f2d92..3799a87ff8 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 2469133699 -#define TS_SIGNATURE "rusEFI 2022.04.07.hellen88bmw.2469133699" +#define SIGNATURE_HASH 948763258 +#define TS_SIGNATURE "rusEFI 2022.04.07.hellen88bmw.948763258" diff --git a/firmware/controllers/generated/signature_hellenNA6.h b/firmware/controllers/generated/signature_hellenNA6.h index 3917497b2f..e14c4e0496 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 2367866368 -#define TS_SIGNATURE "rusEFI 2022.04.07.hellenNA6.2367866368" +#define SIGNATURE_HASH 646300153 +#define TS_SIGNATURE "rusEFI 2022.04.07.hellenNA6.646300153" diff --git a/firmware/controllers/generated/signature_hellenNA8_96.h b/firmware/controllers/generated/signature_hellenNA8_96.h index 29cfed7433..c6bfc96608 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 1320483547 -#define TS_SIGNATURE "rusEFI 2022.04.07.hellenNA8_96.1320483547" +#define SIGNATURE_HASH 3843292450 +#define TS_SIGNATURE "rusEFI 2022.04.07.hellenNA8_96.3843292450" diff --git a/firmware/controllers/generated/signature_hellen_cypress.h b/firmware/controllers/generated/signature_hellen_cypress.h index 70b57b5844..3ff4f25e42 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 2709779298 -#define TS_SIGNATURE "rusEFI 2022.04.07.hellen_cypress.2709779298" +#define SIGNATURE_HASH 170194075 +#define TS_SIGNATURE "rusEFI 2022.04.07.hellen_cypress.170194075" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index be66708bdd..5df0dfb018 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 1579564958 -#define TS_SIGNATURE "rusEFI 2022.04.07.kin.1579564958" +#define SIGNATURE_HASH 4118886503 +#define TS_SIGNATURE "rusEFI 2022.04.07.kin.4118886503" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index dca3ba15a8..206a0bb66c 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 4099332789 -#define TS_SIGNATURE "rusEFI 2022.04.07.mre_f4.4099332789" +#define SIGNATURE_HASH 1609686348 +#define TS_SIGNATURE "rusEFI 2022.04.07.mre_f4.1609686348" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index 0b7dde08a5..879c1b381e 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 4099332789 -#define TS_SIGNATURE "rusEFI 2022.04.07.mre_f7.4099332789" +#define SIGNATURE_HASH 1609686348 +#define TS_SIGNATURE "rusEFI 2022.04.07.mre_f7.1609686348" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index d830992c70..8876d2276a 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 3416051000 -#define TS_SIGNATURE "rusEFI 2022.04.07.prometheus_405.3416051000" +#define SIGNATURE_HASH 1614531265 +#define TS_SIGNATURE "rusEFI 2022.04.07.prometheus_405.1614531265" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index 94edd1a3f4..b5723f9f94 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 3416051000 -#define TS_SIGNATURE "rusEFI 2022.04.07.prometheus_469.3416051000" +#define SIGNATURE_HASH 1614531265 +#define TS_SIGNATURE "rusEFI 2022.04.07.prometheus_469.1614531265" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index 8dcfcb6e21..a748795d30 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 3182398815 -#define TS_SIGNATURE "rusEFI 2022.04.07.proteus_f4.3182398815" +#define SIGNATURE_HASH 369658534 +#define TS_SIGNATURE "rusEFI 2022.04.07.proteus_f4.369658534" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index 40065ebe92..7661cf86da 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 3182398815 -#define TS_SIGNATURE "rusEFI 2022.04.07.proteus_f7.3182398815" +#define SIGNATURE_HASH 369658534 +#define TS_SIGNATURE "rusEFI 2022.04.07.proteus_f7.369658534" diff --git a/firmware/controllers/generated/signature_proteus_h7.h b/firmware/controllers/generated/signature_proteus_h7.h index b6767dbce2..df5782952a 100644 --- a/firmware/controllers/generated/signature_proteus_h7.h +++ b/firmware/controllers/generated/signature_proteus_h7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3182398815 -#define TS_SIGNATURE "rusEFI 2022.04.07.proteus_h7.3182398815" +#define SIGNATURE_HASH 369658534 +#define TS_SIGNATURE "rusEFI 2022.04.07.proteus_h7.369658534" diff --git a/firmware/controllers/generated/signature_subaru_eg33_f7.h b/firmware/controllers/generated/signature_subaru_eg33_f7.h index 0f7e3f60a1..642f40f640 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 4206982495 -#define TS_SIGNATURE "rusEFI 2022.04.07.subaru_eg33_f7.4206982495" +#define SIGNATURE_HASH 1365668518 +#define TS_SIGNATURE "rusEFI 2022.04.07.subaru_eg33_f7.1365668518" diff --git a/firmware/controllers/generated/signature_tdg-pdm8.h b/firmware/controllers/generated/signature_tdg-pdm8.h index 84154ed899..9f09e04230 100644 --- a/firmware/controllers/generated/signature_tdg-pdm8.h +++ b/firmware/controllers/generated/signature_tdg-pdm8.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 2003262607 -#define TS_SIGNATURE "rusEFI 2022.04.07.tdg-pdm8.2003262607" +#define SIGNATURE_HASH 3703593846 +#define TS_SIGNATURE "rusEFI 2022.04.07.tdg-pdm8.3703593846" diff --git a/firmware/controllers/lua/generated/output_lookup_generated.cpp b/firmware/controllers/lua/generated/output_lookup_generated.cpp index 31c3954776..1182e2cd89 100644 --- a/firmware/controllers/lua/generated/output_lookup_generated.cpp +++ b/firmware/controllers/lua/generated/output_lookup_generated.cpp @@ -406,6 +406,8 @@ float getOutputValueByName(const char *name) { return engine->outputChannels.fallbackMap; if (strEqualCaseInsensitive(name, "boostControllerClosedLoopPart")) return engine->outputChannels.boostControllerClosedLoopPart; + if (strEqualCaseInsensitive(name, "detectedGear")) + return engine->outputChannels.detectedGear; if (strEqualCaseInsensitive(name, "timingCltCorrection")) return engine->outputChannels.timingCltCorrection; if (strEqualCaseInsensitive(name, "timingIatCorrection")) diff --git a/firmware/tunerstudio/generated/rusefi.ini b/firmware/tunerstudio/generated/rusefi.ini index 042cae386c..0efd2203fd 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.04.07.all.2608207070" + signature = "rusEFI 2022.04.07.all.819008295" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.07.all.2608207070" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.07.all.819008295" ; 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 Thu Apr 07 03:46:26 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) integration/rusefi_config.txt Thu Apr 07 13:27:26 UTC 2022 pageSize = 21012 page = 1 @@ -2271,7 +2271,7 @@ vvtSyncCounter = scalar, U08, 438, "", 1, 0 vvtStateIndex = scalar, U08, 439, "", 1, 0 fallbackMap = scalar, U16, 440, "kPa", 0.1, 0 boostControllerClosedLoopPart = scalar, S08, 442, "%", 0.5, 0 -unused503 = scalar, U08, 443, "", 1, 0 +detectedGear = scalar, U08, 443, "", 1, 0 timingCltCorrection = scalar, S16, 444, "deg", 0.01, 0 timingIatCorrection = scalar, S16, 446, "deg", 0.01, 0 timingPidCorrection = scalar, S16, 448, "deg", 0.01, 0 @@ -3246,7 +3246,6 @@ gaugeCategory = Sensors - Extra 2 knockLevelGauge = knockLevel,"Knock level", "V", 0, 7, 10, 10, 100, 100, 1, 2 knockCountGauge = knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 fuelTankLevelGauge = fuelTankLevel,"Fuel level", "%", 0, 100, 10, 20, 100, 100, 1, 1 - speedToRpmRatioGauge = speedToRpmRatio, "Gearbox Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 wastegatePosGauge = wastegatePositionSensor, "Wastegate position sensor", "%", 0, 100, 0, 0, 100, 100, 1, 1 idlePosSensGauge = idlePositionSensor, "Idle position sensor", "%", 0, 100, 0, 0, 100, 100, 1, 1 currentEnginePhaseGauge = currentEnginePhase, "Engine Phase", "deg", 0, 720, 0, 0, 720, 720, 0, 0 @@ -3393,6 +3392,8 @@ gaugeCategory = Sensors - Raw gaugeCategory = Transmission desiredGearGauge = tcuDesiredGear, "Desired Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 currentGearGauge = tcuCurrentGear, "Current Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 + detectedGearGauge = detectedGear, "Detected Gear", "gear", 0, 8, 0, 0, 8, 8, 0, 0 + speedToRpmRatioGauge = speedToRpmRatio, "Gearbox Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 gaugeCategory = Knock knock1Gauge = knock1, "Knock Cyl 1", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 @@ -3766,6 +3767,7 @@ entry = vvtSyncCounter, "vvtSyncCounter", int, "%d" entry = vvtStateIndex, "vvtStateIndex", int, "%d" entry = fallbackMap, "fallbackMap", float, "%.3f" entry = boostControllerClosedLoopPart, "Boost Closed Loop", float, "%.3f" +entry = detectedGear, "Detected Gear", int, "%d" entry = timingCltCorrection, "timingCltCorrection", float, "%.3f" entry = timingIatCorrection, "timingIatCorrection", float, "%.3f" entry = timingPidCorrection, "timingPidCorrection", float, "%.3f" @@ -3964,10 +3966,10 @@ menuDialog = main subMenu = gearDetection, "Gear detection", 0 subMenu = std_separator - subMenu = boostDialog, "Boost Control" - subMenu = boostOpenLoopDialog, "Boost Control Open Loop", { isBoostControlEnabled && boostType == 0 } - subMenu = boostPidDialog, "Boost Control Closed Loop PID", { isBoostControlEnabled && boostType == 1 } - subMenu = boostTargetDialog, "Boost Control Closed Loop Target", { isBoostControlEnabled && boostType == 1 } + subMenu = boostDialog, "Boost control" + subMenu = boostOpenLoopDialog, "Boost control open loop", { isBoostControlEnabled } + subMenu = boostPidDialog, "Boost control PID", { isBoostControlEnabled && boostType == 1 } + subMenu = boostTargetDialog, "Boost control target", { isBoostControlEnabled && boostType == 1 } subMenu = boostEtbPid, "ETB-style Wastegate Actuator", { etbFunctions1 == 4 || etbFunctions2 == 4 } subMenu = std_separator @@ -5627,7 +5629,6 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = speedSensorLeft, "", yAxis panel = speedSensorAnalog, { enableCanVss == 0 } panel = speedSensorCan - panel = vssFilter dialog = gearDetection, "Gear Detection" field = "Wheel revolutions per kilometer", driveWheelRevPerKm diff --git a/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini index 000a1bf373..5bb2b72f5c 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.04.07.alphax-2chan.2253769089" + signature = "rusEFI 2022.04.07.alphax-2chan.770887288" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.07.alphax-2chan.2253769089" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.07.alphax-2chan.770887288" ; 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 Thu Apr 07 03:45:46 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) integration/rusefi_config.txt Thu Apr 07 13:26:36 UTC 2022 pageSize = 21012 page = 1 @@ -2271,7 +2271,7 @@ vvtSyncCounter = scalar, U08, 438, "", 1, 0 vvtStateIndex = scalar, U08, 439, "", 1, 0 fallbackMap = scalar, U16, 440, "kPa", 0.1, 0 boostControllerClosedLoopPart = scalar, S08, 442, "%", 0.5, 0 -unused503 = scalar, U08, 443, "", 1, 0 +detectedGear = scalar, U08, 443, "", 1, 0 timingCltCorrection = scalar, S16, 444, "deg", 0.01, 0 timingIatCorrection = scalar, S16, 446, "deg", 0.01, 0 timingPidCorrection = scalar, S16, 448, "deg", 0.01, 0 @@ -3246,7 +3246,6 @@ gaugeCategory = Sensors - Extra 2 knockLevelGauge = knockLevel,"Knock level", "V", 0, 7, 10, 10, 100, 100, 1, 2 knockCountGauge = knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 fuelTankLevelGauge = fuelTankLevel,"Fuel level", "%", 0, 100, 10, 20, 100, 100, 1, 1 - speedToRpmRatioGauge = speedToRpmRatio, "Gearbox Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 wastegatePosGauge = wastegatePositionSensor, "Wastegate position sensor", "%", 0, 100, 0, 0, 100, 100, 1, 1 idlePosSensGauge = idlePositionSensor, "Idle position sensor", "%", 0, 100, 0, 0, 100, 100, 1, 1 currentEnginePhaseGauge = currentEnginePhase, "Engine Phase", "deg", 0, 720, 0, 0, 720, 720, 0, 0 @@ -3393,6 +3392,8 @@ gaugeCategory = Sensors - Raw gaugeCategory = Transmission desiredGearGauge = tcuDesiredGear, "Desired Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 currentGearGauge = tcuCurrentGear, "Current Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 + detectedGearGauge = detectedGear, "Detected Gear", "gear", 0, 8, 0, 0, 8, 8, 0, 0 + speedToRpmRatioGauge = speedToRpmRatio, "Gearbox Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 gaugeCategory = Knock knock1Gauge = knock1, "Knock Cyl 1", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 @@ -3766,6 +3767,7 @@ entry = vvtSyncCounter, "vvtSyncCounter", int, "%d" entry = vvtStateIndex, "vvtStateIndex", int, "%d" entry = fallbackMap, "fallbackMap", float, "%.3f" entry = boostControllerClosedLoopPart, "Boost Closed Loop", float, "%.3f" +entry = detectedGear, "Detected Gear", int, "%d" entry = timingCltCorrection, "timingCltCorrection", float, "%.3f" entry = timingIatCorrection, "timingIatCorrection", float, "%.3f" entry = timingPidCorrection, "timingPidCorrection", float, "%.3f" @@ -3964,10 +3966,10 @@ menuDialog = main subMenu = gearDetection, "Gear detection", 0 subMenu = std_separator - subMenu = boostDialog, "Boost Control" - subMenu = boostOpenLoopDialog, "Boost Control Open Loop", { isBoostControlEnabled && boostType == 0 } - subMenu = boostPidDialog, "Boost Control Closed Loop PID", { isBoostControlEnabled && boostType == 1 } - subMenu = boostTargetDialog, "Boost Control Closed Loop Target", { isBoostControlEnabled && boostType == 1 } + subMenu = boostDialog, "Boost control" + subMenu = boostOpenLoopDialog, "Boost control open loop", { isBoostControlEnabled } + subMenu = boostPidDialog, "Boost control PID", { isBoostControlEnabled && boostType == 1 } + subMenu = boostTargetDialog, "Boost control target", { isBoostControlEnabled && boostType == 1 } subMenu = boostEtbPid, "ETB-style Wastegate Actuator", { etbFunctions1 == 4 || etbFunctions2 == 4 } subMenu = std_separator @@ -5608,7 +5610,6 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = speedSensorLeft, "", yAxis panel = speedSensorAnalog, { enableCanVss == 0 } panel = speedSensorCan - panel = vssFilter dialog = gearDetection, "Gear Detection" field = "Wheel revolutions per kilometer", driveWheelRevPerKm diff --git a/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini index 22c29932d8..09aa5aaf7d 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.04.07.alphax-4chan.314952490" + signature = "rusEFI 2022.04.07.alphax-4chan.3110259923" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.07.alphax-4chan.314952490" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.07.alphax-4chan.3110259923" ; 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 Thu Apr 07 03:45:48 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) integration/rusefi_config.txt Thu Apr 07 13:26:38 UTC 2022 pageSize = 21012 page = 1 @@ -2271,7 +2271,7 @@ vvtSyncCounter = scalar, U08, 438, "", 1, 0 vvtStateIndex = scalar, U08, 439, "", 1, 0 fallbackMap = scalar, U16, 440, "kPa", 0.1, 0 boostControllerClosedLoopPart = scalar, S08, 442, "%", 0.5, 0 -unused503 = scalar, U08, 443, "", 1, 0 +detectedGear = scalar, U08, 443, "", 1, 0 timingCltCorrection = scalar, S16, 444, "deg", 0.01, 0 timingIatCorrection = scalar, S16, 446, "deg", 0.01, 0 timingPidCorrection = scalar, S16, 448, "deg", 0.01, 0 @@ -3246,7 +3246,6 @@ gaugeCategory = Sensors - Extra 2 knockLevelGauge = knockLevel,"Knock level", "V", 0, 7, 10, 10, 100, 100, 1, 2 knockCountGauge = knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 fuelTankLevelGauge = fuelTankLevel,"Fuel level", "%", 0, 100, 10, 20, 100, 100, 1, 1 - speedToRpmRatioGauge = speedToRpmRatio, "Gearbox Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 wastegatePosGauge = wastegatePositionSensor, "Wastegate position sensor", "%", 0, 100, 0, 0, 100, 100, 1, 1 idlePosSensGauge = idlePositionSensor, "Idle position sensor", "%", 0, 100, 0, 0, 100, 100, 1, 1 currentEnginePhaseGauge = currentEnginePhase, "Engine Phase", "deg", 0, 720, 0, 0, 720, 720, 0, 0 @@ -3393,6 +3392,8 @@ gaugeCategory = Sensors - Raw gaugeCategory = Transmission desiredGearGauge = tcuDesiredGear, "Desired Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 currentGearGauge = tcuCurrentGear, "Current Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 + detectedGearGauge = detectedGear, "Detected Gear", "gear", 0, 8, 0, 0, 8, 8, 0, 0 + speedToRpmRatioGauge = speedToRpmRatio, "Gearbox Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 gaugeCategory = Knock knock1Gauge = knock1, "Knock Cyl 1", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 @@ -3766,6 +3767,7 @@ entry = vvtSyncCounter, "vvtSyncCounter", int, "%d" entry = vvtStateIndex, "vvtStateIndex", int, "%d" entry = fallbackMap, "fallbackMap", float, "%.3f" entry = boostControllerClosedLoopPart, "Boost Closed Loop", float, "%.3f" +entry = detectedGear, "Detected Gear", int, "%d" entry = timingCltCorrection, "timingCltCorrection", float, "%.3f" entry = timingIatCorrection, "timingIatCorrection", float, "%.3f" entry = timingPidCorrection, "timingPidCorrection", float, "%.3f" @@ -3964,10 +3966,10 @@ menuDialog = main subMenu = gearDetection, "Gear detection", 0 subMenu = std_separator - subMenu = boostDialog, "Boost Control" - subMenu = boostOpenLoopDialog, "Boost Control Open Loop", { isBoostControlEnabled && boostType == 0 } - subMenu = boostPidDialog, "Boost Control Closed Loop PID", { isBoostControlEnabled && boostType == 1 } - subMenu = boostTargetDialog, "Boost Control Closed Loop Target", { isBoostControlEnabled && boostType == 1 } + subMenu = boostDialog, "Boost control" + subMenu = boostOpenLoopDialog, "Boost control open loop", { isBoostControlEnabled } + subMenu = boostPidDialog, "Boost control PID", { isBoostControlEnabled && boostType == 1 } + subMenu = boostTargetDialog, "Boost control target", { isBoostControlEnabled && boostType == 1 } subMenu = boostEtbPid, "ETB-style Wastegate Actuator", { etbFunctions1 == 4 || etbFunctions2 == 4 } subMenu = std_separator @@ -5609,7 +5611,6 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = speedSensorLeft, "", yAxis panel = speedSensorAnalog, { enableCanVss == 0 } panel = speedSensorCan - panel = vssFilter dialog = gearDetection, "Gear Detection" field = "Wheel revolutions per kilometer", driveWheelRevPerKm diff --git a/firmware/tunerstudio/generated/rusefi_atlas.ini b/firmware/tunerstudio/generated/rusefi_atlas.ini index a56ba6eef5..14516e1483 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.04.07.atlas.2277302777" + signature = "rusEFI 2022.04.07.atlas.740025856" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.07.atlas.2277302777" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.07.atlas.740025856" ; 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 Thu Apr 07 03:46:23 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) integration/rusefi_config.txt Thu Apr 07 13:27:22 UTC 2022 pageSize = 21012 page = 1 @@ -2271,7 +2271,7 @@ vvtSyncCounter = scalar, U08, 438, "", 1, 0 vvtStateIndex = scalar, U08, 439, "", 1, 0 fallbackMap = scalar, U16, 440, "kPa", 0.1, 0 boostControllerClosedLoopPart = scalar, S08, 442, "%", 0.5, 0 -unused503 = scalar, U08, 443, "", 1, 0 +detectedGear = scalar, U08, 443, "", 1, 0 timingCltCorrection = scalar, S16, 444, "deg", 0.01, 0 timingIatCorrection = scalar, S16, 446, "deg", 0.01, 0 timingPidCorrection = scalar, S16, 448, "deg", 0.01, 0 @@ -3246,7 +3246,6 @@ gaugeCategory = Sensors - Extra 2 knockLevelGauge = knockLevel,"Knock level", "V", 0, 7, 10, 10, 100, 100, 1, 2 knockCountGauge = knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 fuelTankLevelGauge = fuelTankLevel,"Fuel level", "%", 0, 100, 10, 20, 100, 100, 1, 1 - speedToRpmRatioGauge = speedToRpmRatio, "Gearbox Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 wastegatePosGauge = wastegatePositionSensor, "Wastegate position sensor", "%", 0, 100, 0, 0, 100, 100, 1, 1 idlePosSensGauge = idlePositionSensor, "Idle position sensor", "%", 0, 100, 0, 0, 100, 100, 1, 1 currentEnginePhaseGauge = currentEnginePhase, "Engine Phase", "deg", 0, 720, 0, 0, 720, 720, 0, 0 @@ -3393,6 +3392,8 @@ gaugeCategory = Sensors - Raw gaugeCategory = Transmission desiredGearGauge = tcuDesiredGear, "Desired Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 currentGearGauge = tcuCurrentGear, "Current Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 + detectedGearGauge = detectedGear, "Detected Gear", "gear", 0, 8, 0, 0, 8, 8, 0, 0 + speedToRpmRatioGauge = speedToRpmRatio, "Gearbox Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 gaugeCategory = Knock knock1Gauge = knock1, "Knock Cyl 1", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 @@ -3766,6 +3767,7 @@ entry = vvtSyncCounter, "vvtSyncCounter", int, "%d" entry = vvtStateIndex, "vvtStateIndex", int, "%d" entry = fallbackMap, "fallbackMap", float, "%.3f" entry = boostControllerClosedLoopPart, "Boost Closed Loop", float, "%.3f" +entry = detectedGear, "Detected Gear", int, "%d" entry = timingCltCorrection, "timingCltCorrection", float, "%.3f" entry = timingIatCorrection, "timingIatCorrection", float, "%.3f" entry = timingPidCorrection, "timingPidCorrection", float, "%.3f" @@ -3964,10 +3966,10 @@ menuDialog = main subMenu = gearDetection, "Gear detection", 0 subMenu = std_separator - subMenu = boostDialog, "Boost Control" - subMenu = boostOpenLoopDialog, "Boost Control Open Loop", { isBoostControlEnabled && boostType == 0 } - subMenu = boostPidDialog, "Boost Control Closed Loop PID", { isBoostControlEnabled && boostType == 1 } - subMenu = boostTargetDialog, "Boost Control Closed Loop Target", { isBoostControlEnabled && boostType == 1 } + subMenu = boostDialog, "Boost control" + subMenu = boostOpenLoopDialog, "Boost control open loop", { isBoostControlEnabled } + subMenu = boostPidDialog, "Boost control PID", { isBoostControlEnabled && boostType == 1 } + subMenu = boostTargetDialog, "Boost control target", { isBoostControlEnabled && boostType == 1 } subMenu = boostEtbPid, "ETB-style Wastegate Actuator", { etbFunctions1 == 4 || etbFunctions2 == 4 } subMenu = std_separator @@ -5619,7 +5621,6 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = speedSensorLeft, "", yAxis panel = speedSensorAnalog, { enableCanVss == 0 } panel = speedSensorCan - panel = vssFilter dialog = gearDetection, "Gear Detection" field = "Wheel revolutions per kilometer", driveWheelRevPerKm diff --git a/firmware/tunerstudio/generated/rusefi_core8.ini b/firmware/tunerstudio/generated/rusefi_core8.ini index 5837250ef2..ea6075ed5d 100644 --- a/firmware/tunerstudio/generated/rusefi_core8.ini +++ b/firmware/tunerstudio/generated/rusefi_core8.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.07.core8.3058277812" + signature = "rusEFI 2022.04.07.core8.502176333" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.07.core8.3058277812" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.07.core8.502176333" ; 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 Thu Apr 07 03:46:10 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) integration/rusefi_config.txt Thu Apr 07 13:27:06 UTC 2022 pageSize = 21012 page = 1 @@ -2271,7 +2271,7 @@ vvtSyncCounter = scalar, U08, 438, "", 1, 0 vvtStateIndex = scalar, U08, 439, "", 1, 0 fallbackMap = scalar, U16, 440, "kPa", 0.1, 0 boostControllerClosedLoopPart = scalar, S08, 442, "%", 0.5, 0 -unused503 = scalar, U08, 443, "", 1, 0 +detectedGear = scalar, U08, 443, "", 1, 0 timingCltCorrection = scalar, S16, 444, "deg", 0.01, 0 timingIatCorrection = scalar, S16, 446, "deg", 0.01, 0 timingPidCorrection = scalar, S16, 448, "deg", 0.01, 0 @@ -3246,7 +3246,6 @@ gaugeCategory = Sensors - Extra 2 knockLevelGauge = knockLevel,"Knock level", "V", 0, 7, 10, 10, 100, 100, 1, 2 knockCountGauge = knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 fuelTankLevelGauge = fuelTankLevel,"Fuel level", "%", 0, 100, 10, 20, 100, 100, 1, 1 - speedToRpmRatioGauge = speedToRpmRatio, "Gearbox Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 wastegatePosGauge = wastegatePositionSensor, "Wastegate position sensor", "%", 0, 100, 0, 0, 100, 100, 1, 1 idlePosSensGauge = idlePositionSensor, "Idle position sensor", "%", 0, 100, 0, 0, 100, 100, 1, 1 currentEnginePhaseGauge = currentEnginePhase, "Engine Phase", "deg", 0, 720, 0, 0, 720, 720, 0, 0 @@ -3393,6 +3392,8 @@ gaugeCategory = Sensors - Raw gaugeCategory = Transmission desiredGearGauge = tcuDesiredGear, "Desired Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 currentGearGauge = tcuCurrentGear, "Current Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 + detectedGearGauge = detectedGear, "Detected Gear", "gear", 0, 8, 0, 0, 8, 8, 0, 0 + speedToRpmRatioGauge = speedToRpmRatio, "Gearbox Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 gaugeCategory = Knock knock1Gauge = knock1, "Knock Cyl 1", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 @@ -3766,6 +3767,7 @@ entry = vvtSyncCounter, "vvtSyncCounter", int, "%d" entry = vvtStateIndex, "vvtStateIndex", int, "%d" entry = fallbackMap, "fallbackMap", float, "%.3f" entry = boostControllerClosedLoopPart, "Boost Closed Loop", float, "%.3f" +entry = detectedGear, "Detected Gear", int, "%d" entry = timingCltCorrection, "timingCltCorrection", float, "%.3f" entry = timingIatCorrection, "timingIatCorrection", float, "%.3f" entry = timingPidCorrection, "timingPidCorrection", float, "%.3f" @@ -3964,10 +3966,10 @@ menuDialog = main subMenu = gearDetection, "Gear detection", 0 subMenu = std_separator - subMenu = boostDialog, "Boost Control" - subMenu = boostOpenLoopDialog, "Boost Control Open Loop", { isBoostControlEnabled && boostType == 0 } - subMenu = boostPidDialog, "Boost Control Closed Loop PID", { isBoostControlEnabled && boostType == 1 } - subMenu = boostTargetDialog, "Boost Control Closed Loop Target", { isBoostControlEnabled && boostType == 1 } + subMenu = boostDialog, "Boost control" + subMenu = boostOpenLoopDialog, "Boost control open loop", { isBoostControlEnabled } + subMenu = boostPidDialog, "Boost control PID", { isBoostControlEnabled && boostType == 1 } + subMenu = boostTargetDialog, "Boost control target", { isBoostControlEnabled && boostType == 1 } subMenu = boostEtbPid, "ETB-style Wastegate Actuator", { etbFunctions1 == 4 || etbFunctions2 == 4 } subMenu = std_separator @@ -5622,7 +5624,6 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = speedSensorLeft, "", yAxis panel = speedSensorAnalog, { enableCanVss == 0 } panel = speedSensorCan - panel = vssFilter dialog = gearDetection, "Gear Detection" field = "Wheel revolutions per kilometer", driveWheelRevPerKm diff --git a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini index cbd1d6a607..bbfeb76280 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.04.07.f429-discovery.2608207070" + signature = "rusEFI 2022.04.07.f429-discovery.819008295" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.07.f429-discovery.2608207070" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.07.f429-discovery.819008295" ; 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 Thu Apr 07 03:46:22 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) integration/rusefi_config.txt Thu Apr 07 13:27:20 UTC 2022 pageSize = 21012 page = 1 @@ -2271,7 +2271,7 @@ vvtSyncCounter = scalar, U08, 438, "", 1, 0 vvtStateIndex = scalar, U08, 439, "", 1, 0 fallbackMap = scalar, U16, 440, "kPa", 0.1, 0 boostControllerClosedLoopPart = scalar, S08, 442, "%", 0.5, 0 -unused503 = scalar, U08, 443, "", 1, 0 +detectedGear = scalar, U08, 443, "", 1, 0 timingCltCorrection = scalar, S16, 444, "deg", 0.01, 0 timingIatCorrection = scalar, S16, 446, "deg", 0.01, 0 timingPidCorrection = scalar, S16, 448, "deg", 0.01, 0 @@ -3246,7 +3246,6 @@ gaugeCategory = Sensors - Extra 2 knockLevelGauge = knockLevel,"Knock level", "V", 0, 7, 10, 10, 100, 100, 1, 2 knockCountGauge = knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 fuelTankLevelGauge = fuelTankLevel,"Fuel level", "%", 0, 100, 10, 20, 100, 100, 1, 1 - speedToRpmRatioGauge = speedToRpmRatio, "Gearbox Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 wastegatePosGauge = wastegatePositionSensor, "Wastegate position sensor", "%", 0, 100, 0, 0, 100, 100, 1, 1 idlePosSensGauge = idlePositionSensor, "Idle position sensor", "%", 0, 100, 0, 0, 100, 100, 1, 1 currentEnginePhaseGauge = currentEnginePhase, "Engine Phase", "deg", 0, 720, 0, 0, 720, 720, 0, 0 @@ -3393,6 +3392,8 @@ gaugeCategory = Sensors - Raw gaugeCategory = Transmission desiredGearGauge = tcuDesiredGear, "Desired Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 currentGearGauge = tcuCurrentGear, "Current Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 + detectedGearGauge = detectedGear, "Detected Gear", "gear", 0, 8, 0, 0, 8, 8, 0, 0 + speedToRpmRatioGauge = speedToRpmRatio, "Gearbox Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 gaugeCategory = Knock knock1Gauge = knock1, "Knock Cyl 1", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 @@ -3766,6 +3767,7 @@ entry = vvtSyncCounter, "vvtSyncCounter", int, "%d" entry = vvtStateIndex, "vvtStateIndex", int, "%d" entry = fallbackMap, "fallbackMap", float, "%.3f" entry = boostControllerClosedLoopPart, "Boost Closed Loop", float, "%.3f" +entry = detectedGear, "Detected Gear", int, "%d" entry = timingCltCorrection, "timingCltCorrection", float, "%.3f" entry = timingIatCorrection, "timingIatCorrection", float, "%.3f" entry = timingPidCorrection, "timingPidCorrection", float, "%.3f" @@ -3964,10 +3966,10 @@ menuDialog = main subMenu = gearDetection, "Gear detection", 0 subMenu = std_separator - subMenu = boostDialog, "Boost Control" - subMenu = boostOpenLoopDialog, "Boost Control Open Loop", { isBoostControlEnabled && boostType == 0 } - subMenu = boostPidDialog, "Boost Control Closed Loop PID", { isBoostControlEnabled && boostType == 1 } - subMenu = boostTargetDialog, "Boost Control Closed Loop Target", { isBoostControlEnabled && boostType == 1 } + subMenu = boostDialog, "Boost control" + subMenu = boostOpenLoopDialog, "Boost control open loop", { isBoostControlEnabled } + subMenu = boostPidDialog, "Boost control PID", { isBoostControlEnabled && boostType == 1 } + subMenu = boostTargetDialog, "Boost control target", { isBoostControlEnabled && boostType == 1 } subMenu = boostEtbPid, "ETB-style Wastegate Actuator", { etbFunctions1 == 4 || etbFunctions2 == 4 } subMenu = std_separator @@ -5627,7 +5629,6 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = speedSensorLeft, "", yAxis panel = speedSensorAnalog, { enableCanVss == 0 } panel = speedSensorCan - panel = vssFilter dialog = gearDetection, "Gear Detection" field = "Wheel revolutions per kilometer", driveWheelRevPerKm diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index 44c8a72460..6572b97e43 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.04.07.frankenso_na6.4071591151" + signature = "rusEFI 2022.04.07.frankenso_na6.1493732118" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.07.frankenso_na6.4071591151" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.07.frankenso_na6.1493732118" ; 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 Thu Apr 07 03:46:12 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) integration/rusefi_config.txt Thu Apr 07 13:27:08 UTC 2022 pageSize = 21012 page = 1 @@ -2271,7 +2271,7 @@ vvtSyncCounter = scalar, U08, 438, "", 1, 0 vvtStateIndex = scalar, U08, 439, "", 1, 0 fallbackMap = scalar, U16, 440, "kPa", 0.1, 0 boostControllerClosedLoopPart = scalar, S08, 442, "%", 0.5, 0 -unused503 = scalar, U08, 443, "", 1, 0 +detectedGear = scalar, U08, 443, "", 1, 0 timingCltCorrection = scalar, S16, 444, "deg", 0.01, 0 timingIatCorrection = scalar, S16, 446, "deg", 0.01, 0 timingPidCorrection = scalar, S16, 448, "deg", 0.01, 0 @@ -3246,7 +3246,6 @@ gaugeCategory = Sensors - Extra 2 knockLevelGauge = knockLevel,"Knock level", "V", 0, 7, 10, 10, 100, 100, 1, 2 knockCountGauge = knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 fuelTankLevelGauge = fuelTankLevel,"Fuel level", "%", 0, 100, 10, 20, 100, 100, 1, 1 - speedToRpmRatioGauge = speedToRpmRatio, "Gearbox Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 wastegatePosGauge = wastegatePositionSensor, "Wastegate position sensor", "%", 0, 100, 0, 0, 100, 100, 1, 1 idlePosSensGauge = idlePositionSensor, "Idle position sensor", "%", 0, 100, 0, 0, 100, 100, 1, 1 currentEnginePhaseGauge = currentEnginePhase, "Engine Phase", "deg", 0, 720, 0, 0, 720, 720, 0, 0 @@ -3393,6 +3392,8 @@ gaugeCategory = Sensors - Raw gaugeCategory = Transmission desiredGearGauge = tcuDesiredGear, "Desired Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 currentGearGauge = tcuCurrentGear, "Current Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 + detectedGearGauge = detectedGear, "Detected Gear", "gear", 0, 8, 0, 0, 8, 8, 0, 0 + speedToRpmRatioGauge = speedToRpmRatio, "Gearbox Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 gaugeCategory = Knock knock1Gauge = knock1, "Knock Cyl 1", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 @@ -3766,6 +3767,7 @@ entry = vvtSyncCounter, "vvtSyncCounter", int, "%d" entry = vvtStateIndex, "vvtStateIndex", int, "%d" entry = fallbackMap, "fallbackMap", float, "%.3f" entry = boostControllerClosedLoopPart, "Boost Closed Loop", float, "%.3f" +entry = detectedGear, "Detected Gear", int, "%d" entry = timingCltCorrection, "timingCltCorrection", float, "%.3f" entry = timingIatCorrection, "timingIatCorrection", float, "%.3f" entry = timingPidCorrection, "timingPidCorrection", float, "%.3f" @@ -3964,10 +3966,10 @@ menuDialog = main subMenu = gearDetection, "Gear detection", 0 subMenu = std_separator - subMenu = boostDialog, "Boost Control" - subMenu = boostOpenLoopDialog, "Boost Control Open Loop", { isBoostControlEnabled && boostType == 0 } - subMenu = boostPidDialog, "Boost Control Closed Loop PID", { isBoostControlEnabled && boostType == 1 } - subMenu = boostTargetDialog, "Boost Control Closed Loop Target", { isBoostControlEnabled && boostType == 1 } + subMenu = boostDialog, "Boost control" + subMenu = boostOpenLoopDialog, "Boost control open loop", { isBoostControlEnabled } + subMenu = boostPidDialog, "Boost control PID", { isBoostControlEnabled && boostType == 1 } + subMenu = boostTargetDialog, "Boost control target", { isBoostControlEnabled && boostType == 1 } subMenu = boostEtbPid, "ETB-style Wastegate Actuator", { etbFunctions1 == 4 || etbFunctions2 == 4 } subMenu = std_separator @@ -5627,7 +5629,6 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = speedSensorLeft, "", yAxis panel = speedSensorAnalog, { enableCanVss == 0 } panel = speedSensorCan - panel = vssFilter dialog = gearDetection, "Gear Detection" field = "Wheel revolutions per kilometer", driveWheelRevPerKm diff --git a/firmware/tunerstudio/generated/rusefi_harley81.ini b/firmware/tunerstudio/generated/rusefi_harley81.ini index a04b064496..4586cd4c87 100644 --- a/firmware/tunerstudio/generated/rusefi_harley81.ini +++ b/firmware/tunerstudio/generated/rusefi_harley81.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.07.harley81.785570865" + signature = "rusEFI 2022.04.07.harley81.2239093704" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.07.harley81.785570865" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.07.harley81.2239093704" ; 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 Thu Apr 07 03:45:49 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) integration/rusefi_config.txt Thu Apr 07 13:26:40 UTC 2022 pageSize = 21012 page = 1 @@ -2271,7 +2271,7 @@ vvtSyncCounter = scalar, U08, 438, "", 1, 0 vvtStateIndex = scalar, U08, 439, "", 1, 0 fallbackMap = scalar, U16, 440, "kPa", 0.1, 0 boostControllerClosedLoopPart = scalar, S08, 442, "%", 0.5, 0 -unused503 = scalar, U08, 443, "", 1, 0 +detectedGear = scalar, U08, 443, "", 1, 0 timingCltCorrection = scalar, S16, 444, "deg", 0.01, 0 timingIatCorrection = scalar, S16, 446, "deg", 0.01, 0 timingPidCorrection = scalar, S16, 448, "deg", 0.01, 0 @@ -3246,7 +3246,6 @@ gaugeCategory = Sensors - Extra 2 knockLevelGauge = knockLevel,"Knock level", "V", 0, 7, 10, 10, 100, 100, 1, 2 knockCountGauge = knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 fuelTankLevelGauge = fuelTankLevel,"Fuel level", "%", 0, 100, 10, 20, 100, 100, 1, 1 - speedToRpmRatioGauge = speedToRpmRatio, "Gearbox Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 wastegatePosGauge = wastegatePositionSensor, "Wastegate position sensor", "%", 0, 100, 0, 0, 100, 100, 1, 1 idlePosSensGauge = idlePositionSensor, "Idle position sensor", "%", 0, 100, 0, 0, 100, 100, 1, 1 currentEnginePhaseGauge = currentEnginePhase, "Engine Phase", "deg", 0, 720, 0, 0, 720, 720, 0, 0 @@ -3393,6 +3392,8 @@ gaugeCategory = Sensors - Raw gaugeCategory = Transmission desiredGearGauge = tcuDesiredGear, "Desired Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 currentGearGauge = tcuCurrentGear, "Current Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 + detectedGearGauge = detectedGear, "Detected Gear", "gear", 0, 8, 0, 0, 8, 8, 0, 0 + speedToRpmRatioGauge = speedToRpmRatio, "Gearbox Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 gaugeCategory = Knock knock1Gauge = knock1, "Knock Cyl 1", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 @@ -3766,6 +3767,7 @@ entry = vvtSyncCounter, "vvtSyncCounter", int, "%d" entry = vvtStateIndex, "vvtStateIndex", int, "%d" entry = fallbackMap, "fallbackMap", float, "%.3f" entry = boostControllerClosedLoopPart, "Boost Closed Loop", float, "%.3f" +entry = detectedGear, "Detected Gear", int, "%d" entry = timingCltCorrection, "timingCltCorrection", float, "%.3f" entry = timingIatCorrection, "timingIatCorrection", float, "%.3f" entry = timingPidCorrection, "timingPidCorrection", float, "%.3f" @@ -3964,10 +3966,10 @@ menuDialog = main subMenu = gearDetection, "Gear detection", 0 subMenu = std_separator - subMenu = boostDialog, "Boost Control" - subMenu = boostOpenLoopDialog, "Boost Control Open Loop", { isBoostControlEnabled && boostType == 0 } - subMenu = boostPidDialog, "Boost Control Closed Loop PID", { isBoostControlEnabled && boostType == 1 } - subMenu = boostTargetDialog, "Boost Control Closed Loop Target", { isBoostControlEnabled && boostType == 1 } + subMenu = boostDialog, "Boost control" + subMenu = boostOpenLoopDialog, "Boost control open loop", { isBoostControlEnabled } + subMenu = boostPidDialog, "Boost control PID", { isBoostControlEnabled && boostType == 1 } + subMenu = boostTargetDialog, "Boost control target", { isBoostControlEnabled && boostType == 1 } subMenu = boostEtbPid, "ETB-style Wastegate Actuator", { etbFunctions1 == 4 || etbFunctions2 == 4 } subMenu = std_separator @@ -5611,7 +5613,6 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = speedSensorLeft, "", yAxis panel = speedSensorAnalog, { enableCanVss == 0 } panel = speedSensorCan - panel = vssFilter dialog = gearDetection, "Gear Detection" field = "Wheel revolutions per kilometer", driveWheelRevPerKm diff --git a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini index cb4d9c678a..837439d739 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.04.07.hellen-nb1.3130935443" + signature = "rusEFI 2022.04.07.hellen-nb1.288968554" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.07.hellen-nb1.3130935443" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.07.hellen-nb1.288968554" ; 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 Thu Apr 07 03:46:02 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) integration/rusefi_config.txt Thu Apr 07 13:26:56 UTC 2022 pageSize = 21012 page = 1 @@ -2271,7 +2271,7 @@ vvtSyncCounter = scalar, U08, 438, "", 1, 0 vvtStateIndex = scalar, U08, 439, "", 1, 0 fallbackMap = scalar, U16, 440, "kPa", 0.1, 0 boostControllerClosedLoopPart = scalar, S08, 442, "%", 0.5, 0 -unused503 = scalar, U08, 443, "", 1, 0 +detectedGear = scalar, U08, 443, "", 1, 0 timingCltCorrection = scalar, S16, 444, "deg", 0.01, 0 timingIatCorrection = scalar, S16, 446, "deg", 0.01, 0 timingPidCorrection = scalar, S16, 448, "deg", 0.01, 0 @@ -3246,7 +3246,6 @@ gaugeCategory = Sensors - Extra 2 knockLevelGauge = knockLevel,"Knock level", "V", 0, 7, 10, 10, 100, 100, 1, 2 knockCountGauge = knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 fuelTankLevelGauge = fuelTankLevel,"Fuel level", "%", 0, 100, 10, 20, 100, 100, 1, 1 - speedToRpmRatioGauge = speedToRpmRatio, "Gearbox Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 wastegatePosGauge = wastegatePositionSensor, "Wastegate position sensor", "%", 0, 100, 0, 0, 100, 100, 1, 1 idlePosSensGauge = idlePositionSensor, "Idle position sensor", "%", 0, 100, 0, 0, 100, 100, 1, 1 currentEnginePhaseGauge = currentEnginePhase, "Engine Phase", "deg", 0, 720, 0, 0, 720, 720, 0, 0 @@ -3393,6 +3392,8 @@ gaugeCategory = Sensors - Raw gaugeCategory = Transmission desiredGearGauge = tcuDesiredGear, "Desired Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 currentGearGauge = tcuCurrentGear, "Current Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 + detectedGearGauge = detectedGear, "Detected Gear", "gear", 0, 8, 0, 0, 8, 8, 0, 0 + speedToRpmRatioGauge = speedToRpmRatio, "Gearbox Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 gaugeCategory = Knock knock1Gauge = knock1, "Knock Cyl 1", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 @@ -3766,6 +3767,7 @@ entry = vvtSyncCounter, "vvtSyncCounter", int, "%d" entry = vvtStateIndex, "vvtStateIndex", int, "%d" entry = fallbackMap, "fallbackMap", float, "%.3f" entry = boostControllerClosedLoopPart, "Boost Closed Loop", float, "%.3f" +entry = detectedGear, "Detected Gear", int, "%d" entry = timingCltCorrection, "timingCltCorrection", float, "%.3f" entry = timingIatCorrection, "timingIatCorrection", float, "%.3f" entry = timingPidCorrection, "timingPidCorrection", float, "%.3f" @@ -3964,10 +3966,10 @@ menuDialog = main subMenu = gearDetection, "Gear detection", 0 subMenu = std_separator - subMenu = boostDialog, "Boost Control" - subMenu = boostOpenLoopDialog, "Boost Control Open Loop", { isBoostControlEnabled && boostType == 0 } - subMenu = boostPidDialog, "Boost Control Closed Loop PID", { isBoostControlEnabled && boostType == 1 } - subMenu = boostTargetDialog, "Boost Control Closed Loop Target", { isBoostControlEnabled && boostType == 1 } + subMenu = boostDialog, "Boost control" + subMenu = boostOpenLoopDialog, "Boost control open loop", { isBoostControlEnabled } + subMenu = boostPidDialog, "Boost control PID", { isBoostControlEnabled && boostType == 1 } + subMenu = boostTargetDialog, "Boost control target", { isBoostControlEnabled && boostType == 1 } subMenu = boostEtbPid, "ETB-style Wastegate Actuator", { etbFunctions1 == 4 || etbFunctions2 == 4 } subMenu = std_separator @@ -5611,7 +5613,6 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = speedSensorLeft, "", yAxis panel = speedSensorAnalog, { enableCanVss == 0 } panel = speedSensorCan - panel = vssFilter dialog = gearDetection, "Gear Detection" field = "Wheel revolutions per kilometer", driveWheelRevPerKm diff --git a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini index 8a979086ac..358632b60e 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.04.07.hellen121nissan.3334550176" + signature = "rusEFI 2022.04.07.hellen121nissan.1835414873" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.07.hellen121nissan.3334550176" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.07.hellen121nissan.1835414873" ; 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 Thu Apr 07 04:21:17 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) integration/rusefi_config.txt Thu Apr 07 13:26:46 UTC 2022 pageSize = 21012 page = 1 @@ -2271,7 +2271,7 @@ vvtSyncCounter = scalar, U08, 438, "", 1, 0 vvtStateIndex = scalar, U08, 439, "", 1, 0 fallbackMap = scalar, U16, 440, "kPa", 0.1, 0 boostControllerClosedLoopPart = scalar, S08, 442, "%", 0.5, 0 -unused503 = scalar, U08, 443, "", 1, 0 +detectedGear = scalar, U08, 443, "", 1, 0 timingCltCorrection = scalar, S16, 444, "deg", 0.01, 0 timingIatCorrection = scalar, S16, 446, "deg", 0.01, 0 timingPidCorrection = scalar, S16, 448, "deg", 0.01, 0 @@ -3246,7 +3246,6 @@ gaugeCategory = Sensors - Extra 2 knockLevelGauge = knockLevel,"Knock level", "V", 0, 7, 10, 10, 100, 100, 1, 2 knockCountGauge = knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 fuelTankLevelGauge = fuelTankLevel,"Fuel level", "%", 0, 100, 10, 20, 100, 100, 1, 1 - speedToRpmRatioGauge = speedToRpmRatio, "Gearbox Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 wastegatePosGauge = wastegatePositionSensor, "Wastegate position sensor", "%", 0, 100, 0, 0, 100, 100, 1, 1 idlePosSensGauge = idlePositionSensor, "Idle position sensor", "%", 0, 100, 0, 0, 100, 100, 1, 1 currentEnginePhaseGauge = currentEnginePhase, "Engine Phase", "deg", 0, 720, 0, 0, 720, 720, 0, 0 @@ -3393,6 +3392,8 @@ gaugeCategory = Sensors - Raw gaugeCategory = Transmission desiredGearGauge = tcuDesiredGear, "Desired Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 currentGearGauge = tcuCurrentGear, "Current Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 + detectedGearGauge = detectedGear, "Detected Gear", "gear", 0, 8, 0, 0, 8, 8, 0, 0 + speedToRpmRatioGauge = speedToRpmRatio, "Gearbox Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 gaugeCategory = Knock knock1Gauge = knock1, "Knock Cyl 1", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 @@ -3766,6 +3767,7 @@ entry = vvtSyncCounter, "vvtSyncCounter", int, "%d" entry = vvtStateIndex, "vvtStateIndex", int, "%d" entry = fallbackMap, "fallbackMap", float, "%.3f" entry = boostControllerClosedLoopPart, "Boost Closed Loop", float, "%.3f" +entry = detectedGear, "Detected Gear", int, "%d" entry = timingCltCorrection, "timingCltCorrection", float, "%.3f" entry = timingIatCorrection, "timingIatCorrection", float, "%.3f" entry = timingPidCorrection, "timingPidCorrection", float, "%.3f" @@ -3964,10 +3966,10 @@ menuDialog = main subMenu = gearDetection, "Gear detection", 0 subMenu = std_separator - subMenu = boostDialog, "Boost Control" - subMenu = boostOpenLoopDialog, "Boost Control Open Loop", { isBoostControlEnabled && boostType == 0 } - subMenu = boostPidDialog, "Boost Control Closed Loop PID", { isBoostControlEnabled && boostType == 1 } - subMenu = boostTargetDialog, "Boost Control Closed Loop Target", { isBoostControlEnabled && boostType == 1 } + subMenu = boostDialog, "Boost control" + subMenu = boostOpenLoopDialog, "Boost control open loop", { isBoostControlEnabled } + subMenu = boostPidDialog, "Boost control PID", { isBoostControlEnabled && boostType == 1 } + subMenu = boostTargetDialog, "Boost control target", { isBoostControlEnabled && boostType == 1 } subMenu = boostEtbPid, "ETB-style Wastegate Actuator", { etbFunctions1 == 4 || etbFunctions2 == 4 } subMenu = std_separator @@ -5611,7 +5613,6 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = speedSensorLeft, "", yAxis panel = speedSensorAnalog, { enableCanVss == 0 } panel = speedSensorCan - panel = vssFilter dialog = gearDetection, "Gear Detection" field = "Wheel revolutions per kilometer", driveWheelRevPerKm diff --git a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini index c7846777f0..c5915ae8b7 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.04.07.hellen121vag.1177561733" + signature = "rusEFI 2022.04.07.hellen121vag.3986107772" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.07.hellen121vag.1177561733" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.07.hellen121vag.3986107772" ; 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 Thu Apr 07 03:45:53 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) integration/rusefi_config.txt Thu Apr 07 13:26:44 UTC 2022 pageSize = 21012 page = 1 @@ -2271,7 +2271,7 @@ vvtSyncCounter = scalar, U08, 438, "", 1, 0 vvtStateIndex = scalar, U08, 439, "", 1, 0 fallbackMap = scalar, U16, 440, "kPa", 0.1, 0 boostControllerClosedLoopPart = scalar, S08, 442, "%", 0.5, 0 -unused503 = scalar, U08, 443, "", 1, 0 +detectedGear = scalar, U08, 443, "", 1, 0 timingCltCorrection = scalar, S16, 444, "deg", 0.01, 0 timingIatCorrection = scalar, S16, 446, "deg", 0.01, 0 timingPidCorrection = scalar, S16, 448, "deg", 0.01, 0 @@ -3246,7 +3246,6 @@ gaugeCategory = Sensors - Extra 2 knockLevelGauge = knockLevel,"Knock level", "V", 0, 7, 10, 10, 100, 100, 1, 2 knockCountGauge = knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 fuelTankLevelGauge = fuelTankLevel,"Fuel level", "%", 0, 100, 10, 20, 100, 100, 1, 1 - speedToRpmRatioGauge = speedToRpmRatio, "Gearbox Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 wastegatePosGauge = wastegatePositionSensor, "Wastegate position sensor", "%", 0, 100, 0, 0, 100, 100, 1, 1 idlePosSensGauge = idlePositionSensor, "Idle position sensor", "%", 0, 100, 0, 0, 100, 100, 1, 1 currentEnginePhaseGauge = currentEnginePhase, "Engine Phase", "deg", 0, 720, 0, 0, 720, 720, 0, 0 @@ -3393,6 +3392,8 @@ gaugeCategory = Sensors - Raw gaugeCategory = Transmission desiredGearGauge = tcuDesiredGear, "Desired Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 currentGearGauge = tcuCurrentGear, "Current Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 + detectedGearGauge = detectedGear, "Detected Gear", "gear", 0, 8, 0, 0, 8, 8, 0, 0 + speedToRpmRatioGauge = speedToRpmRatio, "Gearbox Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 gaugeCategory = Knock knock1Gauge = knock1, "Knock Cyl 1", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 @@ -3766,6 +3767,7 @@ entry = vvtSyncCounter, "vvtSyncCounter", int, "%d" entry = vvtStateIndex, "vvtStateIndex", int, "%d" entry = fallbackMap, "fallbackMap", float, "%.3f" entry = boostControllerClosedLoopPart, "Boost Closed Loop", float, "%.3f" +entry = detectedGear, "Detected Gear", int, "%d" entry = timingCltCorrection, "timingCltCorrection", float, "%.3f" entry = timingIatCorrection, "timingIatCorrection", float, "%.3f" entry = timingPidCorrection, "timingPidCorrection", float, "%.3f" @@ -3964,10 +3966,10 @@ menuDialog = main subMenu = gearDetection, "Gear detection", 0 subMenu = std_separator - subMenu = boostDialog, "Boost Control" - subMenu = boostOpenLoopDialog, "Boost Control Open Loop", { isBoostControlEnabled && boostType == 0 } - subMenu = boostPidDialog, "Boost Control Closed Loop PID", { isBoostControlEnabled && boostType == 1 } - subMenu = boostTargetDialog, "Boost Control Closed Loop Target", { isBoostControlEnabled && boostType == 1 } + subMenu = boostDialog, "Boost control" + subMenu = boostOpenLoopDialog, "Boost control open loop", { isBoostControlEnabled } + subMenu = boostPidDialog, "Boost control PID", { isBoostControlEnabled && boostType == 1 } + subMenu = boostTargetDialog, "Boost control target", { isBoostControlEnabled && boostType == 1 } subMenu = boostEtbPid, "ETB-style Wastegate Actuator", { etbFunctions1 == 4 || etbFunctions2 == 4 } subMenu = std_separator @@ -5611,7 +5613,6 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = speedSensorLeft, "", yAxis panel = speedSensorAnalog, { enableCanVss == 0 } panel = speedSensorCan - panel = vssFilter dialog = gearDetection, "Gear Detection" field = "Wheel revolutions per kilometer", driveWheelRevPerKm diff --git a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini index 845f1fa0fd..d031ceb70a 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.04.07.hellen128.2246316467" + signature = "rusEFI 2022.04.07.hellen128.776148554" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.07.hellen128.2246316467" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.07.hellen128.776148554" ; 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 Thu Apr 07 03:45:51 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) integration/rusefi_config.txt Thu Apr 07 13:26:42 UTC 2022 pageSize = 21012 page = 1 @@ -2271,7 +2271,7 @@ vvtSyncCounter = scalar, U08, 438, "", 1, 0 vvtStateIndex = scalar, U08, 439, "", 1, 0 fallbackMap = scalar, U16, 440, "kPa", 0.1, 0 boostControllerClosedLoopPart = scalar, S08, 442, "%", 0.5, 0 -unused503 = scalar, U08, 443, "", 1, 0 +detectedGear = scalar, U08, 443, "", 1, 0 timingCltCorrection = scalar, S16, 444, "deg", 0.01, 0 timingIatCorrection = scalar, S16, 446, "deg", 0.01, 0 timingPidCorrection = scalar, S16, 448, "deg", 0.01, 0 @@ -3246,7 +3246,6 @@ gaugeCategory = Sensors - Extra 2 knockLevelGauge = knockLevel,"Knock level", "V", 0, 7, 10, 10, 100, 100, 1, 2 knockCountGauge = knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 fuelTankLevelGauge = fuelTankLevel,"Fuel level", "%", 0, 100, 10, 20, 100, 100, 1, 1 - speedToRpmRatioGauge = speedToRpmRatio, "Gearbox Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 wastegatePosGauge = wastegatePositionSensor, "Wastegate position sensor", "%", 0, 100, 0, 0, 100, 100, 1, 1 idlePosSensGauge = idlePositionSensor, "Idle position sensor", "%", 0, 100, 0, 0, 100, 100, 1, 1 currentEnginePhaseGauge = currentEnginePhase, "Engine Phase", "deg", 0, 720, 0, 0, 720, 720, 0, 0 @@ -3393,6 +3392,8 @@ gaugeCategory = Sensors - Raw gaugeCategory = Transmission desiredGearGauge = tcuDesiredGear, "Desired Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 currentGearGauge = tcuCurrentGear, "Current Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 + detectedGearGauge = detectedGear, "Detected Gear", "gear", 0, 8, 0, 0, 8, 8, 0, 0 + speedToRpmRatioGauge = speedToRpmRatio, "Gearbox Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 gaugeCategory = Knock knock1Gauge = knock1, "Knock Cyl 1", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 @@ -3766,6 +3767,7 @@ entry = vvtSyncCounter, "vvtSyncCounter", int, "%d" entry = vvtStateIndex, "vvtStateIndex", int, "%d" entry = fallbackMap, "fallbackMap", float, "%.3f" entry = boostControllerClosedLoopPart, "Boost Closed Loop", float, "%.3f" +entry = detectedGear, "Detected Gear", int, "%d" entry = timingCltCorrection, "timingCltCorrection", float, "%.3f" entry = timingIatCorrection, "timingIatCorrection", float, "%.3f" entry = timingPidCorrection, "timingPidCorrection", float, "%.3f" @@ -3964,10 +3966,10 @@ menuDialog = main subMenu = gearDetection, "Gear detection", 0 subMenu = std_separator - subMenu = boostDialog, "Boost Control" - subMenu = boostOpenLoopDialog, "Boost Control Open Loop", { isBoostControlEnabled && boostType == 0 } - subMenu = boostPidDialog, "Boost Control Closed Loop PID", { isBoostControlEnabled && boostType == 1 } - subMenu = boostTargetDialog, "Boost Control Closed Loop Target", { isBoostControlEnabled && boostType == 1 } + subMenu = boostDialog, "Boost control" + subMenu = boostOpenLoopDialog, "Boost control open loop", { isBoostControlEnabled } + subMenu = boostPidDialog, "Boost control PID", { isBoostControlEnabled && boostType == 1 } + subMenu = boostTargetDialog, "Boost control target", { isBoostControlEnabled && boostType == 1 } subMenu = boostEtbPid, "ETB-style Wastegate Actuator", { etbFunctions1 == 4 || etbFunctions2 == 4 } subMenu = std_separator @@ -5611,7 +5613,6 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = speedSensorLeft, "", yAxis panel = speedSensorAnalog, { enableCanVss == 0 } panel = speedSensorCan - panel = vssFilter dialog = gearDetection, "Gear Detection" field = "Wheel revolutions per kilometer", driveWheelRevPerKm diff --git a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini index 15d80ee60b..1be32c6c62 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.04.07.hellen154hyundai.414361951" + signature = "rusEFI 2022.04.07.hellen154hyundai.3004542630" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.07.hellen154hyundai.414361951" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.07.hellen154hyundai.3004542630" ; 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 Thu Apr 07 07:47:57 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) integration/rusefi_config.txt Thu Apr 07 13:26:48 UTC 2022 pageSize = 21012 page = 1 @@ -2271,7 +2271,7 @@ vvtSyncCounter = scalar, U08, 438, "", 1, 0 vvtStateIndex = scalar, U08, 439, "", 1, 0 fallbackMap = scalar, U16, 440, "kPa", 0.1, 0 boostControllerClosedLoopPart = scalar, S08, 442, "%", 0.5, 0 -unused503 = scalar, U08, 443, "", 1, 0 +detectedGear = scalar, U08, 443, "", 1, 0 timingCltCorrection = scalar, S16, 444, "deg", 0.01, 0 timingIatCorrection = scalar, S16, 446, "deg", 0.01, 0 timingPidCorrection = scalar, S16, 448, "deg", 0.01, 0 @@ -3246,7 +3246,6 @@ gaugeCategory = Sensors - Extra 2 knockLevelGauge = knockLevel,"Knock level", "V", 0, 7, 10, 10, 100, 100, 1, 2 knockCountGauge = knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 fuelTankLevelGauge = fuelTankLevel,"Fuel level", "%", 0, 100, 10, 20, 100, 100, 1, 1 - speedToRpmRatioGauge = speedToRpmRatio, "Gearbox Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 wastegatePosGauge = wastegatePositionSensor, "Wastegate position sensor", "%", 0, 100, 0, 0, 100, 100, 1, 1 idlePosSensGauge = idlePositionSensor, "Idle position sensor", "%", 0, 100, 0, 0, 100, 100, 1, 1 currentEnginePhaseGauge = currentEnginePhase, "Engine Phase", "deg", 0, 720, 0, 0, 720, 720, 0, 0 @@ -3393,6 +3392,8 @@ gaugeCategory = Sensors - Raw gaugeCategory = Transmission desiredGearGauge = tcuDesiredGear, "Desired Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 currentGearGauge = tcuCurrentGear, "Current Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 + detectedGearGauge = detectedGear, "Detected Gear", "gear", 0, 8, 0, 0, 8, 8, 0, 0 + speedToRpmRatioGauge = speedToRpmRatio, "Gearbox Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 gaugeCategory = Knock knock1Gauge = knock1, "Knock Cyl 1", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 @@ -3766,6 +3767,7 @@ entry = vvtSyncCounter, "vvtSyncCounter", int, "%d" entry = vvtStateIndex, "vvtStateIndex", int, "%d" entry = fallbackMap, "fallbackMap", float, "%.3f" entry = boostControllerClosedLoopPart, "Boost Closed Loop", float, "%.3f" +entry = detectedGear, "Detected Gear", int, "%d" entry = timingCltCorrection, "timingCltCorrection", float, "%.3f" entry = timingIatCorrection, "timingIatCorrection", float, "%.3f" entry = timingPidCorrection, "timingPidCorrection", float, "%.3f" @@ -3964,10 +3966,10 @@ menuDialog = main subMenu = gearDetection, "Gear detection", 0 subMenu = std_separator - subMenu = boostDialog, "Boost Control" - subMenu = boostOpenLoopDialog, "Boost Control Open Loop", { isBoostControlEnabled && boostType == 0 } - subMenu = boostPidDialog, "Boost Control Closed Loop PID", { isBoostControlEnabled && boostType == 1 } - subMenu = boostTargetDialog, "Boost Control Closed Loop Target", { isBoostControlEnabled && boostType == 1 } + subMenu = boostDialog, "Boost control" + subMenu = boostOpenLoopDialog, "Boost control open loop", { isBoostControlEnabled } + subMenu = boostPidDialog, "Boost control PID", { isBoostControlEnabled && boostType == 1 } + subMenu = boostTargetDialog, "Boost control target", { isBoostControlEnabled && boostType == 1 } subMenu = boostEtbPid, "ETB-style Wastegate Actuator", { etbFunctions1 == 4 || etbFunctions2 == 4 } subMenu = std_separator @@ -5611,7 +5613,6 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = speedSensorLeft, "", yAxis panel = speedSensorAnalog, { enableCanVss == 0 } panel = speedSensorCan - panel = vssFilter dialog = gearDetection, "Gear Detection" field = "Wheel revolutions per kilometer", driveWheelRevPerKm diff --git a/firmware/tunerstudio/generated/rusefi_hellen72.ini b/firmware/tunerstudio/generated/rusefi_hellen72.ini index 52a89f1e2b..f399bc7230 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.04.07.hellen72.1411376834" + signature = "rusEFI 2022.04.07.hellen72.4290306363" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.07.hellen72.1411376834" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.07.hellen72.4290306363" ; 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 Thu Apr 07 03:45:59 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) integration/rusefi_config.txt Thu Apr 07 13:26:52 UTC 2022 pageSize = 21012 page = 1 @@ -2271,7 +2271,7 @@ vvtSyncCounter = scalar, U08, 438, "", 1, 0 vvtStateIndex = scalar, U08, 439, "", 1, 0 fallbackMap = scalar, U16, 440, "kPa", 0.1, 0 boostControllerClosedLoopPart = scalar, S08, 442, "%", 0.5, 0 -unused503 = scalar, U08, 443, "", 1, 0 +detectedGear = scalar, U08, 443, "", 1, 0 timingCltCorrection = scalar, S16, 444, "deg", 0.01, 0 timingIatCorrection = scalar, S16, 446, "deg", 0.01, 0 timingPidCorrection = scalar, S16, 448, "deg", 0.01, 0 @@ -3246,7 +3246,6 @@ gaugeCategory = Sensors - Extra 2 knockLevelGauge = knockLevel,"Knock level", "V", 0, 7, 10, 10, 100, 100, 1, 2 knockCountGauge = knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 fuelTankLevelGauge = fuelTankLevel,"Fuel level", "%", 0, 100, 10, 20, 100, 100, 1, 1 - speedToRpmRatioGauge = speedToRpmRatio, "Gearbox Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 wastegatePosGauge = wastegatePositionSensor, "Wastegate position sensor", "%", 0, 100, 0, 0, 100, 100, 1, 1 idlePosSensGauge = idlePositionSensor, "Idle position sensor", "%", 0, 100, 0, 0, 100, 100, 1, 1 currentEnginePhaseGauge = currentEnginePhase, "Engine Phase", "deg", 0, 720, 0, 0, 720, 720, 0, 0 @@ -3393,6 +3392,8 @@ gaugeCategory = Sensors - Raw gaugeCategory = Transmission desiredGearGauge = tcuDesiredGear, "Desired Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 currentGearGauge = tcuCurrentGear, "Current Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 + detectedGearGauge = detectedGear, "Detected Gear", "gear", 0, 8, 0, 0, 8, 8, 0, 0 + speedToRpmRatioGauge = speedToRpmRatio, "Gearbox Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 gaugeCategory = Knock knock1Gauge = knock1, "Knock Cyl 1", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 @@ -3766,6 +3767,7 @@ entry = vvtSyncCounter, "vvtSyncCounter", int, "%d" entry = vvtStateIndex, "vvtStateIndex", int, "%d" entry = fallbackMap, "fallbackMap", float, "%.3f" entry = boostControllerClosedLoopPart, "Boost Closed Loop", float, "%.3f" +entry = detectedGear, "Detected Gear", int, "%d" entry = timingCltCorrection, "timingCltCorrection", float, "%.3f" entry = timingIatCorrection, "timingIatCorrection", float, "%.3f" entry = timingPidCorrection, "timingPidCorrection", float, "%.3f" @@ -3964,10 +3966,10 @@ menuDialog = main subMenu = gearDetection, "Gear detection", 0 subMenu = std_separator - subMenu = boostDialog, "Boost Control" - subMenu = boostOpenLoopDialog, "Boost Control Open Loop", { isBoostControlEnabled && boostType == 0 } - subMenu = boostPidDialog, "Boost Control Closed Loop PID", { isBoostControlEnabled && boostType == 1 } - subMenu = boostTargetDialog, "Boost Control Closed Loop Target", { isBoostControlEnabled && boostType == 1 } + subMenu = boostDialog, "Boost control" + subMenu = boostOpenLoopDialog, "Boost control open loop", { isBoostControlEnabled } + subMenu = boostPidDialog, "Boost control PID", { isBoostControlEnabled && boostType == 1 } + subMenu = boostTargetDialog, "Boost control target", { isBoostControlEnabled && boostType == 1 } subMenu = boostEtbPid, "ETB-style Wastegate Actuator", { etbFunctions1 == 4 || etbFunctions2 == 4 } subMenu = std_separator @@ -5611,7 +5613,6 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = speedSensorLeft, "", yAxis panel = speedSensorAnalog, { enableCanVss == 0 } panel = speedSensorCan - panel = vssFilter dialog = gearDetection, "Gear Detection" field = "Wheel revolutions per kilometer", driveWheelRevPerKm diff --git a/firmware/tunerstudio/generated/rusefi_hellen81.ini b/firmware/tunerstudio/generated/rusefi_hellen81.ini index f2759d14d3..573025ec7f 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.04.07.hellen81.1597111989" + signature = "rusEFI 2022.04.07.hellen81.4103534924" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.07.hellen81.1597111989" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.07.hellen81.4103534924" ; 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 Thu Apr 07 03:46:00 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) integration/rusefi_config.txt Thu Apr 07 13:26:54 UTC 2022 pageSize = 21012 page = 1 @@ -2271,7 +2271,7 @@ vvtSyncCounter = scalar, U08, 438, "", 1, 0 vvtStateIndex = scalar, U08, 439, "", 1, 0 fallbackMap = scalar, U16, 440, "kPa", 0.1, 0 boostControllerClosedLoopPart = scalar, S08, 442, "%", 0.5, 0 -unused503 = scalar, U08, 443, "", 1, 0 +detectedGear = scalar, U08, 443, "", 1, 0 timingCltCorrection = scalar, S16, 444, "deg", 0.01, 0 timingIatCorrection = scalar, S16, 446, "deg", 0.01, 0 timingPidCorrection = scalar, S16, 448, "deg", 0.01, 0 @@ -3246,7 +3246,6 @@ gaugeCategory = Sensors - Extra 2 knockLevelGauge = knockLevel,"Knock level", "V", 0, 7, 10, 10, 100, 100, 1, 2 knockCountGauge = knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 fuelTankLevelGauge = fuelTankLevel,"Fuel level", "%", 0, 100, 10, 20, 100, 100, 1, 1 - speedToRpmRatioGauge = speedToRpmRatio, "Gearbox Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 wastegatePosGauge = wastegatePositionSensor, "Wastegate position sensor", "%", 0, 100, 0, 0, 100, 100, 1, 1 idlePosSensGauge = idlePositionSensor, "Idle position sensor", "%", 0, 100, 0, 0, 100, 100, 1, 1 currentEnginePhaseGauge = currentEnginePhase, "Engine Phase", "deg", 0, 720, 0, 0, 720, 720, 0, 0 @@ -3393,6 +3392,8 @@ gaugeCategory = Sensors - Raw gaugeCategory = Transmission desiredGearGauge = tcuDesiredGear, "Desired Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 currentGearGauge = tcuCurrentGear, "Current Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 + detectedGearGauge = detectedGear, "Detected Gear", "gear", 0, 8, 0, 0, 8, 8, 0, 0 + speedToRpmRatioGauge = speedToRpmRatio, "Gearbox Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 gaugeCategory = Knock knock1Gauge = knock1, "Knock Cyl 1", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 @@ -3766,6 +3767,7 @@ entry = vvtSyncCounter, "vvtSyncCounter", int, "%d" entry = vvtStateIndex, "vvtStateIndex", int, "%d" entry = fallbackMap, "fallbackMap", float, "%.3f" entry = boostControllerClosedLoopPart, "Boost Closed Loop", float, "%.3f" +entry = detectedGear, "Detected Gear", int, "%d" entry = timingCltCorrection, "timingCltCorrection", float, "%.3f" entry = timingIatCorrection, "timingIatCorrection", float, "%.3f" entry = timingPidCorrection, "timingPidCorrection", float, "%.3f" @@ -3964,10 +3966,10 @@ menuDialog = main subMenu = gearDetection, "Gear detection", 0 subMenu = std_separator - subMenu = boostDialog, "Boost Control" - subMenu = boostOpenLoopDialog, "Boost Control Open Loop", { isBoostControlEnabled && boostType == 0 } - subMenu = boostPidDialog, "Boost Control Closed Loop PID", { isBoostControlEnabled && boostType == 1 } - subMenu = boostTargetDialog, "Boost Control Closed Loop Target", { isBoostControlEnabled && boostType == 1 } + subMenu = boostDialog, "Boost control" + subMenu = boostOpenLoopDialog, "Boost control open loop", { isBoostControlEnabled } + subMenu = boostPidDialog, "Boost control PID", { isBoostControlEnabled && boostType == 1 } + subMenu = boostTargetDialog, "Boost control target", { isBoostControlEnabled && boostType == 1 } subMenu = boostEtbPid, "ETB-style Wastegate Actuator", { etbFunctions1 == 4 || etbFunctions2 == 4 } subMenu = std_separator @@ -5610,7 +5612,6 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = speedSensorLeft, "", yAxis panel = speedSensorAnalog, { enableCanVss == 0 } panel = speedSensorCan - panel = vssFilter dialog = gearDetection, "Gear Detection" field = "Wheel revolutions per kilometer", driveWheelRevPerKm diff --git a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini index f44551431a..6bcf7dd4fa 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.04.07.hellen88bmw.2469133699" + signature = "rusEFI 2022.04.07.hellen88bmw.948763258" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.07.hellen88bmw.2469133699" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.07.hellen88bmw.948763258" ; 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 Thu Apr 07 03:45:57 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) integration/rusefi_config.txt Thu Apr 07 13:26:50 UTC 2022 pageSize = 21012 page = 1 @@ -2271,7 +2271,7 @@ vvtSyncCounter = scalar, U08, 438, "", 1, 0 vvtStateIndex = scalar, U08, 439, "", 1, 0 fallbackMap = scalar, U16, 440, "kPa", 0.1, 0 boostControllerClosedLoopPart = scalar, S08, 442, "%", 0.5, 0 -unused503 = scalar, U08, 443, "", 1, 0 +detectedGear = scalar, U08, 443, "", 1, 0 timingCltCorrection = scalar, S16, 444, "deg", 0.01, 0 timingIatCorrection = scalar, S16, 446, "deg", 0.01, 0 timingPidCorrection = scalar, S16, 448, "deg", 0.01, 0 @@ -3246,7 +3246,6 @@ gaugeCategory = Sensors - Extra 2 knockLevelGauge = knockLevel,"Knock level", "V", 0, 7, 10, 10, 100, 100, 1, 2 knockCountGauge = knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 fuelTankLevelGauge = fuelTankLevel,"Fuel level", "%", 0, 100, 10, 20, 100, 100, 1, 1 - speedToRpmRatioGauge = speedToRpmRatio, "Gearbox Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 wastegatePosGauge = wastegatePositionSensor, "Wastegate position sensor", "%", 0, 100, 0, 0, 100, 100, 1, 1 idlePosSensGauge = idlePositionSensor, "Idle position sensor", "%", 0, 100, 0, 0, 100, 100, 1, 1 currentEnginePhaseGauge = currentEnginePhase, "Engine Phase", "deg", 0, 720, 0, 0, 720, 720, 0, 0 @@ -3393,6 +3392,8 @@ gaugeCategory = Sensors - Raw gaugeCategory = Transmission desiredGearGauge = tcuDesiredGear, "Desired Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 currentGearGauge = tcuCurrentGear, "Current Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 + detectedGearGauge = detectedGear, "Detected Gear", "gear", 0, 8, 0, 0, 8, 8, 0, 0 + speedToRpmRatioGauge = speedToRpmRatio, "Gearbox Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 gaugeCategory = Knock knock1Gauge = knock1, "Knock Cyl 1", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 @@ -3766,6 +3767,7 @@ entry = vvtSyncCounter, "vvtSyncCounter", int, "%d" entry = vvtStateIndex, "vvtStateIndex", int, "%d" entry = fallbackMap, "fallbackMap", float, "%.3f" entry = boostControllerClosedLoopPart, "Boost Closed Loop", float, "%.3f" +entry = detectedGear, "Detected Gear", int, "%d" entry = timingCltCorrection, "timingCltCorrection", float, "%.3f" entry = timingIatCorrection, "timingIatCorrection", float, "%.3f" entry = timingPidCorrection, "timingPidCorrection", float, "%.3f" @@ -3964,10 +3966,10 @@ menuDialog = main subMenu = gearDetection, "Gear detection", 0 subMenu = std_separator - subMenu = boostDialog, "Boost Control" - subMenu = boostOpenLoopDialog, "Boost Control Open Loop", { isBoostControlEnabled && boostType == 0 } - subMenu = boostPidDialog, "Boost Control Closed Loop PID", { isBoostControlEnabled && boostType == 1 } - subMenu = boostTargetDialog, "Boost Control Closed Loop Target", { isBoostControlEnabled && boostType == 1 } + subMenu = boostDialog, "Boost control" + subMenu = boostOpenLoopDialog, "Boost control open loop", { isBoostControlEnabled } + subMenu = boostPidDialog, "Boost control PID", { isBoostControlEnabled && boostType == 1 } + subMenu = boostTargetDialog, "Boost control target", { isBoostControlEnabled && boostType == 1 } subMenu = boostEtbPid, "ETB-style Wastegate Actuator", { etbFunctions1 == 4 || etbFunctions2 == 4 } subMenu = std_separator @@ -5611,7 +5613,6 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = speedSensorLeft, "", yAxis panel = speedSensorAnalog, { enableCanVss == 0 } panel = speedSensorCan - panel = vssFilter dialog = gearDetection, "Gear Detection" field = "Wheel revolutions per kilometer", driveWheelRevPerKm diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini index f0a66d4f6f..113f22eb37 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.04.07.hellenNA6.2367866368" + signature = "rusEFI 2022.04.07.hellenNA6.646300153" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.07.hellenNA6.2367866368" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.07.hellenNA6.646300153" ; 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 Thu Apr 07 03:46:04 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) integration/rusefi_config.txt Thu Apr 07 13:26:58 UTC 2022 pageSize = 21012 page = 1 @@ -2271,7 +2271,7 @@ vvtSyncCounter = scalar, U08, 438, "", 1, 0 vvtStateIndex = scalar, U08, 439, "", 1, 0 fallbackMap = scalar, U16, 440, "kPa", 0.1, 0 boostControllerClosedLoopPart = scalar, S08, 442, "%", 0.5, 0 -unused503 = scalar, U08, 443, "", 1, 0 +detectedGear = scalar, U08, 443, "", 1, 0 timingCltCorrection = scalar, S16, 444, "deg", 0.01, 0 timingIatCorrection = scalar, S16, 446, "deg", 0.01, 0 timingPidCorrection = scalar, S16, 448, "deg", 0.01, 0 @@ -3246,7 +3246,6 @@ gaugeCategory = Sensors - Extra 2 knockLevelGauge = knockLevel,"Knock level", "V", 0, 7, 10, 10, 100, 100, 1, 2 knockCountGauge = knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 fuelTankLevelGauge = fuelTankLevel,"Fuel level", "%", 0, 100, 10, 20, 100, 100, 1, 1 - speedToRpmRatioGauge = speedToRpmRatio, "Gearbox Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 wastegatePosGauge = wastegatePositionSensor, "Wastegate position sensor", "%", 0, 100, 0, 0, 100, 100, 1, 1 idlePosSensGauge = idlePositionSensor, "Idle position sensor", "%", 0, 100, 0, 0, 100, 100, 1, 1 currentEnginePhaseGauge = currentEnginePhase, "Engine Phase", "deg", 0, 720, 0, 0, 720, 720, 0, 0 @@ -3393,6 +3392,8 @@ gaugeCategory = Sensors - Raw gaugeCategory = Transmission desiredGearGauge = tcuDesiredGear, "Desired Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 currentGearGauge = tcuCurrentGear, "Current Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 + detectedGearGauge = detectedGear, "Detected Gear", "gear", 0, 8, 0, 0, 8, 8, 0, 0 + speedToRpmRatioGauge = speedToRpmRatio, "Gearbox Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 gaugeCategory = Knock knock1Gauge = knock1, "Knock Cyl 1", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 @@ -3766,6 +3767,7 @@ entry = vvtSyncCounter, "vvtSyncCounter", int, "%d" entry = vvtStateIndex, "vvtStateIndex", int, "%d" entry = fallbackMap, "fallbackMap", float, "%.3f" entry = boostControllerClosedLoopPart, "Boost Closed Loop", float, "%.3f" +entry = detectedGear, "Detected Gear", int, "%d" entry = timingCltCorrection, "timingCltCorrection", float, "%.3f" entry = timingIatCorrection, "timingIatCorrection", float, "%.3f" entry = timingPidCorrection, "timingPidCorrection", float, "%.3f" @@ -3964,10 +3966,10 @@ menuDialog = main subMenu = gearDetection, "Gear detection", 0 subMenu = std_separator - subMenu = boostDialog, "Boost Control" - subMenu = boostOpenLoopDialog, "Boost Control Open Loop", { isBoostControlEnabled && boostType == 0 } - subMenu = boostPidDialog, "Boost Control Closed Loop PID", { isBoostControlEnabled && boostType == 1 } - subMenu = boostTargetDialog, "Boost Control Closed Loop Target", { isBoostControlEnabled && boostType == 1 } + subMenu = boostDialog, "Boost control" + subMenu = boostOpenLoopDialog, "Boost control open loop", { isBoostControlEnabled } + subMenu = boostPidDialog, "Boost control PID", { isBoostControlEnabled && boostType == 1 } + subMenu = boostTargetDialog, "Boost control target", { isBoostControlEnabled && boostType == 1 } subMenu = boostEtbPid, "ETB-style Wastegate Actuator", { etbFunctions1 == 4 || etbFunctions2 == 4 } subMenu = std_separator @@ -5611,7 +5613,6 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = speedSensorLeft, "", yAxis panel = speedSensorAnalog, { enableCanVss == 0 } panel = speedSensorCan - panel = vssFilter dialog = gearDetection, "Gear Detection" field = "Wheel revolutions per kilometer", driveWheelRevPerKm diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini b/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini index 979c1a2d61..bb4d4da85f 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.04.07.hellenNA8_96.1320483547" + signature = "rusEFI 2022.04.07.hellenNA8_96.3843292450" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.07.hellenNA8_96.1320483547" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.07.hellenNA8_96.3843292450" ; 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 Thu Apr 07 03:46:05 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) integration/rusefi_config.txt Thu Apr 07 13:27:00 UTC 2022 pageSize = 21012 page = 1 @@ -2271,7 +2271,7 @@ vvtSyncCounter = scalar, U08, 438, "", 1, 0 vvtStateIndex = scalar, U08, 439, "", 1, 0 fallbackMap = scalar, U16, 440, "kPa", 0.1, 0 boostControllerClosedLoopPart = scalar, S08, 442, "%", 0.5, 0 -unused503 = scalar, U08, 443, "", 1, 0 +detectedGear = scalar, U08, 443, "", 1, 0 timingCltCorrection = scalar, S16, 444, "deg", 0.01, 0 timingIatCorrection = scalar, S16, 446, "deg", 0.01, 0 timingPidCorrection = scalar, S16, 448, "deg", 0.01, 0 @@ -3246,7 +3246,6 @@ gaugeCategory = Sensors - Extra 2 knockLevelGauge = knockLevel,"Knock level", "V", 0, 7, 10, 10, 100, 100, 1, 2 knockCountGauge = knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 fuelTankLevelGauge = fuelTankLevel,"Fuel level", "%", 0, 100, 10, 20, 100, 100, 1, 1 - speedToRpmRatioGauge = speedToRpmRatio, "Gearbox Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 wastegatePosGauge = wastegatePositionSensor, "Wastegate position sensor", "%", 0, 100, 0, 0, 100, 100, 1, 1 idlePosSensGauge = idlePositionSensor, "Idle position sensor", "%", 0, 100, 0, 0, 100, 100, 1, 1 currentEnginePhaseGauge = currentEnginePhase, "Engine Phase", "deg", 0, 720, 0, 0, 720, 720, 0, 0 @@ -3393,6 +3392,8 @@ gaugeCategory = Sensors - Raw gaugeCategory = Transmission desiredGearGauge = tcuDesiredGear, "Desired Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 currentGearGauge = tcuCurrentGear, "Current Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 + detectedGearGauge = detectedGear, "Detected Gear", "gear", 0, 8, 0, 0, 8, 8, 0, 0 + speedToRpmRatioGauge = speedToRpmRatio, "Gearbox Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 gaugeCategory = Knock knock1Gauge = knock1, "Knock Cyl 1", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 @@ -3766,6 +3767,7 @@ entry = vvtSyncCounter, "vvtSyncCounter", int, "%d" entry = vvtStateIndex, "vvtStateIndex", int, "%d" entry = fallbackMap, "fallbackMap", float, "%.3f" entry = boostControllerClosedLoopPart, "Boost Closed Loop", float, "%.3f" +entry = detectedGear, "Detected Gear", int, "%d" entry = timingCltCorrection, "timingCltCorrection", float, "%.3f" entry = timingIatCorrection, "timingIatCorrection", float, "%.3f" entry = timingPidCorrection, "timingPidCorrection", float, "%.3f" @@ -3964,10 +3966,10 @@ menuDialog = main subMenu = gearDetection, "Gear detection", 0 subMenu = std_separator - subMenu = boostDialog, "Boost Control" - subMenu = boostOpenLoopDialog, "Boost Control Open Loop", { isBoostControlEnabled && boostType == 0 } - subMenu = boostPidDialog, "Boost Control Closed Loop PID", { isBoostControlEnabled && boostType == 1 } - subMenu = boostTargetDialog, "Boost Control Closed Loop Target", { isBoostControlEnabled && boostType == 1 } + subMenu = boostDialog, "Boost control" + subMenu = boostOpenLoopDialog, "Boost control open loop", { isBoostControlEnabled } + subMenu = boostPidDialog, "Boost control PID", { isBoostControlEnabled && boostType == 1 } + subMenu = boostTargetDialog, "Boost control target", { isBoostControlEnabled && boostType == 1 } subMenu = boostEtbPid, "ETB-style Wastegate Actuator", { etbFunctions1 == 4 || etbFunctions2 == 4 } subMenu = std_separator @@ -5611,7 +5613,6 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = speedSensorLeft, "", yAxis panel = speedSensorAnalog, { enableCanVss == 0 } panel = speedSensorCan - panel = vssFilter dialog = gearDetection, "Gear Detection" field = "Wheel revolutions per kilometer", driveWheelRevPerKm diff --git a/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini b/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini index 5644157d90..5d70254dd9 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.04.07.hellen_cypress.2709779298" + signature = "rusEFI 2022.04.07.hellen_cypress.170194075" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.07.hellen_cypress.2709779298" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.07.hellen_cypress.170194075" ; 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 Thu Apr 07 03:46:29 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) integration/rusefi_config.txt Thu Apr 07 13:27:30 UTC 2022 pageSize = 21012 page = 1 @@ -2271,7 +2271,7 @@ vvtSyncCounter = scalar, U08, 438, "", 1, 0 vvtStateIndex = scalar, U08, 439, "", 1, 0 fallbackMap = scalar, U16, 440, "kPa", 0.1, 0 boostControllerClosedLoopPart = scalar, S08, 442, "%", 0.5, 0 -unused503 = scalar, U08, 443, "", 1, 0 +detectedGear = scalar, U08, 443, "", 1, 0 timingCltCorrection = scalar, S16, 444, "deg", 0.01, 0 timingIatCorrection = scalar, S16, 446, "deg", 0.01, 0 timingPidCorrection = scalar, S16, 448, "deg", 0.01, 0 @@ -3246,7 +3246,6 @@ gaugeCategory = Sensors - Extra 2 knockLevelGauge = knockLevel,"Knock level", "V", 0, 7, 10, 10, 100, 100, 1, 2 knockCountGauge = knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 fuelTankLevelGauge = fuelTankLevel,"Fuel level", "%", 0, 100, 10, 20, 100, 100, 1, 1 - speedToRpmRatioGauge = speedToRpmRatio, "Gearbox Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 wastegatePosGauge = wastegatePositionSensor, "Wastegate position sensor", "%", 0, 100, 0, 0, 100, 100, 1, 1 idlePosSensGauge = idlePositionSensor, "Idle position sensor", "%", 0, 100, 0, 0, 100, 100, 1, 1 currentEnginePhaseGauge = currentEnginePhase, "Engine Phase", "deg", 0, 720, 0, 0, 720, 720, 0, 0 @@ -3393,6 +3392,8 @@ gaugeCategory = Sensors - Raw gaugeCategory = Transmission desiredGearGauge = tcuDesiredGear, "Desired Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 currentGearGauge = tcuCurrentGear, "Current Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 + detectedGearGauge = detectedGear, "Detected Gear", "gear", 0, 8, 0, 0, 8, 8, 0, 0 + speedToRpmRatioGauge = speedToRpmRatio, "Gearbox Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 gaugeCategory = Knock knock1Gauge = knock1, "Knock Cyl 1", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 @@ -3766,6 +3767,7 @@ entry = vvtSyncCounter, "vvtSyncCounter", int, "%d" entry = vvtStateIndex, "vvtStateIndex", int, "%d" entry = fallbackMap, "fallbackMap", float, "%.3f" entry = boostControllerClosedLoopPart, "Boost Closed Loop", float, "%.3f" +entry = detectedGear, "Detected Gear", int, "%d" entry = timingCltCorrection, "timingCltCorrection", float, "%.3f" entry = timingIatCorrection, "timingIatCorrection", float, "%.3f" entry = timingPidCorrection, "timingPidCorrection", float, "%.3f" @@ -3964,10 +3966,10 @@ menuDialog = main subMenu = gearDetection, "Gear detection", 0 subMenu = std_separator - subMenu = boostDialog, "Boost Control" - subMenu = boostOpenLoopDialog, "Boost Control Open Loop", { isBoostControlEnabled && boostType == 0 } - subMenu = boostPidDialog, "Boost Control Closed Loop PID", { isBoostControlEnabled && boostType == 1 } - subMenu = boostTargetDialog, "Boost Control Closed Loop Target", { isBoostControlEnabled && boostType == 1 } + subMenu = boostDialog, "Boost control" + subMenu = boostOpenLoopDialog, "Boost control open loop", { isBoostControlEnabled } + subMenu = boostPidDialog, "Boost control PID", { isBoostControlEnabled && boostType == 1 } + subMenu = boostTargetDialog, "Boost control target", { isBoostControlEnabled && boostType == 1 } subMenu = boostEtbPid, "ETB-style Wastegate Actuator", { etbFunctions1 == 4 || etbFunctions2 == 4 } subMenu = std_separator @@ -5627,7 +5629,6 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = speedSensorLeft, "", yAxis panel = speedSensorAnalog, { enableCanVss == 0 } panel = speedSensorCan - panel = vssFilter dialog = gearDetection, "Gear Detection" field = "Wheel revolutions per kilometer", driveWheelRevPerKm diff --git a/firmware/tunerstudio/generated/rusefi_kinetis.ini b/firmware/tunerstudio/generated/rusefi_kinetis.ini index c9cfbd4227..51b903ec7c 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.04.07.kin.1579564958" + signature = "rusEFI 2022.04.07.kin.4118886503" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.07.kin.1579564958" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.07.kin.4118886503" ; 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 Thu Apr 07 03:46:28 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) integration/rusefi_config.txt Thu Apr 07 13:27:28 UTC 2022 pageSize = 20984 page = 1 @@ -2237,7 +2237,7 @@ vvtSyncCounter = scalar, U08, 438, "", 1, 0 vvtStateIndex = scalar, U08, 439, "", 1, 0 fallbackMap = scalar, U16, 440, "kPa", 0.1, 0 boostControllerClosedLoopPart = scalar, S08, 442, "%", 0.5, 0 -unused503 = scalar, U08, 443, "", 1, 0 +detectedGear = scalar, U08, 443, "", 1, 0 timingCltCorrection = scalar, S16, 444, "deg", 0.01, 0 timingIatCorrection = scalar, S16, 446, "deg", 0.01, 0 timingPidCorrection = scalar, S16, 448, "deg", 0.01, 0 @@ -3212,7 +3212,6 @@ gaugeCategory = Sensors - Extra 2 knockLevelGauge = knockLevel,"Knock level", "V", 0, 7, 10, 10, 100, 100, 1, 2 knockCountGauge = knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 fuelTankLevelGauge = fuelTankLevel,"Fuel level", "%", 0, 100, 10, 20, 100, 100, 1, 1 - speedToRpmRatioGauge = speedToRpmRatio, "Gearbox Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 wastegatePosGauge = wastegatePositionSensor, "Wastegate position sensor", "%", 0, 100, 0, 0, 100, 100, 1, 1 idlePosSensGauge = idlePositionSensor, "Idle position sensor", "%", 0, 100, 0, 0, 100, 100, 1, 1 currentEnginePhaseGauge = currentEnginePhase, "Engine Phase", "deg", 0, 720, 0, 0, 720, 720, 0, 0 @@ -3359,6 +3358,8 @@ gaugeCategory = Sensors - Raw gaugeCategory = Transmission desiredGearGauge = tcuDesiredGear, "Desired Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 currentGearGauge = tcuCurrentGear, "Current Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 + detectedGearGauge = detectedGear, "Detected Gear", "gear", 0, 8, 0, 0, 8, 8, 0, 0 + speedToRpmRatioGauge = speedToRpmRatio, "Gearbox Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 gaugeCategory = Knock knock1Gauge = knock1, "Knock Cyl 1", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 @@ -3732,6 +3733,7 @@ entry = vvtSyncCounter, "vvtSyncCounter", int, "%d" entry = vvtStateIndex, "vvtStateIndex", int, "%d" entry = fallbackMap, "fallbackMap", float, "%.3f" entry = boostControllerClosedLoopPart, "Boost Closed Loop", float, "%.3f" +entry = detectedGear, "Detected Gear", int, "%d" entry = timingCltCorrection, "timingCltCorrection", float, "%.3f" entry = timingIatCorrection, "timingIatCorrection", float, "%.3f" entry = timingPidCorrection, "timingPidCorrection", float, "%.3f" @@ -3930,10 +3932,10 @@ menuDialog = main subMenu = gearDetection, "Gear detection", 0 subMenu = std_separator - subMenu = boostDialog, "Boost Control" - subMenu = boostOpenLoopDialog, "Boost Control Open Loop", { isBoostControlEnabled && boostType == 0 } - subMenu = boostPidDialog, "Boost Control Closed Loop PID", { isBoostControlEnabled && boostType == 1 } - subMenu = boostTargetDialog, "Boost Control Closed Loop Target", { isBoostControlEnabled && boostType == 1 } + subMenu = boostDialog, "Boost control" + subMenu = boostOpenLoopDialog, "Boost control open loop", { isBoostControlEnabled } + subMenu = boostPidDialog, "Boost control PID", { isBoostControlEnabled && boostType == 1 } + subMenu = boostTargetDialog, "Boost control target", { isBoostControlEnabled && boostType == 1 } subMenu = boostEtbPid, "ETB-style Wastegate Actuator", { etbFunctions1 == 4 || etbFunctions2 == 4 } subMenu = std_separator @@ -5594,7 +5596,6 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = speedSensorLeft, "", yAxis panel = speedSensorAnalog, { enableCanVss == 0 } panel = speedSensorCan - panel = vssFilter dialog = gearDetection, "Gear Detection" field = "Wheel revolutions per kilometer", driveWheelRevPerKm diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index 222c19be6c..cb780eca7b 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.04.07.mre_f4.4099332789" + signature = "rusEFI 2022.04.07.mre_f4.1609686348" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.07.mre_f4.4099332789" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.07.mre_f4.1609686348" ; 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 Thu Apr 07 03:46:09 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) integration/rusefi_config.txt Thu Apr 07 13:27:04 UTC 2022 pageSize = 21012 page = 1 @@ -2271,7 +2271,7 @@ vvtSyncCounter = scalar, U08, 438, "", 1, 0 vvtStateIndex = scalar, U08, 439, "", 1, 0 fallbackMap = scalar, U16, 440, "kPa", 0.1, 0 boostControllerClosedLoopPart = scalar, S08, 442, "%", 0.5, 0 -unused503 = scalar, U08, 443, "", 1, 0 +detectedGear = scalar, U08, 443, "", 1, 0 timingCltCorrection = scalar, S16, 444, "deg", 0.01, 0 timingIatCorrection = scalar, S16, 446, "deg", 0.01, 0 timingPidCorrection = scalar, S16, 448, "deg", 0.01, 0 @@ -3246,7 +3246,6 @@ gaugeCategory = Sensors - Extra 2 knockLevelGauge = knockLevel,"Knock level", "V", 0, 7, 10, 10, 100, 100, 1, 2 knockCountGauge = knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 fuelTankLevelGauge = fuelTankLevel,"Fuel level", "%", 0, 100, 10, 20, 100, 100, 1, 1 - speedToRpmRatioGauge = speedToRpmRatio, "Gearbox Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 wastegatePosGauge = wastegatePositionSensor, "Wastegate position sensor", "%", 0, 100, 0, 0, 100, 100, 1, 1 idlePosSensGauge = idlePositionSensor, "Idle position sensor", "%", 0, 100, 0, 0, 100, 100, 1, 1 currentEnginePhaseGauge = currentEnginePhase, "Engine Phase", "deg", 0, 720, 0, 0, 720, 720, 0, 0 @@ -3393,6 +3392,8 @@ gaugeCategory = Sensors - Raw gaugeCategory = Transmission desiredGearGauge = tcuDesiredGear, "Desired Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 currentGearGauge = tcuCurrentGear, "Current Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 + detectedGearGauge = detectedGear, "Detected Gear", "gear", 0, 8, 0, 0, 8, 8, 0, 0 + speedToRpmRatioGauge = speedToRpmRatio, "Gearbox Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 gaugeCategory = Knock knock1Gauge = knock1, "Knock Cyl 1", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 @@ -3766,6 +3767,7 @@ entry = vvtSyncCounter, "vvtSyncCounter", int, "%d" entry = vvtStateIndex, "vvtStateIndex", int, "%d" entry = fallbackMap, "fallbackMap", float, "%.3f" entry = boostControllerClosedLoopPart, "Boost Closed Loop", float, "%.3f" +entry = detectedGear, "Detected Gear", int, "%d" entry = timingCltCorrection, "timingCltCorrection", float, "%.3f" entry = timingIatCorrection, "timingIatCorrection", float, "%.3f" entry = timingPidCorrection, "timingPidCorrection", float, "%.3f" @@ -3964,10 +3966,10 @@ menuDialog = main subMenu = gearDetection, "Gear detection", 0 subMenu = std_separator - subMenu = boostDialog, "Boost Control" - subMenu = boostOpenLoopDialog, "Boost Control Open Loop", { isBoostControlEnabled && boostType == 0 } - subMenu = boostPidDialog, "Boost Control Closed Loop PID", { isBoostControlEnabled && boostType == 1 } - subMenu = boostTargetDialog, "Boost Control Closed Loop Target", { isBoostControlEnabled && boostType == 1 } + subMenu = boostDialog, "Boost control" + subMenu = boostOpenLoopDialog, "Boost control open loop", { isBoostControlEnabled } + subMenu = boostPidDialog, "Boost control PID", { isBoostControlEnabled && boostType == 1 } + subMenu = boostTargetDialog, "Boost control target", { isBoostControlEnabled && boostType == 1 } subMenu = boostEtbPid, "ETB-style Wastegate Actuator", { etbFunctions1 == 4 || etbFunctions2 == 4 } subMenu = std_separator @@ -5611,7 +5613,6 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = speedSensorLeft, "", yAxis panel = speedSensorAnalog, { enableCanVss == 0 } panel = speedSensorCan - panel = vssFilter dialog = gearDetection, "Gear Detection" field = "Wheel revolutions per kilometer", driveWheelRevPerKm diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index a4ac3d9ddf..995705244a 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.04.07.mre_f7.4099332789" + signature = "rusEFI 2022.04.07.mre_f7.1609686348" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.07.mre_f7.4099332789" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.07.mre_f7.1609686348" ; 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 Thu Apr 07 03:46:07 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) integration/rusefi_config.txt Thu Apr 07 13:27:02 UTC 2022 pageSize = 21012 page = 1 @@ -2271,7 +2271,7 @@ vvtSyncCounter = scalar, U08, 438, "", 1, 0 vvtStateIndex = scalar, U08, 439, "", 1, 0 fallbackMap = scalar, U16, 440, "kPa", 0.1, 0 boostControllerClosedLoopPart = scalar, S08, 442, "%", 0.5, 0 -unused503 = scalar, U08, 443, "", 1, 0 +detectedGear = scalar, U08, 443, "", 1, 0 timingCltCorrection = scalar, S16, 444, "deg", 0.01, 0 timingIatCorrection = scalar, S16, 446, "deg", 0.01, 0 timingPidCorrection = scalar, S16, 448, "deg", 0.01, 0 @@ -3246,7 +3246,6 @@ gaugeCategory = Sensors - Extra 2 knockLevelGauge = knockLevel,"Knock level", "V", 0, 7, 10, 10, 100, 100, 1, 2 knockCountGauge = knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 fuelTankLevelGauge = fuelTankLevel,"Fuel level", "%", 0, 100, 10, 20, 100, 100, 1, 1 - speedToRpmRatioGauge = speedToRpmRatio, "Gearbox Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 wastegatePosGauge = wastegatePositionSensor, "Wastegate position sensor", "%", 0, 100, 0, 0, 100, 100, 1, 1 idlePosSensGauge = idlePositionSensor, "Idle position sensor", "%", 0, 100, 0, 0, 100, 100, 1, 1 currentEnginePhaseGauge = currentEnginePhase, "Engine Phase", "deg", 0, 720, 0, 0, 720, 720, 0, 0 @@ -3393,6 +3392,8 @@ gaugeCategory = Sensors - Raw gaugeCategory = Transmission desiredGearGauge = tcuDesiredGear, "Desired Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 currentGearGauge = tcuCurrentGear, "Current Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 + detectedGearGauge = detectedGear, "Detected Gear", "gear", 0, 8, 0, 0, 8, 8, 0, 0 + speedToRpmRatioGauge = speedToRpmRatio, "Gearbox Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 gaugeCategory = Knock knock1Gauge = knock1, "Knock Cyl 1", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 @@ -3766,6 +3767,7 @@ entry = vvtSyncCounter, "vvtSyncCounter", int, "%d" entry = vvtStateIndex, "vvtStateIndex", int, "%d" entry = fallbackMap, "fallbackMap", float, "%.3f" entry = boostControllerClosedLoopPart, "Boost Closed Loop", float, "%.3f" +entry = detectedGear, "Detected Gear", int, "%d" entry = timingCltCorrection, "timingCltCorrection", float, "%.3f" entry = timingIatCorrection, "timingIatCorrection", float, "%.3f" entry = timingPidCorrection, "timingPidCorrection", float, "%.3f" @@ -3964,10 +3966,10 @@ menuDialog = main subMenu = gearDetection, "Gear detection", 0 subMenu = std_separator - subMenu = boostDialog, "Boost Control" - subMenu = boostOpenLoopDialog, "Boost Control Open Loop", { isBoostControlEnabled && boostType == 0 } - subMenu = boostPidDialog, "Boost Control Closed Loop PID", { isBoostControlEnabled && boostType == 1 } - subMenu = boostTargetDialog, "Boost Control Closed Loop Target", { isBoostControlEnabled && boostType == 1 } + subMenu = boostDialog, "Boost control" + subMenu = boostOpenLoopDialog, "Boost control open loop", { isBoostControlEnabled } + subMenu = boostPidDialog, "Boost control PID", { isBoostControlEnabled && boostType == 1 } + subMenu = boostTargetDialog, "Boost control target", { isBoostControlEnabled && boostType == 1 } subMenu = boostEtbPid, "ETB-style Wastegate Actuator", { etbFunctions1 == 4 || etbFunctions2 == 4 } subMenu = std_separator @@ -5611,7 +5613,6 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = speedSensorLeft, "", yAxis panel = speedSensorAnalog, { enableCanVss == 0 } panel = speedSensorCan - panel = vssFilter dialog = gearDetection, "Gear Detection" field = "Wheel revolutions per kilometer", driveWheelRevPerKm diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index 3457137a3b..f01505c6f3 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.04.07.prometheus_405.3416051000" + signature = "rusEFI 2022.04.07.prometheus_405.1614531265" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.07.prometheus_405.3416051000" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.07.prometheus_405.1614531265" ; 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 Thu Apr 07 03:46:15 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) integration/rusefi_config.txt Thu Apr 07 13:27:12 UTC 2022 pageSize = 21012 page = 1 @@ -2271,7 +2271,7 @@ vvtSyncCounter = scalar, U08, 438, "", 1, 0 vvtStateIndex = scalar, U08, 439, "", 1, 0 fallbackMap = scalar, U16, 440, "kPa", 0.1, 0 boostControllerClosedLoopPart = scalar, S08, 442, "%", 0.5, 0 -unused503 = scalar, U08, 443, "", 1, 0 +detectedGear = scalar, U08, 443, "", 1, 0 timingCltCorrection = scalar, S16, 444, "deg", 0.01, 0 timingIatCorrection = scalar, S16, 446, "deg", 0.01, 0 timingPidCorrection = scalar, S16, 448, "deg", 0.01, 0 @@ -3246,7 +3246,6 @@ gaugeCategory = Sensors - Extra 2 knockLevelGauge = knockLevel,"Knock level", "V", 0, 7, 10, 10, 100, 100, 1, 2 knockCountGauge = knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 fuelTankLevelGauge = fuelTankLevel,"Fuel level", "%", 0, 100, 10, 20, 100, 100, 1, 1 - speedToRpmRatioGauge = speedToRpmRatio, "Gearbox Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 wastegatePosGauge = wastegatePositionSensor, "Wastegate position sensor", "%", 0, 100, 0, 0, 100, 100, 1, 1 idlePosSensGauge = idlePositionSensor, "Idle position sensor", "%", 0, 100, 0, 0, 100, 100, 1, 1 currentEnginePhaseGauge = currentEnginePhase, "Engine Phase", "deg", 0, 720, 0, 0, 720, 720, 0, 0 @@ -3393,6 +3392,8 @@ gaugeCategory = Sensors - Raw gaugeCategory = Transmission desiredGearGauge = tcuDesiredGear, "Desired Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 currentGearGauge = tcuCurrentGear, "Current Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 + detectedGearGauge = detectedGear, "Detected Gear", "gear", 0, 8, 0, 0, 8, 8, 0, 0 + speedToRpmRatioGauge = speedToRpmRatio, "Gearbox Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 gaugeCategory = Knock knock1Gauge = knock1, "Knock Cyl 1", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 @@ -3766,6 +3767,7 @@ entry = vvtSyncCounter, "vvtSyncCounter", int, "%d" entry = vvtStateIndex, "vvtStateIndex", int, "%d" entry = fallbackMap, "fallbackMap", float, "%.3f" entry = boostControllerClosedLoopPart, "Boost Closed Loop", float, "%.3f" +entry = detectedGear, "Detected Gear", int, "%d" entry = timingCltCorrection, "timingCltCorrection", float, "%.3f" entry = timingIatCorrection, "timingIatCorrection", float, "%.3f" entry = timingPidCorrection, "timingPidCorrection", float, "%.3f" @@ -3964,10 +3966,10 @@ menuDialog = main subMenu = gearDetection, "Gear detection", 0 subMenu = std_separator - subMenu = boostDialog, "Boost Control" - subMenu = boostOpenLoopDialog, "Boost Control Open Loop", { isBoostControlEnabled && boostType == 0 } - subMenu = boostPidDialog, "Boost Control Closed Loop PID", { isBoostControlEnabled && boostType == 1 } - subMenu = boostTargetDialog, "Boost Control Closed Loop Target", { isBoostControlEnabled && boostType == 1 } + subMenu = boostDialog, "Boost control" + subMenu = boostOpenLoopDialog, "Boost control open loop", { isBoostControlEnabled } + subMenu = boostPidDialog, "Boost control PID", { isBoostControlEnabled && boostType == 1 } + subMenu = boostTargetDialog, "Boost control target", { isBoostControlEnabled && boostType == 1 } subMenu = boostEtbPid, "ETB-style Wastegate Actuator", { etbFunctions1 == 4 || etbFunctions2 == 4 } subMenu = std_separator @@ -5622,7 +5624,6 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = speedSensorLeft, "", yAxis panel = speedSensorAnalog, { enableCanVss == 0 } panel = speedSensorCan - panel = vssFilter dialog = gearDetection, "Gear Detection" field = "Wheel revolutions per kilometer", driveWheelRevPerKm diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index 308cc70b0f..7a2d8520e8 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.04.07.prometheus_469.3416051000" + signature = "rusEFI 2022.04.07.prometheus_469.1614531265" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.07.prometheus_469.3416051000" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.07.prometheus_469.1614531265" ; 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 Thu Apr 07 03:46:13 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) integration/rusefi_config.txt Thu Apr 07 13:27:10 UTC 2022 pageSize = 21012 page = 1 @@ -2271,7 +2271,7 @@ vvtSyncCounter = scalar, U08, 438, "", 1, 0 vvtStateIndex = scalar, U08, 439, "", 1, 0 fallbackMap = scalar, U16, 440, "kPa", 0.1, 0 boostControllerClosedLoopPart = scalar, S08, 442, "%", 0.5, 0 -unused503 = scalar, U08, 443, "", 1, 0 +detectedGear = scalar, U08, 443, "", 1, 0 timingCltCorrection = scalar, S16, 444, "deg", 0.01, 0 timingIatCorrection = scalar, S16, 446, "deg", 0.01, 0 timingPidCorrection = scalar, S16, 448, "deg", 0.01, 0 @@ -3246,7 +3246,6 @@ gaugeCategory = Sensors - Extra 2 knockLevelGauge = knockLevel,"Knock level", "V", 0, 7, 10, 10, 100, 100, 1, 2 knockCountGauge = knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 fuelTankLevelGauge = fuelTankLevel,"Fuel level", "%", 0, 100, 10, 20, 100, 100, 1, 1 - speedToRpmRatioGauge = speedToRpmRatio, "Gearbox Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 wastegatePosGauge = wastegatePositionSensor, "Wastegate position sensor", "%", 0, 100, 0, 0, 100, 100, 1, 1 idlePosSensGauge = idlePositionSensor, "Idle position sensor", "%", 0, 100, 0, 0, 100, 100, 1, 1 currentEnginePhaseGauge = currentEnginePhase, "Engine Phase", "deg", 0, 720, 0, 0, 720, 720, 0, 0 @@ -3393,6 +3392,8 @@ gaugeCategory = Sensors - Raw gaugeCategory = Transmission desiredGearGauge = tcuDesiredGear, "Desired Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 currentGearGauge = tcuCurrentGear, "Current Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 + detectedGearGauge = detectedGear, "Detected Gear", "gear", 0, 8, 0, 0, 8, 8, 0, 0 + speedToRpmRatioGauge = speedToRpmRatio, "Gearbox Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 gaugeCategory = Knock knock1Gauge = knock1, "Knock Cyl 1", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 @@ -3766,6 +3767,7 @@ entry = vvtSyncCounter, "vvtSyncCounter", int, "%d" entry = vvtStateIndex, "vvtStateIndex", int, "%d" entry = fallbackMap, "fallbackMap", float, "%.3f" entry = boostControllerClosedLoopPart, "Boost Closed Loop", float, "%.3f" +entry = detectedGear, "Detected Gear", int, "%d" entry = timingCltCorrection, "timingCltCorrection", float, "%.3f" entry = timingIatCorrection, "timingIatCorrection", float, "%.3f" entry = timingPidCorrection, "timingPidCorrection", float, "%.3f" @@ -3964,10 +3966,10 @@ menuDialog = main subMenu = gearDetection, "Gear detection", 0 subMenu = std_separator - subMenu = boostDialog, "Boost Control" - subMenu = boostOpenLoopDialog, "Boost Control Open Loop", { isBoostControlEnabled && boostType == 0 } - subMenu = boostPidDialog, "Boost Control Closed Loop PID", { isBoostControlEnabled && boostType == 1 } - subMenu = boostTargetDialog, "Boost Control Closed Loop Target", { isBoostControlEnabled && boostType == 1 } + subMenu = boostDialog, "Boost control" + subMenu = boostOpenLoopDialog, "Boost control open loop", { isBoostControlEnabled } + subMenu = boostPidDialog, "Boost control PID", { isBoostControlEnabled && boostType == 1 } + subMenu = boostTargetDialog, "Boost control target", { isBoostControlEnabled && boostType == 1 } subMenu = boostEtbPid, "ETB-style Wastegate Actuator", { etbFunctions1 == 4 || etbFunctions2 == 4 } subMenu = std_separator @@ -5622,7 +5624,6 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = speedSensorLeft, "", yAxis panel = speedSensorAnalog, { enableCanVss == 0 } panel = speedSensorCan - panel = vssFilter dialog = gearDetection, "Gear Detection" field = "Wheel revolutions per kilometer", driveWheelRevPerKm diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index 174fa12fd5..dd770e9cde 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.04.07.proteus_f4.3182398815" + signature = "rusEFI 2022.04.07.proteus_f4.369658534" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.07.proteus_f4.3182398815" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.07.proteus_f4.369658534" ; 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 Thu Apr 07 03:46:18 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) integration/rusefi_config.txt Thu Apr 07 13:27:16 UTC 2022 pageSize = 21012 page = 1 @@ -2271,7 +2271,7 @@ vvtSyncCounter = scalar, U08, 438, "", 1, 0 vvtStateIndex = scalar, U08, 439, "", 1, 0 fallbackMap = scalar, U16, 440, "kPa", 0.1, 0 boostControllerClosedLoopPart = scalar, S08, 442, "%", 0.5, 0 -unused503 = scalar, U08, 443, "", 1, 0 +detectedGear = scalar, U08, 443, "", 1, 0 timingCltCorrection = scalar, S16, 444, "deg", 0.01, 0 timingIatCorrection = scalar, S16, 446, "deg", 0.01, 0 timingPidCorrection = scalar, S16, 448, "deg", 0.01, 0 @@ -3246,7 +3246,6 @@ gaugeCategory = Sensors - Extra 2 knockLevelGauge = knockLevel,"Knock level", "V", 0, 7, 10, 10, 100, 100, 1, 2 knockCountGauge = knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 fuelTankLevelGauge = fuelTankLevel,"Fuel level", "%", 0, 100, 10, 20, 100, 100, 1, 1 - speedToRpmRatioGauge = speedToRpmRatio, "Gearbox Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 wastegatePosGauge = wastegatePositionSensor, "Wastegate position sensor", "%", 0, 100, 0, 0, 100, 100, 1, 1 idlePosSensGauge = idlePositionSensor, "Idle position sensor", "%", 0, 100, 0, 0, 100, 100, 1, 1 currentEnginePhaseGauge = currentEnginePhase, "Engine Phase", "deg", 0, 720, 0, 0, 720, 720, 0, 0 @@ -3393,6 +3392,8 @@ gaugeCategory = Sensors - Raw gaugeCategory = Transmission desiredGearGauge = tcuDesiredGear, "Desired Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 currentGearGauge = tcuCurrentGear, "Current Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 + detectedGearGauge = detectedGear, "Detected Gear", "gear", 0, 8, 0, 0, 8, 8, 0, 0 + speedToRpmRatioGauge = speedToRpmRatio, "Gearbox Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 gaugeCategory = Knock knock1Gauge = knock1, "Knock Cyl 1", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 @@ -3766,6 +3767,7 @@ entry = vvtSyncCounter, "vvtSyncCounter", int, "%d" entry = vvtStateIndex, "vvtStateIndex", int, "%d" entry = fallbackMap, "fallbackMap", float, "%.3f" entry = boostControllerClosedLoopPart, "Boost Closed Loop", float, "%.3f" +entry = detectedGear, "Detected Gear", int, "%d" entry = timingCltCorrection, "timingCltCorrection", float, "%.3f" entry = timingIatCorrection, "timingIatCorrection", float, "%.3f" entry = timingPidCorrection, "timingPidCorrection", float, "%.3f" @@ -3964,10 +3966,10 @@ menuDialog = main subMenu = gearDetection, "Gear detection", 0 subMenu = std_separator - subMenu = boostDialog, "Boost Control" - subMenu = boostOpenLoopDialog, "Boost Control Open Loop", { isBoostControlEnabled && boostType == 0 } - subMenu = boostPidDialog, "Boost Control Closed Loop PID", { isBoostControlEnabled && boostType == 1 } - subMenu = boostTargetDialog, "Boost Control Closed Loop Target", { isBoostControlEnabled && boostType == 1 } + subMenu = boostDialog, "Boost control" + subMenu = boostOpenLoopDialog, "Boost control open loop", { isBoostControlEnabled } + subMenu = boostPidDialog, "Boost control PID", { isBoostControlEnabled && boostType == 1 } + subMenu = boostTargetDialog, "Boost control target", { isBoostControlEnabled && boostType == 1 } subMenu = boostEtbPid, "ETB-style Wastegate Actuator", { etbFunctions1 == 4 || etbFunctions2 == 4 } subMenu = std_separator @@ -5604,7 +5606,6 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = speedSensorLeft, "", yAxis panel = speedSensorAnalog, { enableCanVss == 0 } panel = speedSensorCan - panel = vssFilter dialog = gearDetection, "Gear Detection" field = "Wheel revolutions per kilometer", driveWheelRevPerKm diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index c8217a7855..a261a0fcb4 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.04.07.proteus_f7.3182398815" + signature = "rusEFI 2022.04.07.proteus_f7.369658534" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.07.proteus_f7.3182398815" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.07.proteus_f7.369658534" ; 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 Thu Apr 07 03:46:17 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) integration/rusefi_config.txt Thu Apr 07 13:27:14 UTC 2022 pageSize = 21012 page = 1 @@ -2271,7 +2271,7 @@ vvtSyncCounter = scalar, U08, 438, "", 1, 0 vvtStateIndex = scalar, U08, 439, "", 1, 0 fallbackMap = scalar, U16, 440, "kPa", 0.1, 0 boostControllerClosedLoopPart = scalar, S08, 442, "%", 0.5, 0 -unused503 = scalar, U08, 443, "", 1, 0 +detectedGear = scalar, U08, 443, "", 1, 0 timingCltCorrection = scalar, S16, 444, "deg", 0.01, 0 timingIatCorrection = scalar, S16, 446, "deg", 0.01, 0 timingPidCorrection = scalar, S16, 448, "deg", 0.01, 0 @@ -3246,7 +3246,6 @@ gaugeCategory = Sensors - Extra 2 knockLevelGauge = knockLevel,"Knock level", "V", 0, 7, 10, 10, 100, 100, 1, 2 knockCountGauge = knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 fuelTankLevelGauge = fuelTankLevel,"Fuel level", "%", 0, 100, 10, 20, 100, 100, 1, 1 - speedToRpmRatioGauge = speedToRpmRatio, "Gearbox Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 wastegatePosGauge = wastegatePositionSensor, "Wastegate position sensor", "%", 0, 100, 0, 0, 100, 100, 1, 1 idlePosSensGauge = idlePositionSensor, "Idle position sensor", "%", 0, 100, 0, 0, 100, 100, 1, 1 currentEnginePhaseGauge = currentEnginePhase, "Engine Phase", "deg", 0, 720, 0, 0, 720, 720, 0, 0 @@ -3393,6 +3392,8 @@ gaugeCategory = Sensors - Raw gaugeCategory = Transmission desiredGearGauge = tcuDesiredGear, "Desired Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 currentGearGauge = tcuCurrentGear, "Current Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 + detectedGearGauge = detectedGear, "Detected Gear", "gear", 0, 8, 0, 0, 8, 8, 0, 0 + speedToRpmRatioGauge = speedToRpmRatio, "Gearbox Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 gaugeCategory = Knock knock1Gauge = knock1, "Knock Cyl 1", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 @@ -3766,6 +3767,7 @@ entry = vvtSyncCounter, "vvtSyncCounter", int, "%d" entry = vvtStateIndex, "vvtStateIndex", int, "%d" entry = fallbackMap, "fallbackMap", float, "%.3f" entry = boostControllerClosedLoopPart, "Boost Closed Loop", float, "%.3f" +entry = detectedGear, "Detected Gear", int, "%d" entry = timingCltCorrection, "timingCltCorrection", float, "%.3f" entry = timingIatCorrection, "timingIatCorrection", float, "%.3f" entry = timingPidCorrection, "timingPidCorrection", float, "%.3f" @@ -3964,10 +3966,10 @@ menuDialog = main subMenu = gearDetection, "Gear detection", 0 subMenu = std_separator - subMenu = boostDialog, "Boost Control" - subMenu = boostOpenLoopDialog, "Boost Control Open Loop", { isBoostControlEnabled && boostType == 0 } - subMenu = boostPidDialog, "Boost Control Closed Loop PID", { isBoostControlEnabled && boostType == 1 } - subMenu = boostTargetDialog, "Boost Control Closed Loop Target", { isBoostControlEnabled && boostType == 1 } + subMenu = boostDialog, "Boost control" + subMenu = boostOpenLoopDialog, "Boost control open loop", { isBoostControlEnabled } + subMenu = boostPidDialog, "Boost control PID", { isBoostControlEnabled && boostType == 1 } + subMenu = boostTargetDialog, "Boost control target", { isBoostControlEnabled && boostType == 1 } subMenu = boostEtbPid, "ETB-style Wastegate Actuator", { etbFunctions1 == 4 || etbFunctions2 == 4 } subMenu = std_separator @@ -5604,7 +5606,6 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = speedSensorLeft, "", yAxis panel = speedSensorAnalog, { enableCanVss == 0 } panel = speedSensorCan - panel = vssFilter dialog = gearDetection, "Gear Detection" field = "Wheel revolutions per kilometer", driveWheelRevPerKm diff --git a/firmware/tunerstudio/generated/rusefi_proteus_h7.ini b/firmware/tunerstudio/generated/rusefi_proteus_h7.ini index 996569fd50..954ea4a918 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_h7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_h7.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.07.proteus_h7.3182398815" + signature = "rusEFI 2022.04.07.proteus_h7.369658534" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.07.proteus_h7.3182398815" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.07.proteus_h7.369658534" ; 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 Thu Apr 07 03:46:20 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) integration/rusefi_config.txt Thu Apr 07 13:27:18 UTC 2022 pageSize = 21012 page = 1 @@ -2271,7 +2271,7 @@ vvtSyncCounter = scalar, U08, 438, "", 1, 0 vvtStateIndex = scalar, U08, 439, "", 1, 0 fallbackMap = scalar, U16, 440, "kPa", 0.1, 0 boostControllerClosedLoopPart = scalar, S08, 442, "%", 0.5, 0 -unused503 = scalar, U08, 443, "", 1, 0 +detectedGear = scalar, U08, 443, "", 1, 0 timingCltCorrection = scalar, S16, 444, "deg", 0.01, 0 timingIatCorrection = scalar, S16, 446, "deg", 0.01, 0 timingPidCorrection = scalar, S16, 448, "deg", 0.01, 0 @@ -3246,7 +3246,6 @@ gaugeCategory = Sensors - Extra 2 knockLevelGauge = knockLevel,"Knock level", "V", 0, 7, 10, 10, 100, 100, 1, 2 knockCountGauge = knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 fuelTankLevelGauge = fuelTankLevel,"Fuel level", "%", 0, 100, 10, 20, 100, 100, 1, 1 - speedToRpmRatioGauge = speedToRpmRatio, "Gearbox Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 wastegatePosGauge = wastegatePositionSensor, "Wastegate position sensor", "%", 0, 100, 0, 0, 100, 100, 1, 1 idlePosSensGauge = idlePositionSensor, "Idle position sensor", "%", 0, 100, 0, 0, 100, 100, 1, 1 currentEnginePhaseGauge = currentEnginePhase, "Engine Phase", "deg", 0, 720, 0, 0, 720, 720, 0, 0 @@ -3393,6 +3392,8 @@ gaugeCategory = Sensors - Raw gaugeCategory = Transmission desiredGearGauge = tcuDesiredGear, "Desired Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 currentGearGauge = tcuCurrentGear, "Current Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 + detectedGearGauge = detectedGear, "Detected Gear", "gear", 0, 8, 0, 0, 8, 8, 0, 0 + speedToRpmRatioGauge = speedToRpmRatio, "Gearbox Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 gaugeCategory = Knock knock1Gauge = knock1, "Knock Cyl 1", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 @@ -3766,6 +3767,7 @@ entry = vvtSyncCounter, "vvtSyncCounter", int, "%d" entry = vvtStateIndex, "vvtStateIndex", int, "%d" entry = fallbackMap, "fallbackMap", float, "%.3f" entry = boostControllerClosedLoopPart, "Boost Closed Loop", float, "%.3f" +entry = detectedGear, "Detected Gear", int, "%d" entry = timingCltCorrection, "timingCltCorrection", float, "%.3f" entry = timingIatCorrection, "timingIatCorrection", float, "%.3f" entry = timingPidCorrection, "timingPidCorrection", float, "%.3f" @@ -3964,10 +3966,10 @@ menuDialog = main subMenu = gearDetection, "Gear detection", 0 subMenu = std_separator - subMenu = boostDialog, "Boost Control" - subMenu = boostOpenLoopDialog, "Boost Control Open Loop", { isBoostControlEnabled && boostType == 0 } - subMenu = boostPidDialog, "Boost Control Closed Loop PID", { isBoostControlEnabled && boostType == 1 } - subMenu = boostTargetDialog, "Boost Control Closed Loop Target", { isBoostControlEnabled && boostType == 1 } + subMenu = boostDialog, "Boost control" + subMenu = boostOpenLoopDialog, "Boost control open loop", { isBoostControlEnabled } + subMenu = boostPidDialog, "Boost control PID", { isBoostControlEnabled && boostType == 1 } + subMenu = boostTargetDialog, "Boost control target", { isBoostControlEnabled && boostType == 1 } subMenu = boostEtbPid, "ETB-style Wastegate Actuator", { etbFunctions1 == 4 || etbFunctions2 == 4 } subMenu = std_separator @@ -5604,7 +5606,6 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = speedSensorLeft, "", yAxis panel = speedSensorAnalog, { enableCanVss == 0 } panel = speedSensorCan - panel = vssFilter dialog = gearDetection, "Gear Detection" field = "Wheel revolutions per kilometer", driveWheelRevPerKm diff --git a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini index 9b8befd536..426c9829bf 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.04.07.subaru_eg33_f7.4206982495" + signature = "rusEFI 2022.04.07.subaru_eg33_f7.1365668518" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.07.subaru_eg33_f7.4206982495" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.07.subaru_eg33_f7.1365668518" ; 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 Thu Apr 07 03:46:31 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) integration/rusefi_config.txt Thu Apr 07 13:27:31 UTC 2022 pageSize = 21012 page = 1 @@ -2271,7 +2271,7 @@ vvtSyncCounter = scalar, U08, 438, "", 1, 0 vvtStateIndex = scalar, U08, 439, "", 1, 0 fallbackMap = scalar, U16, 440, "kPa", 0.1, 0 boostControllerClosedLoopPart = scalar, S08, 442, "%", 0.5, 0 -unused503 = scalar, U08, 443, "", 1, 0 +detectedGear = scalar, U08, 443, "", 1, 0 timingCltCorrection = scalar, S16, 444, "deg", 0.01, 0 timingIatCorrection = scalar, S16, 446, "deg", 0.01, 0 timingPidCorrection = scalar, S16, 448, "deg", 0.01, 0 @@ -3246,7 +3246,6 @@ gaugeCategory = Sensors - Extra 2 knockLevelGauge = knockLevel,"Knock level", "V", 0, 7, 10, 10, 100, 100, 1, 2 knockCountGauge = knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 fuelTankLevelGauge = fuelTankLevel,"Fuel level", "%", 0, 100, 10, 20, 100, 100, 1, 1 - speedToRpmRatioGauge = speedToRpmRatio, "Gearbox Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 wastegatePosGauge = wastegatePositionSensor, "Wastegate position sensor", "%", 0, 100, 0, 0, 100, 100, 1, 1 idlePosSensGauge = idlePositionSensor, "Idle position sensor", "%", 0, 100, 0, 0, 100, 100, 1, 1 currentEnginePhaseGauge = currentEnginePhase, "Engine Phase", "deg", 0, 720, 0, 0, 720, 720, 0, 0 @@ -3393,6 +3392,8 @@ gaugeCategory = Sensors - Raw gaugeCategory = Transmission desiredGearGauge = tcuDesiredGear, "Desired Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 currentGearGauge = tcuCurrentGear, "Current Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 + detectedGearGauge = detectedGear, "Detected Gear", "gear", 0, 8, 0, 0, 8, 8, 0, 0 + speedToRpmRatioGauge = speedToRpmRatio, "Gearbox Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 gaugeCategory = Knock knock1Gauge = knock1, "Knock Cyl 1", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 @@ -3766,6 +3767,7 @@ entry = vvtSyncCounter, "vvtSyncCounter", int, "%d" entry = vvtStateIndex, "vvtStateIndex", int, "%d" entry = fallbackMap, "fallbackMap", float, "%.3f" entry = boostControllerClosedLoopPart, "Boost Closed Loop", float, "%.3f" +entry = detectedGear, "Detected Gear", int, "%d" entry = timingCltCorrection, "timingCltCorrection", float, "%.3f" entry = timingIatCorrection, "timingIatCorrection", float, "%.3f" entry = timingPidCorrection, "timingPidCorrection", float, "%.3f" @@ -3964,10 +3966,10 @@ menuDialog = main subMenu = gearDetection, "Gear detection", 0 subMenu = std_separator - subMenu = boostDialog, "Boost Control" - subMenu = boostOpenLoopDialog, "Boost Control Open Loop", { isBoostControlEnabled && boostType == 0 } - subMenu = boostPidDialog, "Boost Control Closed Loop PID", { isBoostControlEnabled && boostType == 1 } - subMenu = boostTargetDialog, "Boost Control Closed Loop Target", { isBoostControlEnabled && boostType == 1 } + subMenu = boostDialog, "Boost control" + subMenu = boostOpenLoopDialog, "Boost control open loop", { isBoostControlEnabled } + subMenu = boostPidDialog, "Boost control PID", { isBoostControlEnabled && boostType == 1 } + subMenu = boostTargetDialog, "Boost control target", { isBoostControlEnabled && boostType == 1 } subMenu = boostEtbPid, "ETB-style Wastegate Actuator", { etbFunctions1 == 4 || etbFunctions2 == 4 } subMenu = std_separator @@ -5621,7 +5623,6 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = speedSensorLeft, "", yAxis panel = speedSensorAnalog, { enableCanVss == 0 } panel = speedSensorCan - panel = vssFilter dialog = gearDetection, "Gear Detection" field = "Wheel revolutions per kilometer", driveWheelRevPerKm diff --git a/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini b/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini index a6b3ab852e..1ac43af7fa 100644 --- a/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini +++ b/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.07.tdg-pdm8.2003262607" + signature = "rusEFI 2022.04.07.tdg-pdm8.3703593846" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.07.tdg-pdm8.2003262607" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.07.tdg-pdm8.3703593846" ; 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 Thu Apr 07 03:46:25 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) integration/rusefi_config.txt Thu Apr 07 13:27:24 UTC 2022 pageSize = 21012 page = 1 @@ -2271,7 +2271,7 @@ vvtSyncCounter = scalar, U08, 438, "", 1, 0 vvtStateIndex = scalar, U08, 439, "", 1, 0 fallbackMap = scalar, U16, 440, "kPa", 0.1, 0 boostControllerClosedLoopPart = scalar, S08, 442, "%", 0.5, 0 -unused503 = scalar, U08, 443, "", 1, 0 +detectedGear = scalar, U08, 443, "", 1, 0 timingCltCorrection = scalar, S16, 444, "deg", 0.01, 0 timingIatCorrection = scalar, S16, 446, "deg", 0.01, 0 timingPidCorrection = scalar, S16, 448, "deg", 0.01, 0 @@ -3246,7 +3246,6 @@ gaugeCategory = Sensors - Extra 2 knockLevelGauge = knockLevel,"Knock level", "V", 0, 7, 10, 10, 100, 100, 1, 2 knockCountGauge = knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 fuelTankLevelGauge = fuelTankLevel,"Fuel level", "%", 0, 100, 10, 20, 100, 100, 1, 1 - speedToRpmRatioGauge = speedToRpmRatio, "Gearbox Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 wastegatePosGauge = wastegatePositionSensor, "Wastegate position sensor", "%", 0, 100, 0, 0, 100, 100, 1, 1 idlePosSensGauge = idlePositionSensor, "Idle position sensor", "%", 0, 100, 0, 0, 100, 100, 1, 1 currentEnginePhaseGauge = currentEnginePhase, "Engine Phase", "deg", 0, 720, 0, 0, 720, 720, 0, 0 @@ -3393,6 +3392,8 @@ gaugeCategory = Sensors - Raw gaugeCategory = Transmission desiredGearGauge = tcuDesiredGear, "Desired Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 currentGearGauge = tcuCurrentGear, "Current Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 + detectedGearGauge = detectedGear, "Detected Gear", "gear", 0, 8, 0, 0, 8, 8, 0, 0 + speedToRpmRatioGauge = speedToRpmRatio, "Gearbox Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 gaugeCategory = Knock knock1Gauge = knock1, "Knock Cyl 1", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 @@ -3766,6 +3767,7 @@ entry = vvtSyncCounter, "vvtSyncCounter", int, "%d" entry = vvtStateIndex, "vvtStateIndex", int, "%d" entry = fallbackMap, "fallbackMap", float, "%.3f" entry = boostControllerClosedLoopPart, "Boost Closed Loop", float, "%.3f" +entry = detectedGear, "Detected Gear", int, "%d" entry = timingCltCorrection, "timingCltCorrection", float, "%.3f" entry = timingIatCorrection, "timingIatCorrection", float, "%.3f" entry = timingPidCorrection, "timingPidCorrection", float, "%.3f" @@ -3964,10 +3966,10 @@ menuDialog = main subMenu = gearDetection, "Gear detection", 0 subMenu = std_separator - subMenu = boostDialog, "Boost Control" - subMenu = boostOpenLoopDialog, "Boost Control Open Loop", { isBoostControlEnabled && boostType == 0 } - subMenu = boostPidDialog, "Boost Control Closed Loop PID", { isBoostControlEnabled && boostType == 1 } - subMenu = boostTargetDialog, "Boost Control Closed Loop Target", { isBoostControlEnabled && boostType == 1 } + subMenu = boostDialog, "Boost control" + subMenu = boostOpenLoopDialog, "Boost control open loop", { isBoostControlEnabled } + subMenu = boostPidDialog, "Boost control PID", { isBoostControlEnabled && boostType == 1 } + subMenu = boostTargetDialog, "Boost control target", { isBoostControlEnabled && boostType == 1 } subMenu = boostEtbPid, "ETB-style Wastegate Actuator", { etbFunctions1 == 4 || etbFunctions2 == 4 } subMenu = std_separator @@ -5627,7 +5629,6 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = speedSensorLeft, "", yAxis panel = speedSensorAnalog, { enableCanVss == 0 } panel = speedSensorCan - panel = vssFilter dialog = gearDetection, "Gear Detection" field = "Wheel revolutions per kilometer", driveWheelRevPerKm 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 844cb8d760..5d780f3891 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 Thu Apr 07 03:46:33 UTC 2022 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) integration/rusefi_config.txt Thu Apr 07 13:27:34 UTC 2022 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -1058,6 +1058,7 @@ public class Fields { public static final String GAUGE_NAME_DEBUG_I4 = "debug i4"; public static final String GAUGE_NAME_DEBUG_I5 = "debug i5"; public static final String GAUGE_NAME_DESIRED_GEAR = "Desired Gear"; + public static final String GAUGE_NAME_DETECTED_GEAR = "Detected Gear"; public static final String GAUGE_NAME_DWELL_DUTY = "dwell: coil duty cycle"; public static final String GAUGE_NAME_ECU_TEMPERATURE = "ECU temperature"; public static final String GAUGE_NAME_ENGINE_CRC16 = "Engine CRC16"; @@ -1871,6 +1872,7 @@ public class Fields { public static final int servoOutputPins7_offset = 2738; public static final int servoOutputPins8_offset = 2739; public static final int showHumanReadableWarning_offset = 896; + public static final int SIGNATURE_HASH = 819008295; public static final int silentTriggerError_offset = 1260; public static final int skippedWheelOnCam_offset = 1260; public static final int slowAdcAlpha_offset = 1712; @@ -2360,7 +2362,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.04.07.all.2608207070"; + public static final String TS_SIGNATURE = "rusEFI 2022.04.07.all.819008295"; public static final char TS_SINGLE_WRITE_COMMAND = 'W'; public static final char TS_TEST_COMMAND = 't'; public static final int TsCalMode_EtbKd = 5;