From 75733ab04b0fad782774a58dcb34a4e072045ae5 Mon Sep 17 00:00:00 2001 From: GitHub gen-configs Action Date: Fri, 6 Dec 2024 20:44:52 +0000 Subject: [PATCH] Auto-generated configs and docs --- .../console/binary/generated/data_logs.ini | 16 +++--- .../binary/generated/fancy_content.ini | 16 +++--- .../binary/generated/output_channels.ini | 16 +++--- .../generated/rusefi_generated_alphax-2chan.h | 4 +- .../generated/rusefi_generated_alphax-4chan.h | 4 +- .../rusefi_generated_alphax-4chan_f7.h | 4 +- .../rusefi_generated_alphax-4k-gdi.h | 4 +- .../rusefi_generated_alphax-8chan-revA.h | 4 +- .../generated/rusefi_generated_alphax-8chan.h | 4 +- .../rusefi_generated_alphax-8chan_f7.h | 4 +- .../rusefi_generated_alphax-silver.h | 4 +- .../rusefi_generated_at_start_f435.h | 4 +- .../generated/rusefi_generated_atlas.h | 4 +- .../rusefi_generated_f407-discovery.h | 4 +- .../rusefi_generated_f429-discovery.h | 4 +- .../rusefi_generated_f469-discovery.h | 4 +- .../rusefi_generated_frankenso_na6.h | 4 +- .../generated/rusefi_generated_haba208.h | 4 +- .../rusefi_generated_hellen-112-17.h | 4 +- .../rusefi_generated_hellen-gm-e67.h | 4 +- .../rusefi_generated_hellen-honda-k.h | 4 +- .../generated/rusefi_generated_hellen-nb1.h | 4 +- .../rusefi_generated_hellen121nissan.h | 4 +- .../generated/rusefi_generated_hellen121vag.h | 4 +- .../generated/rusefi_generated_hellen128.h | 4 +- .../rusefi_generated_hellen154hyundai.h | 4 +- .../rusefi_generated_hellen154hyundai_f7.h | 4 +- .../generated/rusefi_generated_hellen72.h | 4 +- .../generated/rusefi_generated_hellen81.h | 4 +- .../generated/rusefi_generated_hellen88bmw.h | 4 +- .../generated/rusefi_generated_hellenNA6.h | 4 +- .../generated/rusefi_generated_hellenNA8_96.h | 4 +- .../generated/rusefi_generated_m74_9.h | 4 +- .../rusefi_generated_mre-legacy_f4.h | 4 +- .../generated/rusefi_generated_mre_f4.h | 4 +- .../generated/rusefi_generated_mre_f7.h | 4 +- .../generated/rusefi_generated_nucleo_f413.h | 4 +- .../generated/rusefi_generated_proteus_f4.h | 4 +- .../generated/rusefi_generated_proteus_f7.h | 4 +- .../generated/rusefi_generated_proteus_h7.h | 4 +- .../generated/rusefi_generated_s105.h | 4 +- .../rusefi_generated_small-can-board.h | 4 +- .../rusefi_generated_stm32f429_nucleo.h | 4 +- .../rusefi_generated_stm32f767_nucleo.h | 4 +- .../rusefi_generated_stm32h743_nucleo.h | 4 +- .../rusefi_generated_subaru_eg33_f7.h | 4 +- .../generated/rusefi_generated_t-b-g.h | 4 +- .../generated/rusefi_generated_tdg-pdm8.h | 4 +- .../generated/rusefi_generated_uaefi.h | 4 +- .../generated/rusefi_generated_uaefi121.h | 4 +- .../generated/signature_alphax-2chan.h | 4 +- .../generated/signature_alphax-4chan.h | 4 +- .../generated/signature_alphax-4chan_f7.h | 4 +- .../generated/signature_alphax-4k-gdi.h | 4 +- .../generated/signature_alphax-8chan-revA.h | 4 +- .../generated/signature_alphax-8chan.h | 4 +- .../generated/signature_alphax-8chan_f7.h | 4 +- .../generated/signature_alphax-silver.h | 4 +- .../generated/signature_at_start_f435.h | 4 +- .../controllers/generated/signature_atlas.h | 4 +- .../generated/signature_f407-discovery.h | 4 +- .../generated/signature_f429-discovery.h | 4 +- .../generated/signature_f469-discovery.h | 4 +- .../generated/signature_frankenso_na6.h | 4 +- .../controllers/generated/signature_haba208.h | 4 +- .../generated/signature_hellen-112-17.h | 4 +- .../generated/signature_hellen-gm-e67.h | 4 +- .../generated/signature_hellen-honda-k.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_hellen154hyundai_f7.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 +- .../controllers/generated/signature_m74_9.h | 4 +- .../generated/signature_mre-legacy_f4.h | 4 +- .../controllers/generated/signature_mre_f4.h | 4 +- .../controllers/generated/signature_mre_f7.h | 4 +- .../generated/signature_nucleo_f413.h | 4 +- .../generated/signature_proteus_f4.h | 4 +- .../generated/signature_proteus_f7.h | 4 +- .../generated/signature_proteus_h7.h | 4 +- .../controllers/generated/signature_s105.h | 4 +- .../generated/signature_small-can-board.h | 4 +- .../generated/signature_stm32f429_nucleo.h | 4 +- .../generated/signature_stm32f767_nucleo.h | 4 +- .../generated/signature_stm32h743_nucleo.h | 4 +- .../generated/signature_subaru_eg33_f7.h | 4 +- .../controllers/generated/signature_t-b-g.h | 4 +- .../generated/signature_tdg-pdm8.h | 4 +- .../controllers/generated/signature_uaefi.h | 4 +- .../generated/signature_uaefi121.h | 4 +- .../lua/generated/output_lookup_generated.cpp | 48 ++++++++--------- .../nitrous_control_state_generated.h | 16 +++--- firmware/tunerstudio/generated/rusefi.ini | 54 +++++++++---------- .../generated/rusefi_alphax-2chan.ini | 54 +++++++++---------- .../generated/rusefi_alphax-4chan.ini | 54 +++++++++---------- .../generated/rusefi_alphax-4chan_f7.ini | 54 +++++++++---------- .../generated/rusefi_alphax-4k-gdi.ini | 54 +++++++++---------- .../generated/rusefi_alphax-8chan-revA.ini | 54 +++++++++---------- .../generated/rusefi_alphax-8chan.ini | 54 +++++++++---------- .../generated/rusefi_alphax-8chan_f7.ini | 54 +++++++++---------- .../generated/rusefi_alphax-silver.ini | 54 +++++++++---------- .../generated/rusefi_at_start_f435.ini | 54 +++++++++---------- .../tunerstudio/generated/rusefi_atlas.ini | 54 +++++++++---------- .../generated/rusefi_f407-discovery.ini | 54 +++++++++---------- .../generated/rusefi_f429-discovery.ini | 54 +++++++++---------- .../generated/rusefi_f469-discovery.ini | 54 +++++++++---------- .../generated/rusefi_frankenso_na6.ini | 54 +++++++++---------- .../tunerstudio/generated/rusefi_haba208.ini | 54 +++++++++---------- .../generated/rusefi_hellen-112-17.ini | 54 +++++++++---------- .../generated/rusefi_hellen-gm-e67.ini | 54 +++++++++---------- .../generated/rusefi_hellen-honda-k.ini | 54 +++++++++---------- .../generated/rusefi_hellen-nb1.ini | 54 +++++++++---------- .../generated/rusefi_hellen121nissan.ini | 54 +++++++++---------- .../generated/rusefi_hellen121vag.ini | 54 +++++++++---------- .../generated/rusefi_hellen128.ini | 54 +++++++++---------- .../generated/rusefi_hellen154hyundai.ini | 54 +++++++++---------- .../generated/rusefi_hellen154hyundai_f7.ini | 54 +++++++++---------- .../tunerstudio/generated/rusefi_hellen72.ini | 54 +++++++++---------- .../tunerstudio/generated/rusefi_hellen81.ini | 54 +++++++++---------- .../generated/rusefi_hellen88bmw.ini | 54 +++++++++---------- .../generated/rusefi_hellenNA6.ini | 54 +++++++++---------- .../generated/rusefi_hellenNA8_96.ini | 54 +++++++++---------- .../tunerstudio/generated/rusefi_m74_9.ini | 54 +++++++++---------- .../generated/rusefi_mre-legacy_f4.ini | 54 +++++++++---------- .../tunerstudio/generated/rusefi_mre_f4.ini | 54 +++++++++---------- .../tunerstudio/generated/rusefi_mre_f7.ini | 54 +++++++++---------- .../generated/rusefi_nucleo_f413.ini | 54 +++++++++---------- .../generated/rusefi_proteus_f4.ini | 54 +++++++++---------- .../generated/rusefi_proteus_f7.ini | 54 +++++++++---------- .../generated/rusefi_proteus_h7.ini | 54 +++++++++---------- .../tunerstudio/generated/rusefi_s105.ini | 54 +++++++++---------- .../generated/rusefi_small-can-board.ini | 54 +++++++++---------- .../generated/rusefi_stm32f429_nucleo.ini | 54 +++++++++---------- .../generated/rusefi_stm32f767_nucleo.ini | 54 +++++++++---------- .../generated/rusefi_stm32h743_nucleo.ini | 54 +++++++++---------- .../generated/rusefi_subaru_eg33_f7.ini | 54 +++++++++---------- .../tunerstudio/generated/rusefi_t-b-g.ini | 54 +++++++++---------- .../tunerstudio/generated/rusefi_tdg-pdm8.ini | 54 +++++++++---------- .../tunerstudio/generated/rusefi_uaefi.ini | 54 +++++++++---------- .../tunerstudio/generated/rusefi_uaefi121.ini | 54 +++++++++---------- .../com/rusefi/config/generated/Fields.java | 3 +- .../config/generated/NitrousControl.java | 32 +++++------ 149 files changed, 1558 insertions(+), 1557 deletions(-) diff --git a/firmware/console/binary/generated/data_logs.ini b/firmware/console/binary/generated/data_logs.ini index 8c455e4eee..60f93f5a5c 100644 --- a/firmware/console/binary/generated/data_logs.ini +++ b/firmware/console/binary/generated/data_logs.ini @@ -569,14 +569,14 @@ entry = isDisabledByLua, "AC disabled by Lua", int, "%d" entry = acCompressorState, "AC compressor on", int, "%d" entry = acPressureTooLow, "AC pressure too low", int, "%d" entry = acPressureTooHigh, "AC pressure too high", int, "%d" -entry = isArmed, "isArmed", int, "%d" -entry = isNitrousSpeedConditionSatisfied, "isNitrousSpeedConditionSatisfied", int, "%d" -entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" -entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" -entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" -entry = isAfrConditionSatisfied, "isAfrConditionSatisfied", int, "%d" -entry = isNitrousRpmConditionSatisfied, "isNitrousRpmConditionSatisfied", int, "%d" -entry = isNitrousConditionSatisfied, "isNitrousConditionSatisfied", int, "%d" +entry = isNitrousArmed, "isNitrousArmed", int, "%d" +entry = isNitrousSpeedCondition, "isNitrousSpeedCondition", int, "%d" +entry = isNitrousTpsCondition, "isNitrousTpsCondition", int, "%d" +entry = isNitrousCltCondition, "isNitrousCltCondition", int, "%d" +entry = isNitrousMapCondition, "isNitrousMapCondition", int, "%d" +entry = isNitrousAfrCondition, "isNitrousAfrCondition", int, "%d" +entry = isNitrousRpmCondition, "isNitrousRpmCondition", int, "%d" +entry = isNitrousCondition, "isNitrousCondition", int, "%d" entry = cranking0, "cranking0", int, "%d" entry = notRunning0, "notRunning0", int, "%d" entry = disabledWhileEngineStopped0, "disabledWhileEngineStopped0", int, "%d" diff --git a/firmware/console/binary/generated/fancy_content.ini b/firmware/console/binary/generated/fancy_content.ini index dc043ff6fb..a34480bb18 100644 --- a/firmware/console/binary/generated/fancy_content.ini +++ b/firmware/console/binary/generated/fancy_content.ini @@ -237,14 +237,14 @@ dialog = ac_controlDialog, "ac_control" graphLine = acButtonState indicatorPanel = nitrous_control_stateIndicatorPanel, 2 - indicator = {isArmed}, "isArmed No", "isArmed Yes" - indicator = {isNitrousSpeedConditionSatisfied}, "isNitrousSpeedConditionSatisfied No", "isNitrousSpeedConditionSatisfied Yes" - indicator = {isTpsConditionSatisfied}, "isTpsConditionSatisfied No", "isTpsConditionSatisfied Yes" - indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" - indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" - indicator = {isAfrConditionSatisfied}, "isAfrConditionSatisfied No", "isAfrConditionSatisfied Yes" - indicator = {isNitrousRpmConditionSatisfied}, "isNitrousRpmConditionSatisfied No", "isNitrousRpmConditionSatisfied Yes" - indicator = {isNitrousConditionSatisfied}, "isNitrousConditionSatisfied No", "isNitrousConditionSatisfied Yes" + indicator = {isNitrousArmed}, "isNitrousArmed No", "isNitrousArmed Yes" + indicator = {isNitrousSpeedCondition}, "isNitrousSpeedCondition No", "isNitrousSpeedCondition Yes" + indicator = {isNitrousTpsCondition}, "isNitrousTpsCondition No", "isNitrousTpsCondition Yes" + indicator = {isNitrousCltCondition}, "isNitrousCltCondition No", "isNitrousCltCondition Yes" + indicator = {isNitrousMapCondition}, "isNitrousMapCondition No", "isNitrousMapCondition Yes" + indicator = {isNitrousAfrCondition}, "isNitrousAfrCondition No", "isNitrousAfrCondition Yes" + indicator = {isNitrousRpmCondition}, "isNitrousRpmCondition No", "isNitrousRpmCondition Yes" + indicator = {isNitrousCondition}, "isNitrousCondition No", "isNitrousCondition Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel diff --git a/firmware/console/binary/generated/output_channels.ini b/firmware/console/binary/generated/output_channels.ini index 8cf611cc1f..771696f852 100644 --- a/firmware/console/binary/generated/output_channels.ini +++ b/firmware/console/binary/generated/output_channels.ini @@ -636,14 +636,14 @@ acCompressorState = bits, U32, 1172, [7:7] acPressureTooLow = bits, U32, 1172, [8:8] acPressureTooHigh = bits, U32, 1172, [9:9] ; total TS size = 1176 -isArmed = bits, U32, 1176, [0:0] -isNitrousSpeedConditionSatisfied = bits, U32, 1176, [1:1] -isTpsConditionSatisfied = bits, U32, 1176, [2:2] -isCltConditionSatisfied = bits, U32, 1176, [3:3] -isMapConditionSatisfied = bits, U32, 1176, [4:4] -isAfrConditionSatisfied = bits, U32, 1176, [5:5] -isNitrousRpmConditionSatisfied = bits, U32, 1176, [6:6] -isNitrousConditionSatisfied = bits, U32, 1176, [7:7] +isNitrousArmed = bits, U32, 1176, [0:0] +isNitrousSpeedCondition = bits, U32, 1176, [1:1] +isNitrousTpsCondition = bits, U32, 1176, [2:2] +isNitrousCltCondition = bits, U32, 1176, [3:3] +isNitrousMapCondition = bits, U32, 1176, [4:4] +isNitrousAfrCondition = bits, U32, 1176, [5:5] +isNitrousRpmCondition = bits, U32, 1176, [6:6] +isNitrousCondition = bits, U32, 1176, [7:7] ; total TS size = 1180 cranking0 = bits, U32, 1180, [0:0] notRunning0 = bits, U32, 1180, [1:1] diff --git a/firmware/controllers/generated/rusefi_generated_alphax-2chan.h b/firmware/controllers/generated/rusefi_generated_alphax-2chan.h index a032f6ed98..bae0e2f938 100644 --- a/firmware/controllers/generated/rusefi_generated_alphax-2chan.h +++ b/firmware/controllers/generated/rusefi_generated_alphax-2chan.h @@ -1328,7 +1328,7 @@ #define show_2chan_presets true #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 1828783131 +#define SIGNATURE_HASH 3128245377 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1789,7 +1789,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.12.06.alphax-2chan.1828783131" +#define TS_SIGNATURE "rusEFI master.2024.12.06.alphax-2chan.3128245377" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_alphax-4chan.h b/firmware/controllers/generated/rusefi_generated_alphax-4chan.h index 184eb4d35d..4e9e6bb95f 100644 --- a/firmware/controllers/generated/rusefi_generated_alphax-4chan.h +++ b/firmware/controllers/generated/rusefi_generated_alphax-4chan.h @@ -1329,7 +1329,7 @@ #define show_4chan_presets true #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 3183537918 +#define SIGNATURE_HASH 1790236260 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1790,7 +1790,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.12.06.alphax-4chan.3183537918" +#define TS_SIGNATURE "rusEFI master.2024.12.06.alphax-4chan.1790236260" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_alphax-4chan_f7.h b/firmware/controllers/generated/rusefi_generated_alphax-4chan_f7.h index 4d3019eab8..8980ad9388 100644 --- a/firmware/controllers/generated/rusefi_generated_alphax-4chan_f7.h +++ b/firmware/controllers/generated/rusefi_generated_alphax-4chan_f7.h @@ -1329,7 +1329,7 @@ #define show_4chan_presets true #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 3183537918 +#define SIGNATURE_HASH 1790236260 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1790,7 +1790,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.12.06.alphax-4chan_f7.3183537918" +#define TS_SIGNATURE "rusEFI master.2024.12.06.alphax-4chan_f7.1790236260" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_alphax-4k-gdi.h b/firmware/controllers/generated/rusefi_generated_alphax-4k-gdi.h index 63b99b45ec..0aef4db210 100644 --- a/firmware/controllers/generated/rusefi_generated_alphax-4k-gdi.h +++ b/firmware/controllers/generated/rusefi_generated_alphax-4k-gdi.h @@ -1328,7 +1328,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 3194313979 +#define SIGNATURE_HASH 1762747489 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1789,7 +1789,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.12.06.alphax-4k-gdi.3194313979" +#define TS_SIGNATURE "rusEFI master.2024.12.06.alphax-4k-gdi.1762747489" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_alphax-8chan-revA.h b/firmware/controllers/generated/rusefi_generated_alphax-8chan-revA.h index d47f7e756d..de72429daa 100644 --- a/firmware/controllers/generated/rusefi_generated_alphax-8chan-revA.h +++ b/firmware/controllers/generated/rusefi_generated_alphax-8chan-revA.h @@ -1328,7 +1328,7 @@ #define show_8chan_presets true #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 2147672569 +#define SIGNATURE_HASH 1467406691 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1789,7 +1789,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.12.06.alphax-8chan-revA.2147672569" +#define TS_SIGNATURE "rusEFI master.2024.12.06.alphax-8chan-revA.1467406691" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_alphax-8chan.h b/firmware/controllers/generated/rusefi_generated_alphax-8chan.h index bc6bff51a0..69f231ebd5 100644 --- a/firmware/controllers/generated/rusefi_generated_alphax-8chan.h +++ b/firmware/controllers/generated/rusefi_generated_alphax-8chan.h @@ -1326,7 +1326,7 @@ #define show_8chan_presets true #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 2722398898 +#define SIGNATURE_HASH 1966127656 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1787,7 +1787,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.12.06.alphax-8chan.2722398898" +#define TS_SIGNATURE "rusEFI master.2024.12.06.alphax-8chan.1966127656" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_alphax-8chan_f7.h b/firmware/controllers/generated/rusefi_generated_alphax-8chan_f7.h index 730cb8d49e..866e3b973e 100644 --- a/firmware/controllers/generated/rusefi_generated_alphax-8chan_f7.h +++ b/firmware/controllers/generated/rusefi_generated_alphax-8chan_f7.h @@ -1326,7 +1326,7 @@ #define show_8chan_presets true #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 2722398898 +#define SIGNATURE_HASH 1966127656 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1787,7 +1787,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.12.06.alphax-8chan_f7.2722398898" +#define TS_SIGNATURE "rusEFI master.2024.12.06.alphax-8chan_f7.1966127656" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_alphax-silver.h b/firmware/controllers/generated/rusefi_generated_alphax-silver.h index 753e964c83..57e83bff8d 100644 --- a/firmware/controllers/generated/rusefi_generated_alphax-silver.h +++ b/firmware/controllers/generated/rusefi_generated_alphax-silver.h @@ -1327,7 +1327,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 427104714 +#define SIGNATURE_HASH 3456180560 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1788,7 +1788,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.12.06.alphax-silver.427104714" +#define TS_SIGNATURE "rusEFI master.2024.12.06.alphax-silver.3456180560" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_at_start_f435.h b/firmware/controllers/generated/rusefi_generated_at_start_f435.h index 20f239a115..3a4fe8e59c 100644 --- a/firmware/controllers/generated/rusefi_generated_at_start_f435.h +++ b/firmware/controllers/generated/rusefi_generated_at_start_f435.h @@ -1330,7 +1330,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 617288300 +#define SIGNATURE_HASH 4089391862 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1791,7 +1791,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.12.06.at_start_f435.617288300" +#define TS_SIGNATURE "rusEFI master.2024.12.06.at_start_f435.4089391862" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_atlas.h b/firmware/controllers/generated/rusefi_generated_atlas.h index ed91aad4df..abecd76c6d 100644 --- a/firmware/controllers/generated/rusefi_generated_atlas.h +++ b/firmware/controllers/generated/rusefi_generated_atlas.h @@ -1330,7 +1330,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 1624032802 +#define SIGNATURE_HASH 3082354360 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1791,7 +1791,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.12.06.atlas.1624032802" +#define TS_SIGNATURE "rusEFI master.2024.12.06.atlas.3082354360" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_f407-discovery.h b/firmware/controllers/generated/rusefi_generated_f407-discovery.h index 8bab2da612..2bb825a04d 100644 --- a/firmware/controllers/generated/rusefi_generated_f407-discovery.h +++ b/firmware/controllers/generated/rusefi_generated_f407-discovery.h @@ -1331,7 +1331,7 @@ #define show_tcu_gauges false #define show_test_presets true #define show_vvt_output_pin true -#define SIGNATURE_HASH 3295927249 +#define SIGNATURE_HASH 319284043 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1792,7 +1792,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.12.06.f407-discovery.3295927249" +#define TS_SIGNATURE "rusEFI master.2024.12.06.f407-discovery.319284043" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_f429-discovery.h b/firmware/controllers/generated/rusefi_generated_f429-discovery.h index be45b2e43f..398fd90338 100644 --- a/firmware/controllers/generated/rusefi_generated_f429-discovery.h +++ b/firmware/controllers/generated/rusefi_generated_f429-discovery.h @@ -1330,7 +1330,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 617288300 +#define SIGNATURE_HASH 4089391862 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1791,7 +1791,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.12.06.f429-discovery.617288300" +#define TS_SIGNATURE "rusEFI master.2024.12.06.f429-discovery.4089391862" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_f469-discovery.h b/firmware/controllers/generated/rusefi_generated_f469-discovery.h index fbbf0a8cad..974a153784 100644 --- a/firmware/controllers/generated/rusefi_generated_f469-discovery.h +++ b/firmware/controllers/generated/rusefi_generated_f469-discovery.h @@ -1330,7 +1330,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 370939135 +#define SIGNATURE_HASH 3244829797 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1791,7 +1791,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.12.06.f469-discovery.370939135" +#define TS_SIGNATURE "rusEFI master.2024.12.06.f469-discovery.3244829797" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_frankenso_na6.h b/firmware/controllers/generated/rusefi_generated_frankenso_na6.h index 191d5c8ff1..45c70be958 100644 --- a/firmware/controllers/generated/rusefi_generated_frankenso_na6.h +++ b/firmware/controllers/generated/rusefi_generated_frankenso_na6.h @@ -1332,7 +1332,7 @@ #define show_tcu_gauges false #define show_test_presets true #define show_vvt_output_pin true -#define SIGNATURE_HASH 1917347447 +#define SIGNATURE_HASH 2772197101 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1793,7 +1793,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.12.06.frankenso_na6.1917347447" +#define TS_SIGNATURE "rusEFI master.2024.12.06.frankenso_na6.2772197101" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_haba208.h b/firmware/controllers/generated/rusefi_generated_haba208.h index ff695705f4..cb45834a9e 100644 --- a/firmware/controllers/generated/rusefi_generated_haba208.h +++ b/firmware/controllers/generated/rusefi_generated_haba208.h @@ -1330,7 +1330,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 617288300 +#define SIGNATURE_HASH 4089391862 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1791,7 +1791,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.12.06.haba208.617288300" +#define TS_SIGNATURE "rusEFI master.2024.12.06.haba208.4089391862" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_hellen-112-17.h b/firmware/controllers/generated/rusefi_generated_hellen-112-17.h index 635522b479..752cd9b008 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen-112-17.h +++ b/firmware/controllers/generated/rusefi_generated_hellen-112-17.h @@ -1331,7 +1331,7 @@ #define show_8chan_presets false #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 2915273448 +#define SIGNATURE_HASH 2058859122 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1792,7 +1792,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.12.06.hellen-112-17.2915273448" +#define TS_SIGNATURE "rusEFI master.2024.12.06.hellen-112-17.2058859122" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_hellen-gm-e67.h b/firmware/controllers/generated/rusefi_generated_hellen-gm-e67.h index 2fbb0ff435..66eb784049 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen-gm-e67.h +++ b/firmware/controllers/generated/rusefi_generated_hellen-gm-e67.h @@ -1330,7 +1330,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 3904009684 +#define SIGNATURE_HASH 1069960526 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1791,7 +1791,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.12.06.hellen-gm-e67.3904009684" +#define TS_SIGNATURE "rusEFI master.2024.12.06.hellen-gm-e67.1069960526" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_hellen-honda-k.h b/firmware/controllers/generated/rusefi_generated_hellen-honda-k.h index 39ad7a0869..635986bd1c 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen-honda-k.h +++ b/firmware/controllers/generated/rusefi_generated_hellen-honda-k.h @@ -1328,7 +1328,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 1894932506 +#define SIGNATURE_HASH 2810599552 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1791,7 +1791,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.12.06.hellen-honda-k.1894932506" +#define TS_SIGNATURE "rusEFI master.2024.12.06.hellen-honda-k.2810599552" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_hellen-nb1.h b/firmware/controllers/generated/rusefi_generated_hellen-nb1.h index 639dfdb20b..319a69a933 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen-nb1.h +++ b/firmware/controllers/generated/rusefi_generated_hellen-nb1.h @@ -1331,7 +1331,7 @@ #define show_HellenNB1_presets true #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 2808989555 +#define SIGNATURE_HASH 1880752105 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1792,7 +1792,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.12.06.hellen-nb1.2808989555" +#define TS_SIGNATURE "rusEFI master.2024.12.06.hellen-nb1.1880752105" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_hellen121nissan.h b/firmware/controllers/generated/rusefi_generated_hellen121nissan.h index 0e8388d14f..ec87600157 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen121nissan.h +++ b/firmware/controllers/generated/rusefi_generated_hellen121nissan.h @@ -1331,7 +1331,7 @@ #define show_Hellen121nissan_presets true #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 4098916588 +#define SIGNATURE_HASH 589609078 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1792,7 +1792,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.12.06.hellen121nissan.4098916588" +#define TS_SIGNATURE "rusEFI master.2024.12.06.hellen121nissan.589609078" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_hellen121vag.h b/firmware/controllers/generated/rusefi_generated_hellen121vag.h index 51029ea26c..0b9cabba1b 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen121vag.h +++ b/firmware/controllers/generated/rusefi_generated_hellen121vag.h @@ -1331,7 +1331,7 @@ #define show_Hellen121vag_presets true #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 2889454251 +#define SIGNATURE_HASH 2068687409 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1792,7 +1792,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.12.06.hellen121vag.2889454251" +#define TS_SIGNATURE "rusEFI master.2024.12.06.hellen121vag.2068687409" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_hellen128.h b/firmware/controllers/generated/rusefi_generated_hellen128.h index d8b23b99bb..f402b891f3 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen128.h +++ b/firmware/controllers/generated/rusefi_generated_hellen128.h @@ -1331,7 +1331,7 @@ #define show_Hellen128merc_presets true #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 3378067611 +#define SIGNATURE_HASH 506265601 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1792,7 +1792,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.12.06.hellen128.3378067611" +#define TS_SIGNATURE "rusEFI master.2024.12.06.hellen128.506265601" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_hellen154hyundai.h b/firmware/controllers/generated/rusefi_generated_hellen154hyundai.h index eb58f365e4..287d97f386 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen154hyundai.h +++ b/firmware/controllers/generated/rusefi_generated_hellen154hyundai.h @@ -1328,7 +1328,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 3329676132 +#define SIGNATURE_HASH 285404158 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1789,7 +1789,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.12.06.hellen154hyundai.3329676132" +#define TS_SIGNATURE "rusEFI master.2024.12.06.hellen154hyundai.285404158" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_hellen154hyundai_f7.h b/firmware/controllers/generated/rusefi_generated_hellen154hyundai_f7.h index 9bd4dbe997..73a911c4c5 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen154hyundai_f7.h +++ b/firmware/controllers/generated/rusefi_generated_hellen154hyundai_f7.h @@ -1328,7 +1328,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 1378704613 +#define SIGNATURE_HASH 2237228159 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1789,7 +1789,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.12.06.hellen154hyundai_f7.1378704613" +#define TS_SIGNATURE "rusEFI master.2024.12.06.hellen154hyundai_f7.2237228159" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_hellen72.h b/firmware/controllers/generated/rusefi_generated_hellen72.h index 7a720c03e7..2cb8385fec 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen72.h +++ b/firmware/controllers/generated/rusefi_generated_hellen72.h @@ -1331,7 +1331,7 @@ #define show_HellenNB2_presets true #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 3655598010 +#define SIGNATURE_HASH 244827936 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1792,7 +1792,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.12.06.hellen72.3655598010" +#define TS_SIGNATURE "rusEFI master.2024.12.06.hellen72.244827936" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_hellen81.h b/firmware/controllers/generated/rusefi_generated_hellen81.h index 8d0c18d3ff..f98e8e3123 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen81.h +++ b/firmware/controllers/generated/rusefi_generated_hellen81.h @@ -1330,7 +1330,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 1096516234 +#define SIGNATURE_HASH 2519710224 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1791,7 +1791,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.12.06.hellen81.1096516234" +#define TS_SIGNATURE "rusEFI master.2024.12.06.hellen81.2519710224" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_hellen88bmw.h b/firmware/controllers/generated/rusefi_generated_hellen88bmw.h index 5a63aa7091..fd548f3519 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen88bmw.h +++ b/firmware/controllers/generated/rusefi_generated_hellen88bmw.h @@ -1331,7 +1331,7 @@ #define show_Hellen88bmw_presets true #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 1450743753 +#define SIGNATURE_HASH 2165092179 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1792,7 +1792,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.12.06.hellen88bmw.1450743753" +#define TS_SIGNATURE "rusEFI master.2024.12.06.hellen88bmw.2165092179" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_hellenNA6.h b/firmware/controllers/generated/rusefi_generated_hellenNA6.h index 0a7616cd7a..8d8991db0e 100644 --- a/firmware/controllers/generated/rusefi_generated_hellenNA6.h +++ b/firmware/controllers/generated/rusefi_generated_hellenNA6.h @@ -1331,7 +1331,7 @@ #define show_HellenNA6_presets true #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 2960060812 +#define SIGNATURE_HASH 1729808662 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1792,7 +1792,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.12.06.hellenNA6.2960060812" +#define TS_SIGNATURE "rusEFI master.2024.12.06.hellenNA6.1729808662" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_hellenNA8_96.h b/firmware/controllers/generated/rusefi_generated_hellenNA8_96.h index 3b0efb737e..e8ad4b581b 100644 --- a/firmware/controllers/generated/rusefi_generated_hellenNA8_96.h +++ b/firmware/controllers/generated/rusefi_generated_hellenNA8_96.h @@ -1332,7 +1332,7 @@ #define show_HellenNB1_presets false #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 1337242434 +#define SIGNATURE_HASH 2562755544 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1793,7 +1793,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.12.06.hellenNA8_96.1337242434" +#define TS_SIGNATURE "rusEFI master.2024.12.06.hellenNA8_96.2562755544" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_m74_9.h b/firmware/controllers/generated/rusefi_generated_m74_9.h index ca8614556b..3927f2d215 100644 --- a/firmware/controllers/generated/rusefi_generated_m74_9.h +++ b/firmware/controllers/generated/rusefi_generated_m74_9.h @@ -1330,7 +1330,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 2423335603 +#define SIGNATURE_HASH 1191514665 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1792,7 +1792,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.12.06.m74_9.2423335603" +#define TS_SIGNATURE "rusEFI master.2024.12.06.m74_9.1191514665" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_mre-legacy_f4.h b/firmware/controllers/generated/rusefi_generated_mre-legacy_f4.h index b1fbd05a62..9d5518cbef 100644 --- a/firmware/controllers/generated/rusefi_generated_mre-legacy_f4.h +++ b/firmware/controllers/generated/rusefi_generated_mre-legacy_f4.h @@ -1329,7 +1329,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 1874187183 +#define SIGNATURE_HASH 3099716405 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1790,7 +1790,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.12.06.mre-legacy_f4.1874187183" +#define TS_SIGNATURE "rusEFI master.2024.12.06.mre-legacy_f4.3099716405" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_mre_f4.h b/firmware/controllers/generated/rusefi_generated_mre_f4.h index 2ebe6b55fe..6689657869 100644 --- a/firmware/controllers/generated/rusefi_generated_mre_f4.h +++ b/firmware/controllers/generated/rusefi_generated_mre_f4.h @@ -1329,7 +1329,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 1874187183 +#define SIGNATURE_HASH 3099716405 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1790,7 +1790,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.12.06.mre_f4.1874187183" +#define TS_SIGNATURE "rusEFI master.2024.12.06.mre_f4.3099716405" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_mre_f7.h b/firmware/controllers/generated/rusefi_generated_mre_f7.h index 46681f23d0..44a96761e1 100644 --- a/firmware/controllers/generated/rusefi_generated_mre_f7.h +++ b/firmware/controllers/generated/rusefi_generated_mre_f7.h @@ -1329,7 +1329,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 1874187183 +#define SIGNATURE_HASH 3099716405 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1790,7 +1790,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.12.06.mre_f7.1874187183" +#define TS_SIGNATURE "rusEFI master.2024.12.06.mre_f7.3099716405" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_nucleo_f413.h b/firmware/controllers/generated/rusefi_generated_nucleo_f413.h index 290595c3a5..2e915fb783 100644 --- a/firmware/controllers/generated/rusefi_generated_nucleo_f413.h +++ b/firmware/controllers/generated/rusefi_generated_nucleo_f413.h @@ -1330,7 +1330,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 617288300 +#define SIGNATURE_HASH 4089391862 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1791,7 +1791,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.12.06.nucleo_f413.617288300" +#define TS_SIGNATURE "rusEFI master.2024.12.06.nucleo_f413.4089391862" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_proteus_f4.h b/firmware/controllers/generated/rusefi_generated_proteus_f4.h index b6a5f66fc7..d9f6388bf3 100644 --- a/firmware/controllers/generated/rusefi_generated_proteus_f4.h +++ b/firmware/controllers/generated/rusefi_generated_proteus_f4.h @@ -1328,7 +1328,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 2279794350 +#define SIGNATURE_HASH 1352064564 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1789,7 +1789,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.12.06.proteus_f4.2279794350" +#define TS_SIGNATURE "rusEFI master.2024.12.06.proteus_f4.1352064564" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_proteus_f7.h b/firmware/controllers/generated/rusefi_generated_proteus_f7.h index ae29ece008..02954e769c 100644 --- a/firmware/controllers/generated/rusefi_generated_proteus_f7.h +++ b/firmware/controllers/generated/rusefi_generated_proteus_f7.h @@ -1328,7 +1328,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 2279794350 +#define SIGNATURE_HASH 1352064564 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1789,7 +1789,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.12.06.proteus_f7.2279794350" +#define TS_SIGNATURE "rusEFI master.2024.12.06.proteus_f7.1352064564" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_proteus_h7.h b/firmware/controllers/generated/rusefi_generated_proteus_h7.h index 2081592362..a74f3457f9 100644 --- a/firmware/controllers/generated/rusefi_generated_proteus_h7.h +++ b/firmware/controllers/generated/rusefi_generated_proteus_h7.h @@ -1328,7 +1328,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 2279794350 +#define SIGNATURE_HASH 1352064564 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1789,7 +1789,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.12.06.proteus_h7.2279794350" +#define TS_SIGNATURE "rusEFI master.2024.12.06.proteus_h7.1352064564" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_s105.h b/firmware/controllers/generated/rusefi_generated_s105.h index df9f05c21c..157ecd2efb 100644 --- a/firmware/controllers/generated/rusefi_generated_s105.h +++ b/firmware/controllers/generated/rusefi_generated_s105.h @@ -1330,7 +1330,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 2604700334 +#define SIGNATURE_HASH 1278519860 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1792,7 +1792,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.12.06.s105.2604700334" +#define TS_SIGNATURE "rusEFI master.2024.12.06.s105.1278519860" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_small-can-board.h b/firmware/controllers/generated/rusefi_generated_small-can-board.h index 20c12b8df4..3c0de436ef 100644 --- a/firmware/controllers/generated/rusefi_generated_small-can-board.h +++ b/firmware/controllers/generated/rusefi_generated_small-can-board.h @@ -1328,7 +1328,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 2016427841 +#define SIGNATURE_HASH 2940471259 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1790,7 +1790,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.12.06.small-can-board.2016427841" +#define TS_SIGNATURE "rusEFI master.2024.12.06.small-can-board.2940471259" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_stm32f429_nucleo.h b/firmware/controllers/generated/rusefi_generated_stm32f429_nucleo.h index 932d9beb80..b5daf6c65a 100644 --- a/firmware/controllers/generated/rusefi_generated_stm32f429_nucleo.h +++ b/firmware/controllers/generated/rusefi_generated_stm32f429_nucleo.h @@ -1330,7 +1330,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 617288300 +#define SIGNATURE_HASH 4089391862 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1791,7 +1791,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.12.06.stm32f429_nucleo.617288300" +#define TS_SIGNATURE "rusEFI master.2024.12.06.stm32f429_nucleo.4089391862" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_stm32f767_nucleo.h b/firmware/controllers/generated/rusefi_generated_stm32f767_nucleo.h index 2ee9e47dc8..89b5715623 100644 --- a/firmware/controllers/generated/rusefi_generated_stm32f767_nucleo.h +++ b/firmware/controllers/generated/rusefi_generated_stm32f767_nucleo.h @@ -1330,7 +1330,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 617288300 +#define SIGNATURE_HASH 4089391862 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1791,7 +1791,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.12.06.stm32f767_nucleo.617288300" +#define TS_SIGNATURE "rusEFI master.2024.12.06.stm32f767_nucleo.4089391862" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_stm32h743_nucleo.h b/firmware/controllers/generated/rusefi_generated_stm32h743_nucleo.h index af9147d105..b0a3f65b3a 100644 --- a/firmware/controllers/generated/rusefi_generated_stm32h743_nucleo.h +++ b/firmware/controllers/generated/rusefi_generated_stm32h743_nucleo.h @@ -1330,7 +1330,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 617288300 +#define SIGNATURE_HASH 4089391862 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1791,7 +1791,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.12.06.stm32h743_nucleo.617288300" +#define TS_SIGNATURE "rusEFI master.2024.12.06.stm32h743_nucleo.4089391862" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_subaru_eg33_f7.h b/firmware/controllers/generated/rusefi_generated_subaru_eg33_f7.h index 29ddfd102e..03951c44a6 100644 --- a/firmware/controllers/generated/rusefi_generated_subaru_eg33_f7.h +++ b/firmware/controllers/generated/rusefi_generated_subaru_eg33_f7.h @@ -1330,7 +1330,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 2078943794 +#define SIGNATURE_HASH 2896040616 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1792,7 +1792,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.12.06.subaru_eg33_f7.2078943794" +#define TS_SIGNATURE "rusEFI master.2024.12.06.subaru_eg33_f7.2896040616" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_t-b-g.h b/firmware/controllers/generated/rusefi_generated_t-b-g.h index 4dba967655..febe0a7396 100644 --- a/firmware/controllers/generated/rusefi_generated_t-b-g.h +++ b/firmware/controllers/generated/rusefi_generated_t-b-g.h @@ -1330,7 +1330,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 617288300 +#define SIGNATURE_HASH 4089391862 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1791,7 +1791,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.12.06.t-b-g.617288300" +#define TS_SIGNATURE "rusEFI master.2024.12.06.t-b-g.4089391862" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_tdg-pdm8.h b/firmware/controllers/generated/rusefi_generated_tdg-pdm8.h index d6e4b85aa0..d00d15c7a1 100644 --- a/firmware/controllers/generated/rusefi_generated_tdg-pdm8.h +++ b/firmware/controllers/generated/rusefi_generated_tdg-pdm8.h @@ -1330,7 +1330,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 518434532 +#define SIGNATURE_HASH 3381827198 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1791,7 +1791,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.12.06.tdg-pdm8.518434532" +#define TS_SIGNATURE "rusEFI master.2024.12.06.tdg-pdm8.3381827198" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_uaefi.h b/firmware/controllers/generated/rusefi_generated_uaefi.h index 677092b446..d353e1440d 100644 --- a/firmware/controllers/generated/rusefi_generated_uaefi.h +++ b/firmware/controllers/generated/rusefi_generated_uaefi.h @@ -1324,7 +1324,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 2096793967 +#define SIGNATURE_HASH 2878255605 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1786,7 +1786,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.12.06.uaefi.2096793967" +#define TS_SIGNATURE "rusEFI master.2024.12.06.uaefi.2878255605" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_uaefi121.h b/firmware/controllers/generated/rusefi_generated_uaefi121.h index c84dea56e6..e6c9078a41 100644 --- a/firmware/controllers/generated/rusefi_generated_uaefi121.h +++ b/firmware/controllers/generated/rusefi_generated_uaefi121.h @@ -1328,7 +1328,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 3256370372 +#define SIGNATURE_HASH 359431262 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1789,7 +1789,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.12.06.uaefi121.3256370372" +#define TS_SIGNATURE "rusEFI master.2024.12.06.uaefi121.359431262" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/signature_alphax-2chan.h b/firmware/controllers/generated/signature_alphax-2chan.h index 81c164a576..26a9b772e3 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 config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1828783131 -#define TS_SIGNATURE "rusEFI master.2024.12.06.alphax-2chan.1828783131" +#define SIGNATURE_HASH 3128245377 +#define TS_SIGNATURE "rusEFI master.2024.12.06.alphax-2chan.3128245377" diff --git a/firmware/controllers/generated/signature_alphax-4chan.h b/firmware/controllers/generated/signature_alphax-4chan.h index b90112b925..dd6b40682e 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 config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3183537918 -#define TS_SIGNATURE "rusEFI master.2024.12.06.alphax-4chan.3183537918" +#define SIGNATURE_HASH 1790236260 +#define TS_SIGNATURE "rusEFI master.2024.12.06.alphax-4chan.1790236260" diff --git a/firmware/controllers/generated/signature_alphax-4chan_f7.h b/firmware/controllers/generated/signature_alphax-4chan_f7.h index ee4c18ff6f..31cc16afa9 100644 --- a/firmware/controllers/generated/signature_alphax-4chan_f7.h +++ b/firmware/controllers/generated/signature_alphax-4chan_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3183537918 -#define TS_SIGNATURE "rusEFI master.2024.12.06.alphax-4chan_f7.3183537918" +#define SIGNATURE_HASH 1790236260 +#define TS_SIGNATURE "rusEFI master.2024.12.06.alphax-4chan_f7.1790236260" diff --git a/firmware/controllers/generated/signature_alphax-4k-gdi.h b/firmware/controllers/generated/signature_alphax-4k-gdi.h index 50e534c5e9..d247647548 100644 --- a/firmware/controllers/generated/signature_alphax-4k-gdi.h +++ b/firmware/controllers/generated/signature_alphax-4k-gdi.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3194313979 -#define TS_SIGNATURE "rusEFI master.2024.12.06.alphax-4k-gdi.3194313979" +#define SIGNATURE_HASH 1762747489 +#define TS_SIGNATURE "rusEFI master.2024.12.06.alphax-4k-gdi.1762747489" diff --git a/firmware/controllers/generated/signature_alphax-8chan-revA.h b/firmware/controllers/generated/signature_alphax-8chan-revA.h index a933d85a76..00eb22988f 100644 --- a/firmware/controllers/generated/signature_alphax-8chan-revA.h +++ b/firmware/controllers/generated/signature_alphax-8chan-revA.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2147672569 -#define TS_SIGNATURE "rusEFI master.2024.12.06.alphax-8chan-revA.2147672569" +#define SIGNATURE_HASH 1467406691 +#define TS_SIGNATURE "rusEFI master.2024.12.06.alphax-8chan-revA.1467406691" diff --git a/firmware/controllers/generated/signature_alphax-8chan.h b/firmware/controllers/generated/signature_alphax-8chan.h index 0b654b5f89..4b2f08a559 100644 --- a/firmware/controllers/generated/signature_alphax-8chan.h +++ b/firmware/controllers/generated/signature_alphax-8chan.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2722398898 -#define TS_SIGNATURE "rusEFI master.2024.12.06.alphax-8chan.2722398898" +#define SIGNATURE_HASH 1966127656 +#define TS_SIGNATURE "rusEFI master.2024.12.06.alphax-8chan.1966127656" diff --git a/firmware/controllers/generated/signature_alphax-8chan_f7.h b/firmware/controllers/generated/signature_alphax-8chan_f7.h index e560f5faaa..0b456f0905 100644 --- a/firmware/controllers/generated/signature_alphax-8chan_f7.h +++ b/firmware/controllers/generated/signature_alphax-8chan_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2722398898 -#define TS_SIGNATURE "rusEFI master.2024.12.06.alphax-8chan_f7.2722398898" +#define SIGNATURE_HASH 1966127656 +#define TS_SIGNATURE "rusEFI master.2024.12.06.alphax-8chan_f7.1966127656" diff --git a/firmware/controllers/generated/signature_alphax-silver.h b/firmware/controllers/generated/signature_alphax-silver.h index 5714003176..2a03cefac4 100644 --- a/firmware/controllers/generated/signature_alphax-silver.h +++ b/firmware/controllers/generated/signature_alphax-silver.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 427104714 -#define TS_SIGNATURE "rusEFI master.2024.12.06.alphax-silver.427104714" +#define SIGNATURE_HASH 3456180560 +#define TS_SIGNATURE "rusEFI master.2024.12.06.alphax-silver.3456180560" diff --git a/firmware/controllers/generated/signature_at_start_f435.h b/firmware/controllers/generated/signature_at_start_f435.h index 8f56b66d7f..3cc46bcf11 100644 --- a/firmware/controllers/generated/signature_at_start_f435.h +++ b/firmware/controllers/generated/signature_at_start_f435.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 617288300 -#define TS_SIGNATURE "rusEFI master.2024.12.06.at_start_f435.617288300" +#define SIGNATURE_HASH 4089391862 +#define TS_SIGNATURE "rusEFI master.2024.12.06.at_start_f435.4089391862" diff --git a/firmware/controllers/generated/signature_atlas.h b/firmware/controllers/generated/signature_atlas.h index f67dd47e54..e3992e0d30 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 config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1624032802 -#define TS_SIGNATURE "rusEFI master.2024.12.06.atlas.1624032802" +#define SIGNATURE_HASH 3082354360 +#define TS_SIGNATURE "rusEFI master.2024.12.06.atlas.3082354360" diff --git a/firmware/controllers/generated/signature_f407-discovery.h b/firmware/controllers/generated/signature_f407-discovery.h index 0f90817162..88cae81917 100644 --- a/firmware/controllers/generated/signature_f407-discovery.h +++ b/firmware/controllers/generated/signature_f407-discovery.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3295927249 -#define TS_SIGNATURE "rusEFI master.2024.12.06.f407-discovery.3295927249" +#define SIGNATURE_HASH 319284043 +#define TS_SIGNATURE "rusEFI master.2024.12.06.f407-discovery.319284043" diff --git a/firmware/controllers/generated/signature_f429-discovery.h b/firmware/controllers/generated/signature_f429-discovery.h index 4ad8451726..5cdcd7bd3b 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 config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 617288300 -#define TS_SIGNATURE "rusEFI master.2024.12.06.f429-discovery.617288300" +#define SIGNATURE_HASH 4089391862 +#define TS_SIGNATURE "rusEFI master.2024.12.06.f429-discovery.4089391862" diff --git a/firmware/controllers/generated/signature_f469-discovery.h b/firmware/controllers/generated/signature_f469-discovery.h index b1cd3ff90e..9e221e27ff 100644 --- a/firmware/controllers/generated/signature_f469-discovery.h +++ b/firmware/controllers/generated/signature_f469-discovery.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 370939135 -#define TS_SIGNATURE "rusEFI master.2024.12.06.f469-discovery.370939135" +#define SIGNATURE_HASH 3244829797 +#define TS_SIGNATURE "rusEFI master.2024.12.06.f469-discovery.3244829797" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index 2303f46f4c..5901440d7a 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 config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1917347447 -#define TS_SIGNATURE "rusEFI master.2024.12.06.frankenso_na6.1917347447" +#define SIGNATURE_HASH 2772197101 +#define TS_SIGNATURE "rusEFI master.2024.12.06.frankenso_na6.2772197101" diff --git a/firmware/controllers/generated/signature_haba208.h b/firmware/controllers/generated/signature_haba208.h index 667783d6d5..71f8e203f2 100644 --- a/firmware/controllers/generated/signature_haba208.h +++ b/firmware/controllers/generated/signature_haba208.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 617288300 -#define TS_SIGNATURE "rusEFI master.2024.12.06.haba208.617288300" +#define SIGNATURE_HASH 4089391862 +#define TS_SIGNATURE "rusEFI master.2024.12.06.haba208.4089391862" diff --git a/firmware/controllers/generated/signature_hellen-112-17.h b/firmware/controllers/generated/signature_hellen-112-17.h index 3175673e5a..c478ac52e3 100644 --- a/firmware/controllers/generated/signature_hellen-112-17.h +++ b/firmware/controllers/generated/signature_hellen-112-17.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2915273448 -#define TS_SIGNATURE "rusEFI master.2024.12.06.hellen-112-17.2915273448" +#define SIGNATURE_HASH 2058859122 +#define TS_SIGNATURE "rusEFI master.2024.12.06.hellen-112-17.2058859122" diff --git a/firmware/controllers/generated/signature_hellen-gm-e67.h b/firmware/controllers/generated/signature_hellen-gm-e67.h index b7e0c6425d..cddda2edda 100644 --- a/firmware/controllers/generated/signature_hellen-gm-e67.h +++ b/firmware/controllers/generated/signature_hellen-gm-e67.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3904009684 -#define TS_SIGNATURE "rusEFI master.2024.12.06.hellen-gm-e67.3904009684" +#define SIGNATURE_HASH 1069960526 +#define TS_SIGNATURE "rusEFI master.2024.12.06.hellen-gm-e67.1069960526" diff --git a/firmware/controllers/generated/signature_hellen-honda-k.h b/firmware/controllers/generated/signature_hellen-honda-k.h index 5c8672149f..0bf307996e 100644 --- a/firmware/controllers/generated/signature_hellen-honda-k.h +++ b/firmware/controllers/generated/signature_hellen-honda-k.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1894932506 -#define TS_SIGNATURE "rusEFI master.2024.12.06.hellen-honda-k.1894932506" +#define SIGNATURE_HASH 2810599552 +#define TS_SIGNATURE "rusEFI master.2024.12.06.hellen-honda-k.2810599552" diff --git a/firmware/controllers/generated/signature_hellen-nb1.h b/firmware/controllers/generated/signature_hellen-nb1.h index fb32da7e1c..4455cc1577 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 config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2808989555 -#define TS_SIGNATURE "rusEFI master.2024.12.06.hellen-nb1.2808989555" +#define SIGNATURE_HASH 1880752105 +#define TS_SIGNATURE "rusEFI master.2024.12.06.hellen-nb1.1880752105" diff --git a/firmware/controllers/generated/signature_hellen121nissan.h b/firmware/controllers/generated/signature_hellen121nissan.h index 4abd8c5259..0d75b3623a 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 config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 4098916588 -#define TS_SIGNATURE "rusEFI master.2024.12.06.hellen121nissan.4098916588" +#define SIGNATURE_HASH 589609078 +#define TS_SIGNATURE "rusEFI master.2024.12.06.hellen121nissan.589609078" diff --git a/firmware/controllers/generated/signature_hellen121vag.h b/firmware/controllers/generated/signature_hellen121vag.h index 384136b2cf..b4fc5a4be4 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 config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2889454251 -#define TS_SIGNATURE "rusEFI master.2024.12.06.hellen121vag.2889454251" +#define SIGNATURE_HASH 2068687409 +#define TS_SIGNATURE "rusEFI master.2024.12.06.hellen121vag.2068687409" diff --git a/firmware/controllers/generated/signature_hellen128.h b/firmware/controllers/generated/signature_hellen128.h index 560177e0dd..2255b04859 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 config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3378067611 -#define TS_SIGNATURE "rusEFI master.2024.12.06.hellen128.3378067611" +#define SIGNATURE_HASH 506265601 +#define TS_SIGNATURE "rusEFI master.2024.12.06.hellen128.506265601" diff --git a/firmware/controllers/generated/signature_hellen154hyundai.h b/firmware/controllers/generated/signature_hellen154hyundai.h index 286dab3d87..bcab780acd 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 config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3329676132 -#define TS_SIGNATURE "rusEFI master.2024.12.06.hellen154hyundai.3329676132" +#define SIGNATURE_HASH 285404158 +#define TS_SIGNATURE "rusEFI master.2024.12.06.hellen154hyundai.285404158" diff --git a/firmware/controllers/generated/signature_hellen154hyundai_f7.h b/firmware/controllers/generated/signature_hellen154hyundai_f7.h index 4dd2140030..dbb1c9be13 100644 --- a/firmware/controllers/generated/signature_hellen154hyundai_f7.h +++ b/firmware/controllers/generated/signature_hellen154hyundai_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1378704613 -#define TS_SIGNATURE "rusEFI master.2024.12.06.hellen154hyundai_f7.1378704613" +#define SIGNATURE_HASH 2237228159 +#define TS_SIGNATURE "rusEFI master.2024.12.06.hellen154hyundai_f7.2237228159" diff --git a/firmware/controllers/generated/signature_hellen72.h b/firmware/controllers/generated/signature_hellen72.h index cf86e4ea8f..e13b4495d4 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 config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3655598010 -#define TS_SIGNATURE "rusEFI master.2024.12.06.hellen72.3655598010" +#define SIGNATURE_HASH 244827936 +#define TS_SIGNATURE "rusEFI master.2024.12.06.hellen72.244827936" diff --git a/firmware/controllers/generated/signature_hellen81.h b/firmware/controllers/generated/signature_hellen81.h index 76d9a87098..494e9adcfc 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 config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1096516234 -#define TS_SIGNATURE "rusEFI master.2024.12.06.hellen81.1096516234" +#define SIGNATURE_HASH 2519710224 +#define TS_SIGNATURE "rusEFI master.2024.12.06.hellen81.2519710224" diff --git a/firmware/controllers/generated/signature_hellen88bmw.h b/firmware/controllers/generated/signature_hellen88bmw.h index 42073b1766..e61dbcafa2 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 config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1450743753 -#define TS_SIGNATURE "rusEFI master.2024.12.06.hellen88bmw.1450743753" +#define SIGNATURE_HASH 2165092179 +#define TS_SIGNATURE "rusEFI master.2024.12.06.hellen88bmw.2165092179" diff --git a/firmware/controllers/generated/signature_hellenNA6.h b/firmware/controllers/generated/signature_hellenNA6.h index 241825edd9..6f27decf5b 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 config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2960060812 -#define TS_SIGNATURE "rusEFI master.2024.12.06.hellenNA6.2960060812" +#define SIGNATURE_HASH 1729808662 +#define TS_SIGNATURE "rusEFI master.2024.12.06.hellenNA6.1729808662" diff --git a/firmware/controllers/generated/signature_hellenNA8_96.h b/firmware/controllers/generated/signature_hellenNA8_96.h index c8e5814ba4..46fb9cef75 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 config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1337242434 -#define TS_SIGNATURE "rusEFI master.2024.12.06.hellenNA8_96.1337242434" +#define SIGNATURE_HASH 2562755544 +#define TS_SIGNATURE "rusEFI master.2024.12.06.hellenNA8_96.2562755544" diff --git a/firmware/controllers/generated/signature_m74_9.h b/firmware/controllers/generated/signature_m74_9.h index f87a6c376a..fd9f4be2dc 100644 --- a/firmware/controllers/generated/signature_m74_9.h +++ b/firmware/controllers/generated/signature_m74_9.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2423335603 -#define TS_SIGNATURE "rusEFI master.2024.12.06.m74_9.2423335603" +#define SIGNATURE_HASH 1191514665 +#define TS_SIGNATURE "rusEFI master.2024.12.06.m74_9.1191514665" diff --git a/firmware/controllers/generated/signature_mre-legacy_f4.h b/firmware/controllers/generated/signature_mre-legacy_f4.h index 7f448921bd..30ba9bac83 100644 --- a/firmware/controllers/generated/signature_mre-legacy_f4.h +++ b/firmware/controllers/generated/signature_mre-legacy_f4.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1874187183 -#define TS_SIGNATURE "rusEFI master.2024.12.06.mre-legacy_f4.1874187183" +#define SIGNATURE_HASH 3099716405 +#define TS_SIGNATURE "rusEFI master.2024.12.06.mre-legacy_f4.3099716405" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index 47cf58e232..8ea0a04edf 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 config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1874187183 -#define TS_SIGNATURE "rusEFI master.2024.12.06.mre_f4.1874187183" +#define SIGNATURE_HASH 3099716405 +#define TS_SIGNATURE "rusEFI master.2024.12.06.mre_f4.3099716405" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index f1fe43cd81..22cde08032 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 config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1874187183 -#define TS_SIGNATURE "rusEFI master.2024.12.06.mre_f7.1874187183" +#define SIGNATURE_HASH 3099716405 +#define TS_SIGNATURE "rusEFI master.2024.12.06.mre_f7.3099716405" diff --git a/firmware/controllers/generated/signature_nucleo_f413.h b/firmware/controllers/generated/signature_nucleo_f413.h index 7f06528256..f939f87fd6 100644 --- a/firmware/controllers/generated/signature_nucleo_f413.h +++ b/firmware/controllers/generated/signature_nucleo_f413.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 617288300 -#define TS_SIGNATURE "rusEFI master.2024.12.06.nucleo_f413.617288300" +#define SIGNATURE_HASH 4089391862 +#define TS_SIGNATURE "rusEFI master.2024.12.06.nucleo_f413.4089391862" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index 2e610a1fac..396bf4f78b 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 config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2279794350 -#define TS_SIGNATURE "rusEFI master.2024.12.06.proteus_f4.2279794350" +#define SIGNATURE_HASH 1352064564 +#define TS_SIGNATURE "rusEFI master.2024.12.06.proteus_f4.1352064564" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index 459283360c..175f3322bb 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 config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2279794350 -#define TS_SIGNATURE "rusEFI master.2024.12.06.proteus_f7.2279794350" +#define SIGNATURE_HASH 1352064564 +#define TS_SIGNATURE "rusEFI master.2024.12.06.proteus_f7.1352064564" diff --git a/firmware/controllers/generated/signature_proteus_h7.h b/firmware/controllers/generated/signature_proteus_h7.h index 7312df4cf3..6012c964e2 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 config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2279794350 -#define TS_SIGNATURE "rusEFI master.2024.12.06.proteus_h7.2279794350" +#define SIGNATURE_HASH 1352064564 +#define TS_SIGNATURE "rusEFI master.2024.12.06.proteus_h7.1352064564" diff --git a/firmware/controllers/generated/signature_s105.h b/firmware/controllers/generated/signature_s105.h index a915ea8545..21a66a9eba 100644 --- a/firmware/controllers/generated/signature_s105.h +++ b/firmware/controllers/generated/signature_s105.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2604700334 -#define TS_SIGNATURE "rusEFI master.2024.12.06.s105.2604700334" +#define SIGNATURE_HASH 1278519860 +#define TS_SIGNATURE "rusEFI master.2024.12.06.s105.1278519860" diff --git a/firmware/controllers/generated/signature_small-can-board.h b/firmware/controllers/generated/signature_small-can-board.h index 69eee11d83..f938f67dab 100644 --- a/firmware/controllers/generated/signature_small-can-board.h +++ b/firmware/controllers/generated/signature_small-can-board.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2016427841 -#define TS_SIGNATURE "rusEFI master.2024.12.06.small-can-board.2016427841" +#define SIGNATURE_HASH 2940471259 +#define TS_SIGNATURE "rusEFI master.2024.12.06.small-can-board.2940471259" diff --git a/firmware/controllers/generated/signature_stm32f429_nucleo.h b/firmware/controllers/generated/signature_stm32f429_nucleo.h index 1f4de60603..713483b33d 100644 --- a/firmware/controllers/generated/signature_stm32f429_nucleo.h +++ b/firmware/controllers/generated/signature_stm32f429_nucleo.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 617288300 -#define TS_SIGNATURE "rusEFI master.2024.12.06.stm32f429_nucleo.617288300" +#define SIGNATURE_HASH 4089391862 +#define TS_SIGNATURE "rusEFI master.2024.12.06.stm32f429_nucleo.4089391862" diff --git a/firmware/controllers/generated/signature_stm32f767_nucleo.h b/firmware/controllers/generated/signature_stm32f767_nucleo.h index 92712d43de..456196edcd 100644 --- a/firmware/controllers/generated/signature_stm32f767_nucleo.h +++ b/firmware/controllers/generated/signature_stm32f767_nucleo.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 617288300 -#define TS_SIGNATURE "rusEFI master.2024.12.06.stm32f767_nucleo.617288300" +#define SIGNATURE_HASH 4089391862 +#define TS_SIGNATURE "rusEFI master.2024.12.06.stm32f767_nucleo.4089391862" diff --git a/firmware/controllers/generated/signature_stm32h743_nucleo.h b/firmware/controllers/generated/signature_stm32h743_nucleo.h index 7a4978a793..40008c1853 100644 --- a/firmware/controllers/generated/signature_stm32h743_nucleo.h +++ b/firmware/controllers/generated/signature_stm32h743_nucleo.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 617288300 -#define TS_SIGNATURE "rusEFI master.2024.12.06.stm32h743_nucleo.617288300" +#define SIGNATURE_HASH 4089391862 +#define TS_SIGNATURE "rusEFI master.2024.12.06.stm32h743_nucleo.4089391862" diff --git a/firmware/controllers/generated/signature_subaru_eg33_f7.h b/firmware/controllers/generated/signature_subaru_eg33_f7.h index 0246f17a59..04385a8a06 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 config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2078943794 -#define TS_SIGNATURE "rusEFI master.2024.12.06.subaru_eg33_f7.2078943794" +#define SIGNATURE_HASH 2896040616 +#define TS_SIGNATURE "rusEFI master.2024.12.06.subaru_eg33_f7.2896040616" diff --git a/firmware/controllers/generated/signature_t-b-g.h b/firmware/controllers/generated/signature_t-b-g.h index be25016127..aeccc10764 100644 --- a/firmware/controllers/generated/signature_t-b-g.h +++ b/firmware/controllers/generated/signature_t-b-g.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 617288300 -#define TS_SIGNATURE "rusEFI master.2024.12.06.t-b-g.617288300" +#define SIGNATURE_HASH 4089391862 +#define TS_SIGNATURE "rusEFI master.2024.12.06.t-b-g.4089391862" diff --git a/firmware/controllers/generated/signature_tdg-pdm8.h b/firmware/controllers/generated/signature_tdg-pdm8.h index 0f7a8c1213..31a5e54dd8 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 config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 518434532 -#define TS_SIGNATURE "rusEFI master.2024.12.06.tdg-pdm8.518434532" +#define SIGNATURE_HASH 3381827198 +#define TS_SIGNATURE "rusEFI master.2024.12.06.tdg-pdm8.3381827198" diff --git a/firmware/controllers/generated/signature_uaefi.h b/firmware/controllers/generated/signature_uaefi.h index 8e0b176df8..95cb6dc819 100644 --- a/firmware/controllers/generated/signature_uaefi.h +++ b/firmware/controllers/generated/signature_uaefi.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2096793967 -#define TS_SIGNATURE "rusEFI master.2024.12.06.uaefi.2096793967" +#define SIGNATURE_HASH 2878255605 +#define TS_SIGNATURE "rusEFI master.2024.12.06.uaefi.2878255605" diff --git a/firmware/controllers/generated/signature_uaefi121.h b/firmware/controllers/generated/signature_uaefi121.h index 3b80d569ed..261f6c0173 100644 --- a/firmware/controllers/generated/signature_uaefi121.h +++ b/firmware/controllers/generated/signature_uaefi121.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3256370372 -#define TS_SIGNATURE "rusEFI master.2024.12.06.uaefi121.3256370372" +#define SIGNATURE_HASH 359431262 +#define TS_SIGNATURE "rusEFI master.2024.12.06.uaefi121.359431262" diff --git a/firmware/controllers/lua/generated/output_lookup_generated.cpp b/firmware/controllers/lua/generated/output_lookup_generated.cpp index 8a68e749ea..e59e8e4360 100644 --- a/firmware/controllers/lua/generated/output_lookup_generated.cpp +++ b/firmware/controllers/lua/generated/output_lookup_generated.cpp @@ -1215,45 +1215,45 @@ float getOutputValueByName(const char *name) { // acPressureTooHigh case -1220300524: return engine->module()->acPressureTooHigh; -// isArmed +// isNitrousArmed #if EFI_LAUNCH_CONTROL - case -1447071222: - return engine->module()->isArmed; + case 595683774: + return engine->module()->isNitrousArmed; #endif -// isNitrousSpeedConditionSatisfied +// isNitrousSpeedCondition #if EFI_LAUNCH_CONTROL - case 1259221321: - return engine->module()->isNitrousSpeedConditionSatisfied; + case 2135736269: + return engine->module()->isNitrousSpeedCondition; #endif -// isTpsConditionSatisfied +// isNitrousTpsCondition #if EFI_LAUNCH_CONTROL - case -1256912197: - return engine->module()->isTpsConditionSatisfied; + case 1400235571: + return engine->module()->isNitrousTpsCondition; #endif -// isCltConditionSatisfied +// isNitrousCltCondition #if EFI_LAUNCH_CONTROL - case -747236121: - return engine->module()->isCltConditionSatisfied; + case 31747807: + return engine->module()->isNitrousCltCondition; #endif -// isMapConditionSatisfied +// isNitrousMapCondition #if EFI_LAUNCH_CONTROL - case 1960789698: - return engine->module()->isMapConditionSatisfied; + case 541066842: + return engine->module()->isNitrousMapCondition; #endif -// isAfrConditionSatisfied +// isNitrousAfrCondition #if EFI_LAUNCH_CONTROL - case 112999709: - return engine->module()->isAfrConditionSatisfied; + case 2008830549: + return engine->module()->isNitrousAfrCondition; #endif -// isNitrousRpmConditionSatisfied +// isNitrousRpmCondition #if EFI_LAUNCH_CONTROL - case 1138724839: - return engine->module()->isNitrousRpmConditionSatisfied; + case -649083733: + return engine->module()->isNitrousRpmCondition; #endif -// isNitrousConditionSatisfied +// isNitrousCondition #if EFI_LAUNCH_CONTROL - case 1700736632: - return engine->module()->isNitrousConditionSatisfied; + case -454003684: + return engine->module()->isNitrousCondition; #endif // cranking case 182391090: diff --git a/firmware/live_data_generated/nitrous_control_state_generated.h b/firmware/live_data_generated/nitrous_control_state_generated.h index eab2f28901..55ab6302f5 100644 --- a/firmware/live_data_generated/nitrous_control_state_generated.h +++ b/firmware/live_data_generated/nitrous_control_state_generated.h @@ -7,28 +7,28 @@ struct nitrous_control_state_s { /** offset 0 bit 0 */ - bool isArmed : 1 {}; + bool isNitrousArmed : 1 {}; /** offset 0 bit 1 */ - bool isNitrousSpeedConditionSatisfied : 1 {}; + bool isNitrousSpeedCondition : 1 {}; /** offset 0 bit 2 */ - bool isTpsConditionSatisfied : 1 {}; + bool isNitrousTpsCondition : 1 {}; /** offset 0 bit 3 */ - bool isCltConditionSatisfied : 1 {}; + bool isNitrousCltCondition : 1 {}; /** offset 0 bit 4 */ - bool isMapConditionSatisfied : 1 {}; + bool isNitrousMapCondition : 1 {}; /** offset 0 bit 5 */ - bool isAfrConditionSatisfied : 1 {}; + bool isNitrousAfrCondition : 1 {}; /** offset 0 bit 6 */ - bool isNitrousRpmConditionSatisfied : 1 {}; + bool isNitrousRpmCondition : 1 {}; /** offset 0 bit 7 */ - bool isNitrousConditionSatisfied : 1 {}; + bool isNitrousCondition : 1 {}; /** offset 0 bit 8 */ bool unusedBit_8_8 : 1 {}; diff --git a/firmware/tunerstudio/generated/rusefi.ini b/firmware/tunerstudio/generated/rusefi.ini index 6e81f75332..53544d65a9 100644 --- a/firmware/tunerstudio/generated/rusefi.ini +++ b/firmware/tunerstudio/generated/rusefi.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.12.06.f407-discovery.3295927249" + signature = "rusEFI master.2024.12.06.f407-discovery.319284043" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.06.f407-discovery.3295927249" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.06.f407-discovery.319284043" ; 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 @@ -3286,14 +3286,14 @@ acCompressorState = bits, U32, 1172, [7:7] acPressureTooLow = bits, U32, 1172, [8:8] acPressureTooHigh = bits, U32, 1172, [9:9] ; total TS size = 1176 -isArmed = bits, U32, 1176, [0:0] -isNitrousSpeedConditionSatisfied = bits, U32, 1176, [1:1] -isTpsConditionSatisfied = bits, U32, 1176, [2:2] -isCltConditionSatisfied = bits, U32, 1176, [3:3] -isMapConditionSatisfied = bits, U32, 1176, [4:4] -isAfrConditionSatisfied = bits, U32, 1176, [5:5] -isNitrousRpmConditionSatisfied = bits, U32, 1176, [6:6] -isNitrousConditionSatisfied = bits, U32, 1176, [7:7] +isNitrousArmed = bits, U32, 1176, [0:0] +isNitrousSpeedCondition = bits, U32, 1176, [1:1] +isNitrousTpsCondition = bits, U32, 1176, [2:2] +isNitrousCltCondition = bits, U32, 1176, [3:3] +isNitrousMapCondition = bits, U32, 1176, [4:4] +isNitrousAfrCondition = bits, U32, 1176, [5:5] +isNitrousRpmCondition = bits, U32, 1176, [6:6] +isNitrousCondition = bits, U32, 1176, [7:7] ; total TS size = 1180 cranking0 = bits, U32, 1180, [0:0] notRunning0 = bits, U32, 1180, [1:1] @@ -5864,14 +5864,14 @@ entry = isDisabledByLua, "AC disabled by Lua", int, "%d" entry = acCompressorState, "AC compressor on", int, "%d" entry = acPressureTooLow, "AC pressure too low", int, "%d" entry = acPressureTooHigh, "AC pressure too high", int, "%d" -entry = isArmed, "isArmed", int, "%d" -entry = isNitrousSpeedConditionSatisfied, "isNitrousSpeedConditionSatisfied", int, "%d" -entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" -entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" -entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" -entry = isAfrConditionSatisfied, "isAfrConditionSatisfied", int, "%d" -entry = isNitrousRpmConditionSatisfied, "isNitrousRpmConditionSatisfied", int, "%d" -entry = isNitrousConditionSatisfied, "isNitrousConditionSatisfied", int, "%d" +entry = isNitrousArmed, "isNitrousArmed", int, "%d" +entry = isNitrousSpeedCondition, "isNitrousSpeedCondition", int, "%d" +entry = isNitrousTpsCondition, "isNitrousTpsCondition", int, "%d" +entry = isNitrousCltCondition, "isNitrousCltCondition", int, "%d" +entry = isNitrousMapCondition, "isNitrousMapCondition", int, "%d" +entry = isNitrousAfrCondition, "isNitrousAfrCondition", int, "%d" +entry = isNitrousRpmCondition, "isNitrousRpmCondition", int, "%d" +entry = isNitrousCondition, "isNitrousCondition", int, "%d" entry = cranking0, "cranking0", int, "%d" entry = notRunning0, "notRunning0", int, "%d" entry = disabledWhileEngineStopped0, "disabledWhileEngineStopped0", int, "%d" @@ -6868,14 +6868,14 @@ dialog = ac_controlDialog, "ac_control" graphLine = acButtonState indicatorPanel = nitrous_control_stateIndicatorPanel, 2 - indicator = {isArmed}, "isArmed No", "isArmed Yes" - indicator = {isNitrousSpeedConditionSatisfied}, "isNitrousSpeedConditionSatisfied No", "isNitrousSpeedConditionSatisfied Yes" - indicator = {isTpsConditionSatisfied}, "isTpsConditionSatisfied No", "isTpsConditionSatisfied Yes" - indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" - indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" - indicator = {isAfrConditionSatisfied}, "isAfrConditionSatisfied No", "isAfrConditionSatisfied Yes" - indicator = {isNitrousRpmConditionSatisfied}, "isNitrousRpmConditionSatisfied No", "isNitrousRpmConditionSatisfied Yes" - indicator = {isNitrousConditionSatisfied}, "isNitrousConditionSatisfied No", "isNitrousConditionSatisfied Yes" + indicator = {isNitrousArmed}, "isNitrousArmed No", "isNitrousArmed Yes" + indicator = {isNitrousSpeedCondition}, "isNitrousSpeedCondition No", "isNitrousSpeedCondition Yes" + indicator = {isNitrousTpsCondition}, "isNitrousTpsCondition No", "isNitrousTpsCondition Yes" + indicator = {isNitrousCltCondition}, "isNitrousCltCondition No", "isNitrousCltCondition Yes" + indicator = {isNitrousMapCondition}, "isNitrousMapCondition No", "isNitrousMapCondition Yes" + indicator = {isNitrousAfrCondition}, "isNitrousAfrCondition No", "isNitrousAfrCondition Yes" + indicator = {isNitrousRpmCondition}, "isNitrousRpmCondition No", "isNitrousRpmCondition Yes" + indicator = {isNitrousCondition}, "isNitrousCondition No", "isNitrousCondition Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9864,7 +9864,7 @@ dialog = tcuControls, "Transmission Settings" panel = NitrousControlArmingMethodDialog, {nitrousControlEnabled == 1} panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))} - dialog = NitrousControlDialog + dialog = NitrousControlDialog, "", border panel = NitrousControlSettingsDialog, West panel = nitrous_control_stateDialog, East diff --git a/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini index 55ce285aa8..4dd1077af2 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.12.06.alphax-2chan.1828783131" + signature = "rusEFI master.2024.12.06.alphax-2chan.3128245377" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.06.alphax-2chan.1828783131" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.06.alphax-2chan.3128245377" ; 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 @@ -3290,14 +3290,14 @@ acCompressorState = bits, U32, 1172, [7:7] acPressureTooLow = bits, U32, 1172, [8:8] acPressureTooHigh = bits, U32, 1172, [9:9] ; total TS size = 1176 -isArmed = bits, U32, 1176, [0:0] -isNitrousSpeedConditionSatisfied = bits, U32, 1176, [1:1] -isTpsConditionSatisfied = bits, U32, 1176, [2:2] -isCltConditionSatisfied = bits, U32, 1176, [3:3] -isMapConditionSatisfied = bits, U32, 1176, [4:4] -isAfrConditionSatisfied = bits, U32, 1176, [5:5] -isNitrousRpmConditionSatisfied = bits, U32, 1176, [6:6] -isNitrousConditionSatisfied = bits, U32, 1176, [7:7] +isNitrousArmed = bits, U32, 1176, [0:0] +isNitrousSpeedCondition = bits, U32, 1176, [1:1] +isNitrousTpsCondition = bits, U32, 1176, [2:2] +isNitrousCltCondition = bits, U32, 1176, [3:3] +isNitrousMapCondition = bits, U32, 1176, [4:4] +isNitrousAfrCondition = bits, U32, 1176, [5:5] +isNitrousRpmCondition = bits, U32, 1176, [6:6] +isNitrousCondition = bits, U32, 1176, [7:7] ; total TS size = 1180 cranking0 = bits, U32, 1180, [0:0] notRunning0 = bits, U32, 1180, [1:1] @@ -5861,14 +5861,14 @@ entry = isDisabledByLua, "AC disabled by Lua", int, "%d" entry = acCompressorState, "AC compressor on", int, "%d" entry = acPressureTooLow, "AC pressure too low", int, "%d" entry = acPressureTooHigh, "AC pressure too high", int, "%d" -entry = isArmed, "isArmed", int, "%d" -entry = isNitrousSpeedConditionSatisfied, "isNitrousSpeedConditionSatisfied", int, "%d" -entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" -entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" -entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" -entry = isAfrConditionSatisfied, "isAfrConditionSatisfied", int, "%d" -entry = isNitrousRpmConditionSatisfied, "isNitrousRpmConditionSatisfied", int, "%d" -entry = isNitrousConditionSatisfied, "isNitrousConditionSatisfied", int, "%d" +entry = isNitrousArmed, "isNitrousArmed", int, "%d" +entry = isNitrousSpeedCondition, "isNitrousSpeedCondition", int, "%d" +entry = isNitrousTpsCondition, "isNitrousTpsCondition", int, "%d" +entry = isNitrousCltCondition, "isNitrousCltCondition", int, "%d" +entry = isNitrousMapCondition, "isNitrousMapCondition", int, "%d" +entry = isNitrousAfrCondition, "isNitrousAfrCondition", int, "%d" +entry = isNitrousRpmCondition, "isNitrousRpmCondition", int, "%d" +entry = isNitrousCondition, "isNitrousCondition", int, "%d" entry = cranking0, "cranking0", int, "%d" entry = notRunning0, "notRunning0", int, "%d" entry = disabledWhileEngineStopped0, "disabledWhileEngineStopped0", int, "%d" @@ -6849,14 +6849,14 @@ dialog = ac_controlDialog, "ac_control" graphLine = acButtonState indicatorPanel = nitrous_control_stateIndicatorPanel, 2 - indicator = {isArmed}, "isArmed No", "isArmed Yes" - indicator = {isNitrousSpeedConditionSatisfied}, "isNitrousSpeedConditionSatisfied No", "isNitrousSpeedConditionSatisfied Yes" - indicator = {isTpsConditionSatisfied}, "isTpsConditionSatisfied No", "isTpsConditionSatisfied Yes" - indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" - indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" - indicator = {isAfrConditionSatisfied}, "isAfrConditionSatisfied No", "isAfrConditionSatisfied Yes" - indicator = {isNitrousRpmConditionSatisfied}, "isNitrousRpmConditionSatisfied No", "isNitrousRpmConditionSatisfied Yes" - indicator = {isNitrousConditionSatisfied}, "isNitrousConditionSatisfied No", "isNitrousConditionSatisfied Yes" + indicator = {isNitrousArmed}, "isNitrousArmed No", "isNitrousArmed Yes" + indicator = {isNitrousSpeedCondition}, "isNitrousSpeedCondition No", "isNitrousSpeedCondition Yes" + indicator = {isNitrousTpsCondition}, "isNitrousTpsCondition No", "isNitrousTpsCondition Yes" + indicator = {isNitrousCltCondition}, "isNitrousCltCondition No", "isNitrousCltCondition Yes" + indicator = {isNitrousMapCondition}, "isNitrousMapCondition No", "isNitrousMapCondition Yes" + indicator = {isNitrousAfrCondition}, "isNitrousAfrCondition No", "isNitrousAfrCondition Yes" + indicator = {isNitrousRpmCondition}, "isNitrousRpmCondition No", "isNitrousRpmCondition Yes" + indicator = {isNitrousCondition}, "isNitrousCondition No", "isNitrousCondition Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9747,7 +9747,7 @@ dialog = tcuControls, "Transmission Settings" panel = NitrousControlArmingMethodDialog, {nitrousControlEnabled == 1} panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))} - dialog = NitrousControlDialog + dialog = NitrousControlDialog, "", border panel = NitrousControlSettingsDialog, West panel = nitrous_control_stateDialog, East diff --git a/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini index 01cf1b85eb..ebde3c66d2 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.12.06.alphax-4chan.3183537918" + signature = "rusEFI master.2024.12.06.alphax-4chan.1790236260" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.06.alphax-4chan.3183537918" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.06.alphax-4chan.1790236260" ; 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 @@ -3295,14 +3295,14 @@ acCompressorState = bits, U32, 1172, [7:7] acPressureTooLow = bits, U32, 1172, [8:8] acPressureTooHigh = bits, U32, 1172, [9:9] ; total TS size = 1176 -isArmed = bits, U32, 1176, [0:0] -isNitrousSpeedConditionSatisfied = bits, U32, 1176, [1:1] -isTpsConditionSatisfied = bits, U32, 1176, [2:2] -isCltConditionSatisfied = bits, U32, 1176, [3:3] -isMapConditionSatisfied = bits, U32, 1176, [4:4] -isAfrConditionSatisfied = bits, U32, 1176, [5:5] -isNitrousRpmConditionSatisfied = bits, U32, 1176, [6:6] -isNitrousConditionSatisfied = bits, U32, 1176, [7:7] +isNitrousArmed = bits, U32, 1176, [0:0] +isNitrousSpeedCondition = bits, U32, 1176, [1:1] +isNitrousTpsCondition = bits, U32, 1176, [2:2] +isNitrousCltCondition = bits, U32, 1176, [3:3] +isNitrousMapCondition = bits, U32, 1176, [4:4] +isNitrousAfrCondition = bits, U32, 1176, [5:5] +isNitrousRpmCondition = bits, U32, 1176, [6:6] +isNitrousCondition = bits, U32, 1176, [7:7] ; total TS size = 1180 cranking0 = bits, U32, 1180, [0:0] notRunning0 = bits, U32, 1180, [1:1] @@ -5873,14 +5873,14 @@ entry = isDisabledByLua, "AC disabled by Lua", int, "%d" entry = acCompressorState, "AC compressor on", int, "%d" entry = acPressureTooLow, "AC pressure too low", int, "%d" entry = acPressureTooHigh, "AC pressure too high", int, "%d" -entry = isArmed, "isArmed", int, "%d" -entry = isNitrousSpeedConditionSatisfied, "isNitrousSpeedConditionSatisfied", int, "%d" -entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" -entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" -entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" -entry = isAfrConditionSatisfied, "isAfrConditionSatisfied", int, "%d" -entry = isNitrousRpmConditionSatisfied, "isNitrousRpmConditionSatisfied", int, "%d" -entry = isNitrousConditionSatisfied, "isNitrousConditionSatisfied", int, "%d" +entry = isNitrousArmed, "isNitrousArmed", int, "%d" +entry = isNitrousSpeedCondition, "isNitrousSpeedCondition", int, "%d" +entry = isNitrousTpsCondition, "isNitrousTpsCondition", int, "%d" +entry = isNitrousCltCondition, "isNitrousCltCondition", int, "%d" +entry = isNitrousMapCondition, "isNitrousMapCondition", int, "%d" +entry = isNitrousAfrCondition, "isNitrousAfrCondition", int, "%d" +entry = isNitrousRpmCondition, "isNitrousRpmCondition", int, "%d" +entry = isNitrousCondition, "isNitrousCondition", int, "%d" entry = cranking0, "cranking0", int, "%d" entry = notRunning0, "notRunning0", int, "%d" entry = disabledWhileEngineStopped0, "disabledWhileEngineStopped0", int, "%d" @@ -6890,14 +6890,14 @@ dialog = ac_controlDialog, "ac_control" graphLine = acButtonState indicatorPanel = nitrous_control_stateIndicatorPanel, 2 - indicator = {isArmed}, "isArmed No", "isArmed Yes" - indicator = {isNitrousSpeedConditionSatisfied}, "isNitrousSpeedConditionSatisfied No", "isNitrousSpeedConditionSatisfied Yes" - indicator = {isTpsConditionSatisfied}, "isTpsConditionSatisfied No", "isTpsConditionSatisfied Yes" - indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" - indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" - indicator = {isAfrConditionSatisfied}, "isAfrConditionSatisfied No", "isAfrConditionSatisfied Yes" - indicator = {isNitrousRpmConditionSatisfied}, "isNitrousRpmConditionSatisfied No", "isNitrousRpmConditionSatisfied Yes" - indicator = {isNitrousConditionSatisfied}, "isNitrousConditionSatisfied No", "isNitrousConditionSatisfied Yes" + indicator = {isNitrousArmed}, "isNitrousArmed No", "isNitrousArmed Yes" + indicator = {isNitrousSpeedCondition}, "isNitrousSpeedCondition No", "isNitrousSpeedCondition Yes" + indicator = {isNitrousTpsCondition}, "isNitrousTpsCondition No", "isNitrousTpsCondition Yes" + indicator = {isNitrousCltCondition}, "isNitrousCltCondition No", "isNitrousCltCondition Yes" + indicator = {isNitrousMapCondition}, "isNitrousMapCondition No", "isNitrousMapCondition Yes" + indicator = {isNitrousAfrCondition}, "isNitrousAfrCondition No", "isNitrousAfrCondition Yes" + indicator = {isNitrousRpmCondition}, "isNitrousRpmCondition No", "isNitrousRpmCondition Yes" + indicator = {isNitrousCondition}, "isNitrousCondition No", "isNitrousCondition Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9826,7 +9826,7 @@ dialog = tcuControls, "Transmission Settings" panel = NitrousControlArmingMethodDialog, {nitrousControlEnabled == 1} panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))} - dialog = NitrousControlDialog + dialog = NitrousControlDialog, "", border panel = NitrousControlSettingsDialog, West panel = nitrous_control_stateDialog, East diff --git a/firmware/tunerstudio/generated/rusefi_alphax-4chan_f7.ini b/firmware/tunerstudio/generated/rusefi_alphax-4chan_f7.ini index d16fff6b05..af0d0c5fae 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-4chan_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-4chan_f7.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.12.06.alphax-4chan_f7.3183537918" + signature = "rusEFI master.2024.12.06.alphax-4chan_f7.1790236260" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.06.alphax-4chan_f7.3183537918" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.06.alphax-4chan_f7.1790236260" ; 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 @@ -3295,14 +3295,14 @@ acCompressorState = bits, U32, 1172, [7:7] acPressureTooLow = bits, U32, 1172, [8:8] acPressureTooHigh = bits, U32, 1172, [9:9] ; total TS size = 1176 -isArmed = bits, U32, 1176, [0:0] -isNitrousSpeedConditionSatisfied = bits, U32, 1176, [1:1] -isTpsConditionSatisfied = bits, U32, 1176, [2:2] -isCltConditionSatisfied = bits, U32, 1176, [3:3] -isMapConditionSatisfied = bits, U32, 1176, [4:4] -isAfrConditionSatisfied = bits, U32, 1176, [5:5] -isNitrousRpmConditionSatisfied = bits, U32, 1176, [6:6] -isNitrousConditionSatisfied = bits, U32, 1176, [7:7] +isNitrousArmed = bits, U32, 1176, [0:0] +isNitrousSpeedCondition = bits, U32, 1176, [1:1] +isNitrousTpsCondition = bits, U32, 1176, [2:2] +isNitrousCltCondition = bits, U32, 1176, [3:3] +isNitrousMapCondition = bits, U32, 1176, [4:4] +isNitrousAfrCondition = bits, U32, 1176, [5:5] +isNitrousRpmCondition = bits, U32, 1176, [6:6] +isNitrousCondition = bits, U32, 1176, [7:7] ; total TS size = 1180 cranking0 = bits, U32, 1180, [0:0] notRunning0 = bits, U32, 1180, [1:1] @@ -5873,14 +5873,14 @@ entry = isDisabledByLua, "AC disabled by Lua", int, "%d" entry = acCompressorState, "AC compressor on", int, "%d" entry = acPressureTooLow, "AC pressure too low", int, "%d" entry = acPressureTooHigh, "AC pressure too high", int, "%d" -entry = isArmed, "isArmed", int, "%d" -entry = isNitrousSpeedConditionSatisfied, "isNitrousSpeedConditionSatisfied", int, "%d" -entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" -entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" -entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" -entry = isAfrConditionSatisfied, "isAfrConditionSatisfied", int, "%d" -entry = isNitrousRpmConditionSatisfied, "isNitrousRpmConditionSatisfied", int, "%d" -entry = isNitrousConditionSatisfied, "isNitrousConditionSatisfied", int, "%d" +entry = isNitrousArmed, "isNitrousArmed", int, "%d" +entry = isNitrousSpeedCondition, "isNitrousSpeedCondition", int, "%d" +entry = isNitrousTpsCondition, "isNitrousTpsCondition", int, "%d" +entry = isNitrousCltCondition, "isNitrousCltCondition", int, "%d" +entry = isNitrousMapCondition, "isNitrousMapCondition", int, "%d" +entry = isNitrousAfrCondition, "isNitrousAfrCondition", int, "%d" +entry = isNitrousRpmCondition, "isNitrousRpmCondition", int, "%d" +entry = isNitrousCondition, "isNitrousCondition", int, "%d" entry = cranking0, "cranking0", int, "%d" entry = notRunning0, "notRunning0", int, "%d" entry = disabledWhileEngineStopped0, "disabledWhileEngineStopped0", int, "%d" @@ -6890,14 +6890,14 @@ dialog = ac_controlDialog, "ac_control" graphLine = acButtonState indicatorPanel = nitrous_control_stateIndicatorPanel, 2 - indicator = {isArmed}, "isArmed No", "isArmed Yes" - indicator = {isNitrousSpeedConditionSatisfied}, "isNitrousSpeedConditionSatisfied No", "isNitrousSpeedConditionSatisfied Yes" - indicator = {isTpsConditionSatisfied}, "isTpsConditionSatisfied No", "isTpsConditionSatisfied Yes" - indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" - indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" - indicator = {isAfrConditionSatisfied}, "isAfrConditionSatisfied No", "isAfrConditionSatisfied Yes" - indicator = {isNitrousRpmConditionSatisfied}, "isNitrousRpmConditionSatisfied No", "isNitrousRpmConditionSatisfied Yes" - indicator = {isNitrousConditionSatisfied}, "isNitrousConditionSatisfied No", "isNitrousConditionSatisfied Yes" + indicator = {isNitrousArmed}, "isNitrousArmed No", "isNitrousArmed Yes" + indicator = {isNitrousSpeedCondition}, "isNitrousSpeedCondition No", "isNitrousSpeedCondition Yes" + indicator = {isNitrousTpsCondition}, "isNitrousTpsCondition No", "isNitrousTpsCondition Yes" + indicator = {isNitrousCltCondition}, "isNitrousCltCondition No", "isNitrousCltCondition Yes" + indicator = {isNitrousMapCondition}, "isNitrousMapCondition No", "isNitrousMapCondition Yes" + indicator = {isNitrousAfrCondition}, "isNitrousAfrCondition No", "isNitrousAfrCondition Yes" + indicator = {isNitrousRpmCondition}, "isNitrousRpmCondition No", "isNitrousRpmCondition Yes" + indicator = {isNitrousCondition}, "isNitrousCondition No", "isNitrousCondition Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9826,7 +9826,7 @@ dialog = tcuControls, "Transmission Settings" panel = NitrousControlArmingMethodDialog, {nitrousControlEnabled == 1} panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))} - dialog = NitrousControlDialog + dialog = NitrousControlDialog, "", border panel = NitrousControlSettingsDialog, West panel = nitrous_control_stateDialog, East diff --git a/firmware/tunerstudio/generated/rusefi_alphax-4k-gdi.ini b/firmware/tunerstudio/generated/rusefi_alphax-4k-gdi.ini index 9662b38b8d..315b2931cb 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-4k-gdi.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-4k-gdi.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.12.06.alphax-4k-gdi.3194313979" + signature = "rusEFI master.2024.12.06.alphax-4k-gdi.1762747489" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.06.alphax-4k-gdi.3194313979" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.06.alphax-4k-gdi.1762747489" ; 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 @@ -3285,14 +3285,14 @@ acCompressorState = bits, U32, 1172, [7:7] acPressureTooLow = bits, U32, 1172, [8:8] acPressureTooHigh = bits, U32, 1172, [9:9] ; total TS size = 1176 -isArmed = bits, U32, 1176, [0:0] -isNitrousSpeedConditionSatisfied = bits, U32, 1176, [1:1] -isTpsConditionSatisfied = bits, U32, 1176, [2:2] -isCltConditionSatisfied = bits, U32, 1176, [3:3] -isMapConditionSatisfied = bits, U32, 1176, [4:4] -isAfrConditionSatisfied = bits, U32, 1176, [5:5] -isNitrousRpmConditionSatisfied = bits, U32, 1176, [6:6] -isNitrousConditionSatisfied = bits, U32, 1176, [7:7] +isNitrousArmed = bits, U32, 1176, [0:0] +isNitrousSpeedCondition = bits, U32, 1176, [1:1] +isNitrousTpsCondition = bits, U32, 1176, [2:2] +isNitrousCltCondition = bits, U32, 1176, [3:3] +isNitrousMapCondition = bits, U32, 1176, [4:4] +isNitrousAfrCondition = bits, U32, 1176, [5:5] +isNitrousRpmCondition = bits, U32, 1176, [6:6] +isNitrousCondition = bits, U32, 1176, [7:7] ; total TS size = 1180 cranking0 = bits, U32, 1180, [0:0] notRunning0 = bits, U32, 1180, [1:1] @@ -5859,14 +5859,14 @@ entry = isDisabledByLua, "AC disabled by Lua", int, "%d" entry = acCompressorState, "AC compressor on", int, "%d" entry = acPressureTooLow, "AC pressure too low", int, "%d" entry = acPressureTooHigh, "AC pressure too high", int, "%d" -entry = isArmed, "isArmed", int, "%d" -entry = isNitrousSpeedConditionSatisfied, "isNitrousSpeedConditionSatisfied", int, "%d" -entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" -entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" -entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" -entry = isAfrConditionSatisfied, "isAfrConditionSatisfied", int, "%d" -entry = isNitrousRpmConditionSatisfied, "isNitrousRpmConditionSatisfied", int, "%d" -entry = isNitrousConditionSatisfied, "isNitrousConditionSatisfied", int, "%d" +entry = isNitrousArmed, "isNitrousArmed", int, "%d" +entry = isNitrousSpeedCondition, "isNitrousSpeedCondition", int, "%d" +entry = isNitrousTpsCondition, "isNitrousTpsCondition", int, "%d" +entry = isNitrousCltCondition, "isNitrousCltCondition", int, "%d" +entry = isNitrousMapCondition, "isNitrousMapCondition", int, "%d" +entry = isNitrousAfrCondition, "isNitrousAfrCondition", int, "%d" +entry = isNitrousRpmCondition, "isNitrousRpmCondition", int, "%d" +entry = isNitrousCondition, "isNitrousCondition", int, "%d" entry = cranking0, "cranking0", int, "%d" entry = notRunning0, "notRunning0", int, "%d" entry = disabledWhileEngineStopped0, "disabledWhileEngineStopped0", int, "%d" @@ -6866,14 +6866,14 @@ dialog = ac_controlDialog, "ac_control" graphLine = acButtonState indicatorPanel = nitrous_control_stateIndicatorPanel, 2 - indicator = {isArmed}, "isArmed No", "isArmed Yes" - indicator = {isNitrousSpeedConditionSatisfied}, "isNitrousSpeedConditionSatisfied No", "isNitrousSpeedConditionSatisfied Yes" - indicator = {isTpsConditionSatisfied}, "isTpsConditionSatisfied No", "isTpsConditionSatisfied Yes" - indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" - indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" - indicator = {isAfrConditionSatisfied}, "isAfrConditionSatisfied No", "isAfrConditionSatisfied Yes" - indicator = {isNitrousRpmConditionSatisfied}, "isNitrousRpmConditionSatisfied No", "isNitrousRpmConditionSatisfied Yes" - indicator = {isNitrousConditionSatisfied}, "isNitrousConditionSatisfied No", "isNitrousConditionSatisfied Yes" + indicator = {isNitrousArmed}, "isNitrousArmed No", "isNitrousArmed Yes" + indicator = {isNitrousSpeedCondition}, "isNitrousSpeedCondition No", "isNitrousSpeedCondition Yes" + indicator = {isNitrousTpsCondition}, "isNitrousTpsCondition No", "isNitrousTpsCondition Yes" + indicator = {isNitrousCltCondition}, "isNitrousCltCondition No", "isNitrousCltCondition Yes" + indicator = {isNitrousMapCondition}, "isNitrousMapCondition No", "isNitrousMapCondition Yes" + indicator = {isNitrousAfrCondition}, "isNitrousAfrCondition No", "isNitrousAfrCondition Yes" + indicator = {isNitrousRpmCondition}, "isNitrousRpmCondition No", "isNitrousRpmCondition Yes" + indicator = {isNitrousCondition}, "isNitrousCondition No", "isNitrousCondition Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9798,7 +9798,7 @@ commandButton = "GM LCV", cmd_set_engine_type_GM_LCV panel = NitrousControlArmingMethodDialog, {nitrousControlEnabled == 1} panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))} - dialog = NitrousControlDialog + dialog = NitrousControlDialog, "", border panel = NitrousControlSettingsDialog, West panel = nitrous_control_stateDialog, East diff --git a/firmware/tunerstudio/generated/rusefi_alphax-8chan-revA.ini b/firmware/tunerstudio/generated/rusefi_alphax-8chan-revA.ini index 9af08fa03e..00eb7806e8 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-8chan-revA.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-8chan-revA.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.12.06.alphax-8chan-revA.2147672569" + signature = "rusEFI master.2024.12.06.alphax-8chan-revA.1467406691" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.06.alphax-8chan-revA.2147672569" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.06.alphax-8chan-revA.1467406691" ; 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 @@ -3290,14 +3290,14 @@ acCompressorState = bits, U32, 1172, [7:7] acPressureTooLow = bits, U32, 1172, [8:8] acPressureTooHigh = bits, U32, 1172, [9:9] ; total TS size = 1176 -isArmed = bits, U32, 1176, [0:0] -isNitrousSpeedConditionSatisfied = bits, U32, 1176, [1:1] -isTpsConditionSatisfied = bits, U32, 1176, [2:2] -isCltConditionSatisfied = bits, U32, 1176, [3:3] -isMapConditionSatisfied = bits, U32, 1176, [4:4] -isAfrConditionSatisfied = bits, U32, 1176, [5:5] -isNitrousRpmConditionSatisfied = bits, U32, 1176, [6:6] -isNitrousConditionSatisfied = bits, U32, 1176, [7:7] +isNitrousArmed = bits, U32, 1176, [0:0] +isNitrousSpeedCondition = bits, U32, 1176, [1:1] +isNitrousTpsCondition = bits, U32, 1176, [2:2] +isNitrousCltCondition = bits, U32, 1176, [3:3] +isNitrousMapCondition = bits, U32, 1176, [4:4] +isNitrousAfrCondition = bits, U32, 1176, [5:5] +isNitrousRpmCondition = bits, U32, 1176, [6:6] +isNitrousCondition = bits, U32, 1176, [7:7] ; total TS size = 1180 cranking0 = bits, U32, 1180, [0:0] notRunning0 = bits, U32, 1180, [1:1] @@ -5867,14 +5867,14 @@ entry = isDisabledByLua, "AC disabled by Lua", int, "%d" entry = acCompressorState, "AC compressor on", int, "%d" entry = acPressureTooLow, "AC pressure too low", int, "%d" entry = acPressureTooHigh, "AC pressure too high", int, "%d" -entry = isArmed, "isArmed", int, "%d" -entry = isNitrousSpeedConditionSatisfied, "isNitrousSpeedConditionSatisfied", int, "%d" -entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" -entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" -entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" -entry = isAfrConditionSatisfied, "isAfrConditionSatisfied", int, "%d" -entry = isNitrousRpmConditionSatisfied, "isNitrousRpmConditionSatisfied", int, "%d" -entry = isNitrousConditionSatisfied, "isNitrousConditionSatisfied", int, "%d" +entry = isNitrousArmed, "isNitrousArmed", int, "%d" +entry = isNitrousSpeedCondition, "isNitrousSpeedCondition", int, "%d" +entry = isNitrousTpsCondition, "isNitrousTpsCondition", int, "%d" +entry = isNitrousCltCondition, "isNitrousCltCondition", int, "%d" +entry = isNitrousMapCondition, "isNitrousMapCondition", int, "%d" +entry = isNitrousAfrCondition, "isNitrousAfrCondition", int, "%d" +entry = isNitrousRpmCondition, "isNitrousRpmCondition", int, "%d" +entry = isNitrousCondition, "isNitrousCondition", int, "%d" entry = cranking0, "cranking0", int, "%d" entry = notRunning0, "notRunning0", int, "%d" entry = disabledWhileEngineStopped0, "disabledWhileEngineStopped0", int, "%d" @@ -6866,14 +6866,14 @@ dialog = ac_controlDialog, "ac_control" graphLine = acButtonState indicatorPanel = nitrous_control_stateIndicatorPanel, 2 - indicator = {isArmed}, "isArmed No", "isArmed Yes" - indicator = {isNitrousSpeedConditionSatisfied}, "isNitrousSpeedConditionSatisfied No", "isNitrousSpeedConditionSatisfied Yes" - indicator = {isTpsConditionSatisfied}, "isTpsConditionSatisfied No", "isTpsConditionSatisfied Yes" - indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" - indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" - indicator = {isAfrConditionSatisfied}, "isAfrConditionSatisfied No", "isAfrConditionSatisfied Yes" - indicator = {isNitrousRpmConditionSatisfied}, "isNitrousRpmConditionSatisfied No", "isNitrousRpmConditionSatisfied Yes" - indicator = {isNitrousConditionSatisfied}, "isNitrousConditionSatisfied No", "isNitrousConditionSatisfied Yes" + indicator = {isNitrousArmed}, "isNitrousArmed No", "isNitrousArmed Yes" + indicator = {isNitrousSpeedCondition}, "isNitrousSpeedCondition No", "isNitrousSpeedCondition Yes" + indicator = {isNitrousTpsCondition}, "isNitrousTpsCondition No", "isNitrousTpsCondition Yes" + indicator = {isNitrousCltCondition}, "isNitrousCltCondition No", "isNitrousCltCondition Yes" + indicator = {isNitrousMapCondition}, "isNitrousMapCondition No", "isNitrousMapCondition Yes" + indicator = {isNitrousAfrCondition}, "isNitrousAfrCondition No", "isNitrousAfrCondition Yes" + indicator = {isNitrousRpmCondition}, "isNitrousRpmCondition No", "isNitrousRpmCondition Yes" + indicator = {isNitrousCondition}, "isNitrousCondition No", "isNitrousCondition Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9802,7 +9802,7 @@ dialog = tcuControls, "Transmission Settings" panel = NitrousControlArmingMethodDialog, {nitrousControlEnabled == 1} panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))} - dialog = NitrousControlDialog + dialog = NitrousControlDialog, "", border panel = NitrousControlSettingsDialog, West panel = nitrous_control_stateDialog, East diff --git a/firmware/tunerstudio/generated/rusefi_alphax-8chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-8chan.ini index 7470e47bb5..414067d6ff 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-8chan.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-8chan.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.12.06.alphax-8chan.2722398898" + signature = "rusEFI master.2024.12.06.alphax-8chan.1966127656" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.06.alphax-8chan.2722398898" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.06.alphax-8chan.1966127656" ; 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 @@ -3299,14 +3299,14 @@ acCompressorState = bits, U32, 1172, [7:7] acPressureTooLow = bits, U32, 1172, [8:8] acPressureTooHigh = bits, U32, 1172, [9:9] ; total TS size = 1176 -isArmed = bits, U32, 1176, [0:0] -isNitrousSpeedConditionSatisfied = bits, U32, 1176, [1:1] -isTpsConditionSatisfied = bits, U32, 1176, [2:2] -isCltConditionSatisfied = bits, U32, 1176, [3:3] -isMapConditionSatisfied = bits, U32, 1176, [4:4] -isAfrConditionSatisfied = bits, U32, 1176, [5:5] -isNitrousRpmConditionSatisfied = bits, U32, 1176, [6:6] -isNitrousConditionSatisfied = bits, U32, 1176, [7:7] +isNitrousArmed = bits, U32, 1176, [0:0] +isNitrousSpeedCondition = bits, U32, 1176, [1:1] +isNitrousTpsCondition = bits, U32, 1176, [2:2] +isNitrousCltCondition = bits, U32, 1176, [3:3] +isNitrousMapCondition = bits, U32, 1176, [4:4] +isNitrousAfrCondition = bits, U32, 1176, [5:5] +isNitrousRpmCondition = bits, U32, 1176, [6:6] +isNitrousCondition = bits, U32, 1176, [7:7] ; total TS size = 1180 cranking0 = bits, U32, 1180, [0:0] notRunning0 = bits, U32, 1180, [1:1] @@ -5877,14 +5877,14 @@ entry = isDisabledByLua, "AC disabled by Lua", int, "%d" entry = acCompressorState, "AC compressor on", int, "%d" entry = acPressureTooLow, "AC pressure too low", int, "%d" entry = acPressureTooHigh, "AC pressure too high", int, "%d" -entry = isArmed, "isArmed", int, "%d" -entry = isNitrousSpeedConditionSatisfied, "isNitrousSpeedConditionSatisfied", int, "%d" -entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" -entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" -entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" -entry = isAfrConditionSatisfied, "isAfrConditionSatisfied", int, "%d" -entry = isNitrousRpmConditionSatisfied, "isNitrousRpmConditionSatisfied", int, "%d" -entry = isNitrousConditionSatisfied, "isNitrousConditionSatisfied", int, "%d" +entry = isNitrousArmed, "isNitrousArmed", int, "%d" +entry = isNitrousSpeedCondition, "isNitrousSpeedCondition", int, "%d" +entry = isNitrousTpsCondition, "isNitrousTpsCondition", int, "%d" +entry = isNitrousCltCondition, "isNitrousCltCondition", int, "%d" +entry = isNitrousMapCondition, "isNitrousMapCondition", int, "%d" +entry = isNitrousAfrCondition, "isNitrousAfrCondition", int, "%d" +entry = isNitrousRpmCondition, "isNitrousRpmCondition", int, "%d" +entry = isNitrousCondition, "isNitrousCondition", int, "%d" entry = cranking0, "cranking0", int, "%d" entry = notRunning0, "notRunning0", int, "%d" entry = disabledWhileEngineStopped0, "disabledWhileEngineStopped0", int, "%d" @@ -6889,14 +6889,14 @@ dialog = ac_controlDialog, "ac_control" graphLine = acButtonState indicatorPanel = nitrous_control_stateIndicatorPanel, 2 - indicator = {isArmed}, "isArmed No", "isArmed Yes" - indicator = {isNitrousSpeedConditionSatisfied}, "isNitrousSpeedConditionSatisfied No", "isNitrousSpeedConditionSatisfied Yes" - indicator = {isTpsConditionSatisfied}, "isTpsConditionSatisfied No", "isTpsConditionSatisfied Yes" - indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" - indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" - indicator = {isAfrConditionSatisfied}, "isAfrConditionSatisfied No", "isAfrConditionSatisfied Yes" - indicator = {isNitrousRpmConditionSatisfied}, "isNitrousRpmConditionSatisfied No", "isNitrousRpmConditionSatisfied Yes" - indicator = {isNitrousConditionSatisfied}, "isNitrousConditionSatisfied No", "isNitrousConditionSatisfied Yes" + indicator = {isNitrousArmed}, "isNitrousArmed No", "isNitrousArmed Yes" + indicator = {isNitrousSpeedCondition}, "isNitrousSpeedCondition No", "isNitrousSpeedCondition Yes" + indicator = {isNitrousTpsCondition}, "isNitrousTpsCondition No", "isNitrousTpsCondition Yes" + indicator = {isNitrousCltCondition}, "isNitrousCltCondition No", "isNitrousCltCondition Yes" + indicator = {isNitrousMapCondition}, "isNitrousMapCondition No", "isNitrousMapCondition Yes" + indicator = {isNitrousAfrCondition}, "isNitrousAfrCondition No", "isNitrousAfrCondition Yes" + indicator = {isNitrousRpmCondition}, "isNitrousRpmCondition No", "isNitrousRpmCondition Yes" + indicator = {isNitrousCondition}, "isNitrousCondition No", "isNitrousCondition Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9827,7 +9827,7 @@ commandButton = "GM LCV", cmd_set_engine_type_GM_LCV panel = NitrousControlArmingMethodDialog, {nitrousControlEnabled == 1} panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))} - dialog = NitrousControlDialog + dialog = NitrousControlDialog, "", border panel = NitrousControlSettingsDialog, West panel = nitrous_control_stateDialog, East diff --git a/firmware/tunerstudio/generated/rusefi_alphax-8chan_f7.ini b/firmware/tunerstudio/generated/rusefi_alphax-8chan_f7.ini index e20e64d12c..9eb8fe2d07 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-8chan_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-8chan_f7.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.12.06.alphax-8chan_f7.2722398898" + signature = "rusEFI master.2024.12.06.alphax-8chan_f7.1966127656" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.06.alphax-8chan_f7.2722398898" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.06.alphax-8chan_f7.1966127656" ; 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 @@ -3299,14 +3299,14 @@ acCompressorState = bits, U32, 1172, [7:7] acPressureTooLow = bits, U32, 1172, [8:8] acPressureTooHigh = bits, U32, 1172, [9:9] ; total TS size = 1176 -isArmed = bits, U32, 1176, [0:0] -isNitrousSpeedConditionSatisfied = bits, U32, 1176, [1:1] -isTpsConditionSatisfied = bits, U32, 1176, [2:2] -isCltConditionSatisfied = bits, U32, 1176, [3:3] -isMapConditionSatisfied = bits, U32, 1176, [4:4] -isAfrConditionSatisfied = bits, U32, 1176, [5:5] -isNitrousRpmConditionSatisfied = bits, U32, 1176, [6:6] -isNitrousConditionSatisfied = bits, U32, 1176, [7:7] +isNitrousArmed = bits, U32, 1176, [0:0] +isNitrousSpeedCondition = bits, U32, 1176, [1:1] +isNitrousTpsCondition = bits, U32, 1176, [2:2] +isNitrousCltCondition = bits, U32, 1176, [3:3] +isNitrousMapCondition = bits, U32, 1176, [4:4] +isNitrousAfrCondition = bits, U32, 1176, [5:5] +isNitrousRpmCondition = bits, U32, 1176, [6:6] +isNitrousCondition = bits, U32, 1176, [7:7] ; total TS size = 1180 cranking0 = bits, U32, 1180, [0:0] notRunning0 = bits, U32, 1180, [1:1] @@ -5877,14 +5877,14 @@ entry = isDisabledByLua, "AC disabled by Lua", int, "%d" entry = acCompressorState, "AC compressor on", int, "%d" entry = acPressureTooLow, "AC pressure too low", int, "%d" entry = acPressureTooHigh, "AC pressure too high", int, "%d" -entry = isArmed, "isArmed", int, "%d" -entry = isNitrousSpeedConditionSatisfied, "isNitrousSpeedConditionSatisfied", int, "%d" -entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" -entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" -entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" -entry = isAfrConditionSatisfied, "isAfrConditionSatisfied", int, "%d" -entry = isNitrousRpmConditionSatisfied, "isNitrousRpmConditionSatisfied", int, "%d" -entry = isNitrousConditionSatisfied, "isNitrousConditionSatisfied", int, "%d" +entry = isNitrousArmed, "isNitrousArmed", int, "%d" +entry = isNitrousSpeedCondition, "isNitrousSpeedCondition", int, "%d" +entry = isNitrousTpsCondition, "isNitrousTpsCondition", int, "%d" +entry = isNitrousCltCondition, "isNitrousCltCondition", int, "%d" +entry = isNitrousMapCondition, "isNitrousMapCondition", int, "%d" +entry = isNitrousAfrCondition, "isNitrousAfrCondition", int, "%d" +entry = isNitrousRpmCondition, "isNitrousRpmCondition", int, "%d" +entry = isNitrousCondition, "isNitrousCondition", int, "%d" entry = cranking0, "cranking0", int, "%d" entry = notRunning0, "notRunning0", int, "%d" entry = disabledWhileEngineStopped0, "disabledWhileEngineStopped0", int, "%d" @@ -6889,14 +6889,14 @@ dialog = ac_controlDialog, "ac_control" graphLine = acButtonState indicatorPanel = nitrous_control_stateIndicatorPanel, 2 - indicator = {isArmed}, "isArmed No", "isArmed Yes" - indicator = {isNitrousSpeedConditionSatisfied}, "isNitrousSpeedConditionSatisfied No", "isNitrousSpeedConditionSatisfied Yes" - indicator = {isTpsConditionSatisfied}, "isTpsConditionSatisfied No", "isTpsConditionSatisfied Yes" - indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" - indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" - indicator = {isAfrConditionSatisfied}, "isAfrConditionSatisfied No", "isAfrConditionSatisfied Yes" - indicator = {isNitrousRpmConditionSatisfied}, "isNitrousRpmConditionSatisfied No", "isNitrousRpmConditionSatisfied Yes" - indicator = {isNitrousConditionSatisfied}, "isNitrousConditionSatisfied No", "isNitrousConditionSatisfied Yes" + indicator = {isNitrousArmed}, "isNitrousArmed No", "isNitrousArmed Yes" + indicator = {isNitrousSpeedCondition}, "isNitrousSpeedCondition No", "isNitrousSpeedCondition Yes" + indicator = {isNitrousTpsCondition}, "isNitrousTpsCondition No", "isNitrousTpsCondition Yes" + indicator = {isNitrousCltCondition}, "isNitrousCltCondition No", "isNitrousCltCondition Yes" + indicator = {isNitrousMapCondition}, "isNitrousMapCondition No", "isNitrousMapCondition Yes" + indicator = {isNitrousAfrCondition}, "isNitrousAfrCondition No", "isNitrousAfrCondition Yes" + indicator = {isNitrousRpmCondition}, "isNitrousRpmCondition No", "isNitrousRpmCondition Yes" + indicator = {isNitrousCondition}, "isNitrousCondition No", "isNitrousCondition Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9827,7 +9827,7 @@ commandButton = "GM LCV", cmd_set_engine_type_GM_LCV panel = NitrousControlArmingMethodDialog, {nitrousControlEnabled == 1} panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))} - dialog = NitrousControlDialog + dialog = NitrousControlDialog, "", border panel = NitrousControlSettingsDialog, West panel = nitrous_control_stateDialog, East diff --git a/firmware/tunerstudio/generated/rusefi_alphax-silver.ini b/firmware/tunerstudio/generated/rusefi_alphax-silver.ini index cbde3ec361..400c0e0e3a 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-silver.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-silver.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.12.06.alphax-silver.427104714" + signature = "rusEFI master.2024.12.06.alphax-silver.3456180560" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.06.alphax-silver.427104714" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.06.alphax-silver.3456180560" ; 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 @@ -3286,14 +3286,14 @@ acCompressorState = bits, U32, 1172, [7:7] acPressureTooLow = bits, U32, 1172, [8:8] acPressureTooHigh = bits, U32, 1172, [9:9] ; total TS size = 1176 -isArmed = bits, U32, 1176, [0:0] -isNitrousSpeedConditionSatisfied = bits, U32, 1176, [1:1] -isTpsConditionSatisfied = bits, U32, 1176, [2:2] -isCltConditionSatisfied = bits, U32, 1176, [3:3] -isMapConditionSatisfied = bits, U32, 1176, [4:4] -isAfrConditionSatisfied = bits, U32, 1176, [5:5] -isNitrousRpmConditionSatisfied = bits, U32, 1176, [6:6] -isNitrousConditionSatisfied = bits, U32, 1176, [7:7] +isNitrousArmed = bits, U32, 1176, [0:0] +isNitrousSpeedCondition = bits, U32, 1176, [1:1] +isNitrousTpsCondition = bits, U32, 1176, [2:2] +isNitrousCltCondition = bits, U32, 1176, [3:3] +isNitrousMapCondition = bits, U32, 1176, [4:4] +isNitrousAfrCondition = bits, U32, 1176, [5:5] +isNitrousRpmCondition = bits, U32, 1176, [6:6] +isNitrousCondition = bits, U32, 1176, [7:7] ; total TS size = 1180 cranking0 = bits, U32, 1180, [0:0] notRunning0 = bits, U32, 1180, [1:1] @@ -5857,14 +5857,14 @@ entry = isDisabledByLua, "AC disabled by Lua", int, "%d" entry = acCompressorState, "AC compressor on", int, "%d" entry = acPressureTooLow, "AC pressure too low", int, "%d" entry = acPressureTooHigh, "AC pressure too high", int, "%d" -entry = isArmed, "isArmed", int, "%d" -entry = isNitrousSpeedConditionSatisfied, "isNitrousSpeedConditionSatisfied", int, "%d" -entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" -entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" -entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" -entry = isAfrConditionSatisfied, "isAfrConditionSatisfied", int, "%d" -entry = isNitrousRpmConditionSatisfied, "isNitrousRpmConditionSatisfied", int, "%d" -entry = isNitrousConditionSatisfied, "isNitrousConditionSatisfied", int, "%d" +entry = isNitrousArmed, "isNitrousArmed", int, "%d" +entry = isNitrousSpeedCondition, "isNitrousSpeedCondition", int, "%d" +entry = isNitrousTpsCondition, "isNitrousTpsCondition", int, "%d" +entry = isNitrousCltCondition, "isNitrousCltCondition", int, "%d" +entry = isNitrousMapCondition, "isNitrousMapCondition", int, "%d" +entry = isNitrousAfrCondition, "isNitrousAfrCondition", int, "%d" +entry = isNitrousRpmCondition, "isNitrousRpmCondition", int, "%d" +entry = isNitrousCondition, "isNitrousCondition", int, "%d" entry = cranking0, "cranking0", int, "%d" entry = notRunning0, "notRunning0", int, "%d" entry = disabledWhileEngineStopped0, "disabledWhileEngineStopped0", int, "%d" @@ -6846,14 +6846,14 @@ dialog = ac_controlDialog, "ac_control" graphLine = acButtonState indicatorPanel = nitrous_control_stateIndicatorPanel, 2 - indicator = {isArmed}, "isArmed No", "isArmed Yes" - indicator = {isNitrousSpeedConditionSatisfied}, "isNitrousSpeedConditionSatisfied No", "isNitrousSpeedConditionSatisfied Yes" - indicator = {isTpsConditionSatisfied}, "isTpsConditionSatisfied No", "isTpsConditionSatisfied Yes" - indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" - indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" - indicator = {isAfrConditionSatisfied}, "isAfrConditionSatisfied No", "isAfrConditionSatisfied Yes" - indicator = {isNitrousRpmConditionSatisfied}, "isNitrousRpmConditionSatisfied No", "isNitrousRpmConditionSatisfied Yes" - indicator = {isNitrousConditionSatisfied}, "isNitrousConditionSatisfied No", "isNitrousConditionSatisfied Yes" + indicator = {isNitrousArmed}, "isNitrousArmed No", "isNitrousArmed Yes" + indicator = {isNitrousSpeedCondition}, "isNitrousSpeedCondition No", "isNitrousSpeedCondition Yes" + indicator = {isNitrousTpsCondition}, "isNitrousTpsCondition No", "isNitrousTpsCondition Yes" + indicator = {isNitrousCltCondition}, "isNitrousCltCondition No", "isNitrousCltCondition Yes" + indicator = {isNitrousMapCondition}, "isNitrousMapCondition No", "isNitrousMapCondition Yes" + indicator = {isNitrousAfrCondition}, "isNitrousAfrCondition No", "isNitrousAfrCondition Yes" + indicator = {isNitrousRpmCondition}, "isNitrousRpmCondition No", "isNitrousRpmCondition Yes" + indicator = {isNitrousCondition}, "isNitrousCondition No", "isNitrousCondition Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9740,7 +9740,7 @@ dialog = tcuControls, "Transmission Settings" panel = NitrousControlArmingMethodDialog, {nitrousControlEnabled == 1} panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))} - dialog = NitrousControlDialog + dialog = NitrousControlDialog, "", border panel = NitrousControlSettingsDialog, West panel = nitrous_control_stateDialog, East diff --git a/firmware/tunerstudio/generated/rusefi_at_start_f435.ini b/firmware/tunerstudio/generated/rusefi_at_start_f435.ini index e73a5f76bf..b237dd236f 100644 --- a/firmware/tunerstudio/generated/rusefi_at_start_f435.ini +++ b/firmware/tunerstudio/generated/rusefi_at_start_f435.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.12.06.at_start_f435.617288300" + signature = "rusEFI master.2024.12.06.at_start_f435.4089391862" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.06.at_start_f435.617288300" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.06.at_start_f435.4089391862" ; 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 @@ -3285,14 +3285,14 @@ acCompressorState = bits, U32, 1172, [7:7] acPressureTooLow = bits, U32, 1172, [8:8] acPressureTooHigh = bits, U32, 1172, [9:9] ; total TS size = 1176 -isArmed = bits, U32, 1176, [0:0] -isNitrousSpeedConditionSatisfied = bits, U32, 1176, [1:1] -isTpsConditionSatisfied = bits, U32, 1176, [2:2] -isCltConditionSatisfied = bits, U32, 1176, [3:3] -isMapConditionSatisfied = bits, U32, 1176, [4:4] -isAfrConditionSatisfied = bits, U32, 1176, [5:5] -isNitrousRpmConditionSatisfied = bits, U32, 1176, [6:6] -isNitrousConditionSatisfied = bits, U32, 1176, [7:7] +isNitrousArmed = bits, U32, 1176, [0:0] +isNitrousSpeedCondition = bits, U32, 1176, [1:1] +isNitrousTpsCondition = bits, U32, 1176, [2:2] +isNitrousCltCondition = bits, U32, 1176, [3:3] +isNitrousMapCondition = bits, U32, 1176, [4:4] +isNitrousAfrCondition = bits, U32, 1176, [5:5] +isNitrousRpmCondition = bits, U32, 1176, [6:6] +isNitrousCondition = bits, U32, 1176, [7:7] ; total TS size = 1180 cranking0 = bits, U32, 1180, [0:0] notRunning0 = bits, U32, 1180, [1:1] @@ -5862,14 +5862,14 @@ entry = isDisabledByLua, "AC disabled by Lua", int, "%d" entry = acCompressorState, "AC compressor on", int, "%d" entry = acPressureTooLow, "AC pressure too low", int, "%d" entry = acPressureTooHigh, "AC pressure too high", int, "%d" -entry = isArmed, "isArmed", int, "%d" -entry = isNitrousSpeedConditionSatisfied, "isNitrousSpeedConditionSatisfied", int, "%d" -entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" -entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" -entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" -entry = isAfrConditionSatisfied, "isAfrConditionSatisfied", int, "%d" -entry = isNitrousRpmConditionSatisfied, "isNitrousRpmConditionSatisfied", int, "%d" -entry = isNitrousConditionSatisfied, "isNitrousConditionSatisfied", int, "%d" +entry = isNitrousArmed, "isNitrousArmed", int, "%d" +entry = isNitrousSpeedCondition, "isNitrousSpeedCondition", int, "%d" +entry = isNitrousTpsCondition, "isNitrousTpsCondition", int, "%d" +entry = isNitrousCltCondition, "isNitrousCltCondition", int, "%d" +entry = isNitrousMapCondition, "isNitrousMapCondition", int, "%d" +entry = isNitrousAfrCondition, "isNitrousAfrCondition", int, "%d" +entry = isNitrousRpmCondition, "isNitrousRpmCondition", int, "%d" +entry = isNitrousCondition, "isNitrousCondition", int, "%d" entry = cranking0, "cranking0", int, "%d" entry = notRunning0, "notRunning0", int, "%d" entry = disabledWhileEngineStopped0, "disabledWhileEngineStopped0", int, "%d" @@ -6861,14 +6861,14 @@ dialog = ac_controlDialog, "ac_control" graphLine = acButtonState indicatorPanel = nitrous_control_stateIndicatorPanel, 2 - indicator = {isArmed}, "isArmed No", "isArmed Yes" - indicator = {isNitrousSpeedConditionSatisfied}, "isNitrousSpeedConditionSatisfied No", "isNitrousSpeedConditionSatisfied Yes" - indicator = {isTpsConditionSatisfied}, "isTpsConditionSatisfied No", "isTpsConditionSatisfied Yes" - indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" - indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" - indicator = {isAfrConditionSatisfied}, "isAfrConditionSatisfied No", "isAfrConditionSatisfied Yes" - indicator = {isNitrousRpmConditionSatisfied}, "isNitrousRpmConditionSatisfied No", "isNitrousRpmConditionSatisfied Yes" - indicator = {isNitrousConditionSatisfied}, "isNitrousConditionSatisfied No", "isNitrousConditionSatisfied Yes" + indicator = {isNitrousArmed}, "isNitrousArmed No", "isNitrousArmed Yes" + indicator = {isNitrousSpeedCondition}, "isNitrousSpeedCondition No", "isNitrousSpeedCondition Yes" + indicator = {isNitrousTpsCondition}, "isNitrousTpsCondition No", "isNitrousTpsCondition Yes" + indicator = {isNitrousCltCondition}, "isNitrousCltCondition No", "isNitrousCltCondition Yes" + indicator = {isNitrousMapCondition}, "isNitrousMapCondition No", "isNitrousMapCondition Yes" + indicator = {isNitrousAfrCondition}, "isNitrousAfrCondition No", "isNitrousAfrCondition Yes" + indicator = {isNitrousRpmCondition}, "isNitrousRpmCondition No", "isNitrousRpmCondition Yes" + indicator = {isNitrousCondition}, "isNitrousCondition No", "isNitrousCondition Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9851,7 +9851,7 @@ dialog = tcuControls, "Transmission Settings" panel = NitrousControlArmingMethodDialog, {nitrousControlEnabled == 1} panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))} - dialog = NitrousControlDialog + dialog = NitrousControlDialog, "", border panel = NitrousControlSettingsDialog, West panel = nitrous_control_stateDialog, East diff --git a/firmware/tunerstudio/generated/rusefi_atlas.ini b/firmware/tunerstudio/generated/rusefi_atlas.ini index e292172156..22e82e1a73 100644 --- a/firmware/tunerstudio/generated/rusefi_atlas.ini +++ b/firmware/tunerstudio/generated/rusefi_atlas.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.12.06.atlas.1624032802" + signature = "rusEFI master.2024.12.06.atlas.3082354360" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.06.atlas.1624032802" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.06.atlas.3082354360" ; 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 @@ -3285,14 +3285,14 @@ acCompressorState = bits, U32, 1172, [7:7] acPressureTooLow = bits, U32, 1172, [8:8] acPressureTooHigh = bits, U32, 1172, [9:9] ; total TS size = 1176 -isArmed = bits, U32, 1176, [0:0] -isNitrousSpeedConditionSatisfied = bits, U32, 1176, [1:1] -isTpsConditionSatisfied = bits, U32, 1176, [2:2] -isCltConditionSatisfied = bits, U32, 1176, [3:3] -isMapConditionSatisfied = bits, U32, 1176, [4:4] -isAfrConditionSatisfied = bits, U32, 1176, [5:5] -isNitrousRpmConditionSatisfied = bits, U32, 1176, [6:6] -isNitrousConditionSatisfied = bits, U32, 1176, [7:7] +isNitrousArmed = bits, U32, 1176, [0:0] +isNitrousSpeedCondition = bits, U32, 1176, [1:1] +isNitrousTpsCondition = bits, U32, 1176, [2:2] +isNitrousCltCondition = bits, U32, 1176, [3:3] +isNitrousMapCondition = bits, U32, 1176, [4:4] +isNitrousAfrCondition = bits, U32, 1176, [5:5] +isNitrousRpmCondition = bits, U32, 1176, [6:6] +isNitrousCondition = bits, U32, 1176, [7:7] ; total TS size = 1180 cranking0 = bits, U32, 1180, [0:0] notRunning0 = bits, U32, 1180, [1:1] @@ -5862,14 +5862,14 @@ entry = isDisabledByLua, "AC disabled by Lua", int, "%d" entry = acCompressorState, "AC compressor on", int, "%d" entry = acPressureTooLow, "AC pressure too low", int, "%d" entry = acPressureTooHigh, "AC pressure too high", int, "%d" -entry = isArmed, "isArmed", int, "%d" -entry = isNitrousSpeedConditionSatisfied, "isNitrousSpeedConditionSatisfied", int, "%d" -entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" -entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" -entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" -entry = isAfrConditionSatisfied, "isAfrConditionSatisfied", int, "%d" -entry = isNitrousRpmConditionSatisfied, "isNitrousRpmConditionSatisfied", int, "%d" -entry = isNitrousConditionSatisfied, "isNitrousConditionSatisfied", int, "%d" +entry = isNitrousArmed, "isNitrousArmed", int, "%d" +entry = isNitrousSpeedCondition, "isNitrousSpeedCondition", int, "%d" +entry = isNitrousTpsCondition, "isNitrousTpsCondition", int, "%d" +entry = isNitrousCltCondition, "isNitrousCltCondition", int, "%d" +entry = isNitrousMapCondition, "isNitrousMapCondition", int, "%d" +entry = isNitrousAfrCondition, "isNitrousAfrCondition", int, "%d" +entry = isNitrousRpmCondition, "isNitrousRpmCondition", int, "%d" +entry = isNitrousCondition, "isNitrousCondition", int, "%d" entry = cranking0, "cranking0", int, "%d" entry = notRunning0, "notRunning0", int, "%d" entry = disabledWhileEngineStopped0, "disabledWhileEngineStopped0", int, "%d" @@ -6861,14 +6861,14 @@ dialog = ac_controlDialog, "ac_control" graphLine = acButtonState indicatorPanel = nitrous_control_stateIndicatorPanel, 2 - indicator = {isArmed}, "isArmed No", "isArmed Yes" - indicator = {isNitrousSpeedConditionSatisfied}, "isNitrousSpeedConditionSatisfied No", "isNitrousSpeedConditionSatisfied Yes" - indicator = {isTpsConditionSatisfied}, "isTpsConditionSatisfied No", "isTpsConditionSatisfied Yes" - indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" - indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" - indicator = {isAfrConditionSatisfied}, "isAfrConditionSatisfied No", "isAfrConditionSatisfied Yes" - indicator = {isNitrousRpmConditionSatisfied}, "isNitrousRpmConditionSatisfied No", "isNitrousRpmConditionSatisfied Yes" - indicator = {isNitrousConditionSatisfied}, "isNitrousConditionSatisfied No", "isNitrousConditionSatisfied Yes" + indicator = {isNitrousArmed}, "isNitrousArmed No", "isNitrousArmed Yes" + indicator = {isNitrousSpeedCondition}, "isNitrousSpeedCondition No", "isNitrousSpeedCondition Yes" + indicator = {isNitrousTpsCondition}, "isNitrousTpsCondition No", "isNitrousTpsCondition Yes" + indicator = {isNitrousCltCondition}, "isNitrousCltCondition No", "isNitrousCltCondition Yes" + indicator = {isNitrousMapCondition}, "isNitrousMapCondition No", "isNitrousMapCondition Yes" + indicator = {isNitrousAfrCondition}, "isNitrousAfrCondition No", "isNitrousAfrCondition Yes" + indicator = {isNitrousRpmCondition}, "isNitrousRpmCondition No", "isNitrousRpmCondition Yes" + indicator = {isNitrousCondition}, "isNitrousCondition No", "isNitrousCondition Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9842,7 +9842,7 @@ dialog = tcuControls, "Transmission Settings" panel = NitrousControlArmingMethodDialog, {nitrousControlEnabled == 1} panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))} - dialog = NitrousControlDialog + dialog = NitrousControlDialog, "", border panel = NitrousControlSettingsDialog, West panel = nitrous_control_stateDialog, East diff --git a/firmware/tunerstudio/generated/rusefi_f407-discovery.ini b/firmware/tunerstudio/generated/rusefi_f407-discovery.ini index 6e81f75332..53544d65a9 100644 --- a/firmware/tunerstudio/generated/rusefi_f407-discovery.ini +++ b/firmware/tunerstudio/generated/rusefi_f407-discovery.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.12.06.f407-discovery.3295927249" + signature = "rusEFI master.2024.12.06.f407-discovery.319284043" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.06.f407-discovery.3295927249" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.06.f407-discovery.319284043" ; 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 @@ -3286,14 +3286,14 @@ acCompressorState = bits, U32, 1172, [7:7] acPressureTooLow = bits, U32, 1172, [8:8] acPressureTooHigh = bits, U32, 1172, [9:9] ; total TS size = 1176 -isArmed = bits, U32, 1176, [0:0] -isNitrousSpeedConditionSatisfied = bits, U32, 1176, [1:1] -isTpsConditionSatisfied = bits, U32, 1176, [2:2] -isCltConditionSatisfied = bits, U32, 1176, [3:3] -isMapConditionSatisfied = bits, U32, 1176, [4:4] -isAfrConditionSatisfied = bits, U32, 1176, [5:5] -isNitrousRpmConditionSatisfied = bits, U32, 1176, [6:6] -isNitrousConditionSatisfied = bits, U32, 1176, [7:7] +isNitrousArmed = bits, U32, 1176, [0:0] +isNitrousSpeedCondition = bits, U32, 1176, [1:1] +isNitrousTpsCondition = bits, U32, 1176, [2:2] +isNitrousCltCondition = bits, U32, 1176, [3:3] +isNitrousMapCondition = bits, U32, 1176, [4:4] +isNitrousAfrCondition = bits, U32, 1176, [5:5] +isNitrousRpmCondition = bits, U32, 1176, [6:6] +isNitrousCondition = bits, U32, 1176, [7:7] ; total TS size = 1180 cranking0 = bits, U32, 1180, [0:0] notRunning0 = bits, U32, 1180, [1:1] @@ -5864,14 +5864,14 @@ entry = isDisabledByLua, "AC disabled by Lua", int, "%d" entry = acCompressorState, "AC compressor on", int, "%d" entry = acPressureTooLow, "AC pressure too low", int, "%d" entry = acPressureTooHigh, "AC pressure too high", int, "%d" -entry = isArmed, "isArmed", int, "%d" -entry = isNitrousSpeedConditionSatisfied, "isNitrousSpeedConditionSatisfied", int, "%d" -entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" -entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" -entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" -entry = isAfrConditionSatisfied, "isAfrConditionSatisfied", int, "%d" -entry = isNitrousRpmConditionSatisfied, "isNitrousRpmConditionSatisfied", int, "%d" -entry = isNitrousConditionSatisfied, "isNitrousConditionSatisfied", int, "%d" +entry = isNitrousArmed, "isNitrousArmed", int, "%d" +entry = isNitrousSpeedCondition, "isNitrousSpeedCondition", int, "%d" +entry = isNitrousTpsCondition, "isNitrousTpsCondition", int, "%d" +entry = isNitrousCltCondition, "isNitrousCltCondition", int, "%d" +entry = isNitrousMapCondition, "isNitrousMapCondition", int, "%d" +entry = isNitrousAfrCondition, "isNitrousAfrCondition", int, "%d" +entry = isNitrousRpmCondition, "isNitrousRpmCondition", int, "%d" +entry = isNitrousCondition, "isNitrousCondition", int, "%d" entry = cranking0, "cranking0", int, "%d" entry = notRunning0, "notRunning0", int, "%d" entry = disabledWhileEngineStopped0, "disabledWhileEngineStopped0", int, "%d" @@ -6868,14 +6868,14 @@ dialog = ac_controlDialog, "ac_control" graphLine = acButtonState indicatorPanel = nitrous_control_stateIndicatorPanel, 2 - indicator = {isArmed}, "isArmed No", "isArmed Yes" - indicator = {isNitrousSpeedConditionSatisfied}, "isNitrousSpeedConditionSatisfied No", "isNitrousSpeedConditionSatisfied Yes" - indicator = {isTpsConditionSatisfied}, "isTpsConditionSatisfied No", "isTpsConditionSatisfied Yes" - indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" - indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" - indicator = {isAfrConditionSatisfied}, "isAfrConditionSatisfied No", "isAfrConditionSatisfied Yes" - indicator = {isNitrousRpmConditionSatisfied}, "isNitrousRpmConditionSatisfied No", "isNitrousRpmConditionSatisfied Yes" - indicator = {isNitrousConditionSatisfied}, "isNitrousConditionSatisfied No", "isNitrousConditionSatisfied Yes" + indicator = {isNitrousArmed}, "isNitrousArmed No", "isNitrousArmed Yes" + indicator = {isNitrousSpeedCondition}, "isNitrousSpeedCondition No", "isNitrousSpeedCondition Yes" + indicator = {isNitrousTpsCondition}, "isNitrousTpsCondition No", "isNitrousTpsCondition Yes" + indicator = {isNitrousCltCondition}, "isNitrousCltCondition No", "isNitrousCltCondition Yes" + indicator = {isNitrousMapCondition}, "isNitrousMapCondition No", "isNitrousMapCondition Yes" + indicator = {isNitrousAfrCondition}, "isNitrousAfrCondition No", "isNitrousAfrCondition Yes" + indicator = {isNitrousRpmCondition}, "isNitrousRpmCondition No", "isNitrousRpmCondition Yes" + indicator = {isNitrousCondition}, "isNitrousCondition No", "isNitrousCondition Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9864,7 +9864,7 @@ dialog = tcuControls, "Transmission Settings" panel = NitrousControlArmingMethodDialog, {nitrousControlEnabled == 1} panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))} - dialog = NitrousControlDialog + dialog = NitrousControlDialog, "", border panel = NitrousControlSettingsDialog, West panel = nitrous_control_stateDialog, East diff --git a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini index f4327ea4e2..5675216ca3 100644 --- a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini +++ b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.12.06.f429-discovery.617288300" + signature = "rusEFI master.2024.12.06.f429-discovery.4089391862" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.06.f429-discovery.617288300" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.06.f429-discovery.4089391862" ; 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 @@ -3285,14 +3285,14 @@ acCompressorState = bits, U32, 1172, [7:7] acPressureTooLow = bits, U32, 1172, [8:8] acPressureTooHigh = bits, U32, 1172, [9:9] ; total TS size = 1176 -isArmed = bits, U32, 1176, [0:0] -isNitrousSpeedConditionSatisfied = bits, U32, 1176, [1:1] -isTpsConditionSatisfied = bits, U32, 1176, [2:2] -isCltConditionSatisfied = bits, U32, 1176, [3:3] -isMapConditionSatisfied = bits, U32, 1176, [4:4] -isAfrConditionSatisfied = bits, U32, 1176, [5:5] -isNitrousRpmConditionSatisfied = bits, U32, 1176, [6:6] -isNitrousConditionSatisfied = bits, U32, 1176, [7:7] +isNitrousArmed = bits, U32, 1176, [0:0] +isNitrousSpeedCondition = bits, U32, 1176, [1:1] +isNitrousTpsCondition = bits, U32, 1176, [2:2] +isNitrousCltCondition = bits, U32, 1176, [3:3] +isNitrousMapCondition = bits, U32, 1176, [4:4] +isNitrousAfrCondition = bits, U32, 1176, [5:5] +isNitrousRpmCondition = bits, U32, 1176, [6:6] +isNitrousCondition = bits, U32, 1176, [7:7] ; total TS size = 1180 cranking0 = bits, U32, 1180, [0:0] notRunning0 = bits, U32, 1180, [1:1] @@ -5862,14 +5862,14 @@ entry = isDisabledByLua, "AC disabled by Lua", int, "%d" entry = acCompressorState, "AC compressor on", int, "%d" entry = acPressureTooLow, "AC pressure too low", int, "%d" entry = acPressureTooHigh, "AC pressure too high", int, "%d" -entry = isArmed, "isArmed", int, "%d" -entry = isNitrousSpeedConditionSatisfied, "isNitrousSpeedConditionSatisfied", int, "%d" -entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" -entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" -entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" -entry = isAfrConditionSatisfied, "isAfrConditionSatisfied", int, "%d" -entry = isNitrousRpmConditionSatisfied, "isNitrousRpmConditionSatisfied", int, "%d" -entry = isNitrousConditionSatisfied, "isNitrousConditionSatisfied", int, "%d" +entry = isNitrousArmed, "isNitrousArmed", int, "%d" +entry = isNitrousSpeedCondition, "isNitrousSpeedCondition", int, "%d" +entry = isNitrousTpsCondition, "isNitrousTpsCondition", int, "%d" +entry = isNitrousCltCondition, "isNitrousCltCondition", int, "%d" +entry = isNitrousMapCondition, "isNitrousMapCondition", int, "%d" +entry = isNitrousAfrCondition, "isNitrousAfrCondition", int, "%d" +entry = isNitrousRpmCondition, "isNitrousRpmCondition", int, "%d" +entry = isNitrousCondition, "isNitrousCondition", int, "%d" entry = cranking0, "cranking0", int, "%d" entry = notRunning0, "notRunning0", int, "%d" entry = disabledWhileEngineStopped0, "disabledWhileEngineStopped0", int, "%d" @@ -6861,14 +6861,14 @@ dialog = ac_controlDialog, "ac_control" graphLine = acButtonState indicatorPanel = nitrous_control_stateIndicatorPanel, 2 - indicator = {isArmed}, "isArmed No", "isArmed Yes" - indicator = {isNitrousSpeedConditionSatisfied}, "isNitrousSpeedConditionSatisfied No", "isNitrousSpeedConditionSatisfied Yes" - indicator = {isTpsConditionSatisfied}, "isTpsConditionSatisfied No", "isTpsConditionSatisfied Yes" - indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" - indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" - indicator = {isAfrConditionSatisfied}, "isAfrConditionSatisfied No", "isAfrConditionSatisfied Yes" - indicator = {isNitrousRpmConditionSatisfied}, "isNitrousRpmConditionSatisfied No", "isNitrousRpmConditionSatisfied Yes" - indicator = {isNitrousConditionSatisfied}, "isNitrousConditionSatisfied No", "isNitrousConditionSatisfied Yes" + indicator = {isNitrousArmed}, "isNitrousArmed No", "isNitrousArmed Yes" + indicator = {isNitrousSpeedCondition}, "isNitrousSpeedCondition No", "isNitrousSpeedCondition Yes" + indicator = {isNitrousTpsCondition}, "isNitrousTpsCondition No", "isNitrousTpsCondition Yes" + indicator = {isNitrousCltCondition}, "isNitrousCltCondition No", "isNitrousCltCondition Yes" + indicator = {isNitrousMapCondition}, "isNitrousMapCondition No", "isNitrousMapCondition Yes" + indicator = {isNitrousAfrCondition}, "isNitrousAfrCondition No", "isNitrousAfrCondition Yes" + indicator = {isNitrousRpmCondition}, "isNitrousRpmCondition No", "isNitrousRpmCondition Yes" + indicator = {isNitrousCondition}, "isNitrousCondition No", "isNitrousCondition Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9851,7 +9851,7 @@ dialog = tcuControls, "Transmission Settings" panel = NitrousControlArmingMethodDialog, {nitrousControlEnabled == 1} panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))} - dialog = NitrousControlDialog + dialog = NitrousControlDialog, "", border panel = NitrousControlSettingsDialog, West panel = nitrous_control_stateDialog, East diff --git a/firmware/tunerstudio/generated/rusefi_f469-discovery.ini b/firmware/tunerstudio/generated/rusefi_f469-discovery.ini index 7dccc68aab..96d071d175 100644 --- a/firmware/tunerstudio/generated/rusefi_f469-discovery.ini +++ b/firmware/tunerstudio/generated/rusefi_f469-discovery.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.12.06.f469-discovery.370939135" + signature = "rusEFI master.2024.12.06.f469-discovery.3244829797" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.06.f469-discovery.370939135" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.06.f469-discovery.3244829797" ; 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 @@ -3285,14 +3285,14 @@ acCompressorState = bits, U32, 1172, [7:7] acPressureTooLow = bits, U32, 1172, [8:8] acPressureTooHigh = bits, U32, 1172, [9:9] ; total TS size = 1176 -isArmed = bits, U32, 1176, [0:0] -isNitrousSpeedConditionSatisfied = bits, U32, 1176, [1:1] -isTpsConditionSatisfied = bits, U32, 1176, [2:2] -isCltConditionSatisfied = bits, U32, 1176, [3:3] -isMapConditionSatisfied = bits, U32, 1176, [4:4] -isAfrConditionSatisfied = bits, U32, 1176, [5:5] -isNitrousRpmConditionSatisfied = bits, U32, 1176, [6:6] -isNitrousConditionSatisfied = bits, U32, 1176, [7:7] +isNitrousArmed = bits, U32, 1176, [0:0] +isNitrousSpeedCondition = bits, U32, 1176, [1:1] +isNitrousTpsCondition = bits, U32, 1176, [2:2] +isNitrousCltCondition = bits, U32, 1176, [3:3] +isNitrousMapCondition = bits, U32, 1176, [4:4] +isNitrousAfrCondition = bits, U32, 1176, [5:5] +isNitrousRpmCondition = bits, U32, 1176, [6:6] +isNitrousCondition = bits, U32, 1176, [7:7] ; total TS size = 1180 cranking0 = bits, U32, 1180, [0:0] notRunning0 = bits, U32, 1180, [1:1] @@ -5862,14 +5862,14 @@ entry = isDisabledByLua, "AC disabled by Lua", int, "%d" entry = acCompressorState, "AC compressor on", int, "%d" entry = acPressureTooLow, "AC pressure too low", int, "%d" entry = acPressureTooHigh, "AC pressure too high", int, "%d" -entry = isArmed, "isArmed", int, "%d" -entry = isNitrousSpeedConditionSatisfied, "isNitrousSpeedConditionSatisfied", int, "%d" -entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" -entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" -entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" -entry = isAfrConditionSatisfied, "isAfrConditionSatisfied", int, "%d" -entry = isNitrousRpmConditionSatisfied, "isNitrousRpmConditionSatisfied", int, "%d" -entry = isNitrousConditionSatisfied, "isNitrousConditionSatisfied", int, "%d" +entry = isNitrousArmed, "isNitrousArmed", int, "%d" +entry = isNitrousSpeedCondition, "isNitrousSpeedCondition", int, "%d" +entry = isNitrousTpsCondition, "isNitrousTpsCondition", int, "%d" +entry = isNitrousCltCondition, "isNitrousCltCondition", int, "%d" +entry = isNitrousMapCondition, "isNitrousMapCondition", int, "%d" +entry = isNitrousAfrCondition, "isNitrousAfrCondition", int, "%d" +entry = isNitrousRpmCondition, "isNitrousRpmCondition", int, "%d" +entry = isNitrousCondition, "isNitrousCondition", int, "%d" entry = cranking0, "cranking0", int, "%d" entry = notRunning0, "notRunning0", int, "%d" entry = disabledWhileEngineStopped0, "disabledWhileEngineStopped0", int, "%d" @@ -6861,14 +6861,14 @@ dialog = ac_controlDialog, "ac_control" graphLine = acButtonState indicatorPanel = nitrous_control_stateIndicatorPanel, 2 - indicator = {isArmed}, "isArmed No", "isArmed Yes" - indicator = {isNitrousSpeedConditionSatisfied}, "isNitrousSpeedConditionSatisfied No", "isNitrousSpeedConditionSatisfied Yes" - indicator = {isTpsConditionSatisfied}, "isTpsConditionSatisfied No", "isTpsConditionSatisfied Yes" - indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" - indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" - indicator = {isAfrConditionSatisfied}, "isAfrConditionSatisfied No", "isAfrConditionSatisfied Yes" - indicator = {isNitrousRpmConditionSatisfied}, "isNitrousRpmConditionSatisfied No", "isNitrousRpmConditionSatisfied Yes" - indicator = {isNitrousConditionSatisfied}, "isNitrousConditionSatisfied No", "isNitrousConditionSatisfied Yes" + indicator = {isNitrousArmed}, "isNitrousArmed No", "isNitrousArmed Yes" + indicator = {isNitrousSpeedCondition}, "isNitrousSpeedCondition No", "isNitrousSpeedCondition Yes" + indicator = {isNitrousTpsCondition}, "isNitrousTpsCondition No", "isNitrousTpsCondition Yes" + indicator = {isNitrousCltCondition}, "isNitrousCltCondition No", "isNitrousCltCondition Yes" + indicator = {isNitrousMapCondition}, "isNitrousMapCondition No", "isNitrousMapCondition Yes" + indicator = {isNitrousAfrCondition}, "isNitrousAfrCondition No", "isNitrousAfrCondition Yes" + indicator = {isNitrousRpmCondition}, "isNitrousRpmCondition No", "isNitrousRpmCondition Yes" + indicator = {isNitrousCondition}, "isNitrousCondition No", "isNitrousCondition Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9851,7 +9851,7 @@ dialog = tcuControls, "Transmission Settings" panel = NitrousControlArmingMethodDialog, {nitrousControlEnabled == 1} panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))} - dialog = NitrousControlDialog + dialog = NitrousControlDialog, "", border panel = NitrousControlSettingsDialog, West panel = nitrous_control_stateDialog, East diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index b164eaad8d..a68a9eb613 100644 --- a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini +++ b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.12.06.frankenso_na6.1917347447" + signature = "rusEFI master.2024.12.06.frankenso_na6.2772197101" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.06.frankenso_na6.1917347447" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.06.frankenso_na6.2772197101" ; 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 @@ -3285,14 +3285,14 @@ acCompressorState = bits, U32, 1172, [7:7] acPressureTooLow = bits, U32, 1172, [8:8] acPressureTooHigh = bits, U32, 1172, [9:9] ; total TS size = 1176 -isArmed = bits, U32, 1176, [0:0] -isNitrousSpeedConditionSatisfied = bits, U32, 1176, [1:1] -isTpsConditionSatisfied = bits, U32, 1176, [2:2] -isCltConditionSatisfied = bits, U32, 1176, [3:3] -isMapConditionSatisfied = bits, U32, 1176, [4:4] -isAfrConditionSatisfied = bits, U32, 1176, [5:5] -isNitrousRpmConditionSatisfied = bits, U32, 1176, [6:6] -isNitrousConditionSatisfied = bits, U32, 1176, [7:7] +isNitrousArmed = bits, U32, 1176, [0:0] +isNitrousSpeedCondition = bits, U32, 1176, [1:1] +isNitrousTpsCondition = bits, U32, 1176, [2:2] +isNitrousCltCondition = bits, U32, 1176, [3:3] +isNitrousMapCondition = bits, U32, 1176, [4:4] +isNitrousAfrCondition = bits, U32, 1176, [5:5] +isNitrousRpmCondition = bits, U32, 1176, [6:6] +isNitrousCondition = bits, U32, 1176, [7:7] ; total TS size = 1180 cranking0 = bits, U32, 1180, [0:0] notRunning0 = bits, U32, 1180, [1:1] @@ -5862,14 +5862,14 @@ entry = isDisabledByLua, "AC disabled by Lua", int, "%d" entry = acCompressorState, "AC compressor on", int, "%d" entry = acPressureTooLow, "AC pressure too low", int, "%d" entry = acPressureTooHigh, "AC pressure too high", int, "%d" -entry = isArmed, "isArmed", int, "%d" -entry = isNitrousSpeedConditionSatisfied, "isNitrousSpeedConditionSatisfied", int, "%d" -entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" -entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" -entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" -entry = isAfrConditionSatisfied, "isAfrConditionSatisfied", int, "%d" -entry = isNitrousRpmConditionSatisfied, "isNitrousRpmConditionSatisfied", int, "%d" -entry = isNitrousConditionSatisfied, "isNitrousConditionSatisfied", int, "%d" +entry = isNitrousArmed, "isNitrousArmed", int, "%d" +entry = isNitrousSpeedCondition, "isNitrousSpeedCondition", int, "%d" +entry = isNitrousTpsCondition, "isNitrousTpsCondition", int, "%d" +entry = isNitrousCltCondition, "isNitrousCltCondition", int, "%d" +entry = isNitrousMapCondition, "isNitrousMapCondition", int, "%d" +entry = isNitrousAfrCondition, "isNitrousAfrCondition", int, "%d" +entry = isNitrousRpmCondition, "isNitrousRpmCondition", int, "%d" +entry = isNitrousCondition, "isNitrousCondition", int, "%d" entry = cranking0, "cranking0", int, "%d" entry = notRunning0, "notRunning0", int, "%d" entry = disabledWhileEngineStopped0, "disabledWhileEngineStopped0", int, "%d" @@ -6861,14 +6861,14 @@ dialog = ac_controlDialog, "ac_control" graphLine = acButtonState indicatorPanel = nitrous_control_stateIndicatorPanel, 2 - indicator = {isArmed}, "isArmed No", "isArmed Yes" - indicator = {isNitrousSpeedConditionSatisfied}, "isNitrousSpeedConditionSatisfied No", "isNitrousSpeedConditionSatisfied Yes" - indicator = {isTpsConditionSatisfied}, "isTpsConditionSatisfied No", "isTpsConditionSatisfied Yes" - indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" - indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" - indicator = {isAfrConditionSatisfied}, "isAfrConditionSatisfied No", "isAfrConditionSatisfied Yes" - indicator = {isNitrousRpmConditionSatisfied}, "isNitrousRpmConditionSatisfied No", "isNitrousRpmConditionSatisfied Yes" - indicator = {isNitrousConditionSatisfied}, "isNitrousConditionSatisfied No", "isNitrousConditionSatisfied Yes" + indicator = {isNitrousArmed}, "isNitrousArmed No", "isNitrousArmed Yes" + indicator = {isNitrousSpeedCondition}, "isNitrousSpeedCondition No", "isNitrousSpeedCondition Yes" + indicator = {isNitrousTpsCondition}, "isNitrousTpsCondition No", "isNitrousTpsCondition Yes" + indicator = {isNitrousCltCondition}, "isNitrousCltCondition No", "isNitrousCltCondition Yes" + indicator = {isNitrousMapCondition}, "isNitrousMapCondition No", "isNitrousMapCondition Yes" + indicator = {isNitrousAfrCondition}, "isNitrousAfrCondition No", "isNitrousAfrCondition Yes" + indicator = {isNitrousRpmCondition}, "isNitrousRpmCondition No", "isNitrousRpmCondition Yes" + indicator = {isNitrousCondition}, "isNitrousCondition No", "isNitrousCondition Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9852,7 +9852,7 @@ dialog = tcuControls, "Transmission Settings" panel = NitrousControlArmingMethodDialog, {nitrousControlEnabled == 1} panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))} - dialog = NitrousControlDialog + dialog = NitrousControlDialog, "", border panel = NitrousControlSettingsDialog, West panel = nitrous_control_stateDialog, East diff --git a/firmware/tunerstudio/generated/rusefi_haba208.ini b/firmware/tunerstudio/generated/rusefi_haba208.ini index 601bbc23e0..40b269465f 100644 --- a/firmware/tunerstudio/generated/rusefi_haba208.ini +++ b/firmware/tunerstudio/generated/rusefi_haba208.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.12.06.haba208.617288300" + signature = "rusEFI master.2024.12.06.haba208.4089391862" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.06.haba208.617288300" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.06.haba208.4089391862" ; 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 @@ -3285,14 +3285,14 @@ acCompressorState = bits, U32, 1172, [7:7] acPressureTooLow = bits, U32, 1172, [8:8] acPressureTooHigh = bits, U32, 1172, [9:9] ; total TS size = 1176 -isArmed = bits, U32, 1176, [0:0] -isNitrousSpeedConditionSatisfied = bits, U32, 1176, [1:1] -isTpsConditionSatisfied = bits, U32, 1176, [2:2] -isCltConditionSatisfied = bits, U32, 1176, [3:3] -isMapConditionSatisfied = bits, U32, 1176, [4:4] -isAfrConditionSatisfied = bits, U32, 1176, [5:5] -isNitrousRpmConditionSatisfied = bits, U32, 1176, [6:6] -isNitrousConditionSatisfied = bits, U32, 1176, [7:7] +isNitrousArmed = bits, U32, 1176, [0:0] +isNitrousSpeedCondition = bits, U32, 1176, [1:1] +isNitrousTpsCondition = bits, U32, 1176, [2:2] +isNitrousCltCondition = bits, U32, 1176, [3:3] +isNitrousMapCondition = bits, U32, 1176, [4:4] +isNitrousAfrCondition = bits, U32, 1176, [5:5] +isNitrousRpmCondition = bits, U32, 1176, [6:6] +isNitrousCondition = bits, U32, 1176, [7:7] ; total TS size = 1180 cranking0 = bits, U32, 1180, [0:0] notRunning0 = bits, U32, 1180, [1:1] @@ -5862,14 +5862,14 @@ entry = isDisabledByLua, "AC disabled by Lua", int, "%d" entry = acCompressorState, "AC compressor on", int, "%d" entry = acPressureTooLow, "AC pressure too low", int, "%d" entry = acPressureTooHigh, "AC pressure too high", int, "%d" -entry = isArmed, "isArmed", int, "%d" -entry = isNitrousSpeedConditionSatisfied, "isNitrousSpeedConditionSatisfied", int, "%d" -entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" -entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" -entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" -entry = isAfrConditionSatisfied, "isAfrConditionSatisfied", int, "%d" -entry = isNitrousRpmConditionSatisfied, "isNitrousRpmConditionSatisfied", int, "%d" -entry = isNitrousConditionSatisfied, "isNitrousConditionSatisfied", int, "%d" +entry = isNitrousArmed, "isNitrousArmed", int, "%d" +entry = isNitrousSpeedCondition, "isNitrousSpeedCondition", int, "%d" +entry = isNitrousTpsCondition, "isNitrousTpsCondition", int, "%d" +entry = isNitrousCltCondition, "isNitrousCltCondition", int, "%d" +entry = isNitrousMapCondition, "isNitrousMapCondition", int, "%d" +entry = isNitrousAfrCondition, "isNitrousAfrCondition", int, "%d" +entry = isNitrousRpmCondition, "isNitrousRpmCondition", int, "%d" +entry = isNitrousCondition, "isNitrousCondition", int, "%d" entry = cranking0, "cranking0", int, "%d" entry = notRunning0, "notRunning0", int, "%d" entry = disabledWhileEngineStopped0, "disabledWhileEngineStopped0", int, "%d" @@ -6861,14 +6861,14 @@ dialog = ac_controlDialog, "ac_control" graphLine = acButtonState indicatorPanel = nitrous_control_stateIndicatorPanel, 2 - indicator = {isArmed}, "isArmed No", "isArmed Yes" - indicator = {isNitrousSpeedConditionSatisfied}, "isNitrousSpeedConditionSatisfied No", "isNitrousSpeedConditionSatisfied Yes" - indicator = {isTpsConditionSatisfied}, "isTpsConditionSatisfied No", "isTpsConditionSatisfied Yes" - indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" - indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" - indicator = {isAfrConditionSatisfied}, "isAfrConditionSatisfied No", "isAfrConditionSatisfied Yes" - indicator = {isNitrousRpmConditionSatisfied}, "isNitrousRpmConditionSatisfied No", "isNitrousRpmConditionSatisfied Yes" - indicator = {isNitrousConditionSatisfied}, "isNitrousConditionSatisfied No", "isNitrousConditionSatisfied Yes" + indicator = {isNitrousArmed}, "isNitrousArmed No", "isNitrousArmed Yes" + indicator = {isNitrousSpeedCondition}, "isNitrousSpeedCondition No", "isNitrousSpeedCondition Yes" + indicator = {isNitrousTpsCondition}, "isNitrousTpsCondition No", "isNitrousTpsCondition Yes" + indicator = {isNitrousCltCondition}, "isNitrousCltCondition No", "isNitrousCltCondition Yes" + indicator = {isNitrousMapCondition}, "isNitrousMapCondition No", "isNitrousMapCondition Yes" + indicator = {isNitrousAfrCondition}, "isNitrousAfrCondition No", "isNitrousAfrCondition Yes" + indicator = {isNitrousRpmCondition}, "isNitrousRpmCondition No", "isNitrousRpmCondition Yes" + indicator = {isNitrousCondition}, "isNitrousCondition No", "isNitrousCondition Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9851,7 +9851,7 @@ dialog = tcuControls, "Transmission Settings" panel = NitrousControlArmingMethodDialog, {nitrousControlEnabled == 1} panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))} - dialog = NitrousControlDialog + dialog = NitrousControlDialog, "", border panel = NitrousControlSettingsDialog, West panel = nitrous_control_stateDialog, East diff --git a/firmware/tunerstudio/generated/rusefi_hellen-112-17.ini b/firmware/tunerstudio/generated/rusefi_hellen-112-17.ini index 735ecdd982..de5815d280 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-112-17.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-112-17.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.12.06.hellen-112-17.2915273448" + signature = "rusEFI master.2024.12.06.hellen-112-17.2058859122" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.06.hellen-112-17.2915273448" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.06.hellen-112-17.2058859122" ; 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 @@ -3285,14 +3285,14 @@ acCompressorState = bits, U32, 1172, [7:7] acPressureTooLow = bits, U32, 1172, [8:8] acPressureTooHigh = bits, U32, 1172, [9:9] ; total TS size = 1176 -isArmed = bits, U32, 1176, [0:0] -isNitrousSpeedConditionSatisfied = bits, U32, 1176, [1:1] -isTpsConditionSatisfied = bits, U32, 1176, [2:2] -isCltConditionSatisfied = bits, U32, 1176, [3:3] -isMapConditionSatisfied = bits, U32, 1176, [4:4] -isAfrConditionSatisfied = bits, U32, 1176, [5:5] -isNitrousRpmConditionSatisfied = bits, U32, 1176, [6:6] -isNitrousConditionSatisfied = bits, U32, 1176, [7:7] +isNitrousArmed = bits, U32, 1176, [0:0] +isNitrousSpeedCondition = bits, U32, 1176, [1:1] +isNitrousTpsCondition = bits, U32, 1176, [2:2] +isNitrousCltCondition = bits, U32, 1176, [3:3] +isNitrousMapCondition = bits, U32, 1176, [4:4] +isNitrousAfrCondition = bits, U32, 1176, [5:5] +isNitrousRpmCondition = bits, U32, 1176, [6:6] +isNitrousCondition = bits, U32, 1176, [7:7] ; total TS size = 1180 cranking0 = bits, U32, 1180, [0:0] notRunning0 = bits, U32, 1180, [1:1] @@ -5862,14 +5862,14 @@ entry = isDisabledByLua, "AC disabled by Lua", int, "%d" entry = acCompressorState, "AC compressor on", int, "%d" entry = acPressureTooLow, "AC pressure too low", int, "%d" entry = acPressureTooHigh, "AC pressure too high", int, "%d" -entry = isArmed, "isArmed", int, "%d" -entry = isNitrousSpeedConditionSatisfied, "isNitrousSpeedConditionSatisfied", int, "%d" -entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" -entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" -entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" -entry = isAfrConditionSatisfied, "isAfrConditionSatisfied", int, "%d" -entry = isNitrousRpmConditionSatisfied, "isNitrousRpmConditionSatisfied", int, "%d" -entry = isNitrousConditionSatisfied, "isNitrousConditionSatisfied", int, "%d" +entry = isNitrousArmed, "isNitrousArmed", int, "%d" +entry = isNitrousSpeedCondition, "isNitrousSpeedCondition", int, "%d" +entry = isNitrousTpsCondition, "isNitrousTpsCondition", int, "%d" +entry = isNitrousCltCondition, "isNitrousCltCondition", int, "%d" +entry = isNitrousMapCondition, "isNitrousMapCondition", int, "%d" +entry = isNitrousAfrCondition, "isNitrousAfrCondition", int, "%d" +entry = isNitrousRpmCondition, "isNitrousRpmCondition", int, "%d" +entry = isNitrousCondition, "isNitrousCondition", int, "%d" entry = cranking0, "cranking0", int, "%d" entry = notRunning0, "notRunning0", int, "%d" entry = disabledWhileEngineStopped0, "disabledWhileEngineStopped0", int, "%d" @@ -6860,14 +6860,14 @@ dialog = ac_controlDialog, "ac_control" graphLine = acButtonState indicatorPanel = nitrous_control_stateIndicatorPanel, 2 - indicator = {isArmed}, "isArmed No", "isArmed Yes" - indicator = {isNitrousSpeedConditionSatisfied}, "isNitrousSpeedConditionSatisfied No", "isNitrousSpeedConditionSatisfied Yes" - indicator = {isTpsConditionSatisfied}, "isTpsConditionSatisfied No", "isTpsConditionSatisfied Yes" - indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" - indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" - indicator = {isAfrConditionSatisfied}, "isAfrConditionSatisfied No", "isAfrConditionSatisfied Yes" - indicator = {isNitrousRpmConditionSatisfied}, "isNitrousRpmConditionSatisfied No", "isNitrousRpmConditionSatisfied Yes" - indicator = {isNitrousConditionSatisfied}, "isNitrousConditionSatisfied No", "isNitrousConditionSatisfied Yes" + indicator = {isNitrousArmed}, "isNitrousArmed No", "isNitrousArmed Yes" + indicator = {isNitrousSpeedCondition}, "isNitrousSpeedCondition No", "isNitrousSpeedCondition Yes" + indicator = {isNitrousTpsCondition}, "isNitrousTpsCondition No", "isNitrousTpsCondition Yes" + indicator = {isNitrousCltCondition}, "isNitrousCltCondition No", "isNitrousCltCondition Yes" + indicator = {isNitrousMapCondition}, "isNitrousMapCondition No", "isNitrousMapCondition Yes" + indicator = {isNitrousAfrCondition}, "isNitrousAfrCondition No", "isNitrousAfrCondition Yes" + indicator = {isNitrousRpmCondition}, "isNitrousRpmCondition No", "isNitrousRpmCondition Yes" + indicator = {isNitrousCondition}, "isNitrousCondition No", "isNitrousCondition Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9794,7 +9794,7 @@ dialog = tcuControls, "Transmission Settings" panel = NitrousControlArmingMethodDialog, {nitrousControlEnabled == 1} panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))} - dialog = NitrousControlDialog + dialog = NitrousControlDialog, "", border panel = NitrousControlSettingsDialog, West panel = nitrous_control_stateDialog, East diff --git a/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini b/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini index 49a4ea55d1..0e0b4ebb59 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.12.06.hellen-gm-e67.3904009684" + signature = "rusEFI master.2024.12.06.hellen-gm-e67.1069960526" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.06.hellen-gm-e67.3904009684" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.06.hellen-gm-e67.1069960526" ; 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 @@ -3285,14 +3285,14 @@ acCompressorState = bits, U32, 1172, [7:7] acPressureTooLow = bits, U32, 1172, [8:8] acPressureTooHigh = bits, U32, 1172, [9:9] ; total TS size = 1176 -isArmed = bits, U32, 1176, [0:0] -isNitrousSpeedConditionSatisfied = bits, U32, 1176, [1:1] -isTpsConditionSatisfied = bits, U32, 1176, [2:2] -isCltConditionSatisfied = bits, U32, 1176, [3:3] -isMapConditionSatisfied = bits, U32, 1176, [4:4] -isAfrConditionSatisfied = bits, U32, 1176, [5:5] -isNitrousRpmConditionSatisfied = bits, U32, 1176, [6:6] -isNitrousConditionSatisfied = bits, U32, 1176, [7:7] +isNitrousArmed = bits, U32, 1176, [0:0] +isNitrousSpeedCondition = bits, U32, 1176, [1:1] +isNitrousTpsCondition = bits, U32, 1176, [2:2] +isNitrousCltCondition = bits, U32, 1176, [3:3] +isNitrousMapCondition = bits, U32, 1176, [4:4] +isNitrousAfrCondition = bits, U32, 1176, [5:5] +isNitrousRpmCondition = bits, U32, 1176, [6:6] +isNitrousCondition = bits, U32, 1176, [7:7] ; total TS size = 1180 cranking0 = bits, U32, 1180, [0:0] notRunning0 = bits, U32, 1180, [1:1] @@ -5862,14 +5862,14 @@ entry = isDisabledByLua, "AC disabled by Lua", int, "%d" entry = acCompressorState, "AC compressor on", int, "%d" entry = acPressureTooLow, "AC pressure too low", int, "%d" entry = acPressureTooHigh, "AC pressure too high", int, "%d" -entry = isArmed, "isArmed", int, "%d" -entry = isNitrousSpeedConditionSatisfied, "isNitrousSpeedConditionSatisfied", int, "%d" -entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" -entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" -entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" -entry = isAfrConditionSatisfied, "isAfrConditionSatisfied", int, "%d" -entry = isNitrousRpmConditionSatisfied, "isNitrousRpmConditionSatisfied", int, "%d" -entry = isNitrousConditionSatisfied, "isNitrousConditionSatisfied", int, "%d" +entry = isNitrousArmed, "isNitrousArmed", int, "%d" +entry = isNitrousSpeedCondition, "isNitrousSpeedCondition", int, "%d" +entry = isNitrousTpsCondition, "isNitrousTpsCondition", int, "%d" +entry = isNitrousCltCondition, "isNitrousCltCondition", int, "%d" +entry = isNitrousMapCondition, "isNitrousMapCondition", int, "%d" +entry = isNitrousAfrCondition, "isNitrousAfrCondition", int, "%d" +entry = isNitrousRpmCondition, "isNitrousRpmCondition", int, "%d" +entry = isNitrousCondition, "isNitrousCondition", int, "%d" entry = cranking0, "cranking0", int, "%d" entry = notRunning0, "notRunning0", int, "%d" entry = disabledWhileEngineStopped0, "disabledWhileEngineStopped0", int, "%d" @@ -6862,14 +6862,14 @@ dialog = ac_controlDialog, "ac_control" graphLine = acButtonState indicatorPanel = nitrous_control_stateIndicatorPanel, 2 - indicator = {isArmed}, "isArmed No", "isArmed Yes" - indicator = {isNitrousSpeedConditionSatisfied}, "isNitrousSpeedConditionSatisfied No", "isNitrousSpeedConditionSatisfied Yes" - indicator = {isTpsConditionSatisfied}, "isTpsConditionSatisfied No", "isTpsConditionSatisfied Yes" - indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" - indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" - indicator = {isAfrConditionSatisfied}, "isAfrConditionSatisfied No", "isAfrConditionSatisfied Yes" - indicator = {isNitrousRpmConditionSatisfied}, "isNitrousRpmConditionSatisfied No", "isNitrousRpmConditionSatisfied Yes" - indicator = {isNitrousConditionSatisfied}, "isNitrousConditionSatisfied No", "isNitrousConditionSatisfied Yes" + indicator = {isNitrousArmed}, "isNitrousArmed No", "isNitrousArmed Yes" + indicator = {isNitrousSpeedCondition}, "isNitrousSpeedCondition No", "isNitrousSpeedCondition Yes" + indicator = {isNitrousTpsCondition}, "isNitrousTpsCondition No", "isNitrousTpsCondition Yes" + indicator = {isNitrousCltCondition}, "isNitrousCltCondition No", "isNitrousCltCondition Yes" + indicator = {isNitrousMapCondition}, "isNitrousMapCondition No", "isNitrousMapCondition Yes" + indicator = {isNitrousAfrCondition}, "isNitrousAfrCondition No", "isNitrousAfrCondition Yes" + indicator = {isNitrousRpmCondition}, "isNitrousRpmCondition No", "isNitrousRpmCondition Yes" + indicator = {isNitrousCondition}, "isNitrousCondition No", "isNitrousCondition Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9825,7 +9825,7 @@ dialog = tcuControls, "Transmission Settings" panel = NitrousControlArmingMethodDialog, {nitrousControlEnabled == 1} panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))} - dialog = NitrousControlDialog + dialog = NitrousControlDialog, "", border panel = NitrousControlSettingsDialog, West panel = nitrous_control_stateDialog, East diff --git a/firmware/tunerstudio/generated/rusefi_hellen-honda-k.ini b/firmware/tunerstudio/generated/rusefi_hellen-honda-k.ini index 6e214e6408..b0d7a282b4 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-honda-k.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-honda-k.ini @@ -4,12 +4,12 @@ enable2ndByteCanID = false [SettingGroups] [MegaTune] - signature = "rusEFI master.2024.12.06.hellen-honda-k.1894932506" + signature = "rusEFI master.2024.12.06.hellen-honda-k.2810599552" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.06.hellen-honda-k.1894932506" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.06.hellen-honda-k.2810599552" ; signature is expected to be 7 or more characters. useLegacyFTempUnits = false ignoreMissingBitOptions = true @@ -3218,14 +3218,14 @@ acCompressorState = bits, U32, 1172, [7:7] acPressureTooLow = bits, U32, 1172, [8:8] acPressureTooHigh = bits, U32, 1172, [9:9] ; total TS size = 1176 -isArmed = bits, U32, 1176, [0:0] -isNitrousSpeedConditionSatisfied = bits, U32, 1176, [1:1] -isTpsConditionSatisfied = bits, U32, 1176, [2:2] -isCltConditionSatisfied = bits, U32, 1176, [3:3] -isMapConditionSatisfied = bits, U32, 1176, [4:4] -isAfrConditionSatisfied = bits, U32, 1176, [5:5] -isNitrousRpmConditionSatisfied = bits, U32, 1176, [6:6] -isNitrousConditionSatisfied = bits, U32, 1176, [7:7] +isNitrousArmed = bits, U32, 1176, [0:0] +isNitrousSpeedCondition = bits, U32, 1176, [1:1] +isNitrousTpsCondition = bits, U32, 1176, [2:2] +isNitrousCltCondition = bits, U32, 1176, [3:3] +isNitrousMapCondition = bits, U32, 1176, [4:4] +isNitrousAfrCondition = bits, U32, 1176, [5:5] +isNitrousRpmCondition = bits, U32, 1176, [6:6] +isNitrousCondition = bits, U32, 1176, [7:7] ; total TS size = 1180 cranking0 = bits, U32, 1180, [0:0] notRunning0 = bits, U32, 1180, [1:1] @@ -5716,14 +5716,14 @@ entry = isDisabledByLua, "AC disabled by Lua", int, "%d" entry = acCompressorState, "AC compressor on", int, "%d" entry = acPressureTooLow, "AC pressure too low", int, "%d" entry = acPressureTooHigh, "AC pressure too high", int, "%d" -entry = isArmed, "isArmed", int, "%d" -entry = isNitrousSpeedConditionSatisfied, "isNitrousSpeedConditionSatisfied", int, "%d" -entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" -entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" -entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" -entry = isAfrConditionSatisfied, "isAfrConditionSatisfied", int, "%d" -entry = isNitrousRpmConditionSatisfied, "isNitrousRpmConditionSatisfied", int, "%d" -entry = isNitrousConditionSatisfied, "isNitrousConditionSatisfied", int, "%d" +entry = isNitrousArmed, "isNitrousArmed", int, "%d" +entry = isNitrousSpeedCondition, "isNitrousSpeedCondition", int, "%d" +entry = isNitrousTpsCondition, "isNitrousTpsCondition", int, "%d" +entry = isNitrousCltCondition, "isNitrousCltCondition", int, "%d" +entry = isNitrousMapCondition, "isNitrousMapCondition", int, "%d" +entry = isNitrousAfrCondition, "isNitrousAfrCondition", int, "%d" +entry = isNitrousRpmCondition, "isNitrousRpmCondition", int, "%d" +entry = isNitrousCondition, "isNitrousCondition", int, "%d" entry = cranking0, "cranking0", int, "%d" entry = notRunning0, "notRunning0", int, "%d" entry = disabledWhileEngineStopped0, "disabledWhileEngineStopped0", int, "%d" @@ -6681,14 +6681,14 @@ dialog = ac_controlDialog, "ac_control" graphLine = acButtonState indicatorPanel = nitrous_control_stateIndicatorPanel, 2 - indicator = {isArmed}, "isArmed No", "isArmed Yes" - indicator = {isNitrousSpeedConditionSatisfied}, "isNitrousSpeedConditionSatisfied No", "isNitrousSpeedConditionSatisfied Yes" - indicator = {isTpsConditionSatisfied}, "isTpsConditionSatisfied No", "isTpsConditionSatisfied Yes" - indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" - indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" - indicator = {isAfrConditionSatisfied}, "isAfrConditionSatisfied No", "isAfrConditionSatisfied Yes" - indicator = {isNitrousRpmConditionSatisfied}, "isNitrousRpmConditionSatisfied No", "isNitrousRpmConditionSatisfied Yes" - indicator = {isNitrousConditionSatisfied}, "isNitrousConditionSatisfied No", "isNitrousConditionSatisfied Yes" + indicator = {isNitrousArmed}, "isNitrousArmed No", "isNitrousArmed Yes" + indicator = {isNitrousSpeedCondition}, "isNitrousSpeedCondition No", "isNitrousSpeedCondition Yes" + indicator = {isNitrousTpsCondition}, "isNitrousTpsCondition No", "isNitrousTpsCondition Yes" + indicator = {isNitrousCltCondition}, "isNitrousCltCondition No", "isNitrousCltCondition Yes" + indicator = {isNitrousMapCondition}, "isNitrousMapCondition No", "isNitrousMapCondition Yes" + indicator = {isNitrousAfrCondition}, "isNitrousAfrCondition No", "isNitrousAfrCondition Yes" + indicator = {isNitrousRpmCondition}, "isNitrousRpmCondition No", "isNitrousRpmCondition Yes" + indicator = {isNitrousCondition}, "isNitrousCondition No", "isNitrousCondition Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9495,7 +9495,7 @@ dialog = tcuControls, "Transmission Settings" panel = NitrousControlArmingMethodDialog, {nitrousControlEnabled == 1} panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))} - dialog = NitrousControlDialog + dialog = NitrousControlDialog, "", border panel = NitrousControlSettingsDialog, West panel = nitrous_control_stateDialog, East diff --git a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini index 36f43e6749..e5e82624d0 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.12.06.hellen-nb1.2808989555" + signature = "rusEFI master.2024.12.06.hellen-nb1.1880752105" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.06.hellen-nb1.2808989555" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.06.hellen-nb1.1880752105" ; 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 @@ -3285,14 +3285,14 @@ acCompressorState = bits, U32, 1172, [7:7] acPressureTooLow = bits, U32, 1172, [8:8] acPressureTooHigh = bits, U32, 1172, [9:9] ; total TS size = 1176 -isArmed = bits, U32, 1176, [0:0] -isNitrousSpeedConditionSatisfied = bits, U32, 1176, [1:1] -isTpsConditionSatisfied = bits, U32, 1176, [2:2] -isCltConditionSatisfied = bits, U32, 1176, [3:3] -isMapConditionSatisfied = bits, U32, 1176, [4:4] -isAfrConditionSatisfied = bits, U32, 1176, [5:5] -isNitrousRpmConditionSatisfied = bits, U32, 1176, [6:6] -isNitrousConditionSatisfied = bits, U32, 1176, [7:7] +isNitrousArmed = bits, U32, 1176, [0:0] +isNitrousSpeedCondition = bits, U32, 1176, [1:1] +isNitrousTpsCondition = bits, U32, 1176, [2:2] +isNitrousCltCondition = bits, U32, 1176, [3:3] +isNitrousMapCondition = bits, U32, 1176, [4:4] +isNitrousAfrCondition = bits, U32, 1176, [5:5] +isNitrousRpmCondition = bits, U32, 1176, [6:6] +isNitrousCondition = bits, U32, 1176, [7:7] ; total TS size = 1180 cranking0 = bits, U32, 1180, [0:0] notRunning0 = bits, U32, 1180, [1:1] @@ -5862,14 +5862,14 @@ entry = isDisabledByLua, "AC disabled by Lua", int, "%d" entry = acCompressorState, "AC compressor on", int, "%d" entry = acPressureTooLow, "AC pressure too low", int, "%d" entry = acPressureTooHigh, "AC pressure too high", int, "%d" -entry = isArmed, "isArmed", int, "%d" -entry = isNitrousSpeedConditionSatisfied, "isNitrousSpeedConditionSatisfied", int, "%d" -entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" -entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" -entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" -entry = isAfrConditionSatisfied, "isAfrConditionSatisfied", int, "%d" -entry = isNitrousRpmConditionSatisfied, "isNitrousRpmConditionSatisfied", int, "%d" -entry = isNitrousConditionSatisfied, "isNitrousConditionSatisfied", int, "%d" +entry = isNitrousArmed, "isNitrousArmed", int, "%d" +entry = isNitrousSpeedCondition, "isNitrousSpeedCondition", int, "%d" +entry = isNitrousTpsCondition, "isNitrousTpsCondition", int, "%d" +entry = isNitrousCltCondition, "isNitrousCltCondition", int, "%d" +entry = isNitrousMapCondition, "isNitrousMapCondition", int, "%d" +entry = isNitrousAfrCondition, "isNitrousAfrCondition", int, "%d" +entry = isNitrousRpmCondition, "isNitrousRpmCondition", int, "%d" +entry = isNitrousCondition, "isNitrousCondition", int, "%d" entry = cranking0, "cranking0", int, "%d" entry = notRunning0, "notRunning0", int, "%d" entry = disabledWhileEngineStopped0, "disabledWhileEngineStopped0", int, "%d" @@ -6862,14 +6862,14 @@ dialog = ac_controlDialog, "ac_control" graphLine = acButtonState indicatorPanel = nitrous_control_stateIndicatorPanel, 2 - indicator = {isArmed}, "isArmed No", "isArmed Yes" - indicator = {isNitrousSpeedConditionSatisfied}, "isNitrousSpeedConditionSatisfied No", "isNitrousSpeedConditionSatisfied Yes" - indicator = {isTpsConditionSatisfied}, "isTpsConditionSatisfied No", "isTpsConditionSatisfied Yes" - indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" - indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" - indicator = {isAfrConditionSatisfied}, "isAfrConditionSatisfied No", "isAfrConditionSatisfied Yes" - indicator = {isNitrousRpmConditionSatisfied}, "isNitrousRpmConditionSatisfied No", "isNitrousRpmConditionSatisfied Yes" - indicator = {isNitrousConditionSatisfied}, "isNitrousConditionSatisfied No", "isNitrousConditionSatisfied Yes" + indicator = {isNitrousArmed}, "isNitrousArmed No", "isNitrousArmed Yes" + indicator = {isNitrousSpeedCondition}, "isNitrousSpeedCondition No", "isNitrousSpeedCondition Yes" + indicator = {isNitrousTpsCondition}, "isNitrousTpsCondition No", "isNitrousTpsCondition Yes" + indicator = {isNitrousCltCondition}, "isNitrousCltCondition No", "isNitrousCltCondition Yes" + indicator = {isNitrousMapCondition}, "isNitrousMapCondition No", "isNitrousMapCondition Yes" + indicator = {isNitrousAfrCondition}, "isNitrousAfrCondition No", "isNitrousAfrCondition Yes" + indicator = {isNitrousRpmCondition}, "isNitrousRpmCondition No", "isNitrousRpmCondition Yes" + indicator = {isNitrousCondition}, "isNitrousCondition No", "isNitrousCondition Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9825,7 +9825,7 @@ dialog = tcuControls, "Transmission Settings" panel = NitrousControlArmingMethodDialog, {nitrousControlEnabled == 1} panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))} - dialog = NitrousControlDialog + dialog = NitrousControlDialog, "", border panel = NitrousControlSettingsDialog, West panel = nitrous_control_stateDialog, East diff --git a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini index 79eff37bab..79bd3bd03a 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.12.06.hellen121nissan.4098916588" + signature = "rusEFI master.2024.12.06.hellen121nissan.589609078" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.06.hellen121nissan.4098916588" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.06.hellen121nissan.589609078" ; 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 @@ -3285,14 +3285,14 @@ acCompressorState = bits, U32, 1172, [7:7] acPressureTooLow = bits, U32, 1172, [8:8] acPressureTooHigh = bits, U32, 1172, [9:9] ; total TS size = 1176 -isArmed = bits, U32, 1176, [0:0] -isNitrousSpeedConditionSatisfied = bits, U32, 1176, [1:1] -isTpsConditionSatisfied = bits, U32, 1176, [2:2] -isCltConditionSatisfied = bits, U32, 1176, [3:3] -isMapConditionSatisfied = bits, U32, 1176, [4:4] -isAfrConditionSatisfied = bits, U32, 1176, [5:5] -isNitrousRpmConditionSatisfied = bits, U32, 1176, [6:6] -isNitrousConditionSatisfied = bits, U32, 1176, [7:7] +isNitrousArmed = bits, U32, 1176, [0:0] +isNitrousSpeedCondition = bits, U32, 1176, [1:1] +isNitrousTpsCondition = bits, U32, 1176, [2:2] +isNitrousCltCondition = bits, U32, 1176, [3:3] +isNitrousMapCondition = bits, U32, 1176, [4:4] +isNitrousAfrCondition = bits, U32, 1176, [5:5] +isNitrousRpmCondition = bits, U32, 1176, [6:6] +isNitrousCondition = bits, U32, 1176, [7:7] ; total TS size = 1180 cranking0 = bits, U32, 1180, [0:0] notRunning0 = bits, U32, 1180, [1:1] @@ -5862,14 +5862,14 @@ entry = isDisabledByLua, "AC disabled by Lua", int, "%d" entry = acCompressorState, "AC compressor on", int, "%d" entry = acPressureTooLow, "AC pressure too low", int, "%d" entry = acPressureTooHigh, "AC pressure too high", int, "%d" -entry = isArmed, "isArmed", int, "%d" -entry = isNitrousSpeedConditionSatisfied, "isNitrousSpeedConditionSatisfied", int, "%d" -entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" -entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" -entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" -entry = isAfrConditionSatisfied, "isAfrConditionSatisfied", int, "%d" -entry = isNitrousRpmConditionSatisfied, "isNitrousRpmConditionSatisfied", int, "%d" -entry = isNitrousConditionSatisfied, "isNitrousConditionSatisfied", int, "%d" +entry = isNitrousArmed, "isNitrousArmed", int, "%d" +entry = isNitrousSpeedCondition, "isNitrousSpeedCondition", int, "%d" +entry = isNitrousTpsCondition, "isNitrousTpsCondition", int, "%d" +entry = isNitrousCltCondition, "isNitrousCltCondition", int, "%d" +entry = isNitrousMapCondition, "isNitrousMapCondition", int, "%d" +entry = isNitrousAfrCondition, "isNitrousAfrCondition", int, "%d" +entry = isNitrousRpmCondition, "isNitrousRpmCondition", int, "%d" +entry = isNitrousCondition, "isNitrousCondition", int, "%d" entry = cranking0, "cranking0", int, "%d" entry = notRunning0, "notRunning0", int, "%d" entry = disabledWhileEngineStopped0, "disabledWhileEngineStopped0", int, "%d" @@ -6859,14 +6859,14 @@ dialog = ac_controlDialog, "ac_control" graphLine = acButtonState indicatorPanel = nitrous_control_stateIndicatorPanel, 2 - indicator = {isArmed}, "isArmed No", "isArmed Yes" - indicator = {isNitrousSpeedConditionSatisfied}, "isNitrousSpeedConditionSatisfied No", "isNitrousSpeedConditionSatisfied Yes" - indicator = {isTpsConditionSatisfied}, "isTpsConditionSatisfied No", "isTpsConditionSatisfied Yes" - indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" - indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" - indicator = {isAfrConditionSatisfied}, "isAfrConditionSatisfied No", "isAfrConditionSatisfied Yes" - indicator = {isNitrousRpmConditionSatisfied}, "isNitrousRpmConditionSatisfied No", "isNitrousRpmConditionSatisfied Yes" - indicator = {isNitrousConditionSatisfied}, "isNitrousConditionSatisfied No", "isNitrousConditionSatisfied Yes" + indicator = {isNitrousArmed}, "isNitrousArmed No", "isNitrousArmed Yes" + indicator = {isNitrousSpeedCondition}, "isNitrousSpeedCondition No", "isNitrousSpeedCondition Yes" + indicator = {isNitrousTpsCondition}, "isNitrousTpsCondition No", "isNitrousTpsCondition Yes" + indicator = {isNitrousCltCondition}, "isNitrousCltCondition No", "isNitrousCltCondition Yes" + indicator = {isNitrousMapCondition}, "isNitrousMapCondition No", "isNitrousMapCondition Yes" + indicator = {isNitrousAfrCondition}, "isNitrousAfrCondition No", "isNitrousAfrCondition Yes" + indicator = {isNitrousRpmCondition}, "isNitrousRpmCondition No", "isNitrousRpmCondition Yes" + indicator = {isNitrousCondition}, "isNitrousCondition No", "isNitrousCondition Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9780,7 +9780,7 @@ dialog = tcuControls, "Transmission Settings" panel = NitrousControlArmingMethodDialog, {nitrousControlEnabled == 1} panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))} - dialog = NitrousControlDialog + dialog = NitrousControlDialog, "", border panel = NitrousControlSettingsDialog, West panel = nitrous_control_stateDialog, East diff --git a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini index ce035e692e..b361c3e708 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.12.06.hellen121vag.2889454251" + signature = "rusEFI master.2024.12.06.hellen121vag.2068687409" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.06.hellen121vag.2889454251" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.06.hellen121vag.2068687409" ; 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 @@ -3285,14 +3285,14 @@ acCompressorState = bits, U32, 1172, [7:7] acPressureTooLow = bits, U32, 1172, [8:8] acPressureTooHigh = bits, U32, 1172, [9:9] ; total TS size = 1176 -isArmed = bits, U32, 1176, [0:0] -isNitrousSpeedConditionSatisfied = bits, U32, 1176, [1:1] -isTpsConditionSatisfied = bits, U32, 1176, [2:2] -isCltConditionSatisfied = bits, U32, 1176, [3:3] -isMapConditionSatisfied = bits, U32, 1176, [4:4] -isAfrConditionSatisfied = bits, U32, 1176, [5:5] -isNitrousRpmConditionSatisfied = bits, U32, 1176, [6:6] -isNitrousConditionSatisfied = bits, U32, 1176, [7:7] +isNitrousArmed = bits, U32, 1176, [0:0] +isNitrousSpeedCondition = bits, U32, 1176, [1:1] +isNitrousTpsCondition = bits, U32, 1176, [2:2] +isNitrousCltCondition = bits, U32, 1176, [3:3] +isNitrousMapCondition = bits, U32, 1176, [4:4] +isNitrousAfrCondition = bits, U32, 1176, [5:5] +isNitrousRpmCondition = bits, U32, 1176, [6:6] +isNitrousCondition = bits, U32, 1176, [7:7] ; total TS size = 1180 cranking0 = bits, U32, 1180, [0:0] notRunning0 = bits, U32, 1180, [1:1] @@ -5862,14 +5862,14 @@ entry = isDisabledByLua, "AC disabled by Lua", int, "%d" entry = acCompressorState, "AC compressor on", int, "%d" entry = acPressureTooLow, "AC pressure too low", int, "%d" entry = acPressureTooHigh, "AC pressure too high", int, "%d" -entry = isArmed, "isArmed", int, "%d" -entry = isNitrousSpeedConditionSatisfied, "isNitrousSpeedConditionSatisfied", int, "%d" -entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" -entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" -entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" -entry = isAfrConditionSatisfied, "isAfrConditionSatisfied", int, "%d" -entry = isNitrousRpmConditionSatisfied, "isNitrousRpmConditionSatisfied", int, "%d" -entry = isNitrousConditionSatisfied, "isNitrousConditionSatisfied", int, "%d" +entry = isNitrousArmed, "isNitrousArmed", int, "%d" +entry = isNitrousSpeedCondition, "isNitrousSpeedCondition", int, "%d" +entry = isNitrousTpsCondition, "isNitrousTpsCondition", int, "%d" +entry = isNitrousCltCondition, "isNitrousCltCondition", int, "%d" +entry = isNitrousMapCondition, "isNitrousMapCondition", int, "%d" +entry = isNitrousAfrCondition, "isNitrousAfrCondition", int, "%d" +entry = isNitrousRpmCondition, "isNitrousRpmCondition", int, "%d" +entry = isNitrousCondition, "isNitrousCondition", int, "%d" entry = cranking0, "cranking0", int, "%d" entry = notRunning0, "notRunning0", int, "%d" entry = disabledWhileEngineStopped0, "disabledWhileEngineStopped0", int, "%d" @@ -6861,14 +6861,14 @@ dialog = ac_controlDialog, "ac_control" graphLine = acButtonState indicatorPanel = nitrous_control_stateIndicatorPanel, 2 - indicator = {isArmed}, "isArmed No", "isArmed Yes" - indicator = {isNitrousSpeedConditionSatisfied}, "isNitrousSpeedConditionSatisfied No", "isNitrousSpeedConditionSatisfied Yes" - indicator = {isTpsConditionSatisfied}, "isTpsConditionSatisfied No", "isTpsConditionSatisfied Yes" - indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" - indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" - indicator = {isAfrConditionSatisfied}, "isAfrConditionSatisfied No", "isAfrConditionSatisfied Yes" - indicator = {isNitrousRpmConditionSatisfied}, "isNitrousRpmConditionSatisfied No", "isNitrousRpmConditionSatisfied Yes" - indicator = {isNitrousConditionSatisfied}, "isNitrousConditionSatisfied No", "isNitrousConditionSatisfied Yes" + indicator = {isNitrousArmed}, "isNitrousArmed No", "isNitrousArmed Yes" + indicator = {isNitrousSpeedCondition}, "isNitrousSpeedCondition No", "isNitrousSpeedCondition Yes" + indicator = {isNitrousTpsCondition}, "isNitrousTpsCondition No", "isNitrousTpsCondition Yes" + indicator = {isNitrousCltCondition}, "isNitrousCltCondition No", "isNitrousCltCondition Yes" + indicator = {isNitrousMapCondition}, "isNitrousMapCondition No", "isNitrousMapCondition Yes" + indicator = {isNitrousAfrCondition}, "isNitrousAfrCondition No", "isNitrousAfrCondition Yes" + indicator = {isNitrousRpmCondition}, "isNitrousRpmCondition No", "isNitrousRpmCondition Yes" + indicator = {isNitrousCondition}, "isNitrousCondition No", "isNitrousCondition Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9815,7 +9815,7 @@ dialog = tcuControls, "Transmission Settings" panel = NitrousControlArmingMethodDialog, {nitrousControlEnabled == 1} panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))} - dialog = NitrousControlDialog + dialog = NitrousControlDialog, "", border panel = NitrousControlSettingsDialog, West panel = nitrous_control_stateDialog, East diff --git a/firmware/tunerstudio/generated/rusefi_hellen128.ini b/firmware/tunerstudio/generated/rusefi_hellen128.ini index 123a1b089d..47729f0fb5 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen128.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen128.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.12.06.hellen128.3378067611" + signature = "rusEFI master.2024.12.06.hellen128.506265601" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.06.hellen128.3378067611" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.06.hellen128.506265601" ; 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 @@ -3285,14 +3285,14 @@ acCompressorState = bits, U32, 1172, [7:7] acPressureTooLow = bits, U32, 1172, [8:8] acPressureTooHigh = bits, U32, 1172, [9:9] ; total TS size = 1176 -isArmed = bits, U32, 1176, [0:0] -isNitrousSpeedConditionSatisfied = bits, U32, 1176, [1:1] -isTpsConditionSatisfied = bits, U32, 1176, [2:2] -isCltConditionSatisfied = bits, U32, 1176, [3:3] -isMapConditionSatisfied = bits, U32, 1176, [4:4] -isAfrConditionSatisfied = bits, U32, 1176, [5:5] -isNitrousRpmConditionSatisfied = bits, U32, 1176, [6:6] -isNitrousConditionSatisfied = bits, U32, 1176, [7:7] +isNitrousArmed = bits, U32, 1176, [0:0] +isNitrousSpeedCondition = bits, U32, 1176, [1:1] +isNitrousTpsCondition = bits, U32, 1176, [2:2] +isNitrousCltCondition = bits, U32, 1176, [3:3] +isNitrousMapCondition = bits, U32, 1176, [4:4] +isNitrousAfrCondition = bits, U32, 1176, [5:5] +isNitrousRpmCondition = bits, U32, 1176, [6:6] +isNitrousCondition = bits, U32, 1176, [7:7] ; total TS size = 1180 cranking0 = bits, U32, 1180, [0:0] notRunning0 = bits, U32, 1180, [1:1] @@ -5862,14 +5862,14 @@ entry = isDisabledByLua, "AC disabled by Lua", int, "%d" entry = acCompressorState, "AC compressor on", int, "%d" entry = acPressureTooLow, "AC pressure too low", int, "%d" entry = acPressureTooHigh, "AC pressure too high", int, "%d" -entry = isArmed, "isArmed", int, "%d" -entry = isNitrousSpeedConditionSatisfied, "isNitrousSpeedConditionSatisfied", int, "%d" -entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" -entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" -entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" -entry = isAfrConditionSatisfied, "isAfrConditionSatisfied", int, "%d" -entry = isNitrousRpmConditionSatisfied, "isNitrousRpmConditionSatisfied", int, "%d" -entry = isNitrousConditionSatisfied, "isNitrousConditionSatisfied", int, "%d" +entry = isNitrousArmed, "isNitrousArmed", int, "%d" +entry = isNitrousSpeedCondition, "isNitrousSpeedCondition", int, "%d" +entry = isNitrousTpsCondition, "isNitrousTpsCondition", int, "%d" +entry = isNitrousCltCondition, "isNitrousCltCondition", int, "%d" +entry = isNitrousMapCondition, "isNitrousMapCondition", int, "%d" +entry = isNitrousAfrCondition, "isNitrousAfrCondition", int, "%d" +entry = isNitrousRpmCondition, "isNitrousRpmCondition", int, "%d" +entry = isNitrousCondition, "isNitrousCondition", int, "%d" entry = cranking0, "cranking0", int, "%d" entry = notRunning0, "notRunning0", int, "%d" entry = disabledWhileEngineStopped0, "disabledWhileEngineStopped0", int, "%d" @@ -6862,14 +6862,14 @@ dialog = ac_controlDialog, "ac_control" graphLine = acButtonState indicatorPanel = nitrous_control_stateIndicatorPanel, 2 - indicator = {isArmed}, "isArmed No", "isArmed Yes" - indicator = {isNitrousSpeedConditionSatisfied}, "isNitrousSpeedConditionSatisfied No", "isNitrousSpeedConditionSatisfied Yes" - indicator = {isTpsConditionSatisfied}, "isTpsConditionSatisfied No", "isTpsConditionSatisfied Yes" - indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" - indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" - indicator = {isAfrConditionSatisfied}, "isAfrConditionSatisfied No", "isAfrConditionSatisfied Yes" - indicator = {isNitrousRpmConditionSatisfied}, "isNitrousRpmConditionSatisfied No", "isNitrousRpmConditionSatisfied Yes" - indicator = {isNitrousConditionSatisfied}, "isNitrousConditionSatisfied No", "isNitrousConditionSatisfied Yes" + indicator = {isNitrousArmed}, "isNitrousArmed No", "isNitrousArmed Yes" + indicator = {isNitrousSpeedCondition}, "isNitrousSpeedCondition No", "isNitrousSpeedCondition Yes" + indicator = {isNitrousTpsCondition}, "isNitrousTpsCondition No", "isNitrousTpsCondition Yes" + indicator = {isNitrousCltCondition}, "isNitrousCltCondition No", "isNitrousCltCondition Yes" + indicator = {isNitrousMapCondition}, "isNitrousMapCondition No", "isNitrousMapCondition Yes" + indicator = {isNitrousAfrCondition}, "isNitrousAfrCondition No", "isNitrousAfrCondition Yes" + indicator = {isNitrousRpmCondition}, "isNitrousRpmCondition No", "isNitrousRpmCondition Yes" + indicator = {isNitrousCondition}, "isNitrousCondition No", "isNitrousCondition Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9823,7 +9823,7 @@ dialog = tcuControls, "Transmission Settings" panel = NitrousControlArmingMethodDialog, {nitrousControlEnabled == 1} panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))} - dialog = NitrousControlDialog + dialog = NitrousControlDialog, "", border panel = NitrousControlSettingsDialog, West panel = nitrous_control_stateDialog, East diff --git a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini index ba647eb1e7..93a3d61b36 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.12.06.hellen154hyundai.3329676132" + signature = "rusEFI master.2024.12.06.hellen154hyundai.285404158" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.06.hellen154hyundai.3329676132" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.06.hellen154hyundai.285404158" ; 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 @@ -3285,14 +3285,14 @@ acCompressorState = bits, U32, 1172, [7:7] acPressureTooLow = bits, U32, 1172, [8:8] acPressureTooHigh = bits, U32, 1172, [9:9] ; total TS size = 1176 -isArmed = bits, U32, 1176, [0:0] -isNitrousSpeedConditionSatisfied = bits, U32, 1176, [1:1] -isTpsConditionSatisfied = bits, U32, 1176, [2:2] -isCltConditionSatisfied = bits, U32, 1176, [3:3] -isMapConditionSatisfied = bits, U32, 1176, [4:4] -isAfrConditionSatisfied = bits, U32, 1176, [5:5] -isNitrousRpmConditionSatisfied = bits, U32, 1176, [6:6] -isNitrousConditionSatisfied = bits, U32, 1176, [7:7] +isNitrousArmed = bits, U32, 1176, [0:0] +isNitrousSpeedCondition = bits, U32, 1176, [1:1] +isNitrousTpsCondition = bits, U32, 1176, [2:2] +isNitrousCltCondition = bits, U32, 1176, [3:3] +isNitrousMapCondition = bits, U32, 1176, [4:4] +isNitrousAfrCondition = bits, U32, 1176, [5:5] +isNitrousRpmCondition = bits, U32, 1176, [6:6] +isNitrousCondition = bits, U32, 1176, [7:7] ; total TS size = 1180 cranking0 = bits, U32, 1180, [0:0] notRunning0 = bits, U32, 1180, [1:1] @@ -5858,14 +5858,14 @@ entry = isDisabledByLua, "AC disabled by Lua", int, "%d" entry = acCompressorState, "AC compressor on", int, "%d" entry = acPressureTooLow, "AC pressure too low", int, "%d" entry = acPressureTooHigh, "AC pressure too high", int, "%d" -entry = isArmed, "isArmed", int, "%d" -entry = isNitrousSpeedConditionSatisfied, "isNitrousSpeedConditionSatisfied", int, "%d" -entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" -entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" -entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" -entry = isAfrConditionSatisfied, "isAfrConditionSatisfied", int, "%d" -entry = isNitrousRpmConditionSatisfied, "isNitrousRpmConditionSatisfied", int, "%d" -entry = isNitrousConditionSatisfied, "isNitrousConditionSatisfied", int, "%d" +entry = isNitrousArmed, "isNitrousArmed", int, "%d" +entry = isNitrousSpeedCondition, "isNitrousSpeedCondition", int, "%d" +entry = isNitrousTpsCondition, "isNitrousTpsCondition", int, "%d" +entry = isNitrousCltCondition, "isNitrousCltCondition", int, "%d" +entry = isNitrousMapCondition, "isNitrousMapCondition", int, "%d" +entry = isNitrousAfrCondition, "isNitrousAfrCondition", int, "%d" +entry = isNitrousRpmCondition, "isNitrousRpmCondition", int, "%d" +entry = isNitrousCondition, "isNitrousCondition", int, "%d" entry = cranking0, "cranking0", int, "%d" entry = notRunning0, "notRunning0", int, "%d" entry = disabledWhileEngineStopped0, "disabledWhileEngineStopped0", int, "%d" @@ -6844,14 +6844,14 @@ dialog = ac_controlDialog, "ac_control" graphLine = acButtonState indicatorPanel = nitrous_control_stateIndicatorPanel, 2 - indicator = {isArmed}, "isArmed No", "isArmed Yes" - indicator = {isNitrousSpeedConditionSatisfied}, "isNitrousSpeedConditionSatisfied No", "isNitrousSpeedConditionSatisfied Yes" - indicator = {isTpsConditionSatisfied}, "isTpsConditionSatisfied No", "isTpsConditionSatisfied Yes" - indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" - indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" - indicator = {isAfrConditionSatisfied}, "isAfrConditionSatisfied No", "isAfrConditionSatisfied Yes" - indicator = {isNitrousRpmConditionSatisfied}, "isNitrousRpmConditionSatisfied No", "isNitrousRpmConditionSatisfied Yes" - indicator = {isNitrousConditionSatisfied}, "isNitrousConditionSatisfied No", "isNitrousConditionSatisfied Yes" + indicator = {isNitrousArmed}, "isNitrousArmed No", "isNitrousArmed Yes" + indicator = {isNitrousSpeedCondition}, "isNitrousSpeedCondition No", "isNitrousSpeedCondition Yes" + indicator = {isNitrousTpsCondition}, "isNitrousTpsCondition No", "isNitrousTpsCondition Yes" + indicator = {isNitrousCltCondition}, "isNitrousCltCondition No", "isNitrousCltCondition Yes" + indicator = {isNitrousMapCondition}, "isNitrousMapCondition No", "isNitrousMapCondition Yes" + indicator = {isNitrousAfrCondition}, "isNitrousAfrCondition No", "isNitrousAfrCondition Yes" + indicator = {isNitrousRpmCondition}, "isNitrousRpmCondition No", "isNitrousRpmCondition Yes" + indicator = {isNitrousCondition}, "isNitrousCondition No", "isNitrousCondition Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9733,7 +9733,7 @@ dialog = tcuControls, "Transmission Settings" panel = NitrousControlArmingMethodDialog, {nitrousControlEnabled == 1} panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))} - dialog = NitrousControlDialog + dialog = NitrousControlDialog, "", border panel = NitrousControlSettingsDialog, West panel = nitrous_control_stateDialog, East diff --git a/firmware/tunerstudio/generated/rusefi_hellen154hyundai_f7.ini b/firmware/tunerstudio/generated/rusefi_hellen154hyundai_f7.ini index 59f58b39a4..41d8d56f7c 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen154hyundai_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen154hyundai_f7.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.12.06.hellen154hyundai_f7.1378704613" + signature = "rusEFI master.2024.12.06.hellen154hyundai_f7.2237228159" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.06.hellen154hyundai_f7.1378704613" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.06.hellen154hyundai_f7.2237228159" ; 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 @@ -3285,14 +3285,14 @@ acCompressorState = bits, U32, 1172, [7:7] acPressureTooLow = bits, U32, 1172, [8:8] acPressureTooHigh = bits, U32, 1172, [9:9] ; total TS size = 1176 -isArmed = bits, U32, 1176, [0:0] -isNitrousSpeedConditionSatisfied = bits, U32, 1176, [1:1] -isTpsConditionSatisfied = bits, U32, 1176, [2:2] -isCltConditionSatisfied = bits, U32, 1176, [3:3] -isMapConditionSatisfied = bits, U32, 1176, [4:4] -isAfrConditionSatisfied = bits, U32, 1176, [5:5] -isNitrousRpmConditionSatisfied = bits, U32, 1176, [6:6] -isNitrousConditionSatisfied = bits, U32, 1176, [7:7] +isNitrousArmed = bits, U32, 1176, [0:0] +isNitrousSpeedCondition = bits, U32, 1176, [1:1] +isNitrousTpsCondition = bits, U32, 1176, [2:2] +isNitrousCltCondition = bits, U32, 1176, [3:3] +isNitrousMapCondition = bits, U32, 1176, [4:4] +isNitrousAfrCondition = bits, U32, 1176, [5:5] +isNitrousRpmCondition = bits, U32, 1176, [6:6] +isNitrousCondition = bits, U32, 1176, [7:7] ; total TS size = 1180 cranking0 = bits, U32, 1180, [0:0] notRunning0 = bits, U32, 1180, [1:1] @@ -5858,14 +5858,14 @@ entry = isDisabledByLua, "AC disabled by Lua", int, "%d" entry = acCompressorState, "AC compressor on", int, "%d" entry = acPressureTooLow, "AC pressure too low", int, "%d" entry = acPressureTooHigh, "AC pressure too high", int, "%d" -entry = isArmed, "isArmed", int, "%d" -entry = isNitrousSpeedConditionSatisfied, "isNitrousSpeedConditionSatisfied", int, "%d" -entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" -entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" -entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" -entry = isAfrConditionSatisfied, "isAfrConditionSatisfied", int, "%d" -entry = isNitrousRpmConditionSatisfied, "isNitrousRpmConditionSatisfied", int, "%d" -entry = isNitrousConditionSatisfied, "isNitrousConditionSatisfied", int, "%d" +entry = isNitrousArmed, "isNitrousArmed", int, "%d" +entry = isNitrousSpeedCondition, "isNitrousSpeedCondition", int, "%d" +entry = isNitrousTpsCondition, "isNitrousTpsCondition", int, "%d" +entry = isNitrousCltCondition, "isNitrousCltCondition", int, "%d" +entry = isNitrousMapCondition, "isNitrousMapCondition", int, "%d" +entry = isNitrousAfrCondition, "isNitrousAfrCondition", int, "%d" +entry = isNitrousRpmCondition, "isNitrousRpmCondition", int, "%d" +entry = isNitrousCondition, "isNitrousCondition", int, "%d" entry = cranking0, "cranking0", int, "%d" entry = notRunning0, "notRunning0", int, "%d" entry = disabledWhileEngineStopped0, "disabledWhileEngineStopped0", int, "%d" @@ -6844,14 +6844,14 @@ dialog = ac_controlDialog, "ac_control" graphLine = acButtonState indicatorPanel = nitrous_control_stateIndicatorPanel, 2 - indicator = {isArmed}, "isArmed No", "isArmed Yes" - indicator = {isNitrousSpeedConditionSatisfied}, "isNitrousSpeedConditionSatisfied No", "isNitrousSpeedConditionSatisfied Yes" - indicator = {isTpsConditionSatisfied}, "isTpsConditionSatisfied No", "isTpsConditionSatisfied Yes" - indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" - indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" - indicator = {isAfrConditionSatisfied}, "isAfrConditionSatisfied No", "isAfrConditionSatisfied Yes" - indicator = {isNitrousRpmConditionSatisfied}, "isNitrousRpmConditionSatisfied No", "isNitrousRpmConditionSatisfied Yes" - indicator = {isNitrousConditionSatisfied}, "isNitrousConditionSatisfied No", "isNitrousConditionSatisfied Yes" + indicator = {isNitrousArmed}, "isNitrousArmed No", "isNitrousArmed Yes" + indicator = {isNitrousSpeedCondition}, "isNitrousSpeedCondition No", "isNitrousSpeedCondition Yes" + indicator = {isNitrousTpsCondition}, "isNitrousTpsCondition No", "isNitrousTpsCondition Yes" + indicator = {isNitrousCltCondition}, "isNitrousCltCondition No", "isNitrousCltCondition Yes" + indicator = {isNitrousMapCondition}, "isNitrousMapCondition No", "isNitrousMapCondition Yes" + indicator = {isNitrousAfrCondition}, "isNitrousAfrCondition No", "isNitrousAfrCondition Yes" + indicator = {isNitrousRpmCondition}, "isNitrousRpmCondition No", "isNitrousRpmCondition Yes" + indicator = {isNitrousCondition}, "isNitrousCondition No", "isNitrousCondition Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9733,7 +9733,7 @@ dialog = tcuControls, "Transmission Settings" panel = NitrousControlArmingMethodDialog, {nitrousControlEnabled == 1} panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))} - dialog = NitrousControlDialog + dialog = NitrousControlDialog, "", border panel = NitrousControlSettingsDialog, West panel = nitrous_control_stateDialog, East diff --git a/firmware/tunerstudio/generated/rusefi_hellen72.ini b/firmware/tunerstudio/generated/rusefi_hellen72.ini index 55ef058234..0b3fde11f1 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen72.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen72.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.12.06.hellen72.3655598010" + signature = "rusEFI master.2024.12.06.hellen72.244827936" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.06.hellen72.3655598010" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.06.hellen72.244827936" ; 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 @@ -3285,14 +3285,14 @@ acCompressorState = bits, U32, 1172, [7:7] acPressureTooLow = bits, U32, 1172, [8:8] acPressureTooHigh = bits, U32, 1172, [9:9] ; total TS size = 1176 -isArmed = bits, U32, 1176, [0:0] -isNitrousSpeedConditionSatisfied = bits, U32, 1176, [1:1] -isTpsConditionSatisfied = bits, U32, 1176, [2:2] -isCltConditionSatisfied = bits, U32, 1176, [3:3] -isMapConditionSatisfied = bits, U32, 1176, [4:4] -isAfrConditionSatisfied = bits, U32, 1176, [5:5] -isNitrousRpmConditionSatisfied = bits, U32, 1176, [6:6] -isNitrousConditionSatisfied = bits, U32, 1176, [7:7] +isNitrousArmed = bits, U32, 1176, [0:0] +isNitrousSpeedCondition = bits, U32, 1176, [1:1] +isNitrousTpsCondition = bits, U32, 1176, [2:2] +isNitrousCltCondition = bits, U32, 1176, [3:3] +isNitrousMapCondition = bits, U32, 1176, [4:4] +isNitrousAfrCondition = bits, U32, 1176, [5:5] +isNitrousRpmCondition = bits, U32, 1176, [6:6] +isNitrousCondition = bits, U32, 1176, [7:7] ; total TS size = 1180 cranking0 = bits, U32, 1180, [0:0] notRunning0 = bits, U32, 1180, [1:1] @@ -5862,14 +5862,14 @@ entry = isDisabledByLua, "AC disabled by Lua", int, "%d" entry = acCompressorState, "AC compressor on", int, "%d" entry = acPressureTooLow, "AC pressure too low", int, "%d" entry = acPressureTooHigh, "AC pressure too high", int, "%d" -entry = isArmed, "isArmed", int, "%d" -entry = isNitrousSpeedConditionSatisfied, "isNitrousSpeedConditionSatisfied", int, "%d" -entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" -entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" -entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" -entry = isAfrConditionSatisfied, "isAfrConditionSatisfied", int, "%d" -entry = isNitrousRpmConditionSatisfied, "isNitrousRpmConditionSatisfied", int, "%d" -entry = isNitrousConditionSatisfied, "isNitrousConditionSatisfied", int, "%d" +entry = isNitrousArmed, "isNitrousArmed", int, "%d" +entry = isNitrousSpeedCondition, "isNitrousSpeedCondition", int, "%d" +entry = isNitrousTpsCondition, "isNitrousTpsCondition", int, "%d" +entry = isNitrousCltCondition, "isNitrousCltCondition", int, "%d" +entry = isNitrousMapCondition, "isNitrousMapCondition", int, "%d" +entry = isNitrousAfrCondition, "isNitrousAfrCondition", int, "%d" +entry = isNitrousRpmCondition, "isNitrousRpmCondition", int, "%d" +entry = isNitrousCondition, "isNitrousCondition", int, "%d" entry = cranking0, "cranking0", int, "%d" entry = notRunning0, "notRunning0", int, "%d" entry = disabledWhileEngineStopped0, "disabledWhileEngineStopped0", int, "%d" @@ -6862,14 +6862,14 @@ dialog = ac_controlDialog, "ac_control" graphLine = acButtonState indicatorPanel = nitrous_control_stateIndicatorPanel, 2 - indicator = {isArmed}, "isArmed No", "isArmed Yes" - indicator = {isNitrousSpeedConditionSatisfied}, "isNitrousSpeedConditionSatisfied No", "isNitrousSpeedConditionSatisfied Yes" - indicator = {isTpsConditionSatisfied}, "isTpsConditionSatisfied No", "isTpsConditionSatisfied Yes" - indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" - indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" - indicator = {isAfrConditionSatisfied}, "isAfrConditionSatisfied No", "isAfrConditionSatisfied Yes" - indicator = {isNitrousRpmConditionSatisfied}, "isNitrousRpmConditionSatisfied No", "isNitrousRpmConditionSatisfied Yes" - indicator = {isNitrousConditionSatisfied}, "isNitrousConditionSatisfied No", "isNitrousConditionSatisfied Yes" + indicator = {isNitrousArmed}, "isNitrousArmed No", "isNitrousArmed Yes" + indicator = {isNitrousSpeedCondition}, "isNitrousSpeedCondition No", "isNitrousSpeedCondition Yes" + indicator = {isNitrousTpsCondition}, "isNitrousTpsCondition No", "isNitrousTpsCondition Yes" + indicator = {isNitrousCltCondition}, "isNitrousCltCondition No", "isNitrousCltCondition Yes" + indicator = {isNitrousMapCondition}, "isNitrousMapCondition No", "isNitrousMapCondition Yes" + indicator = {isNitrousAfrCondition}, "isNitrousAfrCondition No", "isNitrousAfrCondition Yes" + indicator = {isNitrousRpmCondition}, "isNitrousRpmCondition No", "isNitrousRpmCondition Yes" + indicator = {isNitrousCondition}, "isNitrousCondition No", "isNitrousCondition Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9825,7 +9825,7 @@ dialog = tcuControls, "Transmission Settings" panel = NitrousControlArmingMethodDialog, {nitrousControlEnabled == 1} panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))} - dialog = NitrousControlDialog + dialog = NitrousControlDialog, "", border panel = NitrousControlSettingsDialog, West panel = nitrous_control_stateDialog, East diff --git a/firmware/tunerstudio/generated/rusefi_hellen81.ini b/firmware/tunerstudio/generated/rusefi_hellen81.ini index 53872560d3..26d67b4675 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen81.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen81.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.12.06.hellen81.1096516234" + signature = "rusEFI master.2024.12.06.hellen81.2519710224" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.06.hellen81.1096516234" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.06.hellen81.2519710224" ; 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 @@ -3285,14 +3285,14 @@ acCompressorState = bits, U32, 1172, [7:7] acPressureTooLow = bits, U32, 1172, [8:8] acPressureTooHigh = bits, U32, 1172, [9:9] ; total TS size = 1176 -isArmed = bits, U32, 1176, [0:0] -isNitrousSpeedConditionSatisfied = bits, U32, 1176, [1:1] -isTpsConditionSatisfied = bits, U32, 1176, [2:2] -isCltConditionSatisfied = bits, U32, 1176, [3:3] -isMapConditionSatisfied = bits, U32, 1176, [4:4] -isAfrConditionSatisfied = bits, U32, 1176, [5:5] -isNitrousRpmConditionSatisfied = bits, U32, 1176, [6:6] -isNitrousConditionSatisfied = bits, U32, 1176, [7:7] +isNitrousArmed = bits, U32, 1176, [0:0] +isNitrousSpeedCondition = bits, U32, 1176, [1:1] +isNitrousTpsCondition = bits, U32, 1176, [2:2] +isNitrousCltCondition = bits, U32, 1176, [3:3] +isNitrousMapCondition = bits, U32, 1176, [4:4] +isNitrousAfrCondition = bits, U32, 1176, [5:5] +isNitrousRpmCondition = bits, U32, 1176, [6:6] +isNitrousCondition = bits, U32, 1176, [7:7] ; total TS size = 1180 cranking0 = bits, U32, 1180, [0:0] notRunning0 = bits, U32, 1180, [1:1] @@ -5862,14 +5862,14 @@ entry = isDisabledByLua, "AC disabled by Lua", int, "%d" entry = acCompressorState, "AC compressor on", int, "%d" entry = acPressureTooLow, "AC pressure too low", int, "%d" entry = acPressureTooHigh, "AC pressure too high", int, "%d" -entry = isArmed, "isArmed", int, "%d" -entry = isNitrousSpeedConditionSatisfied, "isNitrousSpeedConditionSatisfied", int, "%d" -entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" -entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" -entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" -entry = isAfrConditionSatisfied, "isAfrConditionSatisfied", int, "%d" -entry = isNitrousRpmConditionSatisfied, "isNitrousRpmConditionSatisfied", int, "%d" -entry = isNitrousConditionSatisfied, "isNitrousConditionSatisfied", int, "%d" +entry = isNitrousArmed, "isNitrousArmed", int, "%d" +entry = isNitrousSpeedCondition, "isNitrousSpeedCondition", int, "%d" +entry = isNitrousTpsCondition, "isNitrousTpsCondition", int, "%d" +entry = isNitrousCltCondition, "isNitrousCltCondition", int, "%d" +entry = isNitrousMapCondition, "isNitrousMapCondition", int, "%d" +entry = isNitrousAfrCondition, "isNitrousAfrCondition", int, "%d" +entry = isNitrousRpmCondition, "isNitrousRpmCondition", int, "%d" +entry = isNitrousCondition, "isNitrousCondition", int, "%d" entry = cranking0, "cranking0", int, "%d" entry = notRunning0, "notRunning0", int, "%d" entry = disabledWhileEngineStopped0, "disabledWhileEngineStopped0", int, "%d" @@ -6860,14 +6860,14 @@ dialog = ac_controlDialog, "ac_control" graphLine = acButtonState indicatorPanel = nitrous_control_stateIndicatorPanel, 2 - indicator = {isArmed}, "isArmed No", "isArmed Yes" - indicator = {isNitrousSpeedConditionSatisfied}, "isNitrousSpeedConditionSatisfied No", "isNitrousSpeedConditionSatisfied Yes" - indicator = {isTpsConditionSatisfied}, "isTpsConditionSatisfied No", "isTpsConditionSatisfied Yes" - indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" - indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" - indicator = {isAfrConditionSatisfied}, "isAfrConditionSatisfied No", "isAfrConditionSatisfied Yes" - indicator = {isNitrousRpmConditionSatisfied}, "isNitrousRpmConditionSatisfied No", "isNitrousRpmConditionSatisfied Yes" - indicator = {isNitrousConditionSatisfied}, "isNitrousConditionSatisfied No", "isNitrousConditionSatisfied Yes" + indicator = {isNitrousArmed}, "isNitrousArmed No", "isNitrousArmed Yes" + indicator = {isNitrousSpeedCondition}, "isNitrousSpeedCondition No", "isNitrousSpeedCondition Yes" + indicator = {isNitrousTpsCondition}, "isNitrousTpsCondition No", "isNitrousTpsCondition Yes" + indicator = {isNitrousCltCondition}, "isNitrousCltCondition No", "isNitrousCltCondition Yes" + indicator = {isNitrousMapCondition}, "isNitrousMapCondition No", "isNitrousMapCondition Yes" + indicator = {isNitrousAfrCondition}, "isNitrousAfrCondition No", "isNitrousAfrCondition Yes" + indicator = {isNitrousRpmCondition}, "isNitrousRpmCondition No", "isNitrousRpmCondition Yes" + indicator = {isNitrousCondition}, "isNitrousCondition No", "isNitrousCondition Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9822,7 +9822,7 @@ dialog = tcuControls, "Transmission Settings" panel = NitrousControlArmingMethodDialog, {nitrousControlEnabled == 1} panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))} - dialog = NitrousControlDialog + dialog = NitrousControlDialog, "", border panel = NitrousControlSettingsDialog, West panel = nitrous_control_stateDialog, East diff --git a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini index 5f1bf3f1e3..e7c4d3fd7f 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.12.06.hellen88bmw.1450743753" + signature = "rusEFI master.2024.12.06.hellen88bmw.2165092179" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.06.hellen88bmw.1450743753" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.06.hellen88bmw.2165092179" ; 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 @@ -3285,14 +3285,14 @@ acCompressorState = bits, U32, 1172, [7:7] acPressureTooLow = bits, U32, 1172, [8:8] acPressureTooHigh = bits, U32, 1172, [9:9] ; total TS size = 1176 -isArmed = bits, U32, 1176, [0:0] -isNitrousSpeedConditionSatisfied = bits, U32, 1176, [1:1] -isTpsConditionSatisfied = bits, U32, 1176, [2:2] -isCltConditionSatisfied = bits, U32, 1176, [3:3] -isMapConditionSatisfied = bits, U32, 1176, [4:4] -isAfrConditionSatisfied = bits, U32, 1176, [5:5] -isNitrousRpmConditionSatisfied = bits, U32, 1176, [6:6] -isNitrousConditionSatisfied = bits, U32, 1176, [7:7] +isNitrousArmed = bits, U32, 1176, [0:0] +isNitrousSpeedCondition = bits, U32, 1176, [1:1] +isNitrousTpsCondition = bits, U32, 1176, [2:2] +isNitrousCltCondition = bits, U32, 1176, [3:3] +isNitrousMapCondition = bits, U32, 1176, [4:4] +isNitrousAfrCondition = bits, U32, 1176, [5:5] +isNitrousRpmCondition = bits, U32, 1176, [6:6] +isNitrousCondition = bits, U32, 1176, [7:7] ; total TS size = 1180 cranking0 = bits, U32, 1180, [0:0] notRunning0 = bits, U32, 1180, [1:1] @@ -5862,14 +5862,14 @@ entry = isDisabledByLua, "AC disabled by Lua", int, "%d" entry = acCompressorState, "AC compressor on", int, "%d" entry = acPressureTooLow, "AC pressure too low", int, "%d" entry = acPressureTooHigh, "AC pressure too high", int, "%d" -entry = isArmed, "isArmed", int, "%d" -entry = isNitrousSpeedConditionSatisfied, "isNitrousSpeedConditionSatisfied", int, "%d" -entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" -entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" -entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" -entry = isAfrConditionSatisfied, "isAfrConditionSatisfied", int, "%d" -entry = isNitrousRpmConditionSatisfied, "isNitrousRpmConditionSatisfied", int, "%d" -entry = isNitrousConditionSatisfied, "isNitrousConditionSatisfied", int, "%d" +entry = isNitrousArmed, "isNitrousArmed", int, "%d" +entry = isNitrousSpeedCondition, "isNitrousSpeedCondition", int, "%d" +entry = isNitrousTpsCondition, "isNitrousTpsCondition", int, "%d" +entry = isNitrousCltCondition, "isNitrousCltCondition", int, "%d" +entry = isNitrousMapCondition, "isNitrousMapCondition", int, "%d" +entry = isNitrousAfrCondition, "isNitrousAfrCondition", int, "%d" +entry = isNitrousRpmCondition, "isNitrousRpmCondition", int, "%d" +entry = isNitrousCondition, "isNitrousCondition", int, "%d" entry = cranking0, "cranking0", int, "%d" entry = notRunning0, "notRunning0", int, "%d" entry = disabledWhileEngineStopped0, "disabledWhileEngineStopped0", int, "%d" @@ -6859,14 +6859,14 @@ dialog = ac_controlDialog, "ac_control" graphLine = acButtonState indicatorPanel = nitrous_control_stateIndicatorPanel, 2 - indicator = {isArmed}, "isArmed No", "isArmed Yes" - indicator = {isNitrousSpeedConditionSatisfied}, "isNitrousSpeedConditionSatisfied No", "isNitrousSpeedConditionSatisfied Yes" - indicator = {isTpsConditionSatisfied}, "isTpsConditionSatisfied No", "isTpsConditionSatisfied Yes" - indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" - indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" - indicator = {isAfrConditionSatisfied}, "isAfrConditionSatisfied No", "isAfrConditionSatisfied Yes" - indicator = {isNitrousRpmConditionSatisfied}, "isNitrousRpmConditionSatisfied No", "isNitrousRpmConditionSatisfied Yes" - indicator = {isNitrousConditionSatisfied}, "isNitrousConditionSatisfied No", "isNitrousConditionSatisfied Yes" + indicator = {isNitrousArmed}, "isNitrousArmed No", "isNitrousArmed Yes" + indicator = {isNitrousSpeedCondition}, "isNitrousSpeedCondition No", "isNitrousSpeedCondition Yes" + indicator = {isNitrousTpsCondition}, "isNitrousTpsCondition No", "isNitrousTpsCondition Yes" + indicator = {isNitrousCltCondition}, "isNitrousCltCondition No", "isNitrousCltCondition Yes" + indicator = {isNitrousMapCondition}, "isNitrousMapCondition No", "isNitrousMapCondition Yes" + indicator = {isNitrousAfrCondition}, "isNitrousAfrCondition No", "isNitrousAfrCondition Yes" + indicator = {isNitrousRpmCondition}, "isNitrousRpmCondition No", "isNitrousRpmCondition Yes" + indicator = {isNitrousCondition}, "isNitrousCondition No", "isNitrousCondition Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9818,7 +9818,7 @@ dialog = tcuControls, "Transmission Settings" panel = NitrousControlArmingMethodDialog, {nitrousControlEnabled == 1} panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))} - dialog = NitrousControlDialog + dialog = NitrousControlDialog, "", border panel = NitrousControlSettingsDialog, West panel = nitrous_control_stateDialog, East diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini index 4609bb8150..6c998167c7 100644 --- a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini +++ b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.12.06.hellenNA6.2960060812" + signature = "rusEFI master.2024.12.06.hellenNA6.1729808662" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.06.hellenNA6.2960060812" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.06.hellenNA6.1729808662" ; 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 @@ -3285,14 +3285,14 @@ acCompressorState = bits, U32, 1172, [7:7] acPressureTooLow = bits, U32, 1172, [8:8] acPressureTooHigh = bits, U32, 1172, [9:9] ; total TS size = 1176 -isArmed = bits, U32, 1176, [0:0] -isNitrousSpeedConditionSatisfied = bits, U32, 1176, [1:1] -isTpsConditionSatisfied = bits, U32, 1176, [2:2] -isCltConditionSatisfied = bits, U32, 1176, [3:3] -isMapConditionSatisfied = bits, U32, 1176, [4:4] -isAfrConditionSatisfied = bits, U32, 1176, [5:5] -isNitrousRpmConditionSatisfied = bits, U32, 1176, [6:6] -isNitrousConditionSatisfied = bits, U32, 1176, [7:7] +isNitrousArmed = bits, U32, 1176, [0:0] +isNitrousSpeedCondition = bits, U32, 1176, [1:1] +isNitrousTpsCondition = bits, U32, 1176, [2:2] +isNitrousCltCondition = bits, U32, 1176, [3:3] +isNitrousMapCondition = bits, U32, 1176, [4:4] +isNitrousAfrCondition = bits, U32, 1176, [5:5] +isNitrousRpmCondition = bits, U32, 1176, [6:6] +isNitrousCondition = bits, U32, 1176, [7:7] ; total TS size = 1180 cranking0 = bits, U32, 1180, [0:0] notRunning0 = bits, U32, 1180, [1:1] @@ -5862,14 +5862,14 @@ entry = isDisabledByLua, "AC disabled by Lua", int, "%d" entry = acCompressorState, "AC compressor on", int, "%d" entry = acPressureTooLow, "AC pressure too low", int, "%d" entry = acPressureTooHigh, "AC pressure too high", int, "%d" -entry = isArmed, "isArmed", int, "%d" -entry = isNitrousSpeedConditionSatisfied, "isNitrousSpeedConditionSatisfied", int, "%d" -entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" -entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" -entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" -entry = isAfrConditionSatisfied, "isAfrConditionSatisfied", int, "%d" -entry = isNitrousRpmConditionSatisfied, "isNitrousRpmConditionSatisfied", int, "%d" -entry = isNitrousConditionSatisfied, "isNitrousConditionSatisfied", int, "%d" +entry = isNitrousArmed, "isNitrousArmed", int, "%d" +entry = isNitrousSpeedCondition, "isNitrousSpeedCondition", int, "%d" +entry = isNitrousTpsCondition, "isNitrousTpsCondition", int, "%d" +entry = isNitrousCltCondition, "isNitrousCltCondition", int, "%d" +entry = isNitrousMapCondition, "isNitrousMapCondition", int, "%d" +entry = isNitrousAfrCondition, "isNitrousAfrCondition", int, "%d" +entry = isNitrousRpmCondition, "isNitrousRpmCondition", int, "%d" +entry = isNitrousCondition, "isNitrousCondition", int, "%d" entry = cranking0, "cranking0", int, "%d" entry = notRunning0, "notRunning0", int, "%d" entry = disabledWhileEngineStopped0, "disabledWhileEngineStopped0", int, "%d" @@ -6862,14 +6862,14 @@ dialog = ac_controlDialog, "ac_control" graphLine = acButtonState indicatorPanel = nitrous_control_stateIndicatorPanel, 2 - indicator = {isArmed}, "isArmed No", "isArmed Yes" - indicator = {isNitrousSpeedConditionSatisfied}, "isNitrousSpeedConditionSatisfied No", "isNitrousSpeedConditionSatisfied Yes" - indicator = {isTpsConditionSatisfied}, "isTpsConditionSatisfied No", "isTpsConditionSatisfied Yes" - indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" - indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" - indicator = {isAfrConditionSatisfied}, "isAfrConditionSatisfied No", "isAfrConditionSatisfied Yes" - indicator = {isNitrousRpmConditionSatisfied}, "isNitrousRpmConditionSatisfied No", "isNitrousRpmConditionSatisfied Yes" - indicator = {isNitrousConditionSatisfied}, "isNitrousConditionSatisfied No", "isNitrousConditionSatisfied Yes" + indicator = {isNitrousArmed}, "isNitrousArmed No", "isNitrousArmed Yes" + indicator = {isNitrousSpeedCondition}, "isNitrousSpeedCondition No", "isNitrousSpeedCondition Yes" + indicator = {isNitrousTpsCondition}, "isNitrousTpsCondition No", "isNitrousTpsCondition Yes" + indicator = {isNitrousCltCondition}, "isNitrousCltCondition No", "isNitrousCltCondition Yes" + indicator = {isNitrousMapCondition}, "isNitrousMapCondition No", "isNitrousMapCondition Yes" + indicator = {isNitrousAfrCondition}, "isNitrousAfrCondition No", "isNitrousAfrCondition Yes" + indicator = {isNitrousRpmCondition}, "isNitrousRpmCondition No", "isNitrousRpmCondition Yes" + indicator = {isNitrousCondition}, "isNitrousCondition No", "isNitrousCondition Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9825,7 +9825,7 @@ dialog = tcuControls, "Transmission Settings" panel = NitrousControlArmingMethodDialog, {nitrousControlEnabled == 1} panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))} - dialog = NitrousControlDialog + dialog = NitrousControlDialog, "", border panel = NitrousControlSettingsDialog, West panel = nitrous_control_stateDialog, East diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini b/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini index a09f0660e8..446d1b6791 100644 --- a/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini +++ b/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.12.06.hellenNA8_96.1337242434" + signature = "rusEFI master.2024.12.06.hellenNA8_96.2562755544" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.06.hellenNA8_96.1337242434" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.06.hellenNA8_96.2562755544" ; 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 @@ -3285,14 +3285,14 @@ acCompressorState = bits, U32, 1172, [7:7] acPressureTooLow = bits, U32, 1172, [8:8] acPressureTooHigh = bits, U32, 1172, [9:9] ; total TS size = 1176 -isArmed = bits, U32, 1176, [0:0] -isNitrousSpeedConditionSatisfied = bits, U32, 1176, [1:1] -isTpsConditionSatisfied = bits, U32, 1176, [2:2] -isCltConditionSatisfied = bits, U32, 1176, [3:3] -isMapConditionSatisfied = bits, U32, 1176, [4:4] -isAfrConditionSatisfied = bits, U32, 1176, [5:5] -isNitrousRpmConditionSatisfied = bits, U32, 1176, [6:6] -isNitrousConditionSatisfied = bits, U32, 1176, [7:7] +isNitrousArmed = bits, U32, 1176, [0:0] +isNitrousSpeedCondition = bits, U32, 1176, [1:1] +isNitrousTpsCondition = bits, U32, 1176, [2:2] +isNitrousCltCondition = bits, U32, 1176, [3:3] +isNitrousMapCondition = bits, U32, 1176, [4:4] +isNitrousAfrCondition = bits, U32, 1176, [5:5] +isNitrousRpmCondition = bits, U32, 1176, [6:6] +isNitrousCondition = bits, U32, 1176, [7:7] ; total TS size = 1180 cranking0 = bits, U32, 1180, [0:0] notRunning0 = bits, U32, 1180, [1:1] @@ -5862,14 +5862,14 @@ entry = isDisabledByLua, "AC disabled by Lua", int, "%d" entry = acCompressorState, "AC compressor on", int, "%d" entry = acPressureTooLow, "AC pressure too low", int, "%d" entry = acPressureTooHigh, "AC pressure too high", int, "%d" -entry = isArmed, "isArmed", int, "%d" -entry = isNitrousSpeedConditionSatisfied, "isNitrousSpeedConditionSatisfied", int, "%d" -entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" -entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" -entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" -entry = isAfrConditionSatisfied, "isAfrConditionSatisfied", int, "%d" -entry = isNitrousRpmConditionSatisfied, "isNitrousRpmConditionSatisfied", int, "%d" -entry = isNitrousConditionSatisfied, "isNitrousConditionSatisfied", int, "%d" +entry = isNitrousArmed, "isNitrousArmed", int, "%d" +entry = isNitrousSpeedCondition, "isNitrousSpeedCondition", int, "%d" +entry = isNitrousTpsCondition, "isNitrousTpsCondition", int, "%d" +entry = isNitrousCltCondition, "isNitrousCltCondition", int, "%d" +entry = isNitrousMapCondition, "isNitrousMapCondition", int, "%d" +entry = isNitrousAfrCondition, "isNitrousAfrCondition", int, "%d" +entry = isNitrousRpmCondition, "isNitrousRpmCondition", int, "%d" +entry = isNitrousCondition, "isNitrousCondition", int, "%d" entry = cranking0, "cranking0", int, "%d" entry = notRunning0, "notRunning0", int, "%d" entry = disabledWhileEngineStopped0, "disabledWhileEngineStopped0", int, "%d" @@ -6862,14 +6862,14 @@ dialog = ac_controlDialog, "ac_control" graphLine = acButtonState indicatorPanel = nitrous_control_stateIndicatorPanel, 2 - indicator = {isArmed}, "isArmed No", "isArmed Yes" - indicator = {isNitrousSpeedConditionSatisfied}, "isNitrousSpeedConditionSatisfied No", "isNitrousSpeedConditionSatisfied Yes" - indicator = {isTpsConditionSatisfied}, "isTpsConditionSatisfied No", "isTpsConditionSatisfied Yes" - indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" - indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" - indicator = {isAfrConditionSatisfied}, "isAfrConditionSatisfied No", "isAfrConditionSatisfied Yes" - indicator = {isNitrousRpmConditionSatisfied}, "isNitrousRpmConditionSatisfied No", "isNitrousRpmConditionSatisfied Yes" - indicator = {isNitrousConditionSatisfied}, "isNitrousConditionSatisfied No", "isNitrousConditionSatisfied Yes" + indicator = {isNitrousArmed}, "isNitrousArmed No", "isNitrousArmed Yes" + indicator = {isNitrousSpeedCondition}, "isNitrousSpeedCondition No", "isNitrousSpeedCondition Yes" + indicator = {isNitrousTpsCondition}, "isNitrousTpsCondition No", "isNitrousTpsCondition Yes" + indicator = {isNitrousCltCondition}, "isNitrousCltCondition No", "isNitrousCltCondition Yes" + indicator = {isNitrousMapCondition}, "isNitrousMapCondition No", "isNitrousMapCondition Yes" + indicator = {isNitrousAfrCondition}, "isNitrousAfrCondition No", "isNitrousAfrCondition Yes" + indicator = {isNitrousRpmCondition}, "isNitrousRpmCondition No", "isNitrousRpmCondition Yes" + indicator = {isNitrousCondition}, "isNitrousCondition No", "isNitrousCondition Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9825,7 +9825,7 @@ dialog = tcuControls, "Transmission Settings" panel = NitrousControlArmingMethodDialog, {nitrousControlEnabled == 1} panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))} - dialog = NitrousControlDialog + dialog = NitrousControlDialog, "", border panel = NitrousControlSettingsDialog, West panel = nitrous_control_stateDialog, East diff --git a/firmware/tunerstudio/generated/rusefi_m74_9.ini b/firmware/tunerstudio/generated/rusefi_m74_9.ini index e59eee348e..c20098af30 100644 --- a/firmware/tunerstudio/generated/rusefi_m74_9.ini +++ b/firmware/tunerstudio/generated/rusefi_m74_9.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.12.06.m74_9.2423335603" + signature = "rusEFI master.2024.12.06.m74_9.1191514665" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.06.m74_9.2423335603" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.06.m74_9.1191514665" ; 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 @@ -3285,14 +3285,14 @@ acCompressorState = bits, U32, 1172, [7:7] acPressureTooLow = bits, U32, 1172, [8:8] acPressureTooHigh = bits, U32, 1172, [9:9] ; total TS size = 1176 -isArmed = bits, U32, 1176, [0:0] -isNitrousSpeedConditionSatisfied = bits, U32, 1176, [1:1] -isTpsConditionSatisfied = bits, U32, 1176, [2:2] -isCltConditionSatisfied = bits, U32, 1176, [3:3] -isMapConditionSatisfied = bits, U32, 1176, [4:4] -isAfrConditionSatisfied = bits, U32, 1176, [5:5] -isNitrousRpmConditionSatisfied = bits, U32, 1176, [6:6] -isNitrousConditionSatisfied = bits, U32, 1176, [7:7] +isNitrousArmed = bits, U32, 1176, [0:0] +isNitrousSpeedCondition = bits, U32, 1176, [1:1] +isNitrousTpsCondition = bits, U32, 1176, [2:2] +isNitrousCltCondition = bits, U32, 1176, [3:3] +isNitrousMapCondition = bits, U32, 1176, [4:4] +isNitrousAfrCondition = bits, U32, 1176, [5:5] +isNitrousRpmCondition = bits, U32, 1176, [6:6] +isNitrousCondition = bits, U32, 1176, [7:7] ; total TS size = 1180 cranking0 = bits, U32, 1180, [0:0] notRunning0 = bits, U32, 1180, [1:1] @@ -5862,14 +5862,14 @@ entry = isDisabledByLua, "AC disabled by Lua", int, "%d" entry = acCompressorState, "AC compressor on", int, "%d" entry = acPressureTooLow, "AC pressure too low", int, "%d" entry = acPressureTooHigh, "AC pressure too high", int, "%d" -entry = isArmed, "isArmed", int, "%d" -entry = isNitrousSpeedConditionSatisfied, "isNitrousSpeedConditionSatisfied", int, "%d" -entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" -entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" -entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" -entry = isAfrConditionSatisfied, "isAfrConditionSatisfied", int, "%d" -entry = isNitrousRpmConditionSatisfied, "isNitrousRpmConditionSatisfied", int, "%d" -entry = isNitrousConditionSatisfied, "isNitrousConditionSatisfied", int, "%d" +entry = isNitrousArmed, "isNitrousArmed", int, "%d" +entry = isNitrousSpeedCondition, "isNitrousSpeedCondition", int, "%d" +entry = isNitrousTpsCondition, "isNitrousTpsCondition", int, "%d" +entry = isNitrousCltCondition, "isNitrousCltCondition", int, "%d" +entry = isNitrousMapCondition, "isNitrousMapCondition", int, "%d" +entry = isNitrousAfrCondition, "isNitrousAfrCondition", int, "%d" +entry = isNitrousRpmCondition, "isNitrousRpmCondition", int, "%d" +entry = isNitrousCondition, "isNitrousCondition", int, "%d" entry = cranking0, "cranking0", int, "%d" entry = notRunning0, "notRunning0", int, "%d" entry = disabledWhileEngineStopped0, "disabledWhileEngineStopped0", int, "%d" @@ -6864,14 +6864,14 @@ dialog = ac_controlDialog, "ac_control" graphLine = acButtonState indicatorPanel = nitrous_control_stateIndicatorPanel, 2 - indicator = {isArmed}, "isArmed No", "isArmed Yes" - indicator = {isNitrousSpeedConditionSatisfied}, "isNitrousSpeedConditionSatisfied No", "isNitrousSpeedConditionSatisfied Yes" - indicator = {isTpsConditionSatisfied}, "isTpsConditionSatisfied No", "isTpsConditionSatisfied Yes" - indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" - indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" - indicator = {isAfrConditionSatisfied}, "isAfrConditionSatisfied No", "isAfrConditionSatisfied Yes" - indicator = {isNitrousRpmConditionSatisfied}, "isNitrousRpmConditionSatisfied No", "isNitrousRpmConditionSatisfied Yes" - indicator = {isNitrousConditionSatisfied}, "isNitrousConditionSatisfied No", "isNitrousConditionSatisfied Yes" + indicator = {isNitrousArmed}, "isNitrousArmed No", "isNitrousArmed Yes" + indicator = {isNitrousSpeedCondition}, "isNitrousSpeedCondition No", "isNitrousSpeedCondition Yes" + indicator = {isNitrousTpsCondition}, "isNitrousTpsCondition No", "isNitrousTpsCondition Yes" + indicator = {isNitrousCltCondition}, "isNitrousCltCondition No", "isNitrousCltCondition Yes" + indicator = {isNitrousMapCondition}, "isNitrousMapCondition No", "isNitrousMapCondition Yes" + indicator = {isNitrousAfrCondition}, "isNitrousAfrCondition No", "isNitrousAfrCondition Yes" + indicator = {isNitrousRpmCondition}, "isNitrousRpmCondition No", "isNitrousRpmCondition Yes" + indicator = {isNitrousCondition}, "isNitrousCondition No", "isNitrousCondition Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9829,7 +9829,7 @@ dialog = tcuControls, "Transmission Settings" panel = NitrousControlArmingMethodDialog, {nitrousControlEnabled == 1} panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))} - dialog = NitrousControlDialog + dialog = NitrousControlDialog, "", border panel = NitrousControlSettingsDialog, West panel = nitrous_control_stateDialog, East diff --git a/firmware/tunerstudio/generated/rusefi_mre-legacy_f4.ini b/firmware/tunerstudio/generated/rusefi_mre-legacy_f4.ini index ce95bea88a..ff501a880e 100644 --- a/firmware/tunerstudio/generated/rusefi_mre-legacy_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_mre-legacy_f4.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.12.06.mre-legacy_f4.1874187183" + signature = "rusEFI master.2024.12.06.mre-legacy_f4.3099716405" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.06.mre-legacy_f4.1874187183" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.06.mre-legacy_f4.3099716405" ; 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 @@ -3285,14 +3285,14 @@ acCompressorState = bits, U32, 1172, [7:7] acPressureTooLow = bits, U32, 1172, [8:8] acPressureTooHigh = bits, U32, 1172, [9:9] ; total TS size = 1176 -isArmed = bits, U32, 1176, [0:0] -isNitrousSpeedConditionSatisfied = bits, U32, 1176, [1:1] -isTpsConditionSatisfied = bits, U32, 1176, [2:2] -isCltConditionSatisfied = bits, U32, 1176, [3:3] -isMapConditionSatisfied = bits, U32, 1176, [4:4] -isAfrConditionSatisfied = bits, U32, 1176, [5:5] -isNitrousRpmConditionSatisfied = bits, U32, 1176, [6:6] -isNitrousConditionSatisfied = bits, U32, 1176, [7:7] +isNitrousArmed = bits, U32, 1176, [0:0] +isNitrousSpeedCondition = bits, U32, 1176, [1:1] +isNitrousTpsCondition = bits, U32, 1176, [2:2] +isNitrousCltCondition = bits, U32, 1176, [3:3] +isNitrousMapCondition = bits, U32, 1176, [4:4] +isNitrousAfrCondition = bits, U32, 1176, [5:5] +isNitrousRpmCondition = bits, U32, 1176, [6:6] +isNitrousCondition = bits, U32, 1176, [7:7] ; total TS size = 1180 cranking0 = bits, U32, 1180, [0:0] notRunning0 = bits, U32, 1180, [1:1] @@ -5860,14 +5860,14 @@ entry = isDisabledByLua, "AC disabled by Lua", int, "%d" entry = acCompressorState, "AC compressor on", int, "%d" entry = acPressureTooLow, "AC pressure too low", int, "%d" entry = acPressureTooHigh, "AC pressure too high", int, "%d" -entry = isArmed, "isArmed", int, "%d" -entry = isNitrousSpeedConditionSatisfied, "isNitrousSpeedConditionSatisfied", int, "%d" -entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" -entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" -entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" -entry = isAfrConditionSatisfied, "isAfrConditionSatisfied", int, "%d" -entry = isNitrousRpmConditionSatisfied, "isNitrousRpmConditionSatisfied", int, "%d" -entry = isNitrousConditionSatisfied, "isNitrousConditionSatisfied", int, "%d" +entry = isNitrousArmed, "isNitrousArmed", int, "%d" +entry = isNitrousSpeedCondition, "isNitrousSpeedCondition", int, "%d" +entry = isNitrousTpsCondition, "isNitrousTpsCondition", int, "%d" +entry = isNitrousCltCondition, "isNitrousCltCondition", int, "%d" +entry = isNitrousMapCondition, "isNitrousMapCondition", int, "%d" +entry = isNitrousAfrCondition, "isNitrousAfrCondition", int, "%d" +entry = isNitrousRpmCondition, "isNitrousRpmCondition", int, "%d" +entry = isNitrousCondition, "isNitrousCondition", int, "%d" entry = cranking0, "cranking0", int, "%d" entry = notRunning0, "notRunning0", int, "%d" entry = disabledWhileEngineStopped0, "disabledWhileEngineStopped0", int, "%d" @@ -6877,14 +6877,14 @@ dialog = ac_controlDialog, "ac_control" graphLine = acButtonState indicatorPanel = nitrous_control_stateIndicatorPanel, 2 - indicator = {isArmed}, "isArmed No", "isArmed Yes" - indicator = {isNitrousSpeedConditionSatisfied}, "isNitrousSpeedConditionSatisfied No", "isNitrousSpeedConditionSatisfied Yes" - indicator = {isTpsConditionSatisfied}, "isTpsConditionSatisfied No", "isTpsConditionSatisfied Yes" - indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" - indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" - indicator = {isAfrConditionSatisfied}, "isAfrConditionSatisfied No", "isAfrConditionSatisfied Yes" - indicator = {isNitrousRpmConditionSatisfied}, "isNitrousRpmConditionSatisfied No", "isNitrousRpmConditionSatisfied Yes" - indicator = {isNitrousConditionSatisfied}, "isNitrousConditionSatisfied No", "isNitrousConditionSatisfied Yes" + indicator = {isNitrousArmed}, "isNitrousArmed No", "isNitrousArmed Yes" + indicator = {isNitrousSpeedCondition}, "isNitrousSpeedCondition No", "isNitrousSpeedCondition Yes" + indicator = {isNitrousTpsCondition}, "isNitrousTpsCondition No", "isNitrousTpsCondition Yes" + indicator = {isNitrousCltCondition}, "isNitrousCltCondition No", "isNitrousCltCondition Yes" + indicator = {isNitrousMapCondition}, "isNitrousMapCondition No", "isNitrousMapCondition Yes" + indicator = {isNitrousAfrCondition}, "isNitrousAfrCondition No", "isNitrousAfrCondition Yes" + indicator = {isNitrousRpmCondition}, "isNitrousRpmCondition No", "isNitrousRpmCondition Yes" + indicator = {isNitrousCondition}, "isNitrousCondition No", "isNitrousCondition Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9800,7 +9800,7 @@ commandButton = "microRusEFI M111", cmd_set_engine_type_MERCEDES_M11 panel = NitrousControlArmingMethodDialog, {nitrousControlEnabled == 1} panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))} - dialog = NitrousControlDialog + dialog = NitrousControlDialog, "", border panel = NitrousControlSettingsDialog, West panel = nitrous_control_stateDialog, East diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index ef3acbadf9..6fa42e90aa 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f4.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.12.06.mre_f4.1874187183" + signature = "rusEFI master.2024.12.06.mre_f4.3099716405" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.06.mre_f4.1874187183" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.06.mre_f4.3099716405" ; 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 @@ -3285,14 +3285,14 @@ acCompressorState = bits, U32, 1172, [7:7] acPressureTooLow = bits, U32, 1172, [8:8] acPressureTooHigh = bits, U32, 1172, [9:9] ; total TS size = 1176 -isArmed = bits, U32, 1176, [0:0] -isNitrousSpeedConditionSatisfied = bits, U32, 1176, [1:1] -isTpsConditionSatisfied = bits, U32, 1176, [2:2] -isCltConditionSatisfied = bits, U32, 1176, [3:3] -isMapConditionSatisfied = bits, U32, 1176, [4:4] -isAfrConditionSatisfied = bits, U32, 1176, [5:5] -isNitrousRpmConditionSatisfied = bits, U32, 1176, [6:6] -isNitrousConditionSatisfied = bits, U32, 1176, [7:7] +isNitrousArmed = bits, U32, 1176, [0:0] +isNitrousSpeedCondition = bits, U32, 1176, [1:1] +isNitrousTpsCondition = bits, U32, 1176, [2:2] +isNitrousCltCondition = bits, U32, 1176, [3:3] +isNitrousMapCondition = bits, U32, 1176, [4:4] +isNitrousAfrCondition = bits, U32, 1176, [5:5] +isNitrousRpmCondition = bits, U32, 1176, [6:6] +isNitrousCondition = bits, U32, 1176, [7:7] ; total TS size = 1180 cranking0 = bits, U32, 1180, [0:0] notRunning0 = bits, U32, 1180, [1:1] @@ -5860,14 +5860,14 @@ entry = isDisabledByLua, "AC disabled by Lua", int, "%d" entry = acCompressorState, "AC compressor on", int, "%d" entry = acPressureTooLow, "AC pressure too low", int, "%d" entry = acPressureTooHigh, "AC pressure too high", int, "%d" -entry = isArmed, "isArmed", int, "%d" -entry = isNitrousSpeedConditionSatisfied, "isNitrousSpeedConditionSatisfied", int, "%d" -entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" -entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" -entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" -entry = isAfrConditionSatisfied, "isAfrConditionSatisfied", int, "%d" -entry = isNitrousRpmConditionSatisfied, "isNitrousRpmConditionSatisfied", int, "%d" -entry = isNitrousConditionSatisfied, "isNitrousConditionSatisfied", int, "%d" +entry = isNitrousArmed, "isNitrousArmed", int, "%d" +entry = isNitrousSpeedCondition, "isNitrousSpeedCondition", int, "%d" +entry = isNitrousTpsCondition, "isNitrousTpsCondition", int, "%d" +entry = isNitrousCltCondition, "isNitrousCltCondition", int, "%d" +entry = isNitrousMapCondition, "isNitrousMapCondition", int, "%d" +entry = isNitrousAfrCondition, "isNitrousAfrCondition", int, "%d" +entry = isNitrousRpmCondition, "isNitrousRpmCondition", int, "%d" +entry = isNitrousCondition, "isNitrousCondition", int, "%d" entry = cranking0, "cranking0", int, "%d" entry = notRunning0, "notRunning0", int, "%d" entry = disabledWhileEngineStopped0, "disabledWhileEngineStopped0", int, "%d" @@ -6877,14 +6877,14 @@ dialog = ac_controlDialog, "ac_control" graphLine = acButtonState indicatorPanel = nitrous_control_stateIndicatorPanel, 2 - indicator = {isArmed}, "isArmed No", "isArmed Yes" - indicator = {isNitrousSpeedConditionSatisfied}, "isNitrousSpeedConditionSatisfied No", "isNitrousSpeedConditionSatisfied Yes" - indicator = {isTpsConditionSatisfied}, "isTpsConditionSatisfied No", "isTpsConditionSatisfied Yes" - indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" - indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" - indicator = {isAfrConditionSatisfied}, "isAfrConditionSatisfied No", "isAfrConditionSatisfied Yes" - indicator = {isNitrousRpmConditionSatisfied}, "isNitrousRpmConditionSatisfied No", "isNitrousRpmConditionSatisfied Yes" - indicator = {isNitrousConditionSatisfied}, "isNitrousConditionSatisfied No", "isNitrousConditionSatisfied Yes" + indicator = {isNitrousArmed}, "isNitrousArmed No", "isNitrousArmed Yes" + indicator = {isNitrousSpeedCondition}, "isNitrousSpeedCondition No", "isNitrousSpeedCondition Yes" + indicator = {isNitrousTpsCondition}, "isNitrousTpsCondition No", "isNitrousTpsCondition Yes" + indicator = {isNitrousCltCondition}, "isNitrousCltCondition No", "isNitrousCltCondition Yes" + indicator = {isNitrousMapCondition}, "isNitrousMapCondition No", "isNitrousMapCondition Yes" + indicator = {isNitrousAfrCondition}, "isNitrousAfrCondition No", "isNitrousAfrCondition Yes" + indicator = {isNitrousRpmCondition}, "isNitrousRpmCondition No", "isNitrousRpmCondition Yes" + indicator = {isNitrousCondition}, "isNitrousCondition No", "isNitrousCondition Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9800,7 +9800,7 @@ commandButton = "microRusEFI M111", cmd_set_engine_type_MERCEDES_M11 panel = NitrousControlArmingMethodDialog, {nitrousControlEnabled == 1} panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))} - dialog = NitrousControlDialog + dialog = NitrousControlDialog, "", border panel = NitrousControlSettingsDialog, West panel = nitrous_control_stateDialog, East diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index 93cca2cf75..19e7616022 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f7.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.12.06.mre_f7.1874187183" + signature = "rusEFI master.2024.12.06.mre_f7.3099716405" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.06.mre_f7.1874187183" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.06.mre_f7.3099716405" ; 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 @@ -3285,14 +3285,14 @@ acCompressorState = bits, U32, 1172, [7:7] acPressureTooLow = bits, U32, 1172, [8:8] acPressureTooHigh = bits, U32, 1172, [9:9] ; total TS size = 1176 -isArmed = bits, U32, 1176, [0:0] -isNitrousSpeedConditionSatisfied = bits, U32, 1176, [1:1] -isTpsConditionSatisfied = bits, U32, 1176, [2:2] -isCltConditionSatisfied = bits, U32, 1176, [3:3] -isMapConditionSatisfied = bits, U32, 1176, [4:4] -isAfrConditionSatisfied = bits, U32, 1176, [5:5] -isNitrousRpmConditionSatisfied = bits, U32, 1176, [6:6] -isNitrousConditionSatisfied = bits, U32, 1176, [7:7] +isNitrousArmed = bits, U32, 1176, [0:0] +isNitrousSpeedCondition = bits, U32, 1176, [1:1] +isNitrousTpsCondition = bits, U32, 1176, [2:2] +isNitrousCltCondition = bits, U32, 1176, [3:3] +isNitrousMapCondition = bits, U32, 1176, [4:4] +isNitrousAfrCondition = bits, U32, 1176, [5:5] +isNitrousRpmCondition = bits, U32, 1176, [6:6] +isNitrousCondition = bits, U32, 1176, [7:7] ; total TS size = 1180 cranking0 = bits, U32, 1180, [0:0] notRunning0 = bits, U32, 1180, [1:1] @@ -5860,14 +5860,14 @@ entry = isDisabledByLua, "AC disabled by Lua", int, "%d" entry = acCompressorState, "AC compressor on", int, "%d" entry = acPressureTooLow, "AC pressure too low", int, "%d" entry = acPressureTooHigh, "AC pressure too high", int, "%d" -entry = isArmed, "isArmed", int, "%d" -entry = isNitrousSpeedConditionSatisfied, "isNitrousSpeedConditionSatisfied", int, "%d" -entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" -entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" -entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" -entry = isAfrConditionSatisfied, "isAfrConditionSatisfied", int, "%d" -entry = isNitrousRpmConditionSatisfied, "isNitrousRpmConditionSatisfied", int, "%d" -entry = isNitrousConditionSatisfied, "isNitrousConditionSatisfied", int, "%d" +entry = isNitrousArmed, "isNitrousArmed", int, "%d" +entry = isNitrousSpeedCondition, "isNitrousSpeedCondition", int, "%d" +entry = isNitrousTpsCondition, "isNitrousTpsCondition", int, "%d" +entry = isNitrousCltCondition, "isNitrousCltCondition", int, "%d" +entry = isNitrousMapCondition, "isNitrousMapCondition", int, "%d" +entry = isNitrousAfrCondition, "isNitrousAfrCondition", int, "%d" +entry = isNitrousRpmCondition, "isNitrousRpmCondition", int, "%d" +entry = isNitrousCondition, "isNitrousCondition", int, "%d" entry = cranking0, "cranking0", int, "%d" entry = notRunning0, "notRunning0", int, "%d" entry = disabledWhileEngineStopped0, "disabledWhileEngineStopped0", int, "%d" @@ -6877,14 +6877,14 @@ dialog = ac_controlDialog, "ac_control" graphLine = acButtonState indicatorPanel = nitrous_control_stateIndicatorPanel, 2 - indicator = {isArmed}, "isArmed No", "isArmed Yes" - indicator = {isNitrousSpeedConditionSatisfied}, "isNitrousSpeedConditionSatisfied No", "isNitrousSpeedConditionSatisfied Yes" - indicator = {isTpsConditionSatisfied}, "isTpsConditionSatisfied No", "isTpsConditionSatisfied Yes" - indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" - indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" - indicator = {isAfrConditionSatisfied}, "isAfrConditionSatisfied No", "isAfrConditionSatisfied Yes" - indicator = {isNitrousRpmConditionSatisfied}, "isNitrousRpmConditionSatisfied No", "isNitrousRpmConditionSatisfied Yes" - indicator = {isNitrousConditionSatisfied}, "isNitrousConditionSatisfied No", "isNitrousConditionSatisfied Yes" + indicator = {isNitrousArmed}, "isNitrousArmed No", "isNitrousArmed Yes" + indicator = {isNitrousSpeedCondition}, "isNitrousSpeedCondition No", "isNitrousSpeedCondition Yes" + indicator = {isNitrousTpsCondition}, "isNitrousTpsCondition No", "isNitrousTpsCondition Yes" + indicator = {isNitrousCltCondition}, "isNitrousCltCondition No", "isNitrousCltCondition Yes" + indicator = {isNitrousMapCondition}, "isNitrousMapCondition No", "isNitrousMapCondition Yes" + indicator = {isNitrousAfrCondition}, "isNitrousAfrCondition No", "isNitrousAfrCondition Yes" + indicator = {isNitrousRpmCondition}, "isNitrousRpmCondition No", "isNitrousRpmCondition Yes" + indicator = {isNitrousCondition}, "isNitrousCondition No", "isNitrousCondition Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9800,7 +9800,7 @@ commandButton = "microRusEFI M111", cmd_set_engine_type_MERCEDES_M11 panel = NitrousControlArmingMethodDialog, {nitrousControlEnabled == 1} panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))} - dialog = NitrousControlDialog + dialog = NitrousControlDialog, "", border panel = NitrousControlSettingsDialog, West panel = nitrous_control_stateDialog, East diff --git a/firmware/tunerstudio/generated/rusefi_nucleo_f413.ini b/firmware/tunerstudio/generated/rusefi_nucleo_f413.ini index 8b4f448b05..ca5b2b3544 100644 --- a/firmware/tunerstudio/generated/rusefi_nucleo_f413.ini +++ b/firmware/tunerstudio/generated/rusefi_nucleo_f413.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.12.06.nucleo_f413.617288300" + signature = "rusEFI master.2024.12.06.nucleo_f413.4089391862" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.06.nucleo_f413.617288300" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.06.nucleo_f413.4089391862" ; 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 @@ -3285,14 +3285,14 @@ acCompressorState = bits, U32, 1172, [7:7] acPressureTooLow = bits, U32, 1172, [8:8] acPressureTooHigh = bits, U32, 1172, [9:9] ; total TS size = 1176 -isArmed = bits, U32, 1176, [0:0] -isNitrousSpeedConditionSatisfied = bits, U32, 1176, [1:1] -isTpsConditionSatisfied = bits, U32, 1176, [2:2] -isCltConditionSatisfied = bits, U32, 1176, [3:3] -isMapConditionSatisfied = bits, U32, 1176, [4:4] -isAfrConditionSatisfied = bits, U32, 1176, [5:5] -isNitrousRpmConditionSatisfied = bits, U32, 1176, [6:6] -isNitrousConditionSatisfied = bits, U32, 1176, [7:7] +isNitrousArmed = bits, U32, 1176, [0:0] +isNitrousSpeedCondition = bits, U32, 1176, [1:1] +isNitrousTpsCondition = bits, U32, 1176, [2:2] +isNitrousCltCondition = bits, U32, 1176, [3:3] +isNitrousMapCondition = bits, U32, 1176, [4:4] +isNitrousAfrCondition = bits, U32, 1176, [5:5] +isNitrousRpmCondition = bits, U32, 1176, [6:6] +isNitrousCondition = bits, U32, 1176, [7:7] ; total TS size = 1180 cranking0 = bits, U32, 1180, [0:0] notRunning0 = bits, U32, 1180, [1:1] @@ -5862,14 +5862,14 @@ entry = isDisabledByLua, "AC disabled by Lua", int, "%d" entry = acCompressorState, "AC compressor on", int, "%d" entry = acPressureTooLow, "AC pressure too low", int, "%d" entry = acPressureTooHigh, "AC pressure too high", int, "%d" -entry = isArmed, "isArmed", int, "%d" -entry = isNitrousSpeedConditionSatisfied, "isNitrousSpeedConditionSatisfied", int, "%d" -entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" -entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" -entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" -entry = isAfrConditionSatisfied, "isAfrConditionSatisfied", int, "%d" -entry = isNitrousRpmConditionSatisfied, "isNitrousRpmConditionSatisfied", int, "%d" -entry = isNitrousConditionSatisfied, "isNitrousConditionSatisfied", int, "%d" +entry = isNitrousArmed, "isNitrousArmed", int, "%d" +entry = isNitrousSpeedCondition, "isNitrousSpeedCondition", int, "%d" +entry = isNitrousTpsCondition, "isNitrousTpsCondition", int, "%d" +entry = isNitrousCltCondition, "isNitrousCltCondition", int, "%d" +entry = isNitrousMapCondition, "isNitrousMapCondition", int, "%d" +entry = isNitrousAfrCondition, "isNitrousAfrCondition", int, "%d" +entry = isNitrousRpmCondition, "isNitrousRpmCondition", int, "%d" +entry = isNitrousCondition, "isNitrousCondition", int, "%d" entry = cranking0, "cranking0", int, "%d" entry = notRunning0, "notRunning0", int, "%d" entry = disabledWhileEngineStopped0, "disabledWhileEngineStopped0", int, "%d" @@ -6861,14 +6861,14 @@ dialog = ac_controlDialog, "ac_control" graphLine = acButtonState indicatorPanel = nitrous_control_stateIndicatorPanel, 2 - indicator = {isArmed}, "isArmed No", "isArmed Yes" - indicator = {isNitrousSpeedConditionSatisfied}, "isNitrousSpeedConditionSatisfied No", "isNitrousSpeedConditionSatisfied Yes" - indicator = {isTpsConditionSatisfied}, "isTpsConditionSatisfied No", "isTpsConditionSatisfied Yes" - indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" - indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" - indicator = {isAfrConditionSatisfied}, "isAfrConditionSatisfied No", "isAfrConditionSatisfied Yes" - indicator = {isNitrousRpmConditionSatisfied}, "isNitrousRpmConditionSatisfied No", "isNitrousRpmConditionSatisfied Yes" - indicator = {isNitrousConditionSatisfied}, "isNitrousConditionSatisfied No", "isNitrousConditionSatisfied Yes" + indicator = {isNitrousArmed}, "isNitrousArmed No", "isNitrousArmed Yes" + indicator = {isNitrousSpeedCondition}, "isNitrousSpeedCondition No", "isNitrousSpeedCondition Yes" + indicator = {isNitrousTpsCondition}, "isNitrousTpsCondition No", "isNitrousTpsCondition Yes" + indicator = {isNitrousCltCondition}, "isNitrousCltCondition No", "isNitrousCltCondition Yes" + indicator = {isNitrousMapCondition}, "isNitrousMapCondition No", "isNitrousMapCondition Yes" + indicator = {isNitrousAfrCondition}, "isNitrousAfrCondition No", "isNitrousAfrCondition Yes" + indicator = {isNitrousRpmCondition}, "isNitrousRpmCondition No", "isNitrousRpmCondition Yes" + indicator = {isNitrousCondition}, "isNitrousCondition No", "isNitrousCondition Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9851,7 +9851,7 @@ dialog = tcuControls, "Transmission Settings" panel = NitrousControlArmingMethodDialog, {nitrousControlEnabled == 1} panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))} - dialog = NitrousControlDialog + dialog = NitrousControlDialog, "", border panel = NitrousControlSettingsDialog, West panel = nitrous_control_stateDialog, East diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index e197e9574f..23f789f1e6 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.12.06.proteus_f4.2279794350" + signature = "rusEFI master.2024.12.06.proteus_f4.1352064564" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.06.proteus_f4.2279794350" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.06.proteus_f4.1352064564" ; 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 @@ -3285,14 +3285,14 @@ acCompressorState = bits, U32, 1172, [7:7] acPressureTooLow = bits, U32, 1172, [8:8] acPressureTooHigh = bits, U32, 1172, [9:9] ; total TS size = 1176 -isArmed = bits, U32, 1176, [0:0] -isNitrousSpeedConditionSatisfied = bits, U32, 1176, [1:1] -isTpsConditionSatisfied = bits, U32, 1176, [2:2] -isCltConditionSatisfied = bits, U32, 1176, [3:3] -isMapConditionSatisfied = bits, U32, 1176, [4:4] -isAfrConditionSatisfied = bits, U32, 1176, [5:5] -isNitrousRpmConditionSatisfied = bits, U32, 1176, [6:6] -isNitrousConditionSatisfied = bits, U32, 1176, [7:7] +isNitrousArmed = bits, U32, 1176, [0:0] +isNitrousSpeedCondition = bits, U32, 1176, [1:1] +isNitrousTpsCondition = bits, U32, 1176, [2:2] +isNitrousCltCondition = bits, U32, 1176, [3:3] +isNitrousMapCondition = bits, U32, 1176, [4:4] +isNitrousAfrCondition = bits, U32, 1176, [5:5] +isNitrousRpmCondition = bits, U32, 1176, [6:6] +isNitrousCondition = bits, U32, 1176, [7:7] ; total TS size = 1180 cranking0 = bits, U32, 1180, [0:0] notRunning0 = bits, U32, 1180, [1:1] @@ -5863,14 +5863,14 @@ entry = isDisabledByLua, "AC disabled by Lua", int, "%d" entry = acCompressorState, "AC compressor on", int, "%d" entry = acPressureTooLow, "AC pressure too low", int, "%d" entry = acPressureTooHigh, "AC pressure too high", int, "%d" -entry = isArmed, "isArmed", int, "%d" -entry = isNitrousSpeedConditionSatisfied, "isNitrousSpeedConditionSatisfied", int, "%d" -entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" -entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" -entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" -entry = isAfrConditionSatisfied, "isAfrConditionSatisfied", int, "%d" -entry = isNitrousRpmConditionSatisfied, "isNitrousRpmConditionSatisfied", int, "%d" -entry = isNitrousConditionSatisfied, "isNitrousConditionSatisfied", int, "%d" +entry = isNitrousArmed, "isNitrousArmed", int, "%d" +entry = isNitrousSpeedCondition, "isNitrousSpeedCondition", int, "%d" +entry = isNitrousTpsCondition, "isNitrousTpsCondition", int, "%d" +entry = isNitrousCltCondition, "isNitrousCltCondition", int, "%d" +entry = isNitrousMapCondition, "isNitrousMapCondition", int, "%d" +entry = isNitrousAfrCondition, "isNitrousAfrCondition", int, "%d" +entry = isNitrousRpmCondition, "isNitrousRpmCondition", int, "%d" +entry = isNitrousCondition, "isNitrousCondition", int, "%d" entry = cranking0, "cranking0", int, "%d" entry = notRunning0, "notRunning0", int, "%d" entry = disabledWhileEngineStopped0, "disabledWhileEngineStopped0", int, "%d" @@ -6889,14 +6889,14 @@ dialog = ac_controlDialog, "ac_control" graphLine = acButtonState indicatorPanel = nitrous_control_stateIndicatorPanel, 2 - indicator = {isArmed}, "isArmed No", "isArmed Yes" - indicator = {isNitrousSpeedConditionSatisfied}, "isNitrousSpeedConditionSatisfied No", "isNitrousSpeedConditionSatisfied Yes" - indicator = {isTpsConditionSatisfied}, "isTpsConditionSatisfied No", "isTpsConditionSatisfied Yes" - indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" - indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" - indicator = {isAfrConditionSatisfied}, "isAfrConditionSatisfied No", "isAfrConditionSatisfied Yes" - indicator = {isNitrousRpmConditionSatisfied}, "isNitrousRpmConditionSatisfied No", "isNitrousRpmConditionSatisfied Yes" - indicator = {isNitrousConditionSatisfied}, "isNitrousConditionSatisfied No", "isNitrousConditionSatisfied Yes" + indicator = {isNitrousArmed}, "isNitrousArmed No", "isNitrousArmed Yes" + indicator = {isNitrousSpeedCondition}, "isNitrousSpeedCondition No", "isNitrousSpeedCondition Yes" + indicator = {isNitrousTpsCondition}, "isNitrousTpsCondition No", "isNitrousTpsCondition Yes" + indicator = {isNitrousCltCondition}, "isNitrousCltCondition No", "isNitrousCltCondition Yes" + indicator = {isNitrousMapCondition}, "isNitrousMapCondition No", "isNitrousMapCondition Yes" + indicator = {isNitrousAfrCondition}, "isNitrousAfrCondition No", "isNitrousAfrCondition Yes" + indicator = {isNitrousRpmCondition}, "isNitrousRpmCondition No", "isNitrousRpmCondition Yes" + indicator = {isNitrousCondition}, "isNitrousCondition No", "isNitrousCondition Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9862,7 +9862,7 @@ commandButton = "Fuel Bench", cmd_set_engine_type_FUEL_BENCH panel = NitrousControlArmingMethodDialog, {nitrousControlEnabled == 1} panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))} - dialog = NitrousControlDialog + dialog = NitrousControlDialog, "", border panel = NitrousControlSettingsDialog, West panel = nitrous_control_stateDialog, East diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index 0b6537cc05..b59eba620d 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.12.06.proteus_f7.2279794350" + signature = "rusEFI master.2024.12.06.proteus_f7.1352064564" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.06.proteus_f7.2279794350" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.06.proteus_f7.1352064564" ; 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 @@ -3285,14 +3285,14 @@ acCompressorState = bits, U32, 1172, [7:7] acPressureTooLow = bits, U32, 1172, [8:8] acPressureTooHigh = bits, U32, 1172, [9:9] ; total TS size = 1176 -isArmed = bits, U32, 1176, [0:0] -isNitrousSpeedConditionSatisfied = bits, U32, 1176, [1:1] -isTpsConditionSatisfied = bits, U32, 1176, [2:2] -isCltConditionSatisfied = bits, U32, 1176, [3:3] -isMapConditionSatisfied = bits, U32, 1176, [4:4] -isAfrConditionSatisfied = bits, U32, 1176, [5:5] -isNitrousRpmConditionSatisfied = bits, U32, 1176, [6:6] -isNitrousConditionSatisfied = bits, U32, 1176, [7:7] +isNitrousArmed = bits, U32, 1176, [0:0] +isNitrousSpeedCondition = bits, U32, 1176, [1:1] +isNitrousTpsCondition = bits, U32, 1176, [2:2] +isNitrousCltCondition = bits, U32, 1176, [3:3] +isNitrousMapCondition = bits, U32, 1176, [4:4] +isNitrousAfrCondition = bits, U32, 1176, [5:5] +isNitrousRpmCondition = bits, U32, 1176, [6:6] +isNitrousCondition = bits, U32, 1176, [7:7] ; total TS size = 1180 cranking0 = bits, U32, 1180, [0:0] notRunning0 = bits, U32, 1180, [1:1] @@ -5863,14 +5863,14 @@ entry = isDisabledByLua, "AC disabled by Lua", int, "%d" entry = acCompressorState, "AC compressor on", int, "%d" entry = acPressureTooLow, "AC pressure too low", int, "%d" entry = acPressureTooHigh, "AC pressure too high", int, "%d" -entry = isArmed, "isArmed", int, "%d" -entry = isNitrousSpeedConditionSatisfied, "isNitrousSpeedConditionSatisfied", int, "%d" -entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" -entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" -entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" -entry = isAfrConditionSatisfied, "isAfrConditionSatisfied", int, "%d" -entry = isNitrousRpmConditionSatisfied, "isNitrousRpmConditionSatisfied", int, "%d" -entry = isNitrousConditionSatisfied, "isNitrousConditionSatisfied", int, "%d" +entry = isNitrousArmed, "isNitrousArmed", int, "%d" +entry = isNitrousSpeedCondition, "isNitrousSpeedCondition", int, "%d" +entry = isNitrousTpsCondition, "isNitrousTpsCondition", int, "%d" +entry = isNitrousCltCondition, "isNitrousCltCondition", int, "%d" +entry = isNitrousMapCondition, "isNitrousMapCondition", int, "%d" +entry = isNitrousAfrCondition, "isNitrousAfrCondition", int, "%d" +entry = isNitrousRpmCondition, "isNitrousRpmCondition", int, "%d" +entry = isNitrousCondition, "isNitrousCondition", int, "%d" entry = cranking0, "cranking0", int, "%d" entry = notRunning0, "notRunning0", int, "%d" entry = disabledWhileEngineStopped0, "disabledWhileEngineStopped0", int, "%d" @@ -6889,14 +6889,14 @@ dialog = ac_controlDialog, "ac_control" graphLine = acButtonState indicatorPanel = nitrous_control_stateIndicatorPanel, 2 - indicator = {isArmed}, "isArmed No", "isArmed Yes" - indicator = {isNitrousSpeedConditionSatisfied}, "isNitrousSpeedConditionSatisfied No", "isNitrousSpeedConditionSatisfied Yes" - indicator = {isTpsConditionSatisfied}, "isTpsConditionSatisfied No", "isTpsConditionSatisfied Yes" - indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" - indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" - indicator = {isAfrConditionSatisfied}, "isAfrConditionSatisfied No", "isAfrConditionSatisfied Yes" - indicator = {isNitrousRpmConditionSatisfied}, "isNitrousRpmConditionSatisfied No", "isNitrousRpmConditionSatisfied Yes" - indicator = {isNitrousConditionSatisfied}, "isNitrousConditionSatisfied No", "isNitrousConditionSatisfied Yes" + indicator = {isNitrousArmed}, "isNitrousArmed No", "isNitrousArmed Yes" + indicator = {isNitrousSpeedCondition}, "isNitrousSpeedCondition No", "isNitrousSpeedCondition Yes" + indicator = {isNitrousTpsCondition}, "isNitrousTpsCondition No", "isNitrousTpsCondition Yes" + indicator = {isNitrousCltCondition}, "isNitrousCltCondition No", "isNitrousCltCondition Yes" + indicator = {isNitrousMapCondition}, "isNitrousMapCondition No", "isNitrousMapCondition Yes" + indicator = {isNitrousAfrCondition}, "isNitrousAfrCondition No", "isNitrousAfrCondition Yes" + indicator = {isNitrousRpmCondition}, "isNitrousRpmCondition No", "isNitrousRpmCondition Yes" + indicator = {isNitrousCondition}, "isNitrousCondition No", "isNitrousCondition Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9862,7 +9862,7 @@ commandButton = "Fuel Bench", cmd_set_engine_type_FUEL_BENCH panel = NitrousControlArmingMethodDialog, {nitrousControlEnabled == 1} panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))} - dialog = NitrousControlDialog + dialog = NitrousControlDialog, "", border panel = NitrousControlSettingsDialog, West panel = nitrous_control_stateDialog, East diff --git a/firmware/tunerstudio/generated/rusefi_proteus_h7.ini b/firmware/tunerstudio/generated/rusefi_proteus_h7.ini index db96fb3fa2..a945b37e3b 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_h7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_h7.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.12.06.proteus_h7.2279794350" + signature = "rusEFI master.2024.12.06.proteus_h7.1352064564" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.06.proteus_h7.2279794350" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.06.proteus_h7.1352064564" ; 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 @@ -3285,14 +3285,14 @@ acCompressorState = bits, U32, 1172, [7:7] acPressureTooLow = bits, U32, 1172, [8:8] acPressureTooHigh = bits, U32, 1172, [9:9] ; total TS size = 1176 -isArmed = bits, U32, 1176, [0:0] -isNitrousSpeedConditionSatisfied = bits, U32, 1176, [1:1] -isTpsConditionSatisfied = bits, U32, 1176, [2:2] -isCltConditionSatisfied = bits, U32, 1176, [3:3] -isMapConditionSatisfied = bits, U32, 1176, [4:4] -isAfrConditionSatisfied = bits, U32, 1176, [5:5] -isNitrousRpmConditionSatisfied = bits, U32, 1176, [6:6] -isNitrousConditionSatisfied = bits, U32, 1176, [7:7] +isNitrousArmed = bits, U32, 1176, [0:0] +isNitrousSpeedCondition = bits, U32, 1176, [1:1] +isNitrousTpsCondition = bits, U32, 1176, [2:2] +isNitrousCltCondition = bits, U32, 1176, [3:3] +isNitrousMapCondition = bits, U32, 1176, [4:4] +isNitrousAfrCondition = bits, U32, 1176, [5:5] +isNitrousRpmCondition = bits, U32, 1176, [6:6] +isNitrousCondition = bits, U32, 1176, [7:7] ; total TS size = 1180 cranking0 = bits, U32, 1180, [0:0] notRunning0 = bits, U32, 1180, [1:1] @@ -5863,14 +5863,14 @@ entry = isDisabledByLua, "AC disabled by Lua", int, "%d" entry = acCompressorState, "AC compressor on", int, "%d" entry = acPressureTooLow, "AC pressure too low", int, "%d" entry = acPressureTooHigh, "AC pressure too high", int, "%d" -entry = isArmed, "isArmed", int, "%d" -entry = isNitrousSpeedConditionSatisfied, "isNitrousSpeedConditionSatisfied", int, "%d" -entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" -entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" -entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" -entry = isAfrConditionSatisfied, "isAfrConditionSatisfied", int, "%d" -entry = isNitrousRpmConditionSatisfied, "isNitrousRpmConditionSatisfied", int, "%d" -entry = isNitrousConditionSatisfied, "isNitrousConditionSatisfied", int, "%d" +entry = isNitrousArmed, "isNitrousArmed", int, "%d" +entry = isNitrousSpeedCondition, "isNitrousSpeedCondition", int, "%d" +entry = isNitrousTpsCondition, "isNitrousTpsCondition", int, "%d" +entry = isNitrousCltCondition, "isNitrousCltCondition", int, "%d" +entry = isNitrousMapCondition, "isNitrousMapCondition", int, "%d" +entry = isNitrousAfrCondition, "isNitrousAfrCondition", int, "%d" +entry = isNitrousRpmCondition, "isNitrousRpmCondition", int, "%d" +entry = isNitrousCondition, "isNitrousCondition", int, "%d" entry = cranking0, "cranking0", int, "%d" entry = notRunning0, "notRunning0", int, "%d" entry = disabledWhileEngineStopped0, "disabledWhileEngineStopped0", int, "%d" @@ -6889,14 +6889,14 @@ dialog = ac_controlDialog, "ac_control" graphLine = acButtonState indicatorPanel = nitrous_control_stateIndicatorPanel, 2 - indicator = {isArmed}, "isArmed No", "isArmed Yes" - indicator = {isNitrousSpeedConditionSatisfied}, "isNitrousSpeedConditionSatisfied No", "isNitrousSpeedConditionSatisfied Yes" - indicator = {isTpsConditionSatisfied}, "isTpsConditionSatisfied No", "isTpsConditionSatisfied Yes" - indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" - indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" - indicator = {isAfrConditionSatisfied}, "isAfrConditionSatisfied No", "isAfrConditionSatisfied Yes" - indicator = {isNitrousRpmConditionSatisfied}, "isNitrousRpmConditionSatisfied No", "isNitrousRpmConditionSatisfied Yes" - indicator = {isNitrousConditionSatisfied}, "isNitrousConditionSatisfied No", "isNitrousConditionSatisfied Yes" + indicator = {isNitrousArmed}, "isNitrousArmed No", "isNitrousArmed Yes" + indicator = {isNitrousSpeedCondition}, "isNitrousSpeedCondition No", "isNitrousSpeedCondition Yes" + indicator = {isNitrousTpsCondition}, "isNitrousTpsCondition No", "isNitrousTpsCondition Yes" + indicator = {isNitrousCltCondition}, "isNitrousCltCondition No", "isNitrousCltCondition Yes" + indicator = {isNitrousMapCondition}, "isNitrousMapCondition No", "isNitrousMapCondition Yes" + indicator = {isNitrousAfrCondition}, "isNitrousAfrCondition No", "isNitrousAfrCondition Yes" + indicator = {isNitrousRpmCondition}, "isNitrousRpmCondition No", "isNitrousRpmCondition Yes" + indicator = {isNitrousCondition}, "isNitrousCondition No", "isNitrousCondition Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9862,7 +9862,7 @@ commandButton = "Fuel Bench", cmd_set_engine_type_FUEL_BENCH panel = NitrousControlArmingMethodDialog, {nitrousControlEnabled == 1} panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))} - dialog = NitrousControlDialog + dialog = NitrousControlDialog, "", border panel = NitrousControlSettingsDialog, West panel = nitrous_control_stateDialog, East diff --git a/firmware/tunerstudio/generated/rusefi_s105.ini b/firmware/tunerstudio/generated/rusefi_s105.ini index b5638b8810..3f4cfa5b3d 100644 --- a/firmware/tunerstudio/generated/rusefi_s105.ini +++ b/firmware/tunerstudio/generated/rusefi_s105.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.12.06.s105.2604700334" + signature = "rusEFI master.2024.12.06.s105.1278519860" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.06.s105.2604700334" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.06.s105.1278519860" ; 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 @@ -3285,14 +3285,14 @@ acCompressorState = bits, U32, 1172, [7:7] acPressureTooLow = bits, U32, 1172, [8:8] acPressureTooHigh = bits, U32, 1172, [9:9] ; total TS size = 1176 -isArmed = bits, U32, 1176, [0:0] -isNitrousSpeedConditionSatisfied = bits, U32, 1176, [1:1] -isTpsConditionSatisfied = bits, U32, 1176, [2:2] -isCltConditionSatisfied = bits, U32, 1176, [3:3] -isMapConditionSatisfied = bits, U32, 1176, [4:4] -isAfrConditionSatisfied = bits, U32, 1176, [5:5] -isNitrousRpmConditionSatisfied = bits, U32, 1176, [6:6] -isNitrousConditionSatisfied = bits, U32, 1176, [7:7] +isNitrousArmed = bits, U32, 1176, [0:0] +isNitrousSpeedCondition = bits, U32, 1176, [1:1] +isNitrousTpsCondition = bits, U32, 1176, [2:2] +isNitrousCltCondition = bits, U32, 1176, [3:3] +isNitrousMapCondition = bits, U32, 1176, [4:4] +isNitrousAfrCondition = bits, U32, 1176, [5:5] +isNitrousRpmCondition = bits, U32, 1176, [6:6] +isNitrousCondition = bits, U32, 1176, [7:7] ; total TS size = 1180 cranking0 = bits, U32, 1180, [0:0] notRunning0 = bits, U32, 1180, [1:1] @@ -5862,14 +5862,14 @@ entry = isDisabledByLua, "AC disabled by Lua", int, "%d" entry = acCompressorState, "AC compressor on", int, "%d" entry = acPressureTooLow, "AC pressure too low", int, "%d" entry = acPressureTooHigh, "AC pressure too high", int, "%d" -entry = isArmed, "isArmed", int, "%d" -entry = isNitrousSpeedConditionSatisfied, "isNitrousSpeedConditionSatisfied", int, "%d" -entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" -entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" -entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" -entry = isAfrConditionSatisfied, "isAfrConditionSatisfied", int, "%d" -entry = isNitrousRpmConditionSatisfied, "isNitrousRpmConditionSatisfied", int, "%d" -entry = isNitrousConditionSatisfied, "isNitrousConditionSatisfied", int, "%d" +entry = isNitrousArmed, "isNitrousArmed", int, "%d" +entry = isNitrousSpeedCondition, "isNitrousSpeedCondition", int, "%d" +entry = isNitrousTpsCondition, "isNitrousTpsCondition", int, "%d" +entry = isNitrousCltCondition, "isNitrousCltCondition", int, "%d" +entry = isNitrousMapCondition, "isNitrousMapCondition", int, "%d" +entry = isNitrousAfrCondition, "isNitrousAfrCondition", int, "%d" +entry = isNitrousRpmCondition, "isNitrousRpmCondition", int, "%d" +entry = isNitrousCondition, "isNitrousCondition", int, "%d" entry = cranking0, "cranking0", int, "%d" entry = notRunning0, "notRunning0", int, "%d" entry = disabledWhileEngineStopped0, "disabledWhileEngineStopped0", int, "%d" @@ -6862,14 +6862,14 @@ dialog = ac_controlDialog, "ac_control" graphLine = acButtonState indicatorPanel = nitrous_control_stateIndicatorPanel, 2 - indicator = {isArmed}, "isArmed No", "isArmed Yes" - indicator = {isNitrousSpeedConditionSatisfied}, "isNitrousSpeedConditionSatisfied No", "isNitrousSpeedConditionSatisfied Yes" - indicator = {isTpsConditionSatisfied}, "isTpsConditionSatisfied No", "isTpsConditionSatisfied Yes" - indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" - indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" - indicator = {isAfrConditionSatisfied}, "isAfrConditionSatisfied No", "isAfrConditionSatisfied Yes" - indicator = {isNitrousRpmConditionSatisfied}, "isNitrousRpmConditionSatisfied No", "isNitrousRpmConditionSatisfied Yes" - indicator = {isNitrousConditionSatisfied}, "isNitrousConditionSatisfied No", "isNitrousConditionSatisfied Yes" + indicator = {isNitrousArmed}, "isNitrousArmed No", "isNitrousArmed Yes" + indicator = {isNitrousSpeedCondition}, "isNitrousSpeedCondition No", "isNitrousSpeedCondition Yes" + indicator = {isNitrousTpsCondition}, "isNitrousTpsCondition No", "isNitrousTpsCondition Yes" + indicator = {isNitrousCltCondition}, "isNitrousCltCondition No", "isNitrousCltCondition Yes" + indicator = {isNitrousMapCondition}, "isNitrousMapCondition No", "isNitrousMapCondition Yes" + indicator = {isNitrousAfrCondition}, "isNitrousAfrCondition No", "isNitrousAfrCondition Yes" + indicator = {isNitrousRpmCondition}, "isNitrousRpmCondition No", "isNitrousRpmCondition Yes" + indicator = {isNitrousCondition}, "isNitrousCondition No", "isNitrousCondition Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9827,7 +9827,7 @@ dialog = tcuControls, "Transmission Settings" panel = NitrousControlArmingMethodDialog, {nitrousControlEnabled == 1} panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))} - dialog = NitrousControlDialog + dialog = NitrousControlDialog, "", border panel = NitrousControlSettingsDialog, West panel = nitrous_control_stateDialog, East diff --git a/firmware/tunerstudio/generated/rusefi_small-can-board.ini b/firmware/tunerstudio/generated/rusefi_small-can-board.ini index 4ebcda5bf0..64fbbba373 100644 --- a/firmware/tunerstudio/generated/rusefi_small-can-board.ini +++ b/firmware/tunerstudio/generated/rusefi_small-can-board.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.12.06.small-can-board.2016427841" + signature = "rusEFI master.2024.12.06.small-can-board.2940471259" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.06.small-can-board.2016427841" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.06.small-can-board.2940471259" ; 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 @@ -3285,14 +3285,14 @@ acCompressorState = bits, U32, 1172, [7:7] acPressureTooLow = bits, U32, 1172, [8:8] acPressureTooHigh = bits, U32, 1172, [9:9] ; total TS size = 1176 -isArmed = bits, U32, 1176, [0:0] -isNitrousSpeedConditionSatisfied = bits, U32, 1176, [1:1] -isTpsConditionSatisfied = bits, U32, 1176, [2:2] -isCltConditionSatisfied = bits, U32, 1176, [3:3] -isMapConditionSatisfied = bits, U32, 1176, [4:4] -isAfrConditionSatisfied = bits, U32, 1176, [5:5] -isNitrousRpmConditionSatisfied = bits, U32, 1176, [6:6] -isNitrousConditionSatisfied = bits, U32, 1176, [7:7] +isNitrousArmed = bits, U32, 1176, [0:0] +isNitrousSpeedCondition = bits, U32, 1176, [1:1] +isNitrousTpsCondition = bits, U32, 1176, [2:2] +isNitrousCltCondition = bits, U32, 1176, [3:3] +isNitrousMapCondition = bits, U32, 1176, [4:4] +isNitrousAfrCondition = bits, U32, 1176, [5:5] +isNitrousRpmCondition = bits, U32, 1176, [6:6] +isNitrousCondition = bits, U32, 1176, [7:7] ; total TS size = 1180 cranking0 = bits, U32, 1180, [0:0] notRunning0 = bits, U32, 1180, [1:1] @@ -5862,14 +5862,14 @@ entry = isDisabledByLua, "AC disabled by Lua", int, "%d" entry = acCompressorState, "AC compressor on", int, "%d" entry = acPressureTooLow, "AC pressure too low", int, "%d" entry = acPressureTooHigh, "AC pressure too high", int, "%d" -entry = isArmed, "isArmed", int, "%d" -entry = isNitrousSpeedConditionSatisfied, "isNitrousSpeedConditionSatisfied", int, "%d" -entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" -entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" -entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" -entry = isAfrConditionSatisfied, "isAfrConditionSatisfied", int, "%d" -entry = isNitrousRpmConditionSatisfied, "isNitrousRpmConditionSatisfied", int, "%d" -entry = isNitrousConditionSatisfied, "isNitrousConditionSatisfied", int, "%d" +entry = isNitrousArmed, "isNitrousArmed", int, "%d" +entry = isNitrousSpeedCondition, "isNitrousSpeedCondition", int, "%d" +entry = isNitrousTpsCondition, "isNitrousTpsCondition", int, "%d" +entry = isNitrousCltCondition, "isNitrousCltCondition", int, "%d" +entry = isNitrousMapCondition, "isNitrousMapCondition", int, "%d" +entry = isNitrousAfrCondition, "isNitrousAfrCondition", int, "%d" +entry = isNitrousRpmCondition, "isNitrousRpmCondition", int, "%d" +entry = isNitrousCondition, "isNitrousCondition", int, "%d" entry = cranking0, "cranking0", int, "%d" entry = notRunning0, "notRunning0", int, "%d" entry = disabledWhileEngineStopped0, "disabledWhileEngineStopped0", int, "%d" @@ -6861,14 +6861,14 @@ dialog = ac_controlDialog, "ac_control" graphLine = acButtonState indicatorPanel = nitrous_control_stateIndicatorPanel, 2 - indicator = {isArmed}, "isArmed No", "isArmed Yes" - indicator = {isNitrousSpeedConditionSatisfied}, "isNitrousSpeedConditionSatisfied No", "isNitrousSpeedConditionSatisfied Yes" - indicator = {isTpsConditionSatisfied}, "isTpsConditionSatisfied No", "isTpsConditionSatisfied Yes" - indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" - indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" - indicator = {isAfrConditionSatisfied}, "isAfrConditionSatisfied No", "isAfrConditionSatisfied Yes" - indicator = {isNitrousRpmConditionSatisfied}, "isNitrousRpmConditionSatisfied No", "isNitrousRpmConditionSatisfied Yes" - indicator = {isNitrousConditionSatisfied}, "isNitrousConditionSatisfied No", "isNitrousConditionSatisfied Yes" + indicator = {isNitrousArmed}, "isNitrousArmed No", "isNitrousArmed Yes" + indicator = {isNitrousSpeedCondition}, "isNitrousSpeedCondition No", "isNitrousSpeedCondition Yes" + indicator = {isNitrousTpsCondition}, "isNitrousTpsCondition No", "isNitrousTpsCondition Yes" + indicator = {isNitrousCltCondition}, "isNitrousCltCondition No", "isNitrousCltCondition Yes" + indicator = {isNitrousMapCondition}, "isNitrousMapCondition No", "isNitrousMapCondition Yes" + indicator = {isNitrousAfrCondition}, "isNitrousAfrCondition No", "isNitrousAfrCondition Yes" + indicator = {isNitrousRpmCondition}, "isNitrousRpmCondition No", "isNitrousRpmCondition Yes" + indicator = {isNitrousCondition}, "isNitrousCondition No", "isNitrousCondition Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9842,7 +9842,7 @@ commandButton = "Honda BCM", cmd_set_engine_type_SMALL_CB_HONDA_BCM panel = NitrousControlArmingMethodDialog, {nitrousControlEnabled == 1} panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))} - dialog = NitrousControlDialog + dialog = NitrousControlDialog, "", border panel = NitrousControlSettingsDialog, West panel = nitrous_control_stateDialog, East diff --git a/firmware/tunerstudio/generated/rusefi_stm32f429_nucleo.ini b/firmware/tunerstudio/generated/rusefi_stm32f429_nucleo.ini index e8b96b830b..99c16f0a08 100644 --- a/firmware/tunerstudio/generated/rusefi_stm32f429_nucleo.ini +++ b/firmware/tunerstudio/generated/rusefi_stm32f429_nucleo.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.12.06.stm32f429_nucleo.617288300" + signature = "rusEFI master.2024.12.06.stm32f429_nucleo.4089391862" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.06.stm32f429_nucleo.617288300" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.06.stm32f429_nucleo.4089391862" ; 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 @@ -3285,14 +3285,14 @@ acCompressorState = bits, U32, 1172, [7:7] acPressureTooLow = bits, U32, 1172, [8:8] acPressureTooHigh = bits, U32, 1172, [9:9] ; total TS size = 1176 -isArmed = bits, U32, 1176, [0:0] -isNitrousSpeedConditionSatisfied = bits, U32, 1176, [1:1] -isTpsConditionSatisfied = bits, U32, 1176, [2:2] -isCltConditionSatisfied = bits, U32, 1176, [3:3] -isMapConditionSatisfied = bits, U32, 1176, [4:4] -isAfrConditionSatisfied = bits, U32, 1176, [5:5] -isNitrousRpmConditionSatisfied = bits, U32, 1176, [6:6] -isNitrousConditionSatisfied = bits, U32, 1176, [7:7] +isNitrousArmed = bits, U32, 1176, [0:0] +isNitrousSpeedCondition = bits, U32, 1176, [1:1] +isNitrousTpsCondition = bits, U32, 1176, [2:2] +isNitrousCltCondition = bits, U32, 1176, [3:3] +isNitrousMapCondition = bits, U32, 1176, [4:4] +isNitrousAfrCondition = bits, U32, 1176, [5:5] +isNitrousRpmCondition = bits, U32, 1176, [6:6] +isNitrousCondition = bits, U32, 1176, [7:7] ; total TS size = 1180 cranking0 = bits, U32, 1180, [0:0] notRunning0 = bits, U32, 1180, [1:1] @@ -5862,14 +5862,14 @@ entry = isDisabledByLua, "AC disabled by Lua", int, "%d" entry = acCompressorState, "AC compressor on", int, "%d" entry = acPressureTooLow, "AC pressure too low", int, "%d" entry = acPressureTooHigh, "AC pressure too high", int, "%d" -entry = isArmed, "isArmed", int, "%d" -entry = isNitrousSpeedConditionSatisfied, "isNitrousSpeedConditionSatisfied", int, "%d" -entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" -entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" -entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" -entry = isAfrConditionSatisfied, "isAfrConditionSatisfied", int, "%d" -entry = isNitrousRpmConditionSatisfied, "isNitrousRpmConditionSatisfied", int, "%d" -entry = isNitrousConditionSatisfied, "isNitrousConditionSatisfied", int, "%d" +entry = isNitrousArmed, "isNitrousArmed", int, "%d" +entry = isNitrousSpeedCondition, "isNitrousSpeedCondition", int, "%d" +entry = isNitrousTpsCondition, "isNitrousTpsCondition", int, "%d" +entry = isNitrousCltCondition, "isNitrousCltCondition", int, "%d" +entry = isNitrousMapCondition, "isNitrousMapCondition", int, "%d" +entry = isNitrousAfrCondition, "isNitrousAfrCondition", int, "%d" +entry = isNitrousRpmCondition, "isNitrousRpmCondition", int, "%d" +entry = isNitrousCondition, "isNitrousCondition", int, "%d" entry = cranking0, "cranking0", int, "%d" entry = notRunning0, "notRunning0", int, "%d" entry = disabledWhileEngineStopped0, "disabledWhileEngineStopped0", int, "%d" @@ -6861,14 +6861,14 @@ dialog = ac_controlDialog, "ac_control" graphLine = acButtonState indicatorPanel = nitrous_control_stateIndicatorPanel, 2 - indicator = {isArmed}, "isArmed No", "isArmed Yes" - indicator = {isNitrousSpeedConditionSatisfied}, "isNitrousSpeedConditionSatisfied No", "isNitrousSpeedConditionSatisfied Yes" - indicator = {isTpsConditionSatisfied}, "isTpsConditionSatisfied No", "isTpsConditionSatisfied Yes" - indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" - indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" - indicator = {isAfrConditionSatisfied}, "isAfrConditionSatisfied No", "isAfrConditionSatisfied Yes" - indicator = {isNitrousRpmConditionSatisfied}, "isNitrousRpmConditionSatisfied No", "isNitrousRpmConditionSatisfied Yes" - indicator = {isNitrousConditionSatisfied}, "isNitrousConditionSatisfied No", "isNitrousConditionSatisfied Yes" + indicator = {isNitrousArmed}, "isNitrousArmed No", "isNitrousArmed Yes" + indicator = {isNitrousSpeedCondition}, "isNitrousSpeedCondition No", "isNitrousSpeedCondition Yes" + indicator = {isNitrousTpsCondition}, "isNitrousTpsCondition No", "isNitrousTpsCondition Yes" + indicator = {isNitrousCltCondition}, "isNitrousCltCondition No", "isNitrousCltCondition Yes" + indicator = {isNitrousMapCondition}, "isNitrousMapCondition No", "isNitrousMapCondition Yes" + indicator = {isNitrousAfrCondition}, "isNitrousAfrCondition No", "isNitrousAfrCondition Yes" + indicator = {isNitrousRpmCondition}, "isNitrousRpmCondition No", "isNitrousRpmCondition Yes" + indicator = {isNitrousCondition}, "isNitrousCondition No", "isNitrousCondition Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9851,7 +9851,7 @@ dialog = tcuControls, "Transmission Settings" panel = NitrousControlArmingMethodDialog, {nitrousControlEnabled == 1} panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))} - dialog = NitrousControlDialog + dialog = NitrousControlDialog, "", border panel = NitrousControlSettingsDialog, West panel = nitrous_control_stateDialog, East diff --git a/firmware/tunerstudio/generated/rusefi_stm32f767_nucleo.ini b/firmware/tunerstudio/generated/rusefi_stm32f767_nucleo.ini index 114bc7b612..90a2861b39 100644 --- a/firmware/tunerstudio/generated/rusefi_stm32f767_nucleo.ini +++ b/firmware/tunerstudio/generated/rusefi_stm32f767_nucleo.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.12.06.stm32f767_nucleo.617288300" + signature = "rusEFI master.2024.12.06.stm32f767_nucleo.4089391862" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.06.stm32f767_nucleo.617288300" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.06.stm32f767_nucleo.4089391862" ; 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 @@ -3285,14 +3285,14 @@ acCompressorState = bits, U32, 1172, [7:7] acPressureTooLow = bits, U32, 1172, [8:8] acPressureTooHigh = bits, U32, 1172, [9:9] ; total TS size = 1176 -isArmed = bits, U32, 1176, [0:0] -isNitrousSpeedConditionSatisfied = bits, U32, 1176, [1:1] -isTpsConditionSatisfied = bits, U32, 1176, [2:2] -isCltConditionSatisfied = bits, U32, 1176, [3:3] -isMapConditionSatisfied = bits, U32, 1176, [4:4] -isAfrConditionSatisfied = bits, U32, 1176, [5:5] -isNitrousRpmConditionSatisfied = bits, U32, 1176, [6:6] -isNitrousConditionSatisfied = bits, U32, 1176, [7:7] +isNitrousArmed = bits, U32, 1176, [0:0] +isNitrousSpeedCondition = bits, U32, 1176, [1:1] +isNitrousTpsCondition = bits, U32, 1176, [2:2] +isNitrousCltCondition = bits, U32, 1176, [3:3] +isNitrousMapCondition = bits, U32, 1176, [4:4] +isNitrousAfrCondition = bits, U32, 1176, [5:5] +isNitrousRpmCondition = bits, U32, 1176, [6:6] +isNitrousCondition = bits, U32, 1176, [7:7] ; total TS size = 1180 cranking0 = bits, U32, 1180, [0:0] notRunning0 = bits, U32, 1180, [1:1] @@ -5862,14 +5862,14 @@ entry = isDisabledByLua, "AC disabled by Lua", int, "%d" entry = acCompressorState, "AC compressor on", int, "%d" entry = acPressureTooLow, "AC pressure too low", int, "%d" entry = acPressureTooHigh, "AC pressure too high", int, "%d" -entry = isArmed, "isArmed", int, "%d" -entry = isNitrousSpeedConditionSatisfied, "isNitrousSpeedConditionSatisfied", int, "%d" -entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" -entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" -entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" -entry = isAfrConditionSatisfied, "isAfrConditionSatisfied", int, "%d" -entry = isNitrousRpmConditionSatisfied, "isNitrousRpmConditionSatisfied", int, "%d" -entry = isNitrousConditionSatisfied, "isNitrousConditionSatisfied", int, "%d" +entry = isNitrousArmed, "isNitrousArmed", int, "%d" +entry = isNitrousSpeedCondition, "isNitrousSpeedCondition", int, "%d" +entry = isNitrousTpsCondition, "isNitrousTpsCondition", int, "%d" +entry = isNitrousCltCondition, "isNitrousCltCondition", int, "%d" +entry = isNitrousMapCondition, "isNitrousMapCondition", int, "%d" +entry = isNitrousAfrCondition, "isNitrousAfrCondition", int, "%d" +entry = isNitrousRpmCondition, "isNitrousRpmCondition", int, "%d" +entry = isNitrousCondition, "isNitrousCondition", int, "%d" entry = cranking0, "cranking0", int, "%d" entry = notRunning0, "notRunning0", int, "%d" entry = disabledWhileEngineStopped0, "disabledWhileEngineStopped0", int, "%d" @@ -6861,14 +6861,14 @@ dialog = ac_controlDialog, "ac_control" graphLine = acButtonState indicatorPanel = nitrous_control_stateIndicatorPanel, 2 - indicator = {isArmed}, "isArmed No", "isArmed Yes" - indicator = {isNitrousSpeedConditionSatisfied}, "isNitrousSpeedConditionSatisfied No", "isNitrousSpeedConditionSatisfied Yes" - indicator = {isTpsConditionSatisfied}, "isTpsConditionSatisfied No", "isTpsConditionSatisfied Yes" - indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" - indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" - indicator = {isAfrConditionSatisfied}, "isAfrConditionSatisfied No", "isAfrConditionSatisfied Yes" - indicator = {isNitrousRpmConditionSatisfied}, "isNitrousRpmConditionSatisfied No", "isNitrousRpmConditionSatisfied Yes" - indicator = {isNitrousConditionSatisfied}, "isNitrousConditionSatisfied No", "isNitrousConditionSatisfied Yes" + indicator = {isNitrousArmed}, "isNitrousArmed No", "isNitrousArmed Yes" + indicator = {isNitrousSpeedCondition}, "isNitrousSpeedCondition No", "isNitrousSpeedCondition Yes" + indicator = {isNitrousTpsCondition}, "isNitrousTpsCondition No", "isNitrousTpsCondition Yes" + indicator = {isNitrousCltCondition}, "isNitrousCltCondition No", "isNitrousCltCondition Yes" + indicator = {isNitrousMapCondition}, "isNitrousMapCondition No", "isNitrousMapCondition Yes" + indicator = {isNitrousAfrCondition}, "isNitrousAfrCondition No", "isNitrousAfrCondition Yes" + indicator = {isNitrousRpmCondition}, "isNitrousRpmCondition No", "isNitrousRpmCondition Yes" + indicator = {isNitrousCondition}, "isNitrousCondition No", "isNitrousCondition Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9851,7 +9851,7 @@ dialog = tcuControls, "Transmission Settings" panel = NitrousControlArmingMethodDialog, {nitrousControlEnabled == 1} panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))} - dialog = NitrousControlDialog + dialog = NitrousControlDialog, "", border panel = NitrousControlSettingsDialog, West panel = nitrous_control_stateDialog, East diff --git a/firmware/tunerstudio/generated/rusefi_stm32h743_nucleo.ini b/firmware/tunerstudio/generated/rusefi_stm32h743_nucleo.ini index fc12425739..a6a7715a06 100644 --- a/firmware/tunerstudio/generated/rusefi_stm32h743_nucleo.ini +++ b/firmware/tunerstudio/generated/rusefi_stm32h743_nucleo.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.12.06.stm32h743_nucleo.617288300" + signature = "rusEFI master.2024.12.06.stm32h743_nucleo.4089391862" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.06.stm32h743_nucleo.617288300" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.06.stm32h743_nucleo.4089391862" ; 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 @@ -3285,14 +3285,14 @@ acCompressorState = bits, U32, 1172, [7:7] acPressureTooLow = bits, U32, 1172, [8:8] acPressureTooHigh = bits, U32, 1172, [9:9] ; total TS size = 1176 -isArmed = bits, U32, 1176, [0:0] -isNitrousSpeedConditionSatisfied = bits, U32, 1176, [1:1] -isTpsConditionSatisfied = bits, U32, 1176, [2:2] -isCltConditionSatisfied = bits, U32, 1176, [3:3] -isMapConditionSatisfied = bits, U32, 1176, [4:4] -isAfrConditionSatisfied = bits, U32, 1176, [5:5] -isNitrousRpmConditionSatisfied = bits, U32, 1176, [6:6] -isNitrousConditionSatisfied = bits, U32, 1176, [7:7] +isNitrousArmed = bits, U32, 1176, [0:0] +isNitrousSpeedCondition = bits, U32, 1176, [1:1] +isNitrousTpsCondition = bits, U32, 1176, [2:2] +isNitrousCltCondition = bits, U32, 1176, [3:3] +isNitrousMapCondition = bits, U32, 1176, [4:4] +isNitrousAfrCondition = bits, U32, 1176, [5:5] +isNitrousRpmCondition = bits, U32, 1176, [6:6] +isNitrousCondition = bits, U32, 1176, [7:7] ; total TS size = 1180 cranking0 = bits, U32, 1180, [0:0] notRunning0 = bits, U32, 1180, [1:1] @@ -5862,14 +5862,14 @@ entry = isDisabledByLua, "AC disabled by Lua", int, "%d" entry = acCompressorState, "AC compressor on", int, "%d" entry = acPressureTooLow, "AC pressure too low", int, "%d" entry = acPressureTooHigh, "AC pressure too high", int, "%d" -entry = isArmed, "isArmed", int, "%d" -entry = isNitrousSpeedConditionSatisfied, "isNitrousSpeedConditionSatisfied", int, "%d" -entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" -entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" -entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" -entry = isAfrConditionSatisfied, "isAfrConditionSatisfied", int, "%d" -entry = isNitrousRpmConditionSatisfied, "isNitrousRpmConditionSatisfied", int, "%d" -entry = isNitrousConditionSatisfied, "isNitrousConditionSatisfied", int, "%d" +entry = isNitrousArmed, "isNitrousArmed", int, "%d" +entry = isNitrousSpeedCondition, "isNitrousSpeedCondition", int, "%d" +entry = isNitrousTpsCondition, "isNitrousTpsCondition", int, "%d" +entry = isNitrousCltCondition, "isNitrousCltCondition", int, "%d" +entry = isNitrousMapCondition, "isNitrousMapCondition", int, "%d" +entry = isNitrousAfrCondition, "isNitrousAfrCondition", int, "%d" +entry = isNitrousRpmCondition, "isNitrousRpmCondition", int, "%d" +entry = isNitrousCondition, "isNitrousCondition", int, "%d" entry = cranking0, "cranking0", int, "%d" entry = notRunning0, "notRunning0", int, "%d" entry = disabledWhileEngineStopped0, "disabledWhileEngineStopped0", int, "%d" @@ -6861,14 +6861,14 @@ dialog = ac_controlDialog, "ac_control" graphLine = acButtonState indicatorPanel = nitrous_control_stateIndicatorPanel, 2 - indicator = {isArmed}, "isArmed No", "isArmed Yes" - indicator = {isNitrousSpeedConditionSatisfied}, "isNitrousSpeedConditionSatisfied No", "isNitrousSpeedConditionSatisfied Yes" - indicator = {isTpsConditionSatisfied}, "isTpsConditionSatisfied No", "isTpsConditionSatisfied Yes" - indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" - indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" - indicator = {isAfrConditionSatisfied}, "isAfrConditionSatisfied No", "isAfrConditionSatisfied Yes" - indicator = {isNitrousRpmConditionSatisfied}, "isNitrousRpmConditionSatisfied No", "isNitrousRpmConditionSatisfied Yes" - indicator = {isNitrousConditionSatisfied}, "isNitrousConditionSatisfied No", "isNitrousConditionSatisfied Yes" + indicator = {isNitrousArmed}, "isNitrousArmed No", "isNitrousArmed Yes" + indicator = {isNitrousSpeedCondition}, "isNitrousSpeedCondition No", "isNitrousSpeedCondition Yes" + indicator = {isNitrousTpsCondition}, "isNitrousTpsCondition No", "isNitrousTpsCondition Yes" + indicator = {isNitrousCltCondition}, "isNitrousCltCondition No", "isNitrousCltCondition Yes" + indicator = {isNitrousMapCondition}, "isNitrousMapCondition No", "isNitrousMapCondition Yes" + indicator = {isNitrousAfrCondition}, "isNitrousAfrCondition No", "isNitrousAfrCondition Yes" + indicator = {isNitrousRpmCondition}, "isNitrousRpmCondition No", "isNitrousRpmCondition Yes" + indicator = {isNitrousCondition}, "isNitrousCondition No", "isNitrousCondition Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9851,7 +9851,7 @@ dialog = tcuControls, "Transmission Settings" panel = NitrousControlArmingMethodDialog, {nitrousControlEnabled == 1} panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))} - dialog = NitrousControlDialog + dialog = NitrousControlDialog, "", border panel = NitrousControlSettingsDialog, West panel = nitrous_control_stateDialog, East diff --git a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini index 32d26e8542..2d5e137b11 100644 --- a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.12.06.subaru_eg33_f7.2078943794" + signature = "rusEFI master.2024.12.06.subaru_eg33_f7.2896040616" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.06.subaru_eg33_f7.2078943794" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.06.subaru_eg33_f7.2896040616" ; 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 @@ -3285,14 +3285,14 @@ acCompressorState = bits, U32, 1172, [7:7] acPressureTooLow = bits, U32, 1172, [8:8] acPressureTooHigh = bits, U32, 1172, [9:9] ; total TS size = 1176 -isArmed = bits, U32, 1176, [0:0] -isNitrousSpeedConditionSatisfied = bits, U32, 1176, [1:1] -isTpsConditionSatisfied = bits, U32, 1176, [2:2] -isCltConditionSatisfied = bits, U32, 1176, [3:3] -isMapConditionSatisfied = bits, U32, 1176, [4:4] -isAfrConditionSatisfied = bits, U32, 1176, [5:5] -isNitrousRpmConditionSatisfied = bits, U32, 1176, [6:6] -isNitrousConditionSatisfied = bits, U32, 1176, [7:7] +isNitrousArmed = bits, U32, 1176, [0:0] +isNitrousSpeedCondition = bits, U32, 1176, [1:1] +isNitrousTpsCondition = bits, U32, 1176, [2:2] +isNitrousCltCondition = bits, U32, 1176, [3:3] +isNitrousMapCondition = bits, U32, 1176, [4:4] +isNitrousAfrCondition = bits, U32, 1176, [5:5] +isNitrousRpmCondition = bits, U32, 1176, [6:6] +isNitrousCondition = bits, U32, 1176, [7:7] ; total TS size = 1180 cranking0 = bits, U32, 1180, [0:0] notRunning0 = bits, U32, 1180, [1:1] @@ -5862,14 +5862,14 @@ entry = isDisabledByLua, "AC disabled by Lua", int, "%d" entry = acCompressorState, "AC compressor on", int, "%d" entry = acPressureTooLow, "AC pressure too low", int, "%d" entry = acPressureTooHigh, "AC pressure too high", int, "%d" -entry = isArmed, "isArmed", int, "%d" -entry = isNitrousSpeedConditionSatisfied, "isNitrousSpeedConditionSatisfied", int, "%d" -entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" -entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" -entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" -entry = isAfrConditionSatisfied, "isAfrConditionSatisfied", int, "%d" -entry = isNitrousRpmConditionSatisfied, "isNitrousRpmConditionSatisfied", int, "%d" -entry = isNitrousConditionSatisfied, "isNitrousConditionSatisfied", int, "%d" +entry = isNitrousArmed, "isNitrousArmed", int, "%d" +entry = isNitrousSpeedCondition, "isNitrousSpeedCondition", int, "%d" +entry = isNitrousTpsCondition, "isNitrousTpsCondition", int, "%d" +entry = isNitrousCltCondition, "isNitrousCltCondition", int, "%d" +entry = isNitrousMapCondition, "isNitrousMapCondition", int, "%d" +entry = isNitrousAfrCondition, "isNitrousAfrCondition", int, "%d" +entry = isNitrousRpmCondition, "isNitrousRpmCondition", int, "%d" +entry = isNitrousCondition, "isNitrousCondition", int, "%d" entry = cranking0, "cranking0", int, "%d" entry = notRunning0, "notRunning0", int, "%d" entry = disabledWhileEngineStopped0, "disabledWhileEngineStopped0", int, "%d" @@ -6863,14 +6863,14 @@ dialog = ac_controlDialog, "ac_control" graphLine = acButtonState indicatorPanel = nitrous_control_stateIndicatorPanel, 2 - indicator = {isArmed}, "isArmed No", "isArmed Yes" - indicator = {isNitrousSpeedConditionSatisfied}, "isNitrousSpeedConditionSatisfied No", "isNitrousSpeedConditionSatisfied Yes" - indicator = {isTpsConditionSatisfied}, "isTpsConditionSatisfied No", "isTpsConditionSatisfied Yes" - indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" - indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" - indicator = {isAfrConditionSatisfied}, "isAfrConditionSatisfied No", "isAfrConditionSatisfied Yes" - indicator = {isNitrousRpmConditionSatisfied}, "isNitrousRpmConditionSatisfied No", "isNitrousRpmConditionSatisfied Yes" - indicator = {isNitrousConditionSatisfied}, "isNitrousConditionSatisfied No", "isNitrousConditionSatisfied Yes" + indicator = {isNitrousArmed}, "isNitrousArmed No", "isNitrousArmed Yes" + indicator = {isNitrousSpeedCondition}, "isNitrousSpeedCondition No", "isNitrousSpeedCondition Yes" + indicator = {isNitrousTpsCondition}, "isNitrousTpsCondition No", "isNitrousTpsCondition Yes" + indicator = {isNitrousCltCondition}, "isNitrousCltCondition No", "isNitrousCltCondition Yes" + indicator = {isNitrousMapCondition}, "isNitrousMapCondition No", "isNitrousMapCondition Yes" + indicator = {isNitrousAfrCondition}, "isNitrousAfrCondition No", "isNitrousAfrCondition Yes" + indicator = {isNitrousRpmCondition}, "isNitrousRpmCondition No", "isNitrousRpmCondition Yes" + indicator = {isNitrousCondition}, "isNitrousCondition No", "isNitrousCondition Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9845,7 +9845,7 @@ dialog = tcuControls, "Transmission Settings" panel = NitrousControlArmingMethodDialog, {nitrousControlEnabled == 1} panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))} - dialog = NitrousControlDialog + dialog = NitrousControlDialog, "", border panel = NitrousControlSettingsDialog, West panel = nitrous_control_stateDialog, East diff --git a/firmware/tunerstudio/generated/rusefi_t-b-g.ini b/firmware/tunerstudio/generated/rusefi_t-b-g.ini index 02b43d21b8..64f773a365 100644 --- a/firmware/tunerstudio/generated/rusefi_t-b-g.ini +++ b/firmware/tunerstudio/generated/rusefi_t-b-g.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.12.06.t-b-g.617288300" + signature = "rusEFI master.2024.12.06.t-b-g.4089391862" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.06.t-b-g.617288300" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.06.t-b-g.4089391862" ; 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 @@ -3285,14 +3285,14 @@ acCompressorState = bits, U32, 1172, [7:7] acPressureTooLow = bits, U32, 1172, [8:8] acPressureTooHigh = bits, U32, 1172, [9:9] ; total TS size = 1176 -isArmed = bits, U32, 1176, [0:0] -isNitrousSpeedConditionSatisfied = bits, U32, 1176, [1:1] -isTpsConditionSatisfied = bits, U32, 1176, [2:2] -isCltConditionSatisfied = bits, U32, 1176, [3:3] -isMapConditionSatisfied = bits, U32, 1176, [4:4] -isAfrConditionSatisfied = bits, U32, 1176, [5:5] -isNitrousRpmConditionSatisfied = bits, U32, 1176, [6:6] -isNitrousConditionSatisfied = bits, U32, 1176, [7:7] +isNitrousArmed = bits, U32, 1176, [0:0] +isNitrousSpeedCondition = bits, U32, 1176, [1:1] +isNitrousTpsCondition = bits, U32, 1176, [2:2] +isNitrousCltCondition = bits, U32, 1176, [3:3] +isNitrousMapCondition = bits, U32, 1176, [4:4] +isNitrousAfrCondition = bits, U32, 1176, [5:5] +isNitrousRpmCondition = bits, U32, 1176, [6:6] +isNitrousCondition = bits, U32, 1176, [7:7] ; total TS size = 1180 cranking0 = bits, U32, 1180, [0:0] notRunning0 = bits, U32, 1180, [1:1] @@ -5862,14 +5862,14 @@ entry = isDisabledByLua, "AC disabled by Lua", int, "%d" entry = acCompressorState, "AC compressor on", int, "%d" entry = acPressureTooLow, "AC pressure too low", int, "%d" entry = acPressureTooHigh, "AC pressure too high", int, "%d" -entry = isArmed, "isArmed", int, "%d" -entry = isNitrousSpeedConditionSatisfied, "isNitrousSpeedConditionSatisfied", int, "%d" -entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" -entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" -entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" -entry = isAfrConditionSatisfied, "isAfrConditionSatisfied", int, "%d" -entry = isNitrousRpmConditionSatisfied, "isNitrousRpmConditionSatisfied", int, "%d" -entry = isNitrousConditionSatisfied, "isNitrousConditionSatisfied", int, "%d" +entry = isNitrousArmed, "isNitrousArmed", int, "%d" +entry = isNitrousSpeedCondition, "isNitrousSpeedCondition", int, "%d" +entry = isNitrousTpsCondition, "isNitrousTpsCondition", int, "%d" +entry = isNitrousCltCondition, "isNitrousCltCondition", int, "%d" +entry = isNitrousMapCondition, "isNitrousMapCondition", int, "%d" +entry = isNitrousAfrCondition, "isNitrousAfrCondition", int, "%d" +entry = isNitrousRpmCondition, "isNitrousRpmCondition", int, "%d" +entry = isNitrousCondition, "isNitrousCondition", int, "%d" entry = cranking0, "cranking0", int, "%d" entry = notRunning0, "notRunning0", int, "%d" entry = disabledWhileEngineStopped0, "disabledWhileEngineStopped0", int, "%d" @@ -6861,14 +6861,14 @@ dialog = ac_controlDialog, "ac_control" graphLine = acButtonState indicatorPanel = nitrous_control_stateIndicatorPanel, 2 - indicator = {isArmed}, "isArmed No", "isArmed Yes" - indicator = {isNitrousSpeedConditionSatisfied}, "isNitrousSpeedConditionSatisfied No", "isNitrousSpeedConditionSatisfied Yes" - indicator = {isTpsConditionSatisfied}, "isTpsConditionSatisfied No", "isTpsConditionSatisfied Yes" - indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" - indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" - indicator = {isAfrConditionSatisfied}, "isAfrConditionSatisfied No", "isAfrConditionSatisfied Yes" - indicator = {isNitrousRpmConditionSatisfied}, "isNitrousRpmConditionSatisfied No", "isNitrousRpmConditionSatisfied Yes" - indicator = {isNitrousConditionSatisfied}, "isNitrousConditionSatisfied No", "isNitrousConditionSatisfied Yes" + indicator = {isNitrousArmed}, "isNitrousArmed No", "isNitrousArmed Yes" + indicator = {isNitrousSpeedCondition}, "isNitrousSpeedCondition No", "isNitrousSpeedCondition Yes" + indicator = {isNitrousTpsCondition}, "isNitrousTpsCondition No", "isNitrousTpsCondition Yes" + indicator = {isNitrousCltCondition}, "isNitrousCltCondition No", "isNitrousCltCondition Yes" + indicator = {isNitrousMapCondition}, "isNitrousMapCondition No", "isNitrousMapCondition Yes" + indicator = {isNitrousAfrCondition}, "isNitrousAfrCondition No", "isNitrousAfrCondition Yes" + indicator = {isNitrousRpmCondition}, "isNitrousRpmCondition No", "isNitrousRpmCondition Yes" + indicator = {isNitrousCondition}, "isNitrousCondition No", "isNitrousCondition Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9851,7 +9851,7 @@ dialog = tcuControls, "Transmission Settings" panel = NitrousControlArmingMethodDialog, {nitrousControlEnabled == 1} panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))} - dialog = NitrousControlDialog + dialog = NitrousControlDialog, "", border panel = NitrousControlSettingsDialog, West panel = nitrous_control_stateDialog, East diff --git a/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini b/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini index ffafb9bede..6a6b595c78 100644 --- a/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini +++ b/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.12.06.tdg-pdm8.518434532" + signature = "rusEFI master.2024.12.06.tdg-pdm8.3381827198" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.06.tdg-pdm8.518434532" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.06.tdg-pdm8.3381827198" ; 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 @@ -3285,14 +3285,14 @@ acCompressorState = bits, U32, 1172, [7:7] acPressureTooLow = bits, U32, 1172, [8:8] acPressureTooHigh = bits, U32, 1172, [9:9] ; total TS size = 1176 -isArmed = bits, U32, 1176, [0:0] -isNitrousSpeedConditionSatisfied = bits, U32, 1176, [1:1] -isTpsConditionSatisfied = bits, U32, 1176, [2:2] -isCltConditionSatisfied = bits, U32, 1176, [3:3] -isMapConditionSatisfied = bits, U32, 1176, [4:4] -isAfrConditionSatisfied = bits, U32, 1176, [5:5] -isNitrousRpmConditionSatisfied = bits, U32, 1176, [6:6] -isNitrousConditionSatisfied = bits, U32, 1176, [7:7] +isNitrousArmed = bits, U32, 1176, [0:0] +isNitrousSpeedCondition = bits, U32, 1176, [1:1] +isNitrousTpsCondition = bits, U32, 1176, [2:2] +isNitrousCltCondition = bits, U32, 1176, [3:3] +isNitrousMapCondition = bits, U32, 1176, [4:4] +isNitrousAfrCondition = bits, U32, 1176, [5:5] +isNitrousRpmCondition = bits, U32, 1176, [6:6] +isNitrousCondition = bits, U32, 1176, [7:7] ; total TS size = 1180 cranking0 = bits, U32, 1180, [0:0] notRunning0 = bits, U32, 1180, [1:1] @@ -5862,14 +5862,14 @@ entry = isDisabledByLua, "AC disabled by Lua", int, "%d" entry = acCompressorState, "AC compressor on", int, "%d" entry = acPressureTooLow, "AC pressure too low", int, "%d" entry = acPressureTooHigh, "AC pressure too high", int, "%d" -entry = isArmed, "isArmed", int, "%d" -entry = isNitrousSpeedConditionSatisfied, "isNitrousSpeedConditionSatisfied", int, "%d" -entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" -entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" -entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" -entry = isAfrConditionSatisfied, "isAfrConditionSatisfied", int, "%d" -entry = isNitrousRpmConditionSatisfied, "isNitrousRpmConditionSatisfied", int, "%d" -entry = isNitrousConditionSatisfied, "isNitrousConditionSatisfied", int, "%d" +entry = isNitrousArmed, "isNitrousArmed", int, "%d" +entry = isNitrousSpeedCondition, "isNitrousSpeedCondition", int, "%d" +entry = isNitrousTpsCondition, "isNitrousTpsCondition", int, "%d" +entry = isNitrousCltCondition, "isNitrousCltCondition", int, "%d" +entry = isNitrousMapCondition, "isNitrousMapCondition", int, "%d" +entry = isNitrousAfrCondition, "isNitrousAfrCondition", int, "%d" +entry = isNitrousRpmCondition, "isNitrousRpmCondition", int, "%d" +entry = isNitrousCondition, "isNitrousCondition", int, "%d" entry = cranking0, "cranking0", int, "%d" entry = notRunning0, "notRunning0", int, "%d" entry = disabledWhileEngineStopped0, "disabledWhileEngineStopped0", int, "%d" @@ -6861,14 +6861,14 @@ dialog = ac_controlDialog, "ac_control" graphLine = acButtonState indicatorPanel = nitrous_control_stateIndicatorPanel, 2 - indicator = {isArmed}, "isArmed No", "isArmed Yes" - indicator = {isNitrousSpeedConditionSatisfied}, "isNitrousSpeedConditionSatisfied No", "isNitrousSpeedConditionSatisfied Yes" - indicator = {isTpsConditionSatisfied}, "isTpsConditionSatisfied No", "isTpsConditionSatisfied Yes" - indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" - indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" - indicator = {isAfrConditionSatisfied}, "isAfrConditionSatisfied No", "isAfrConditionSatisfied Yes" - indicator = {isNitrousRpmConditionSatisfied}, "isNitrousRpmConditionSatisfied No", "isNitrousRpmConditionSatisfied Yes" - indicator = {isNitrousConditionSatisfied}, "isNitrousConditionSatisfied No", "isNitrousConditionSatisfied Yes" + indicator = {isNitrousArmed}, "isNitrousArmed No", "isNitrousArmed Yes" + indicator = {isNitrousSpeedCondition}, "isNitrousSpeedCondition No", "isNitrousSpeedCondition Yes" + indicator = {isNitrousTpsCondition}, "isNitrousTpsCondition No", "isNitrousTpsCondition Yes" + indicator = {isNitrousCltCondition}, "isNitrousCltCondition No", "isNitrousCltCondition Yes" + indicator = {isNitrousMapCondition}, "isNitrousMapCondition No", "isNitrousMapCondition Yes" + indicator = {isNitrousAfrCondition}, "isNitrousAfrCondition No", "isNitrousAfrCondition Yes" + indicator = {isNitrousRpmCondition}, "isNitrousRpmCondition No", "isNitrousRpmCondition Yes" + indicator = {isNitrousCondition}, "isNitrousCondition No", "isNitrousCondition Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9851,7 +9851,7 @@ dialog = tcuControls, "Transmission Settings" panel = NitrousControlArmingMethodDialog, {nitrousControlEnabled == 1} panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))} - dialog = NitrousControlDialog + dialog = NitrousControlDialog, "", border panel = NitrousControlSettingsDialog, West panel = nitrous_control_stateDialog, East diff --git a/firmware/tunerstudio/generated/rusefi_uaefi.ini b/firmware/tunerstudio/generated/rusefi_uaefi.ini index 5bda44c524..546c30c955 100644 --- a/firmware/tunerstudio/generated/rusefi_uaefi.ini +++ b/firmware/tunerstudio/generated/rusefi_uaefi.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.12.06.uaefi.2096793967" + signature = "rusEFI master.2024.12.06.uaefi.2878255605" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.06.uaefi.2096793967" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.06.uaefi.2878255605" ; 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 @@ -3288,14 +3288,14 @@ acCompressorState = bits, U32, 1172, [7:7] acPressureTooLow = bits, U32, 1172, [8:8] acPressureTooHigh = bits, U32, 1172, [9:9] ; total TS size = 1176 -isArmed = bits, U32, 1176, [0:0] -isNitrousSpeedConditionSatisfied = bits, U32, 1176, [1:1] -isTpsConditionSatisfied = bits, U32, 1176, [2:2] -isCltConditionSatisfied = bits, U32, 1176, [3:3] -isMapConditionSatisfied = bits, U32, 1176, [4:4] -isAfrConditionSatisfied = bits, U32, 1176, [5:5] -isNitrousRpmConditionSatisfied = bits, U32, 1176, [6:6] -isNitrousConditionSatisfied = bits, U32, 1176, [7:7] +isNitrousArmed = bits, U32, 1176, [0:0] +isNitrousSpeedCondition = bits, U32, 1176, [1:1] +isNitrousTpsCondition = bits, U32, 1176, [2:2] +isNitrousCltCondition = bits, U32, 1176, [3:3] +isNitrousMapCondition = bits, U32, 1176, [4:4] +isNitrousAfrCondition = bits, U32, 1176, [5:5] +isNitrousRpmCondition = bits, U32, 1176, [6:6] +isNitrousCondition = bits, U32, 1176, [7:7] ; total TS size = 1180 cranking0 = bits, U32, 1180, [0:0] notRunning0 = bits, U32, 1180, [1:1] @@ -5873,14 +5873,14 @@ entry = isDisabledByLua, "AC disabled by Lua", int, "%d" entry = acCompressorState, "AC compressor on", int, "%d" entry = acPressureTooLow, "AC pressure too low", int, "%d" entry = acPressureTooHigh, "AC pressure too high", int, "%d" -entry = isArmed, "isArmed", int, "%d" -entry = isNitrousSpeedConditionSatisfied, "isNitrousSpeedConditionSatisfied", int, "%d" -entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" -entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" -entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" -entry = isAfrConditionSatisfied, "isAfrConditionSatisfied", int, "%d" -entry = isNitrousRpmConditionSatisfied, "isNitrousRpmConditionSatisfied", int, "%d" -entry = isNitrousConditionSatisfied, "isNitrousConditionSatisfied", int, "%d" +entry = isNitrousArmed, "isNitrousArmed", int, "%d" +entry = isNitrousSpeedCondition, "isNitrousSpeedCondition", int, "%d" +entry = isNitrousTpsCondition, "isNitrousTpsCondition", int, "%d" +entry = isNitrousCltCondition, "isNitrousCltCondition", int, "%d" +entry = isNitrousMapCondition, "isNitrousMapCondition", int, "%d" +entry = isNitrousAfrCondition, "isNitrousAfrCondition", int, "%d" +entry = isNitrousRpmCondition, "isNitrousRpmCondition", int, "%d" +entry = isNitrousCondition, "isNitrousCondition", int, "%d" entry = cranking0, "cranking0", int, "%d" entry = notRunning0, "notRunning0", int, "%d" entry = disabledWhileEngineStopped0, "disabledWhileEngineStopped0", int, "%d" @@ -6893,14 +6893,14 @@ dialog = ac_controlDialog, "ac_control" graphLine = acButtonState indicatorPanel = nitrous_control_stateIndicatorPanel, 2 - indicator = {isArmed}, "isArmed No", "isArmed Yes" - indicator = {isNitrousSpeedConditionSatisfied}, "isNitrousSpeedConditionSatisfied No", "isNitrousSpeedConditionSatisfied Yes" - indicator = {isTpsConditionSatisfied}, "isTpsConditionSatisfied No", "isTpsConditionSatisfied Yes" - indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" - indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" - indicator = {isAfrConditionSatisfied}, "isAfrConditionSatisfied No", "isAfrConditionSatisfied Yes" - indicator = {isNitrousRpmConditionSatisfied}, "isNitrousRpmConditionSatisfied No", "isNitrousRpmConditionSatisfied Yes" - indicator = {isNitrousConditionSatisfied}, "isNitrousConditionSatisfied No", "isNitrousConditionSatisfied Yes" + indicator = {isNitrousArmed}, "isNitrousArmed No", "isNitrousArmed Yes" + indicator = {isNitrousSpeedCondition}, "isNitrousSpeedCondition No", "isNitrousSpeedCondition Yes" + indicator = {isNitrousTpsCondition}, "isNitrousTpsCondition No", "isNitrousTpsCondition Yes" + indicator = {isNitrousCltCondition}, "isNitrousCltCondition No", "isNitrousCltCondition Yes" + indicator = {isNitrousMapCondition}, "isNitrousMapCondition No", "isNitrousMapCondition Yes" + indicator = {isNitrousAfrCondition}, "isNitrousAfrCondition No", "isNitrousAfrCondition Yes" + indicator = {isNitrousRpmCondition}, "isNitrousRpmCondition No", "isNitrousRpmCondition Yes" + indicator = {isNitrousCondition}, "isNitrousCondition No", "isNitrousCondition Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9843,7 +9843,7 @@ commandButton = "VAG i5", cmd_set_engine_type_vag_5 panel = NitrousControlArmingMethodDialog, {nitrousControlEnabled == 1} panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))} - dialog = NitrousControlDialog + dialog = NitrousControlDialog, "", border panel = NitrousControlSettingsDialog, West panel = nitrous_control_stateDialog, East diff --git a/firmware/tunerstudio/generated/rusefi_uaefi121.ini b/firmware/tunerstudio/generated/rusefi_uaefi121.ini index 61001effe1..9ec5bfb737 100644 --- a/firmware/tunerstudio/generated/rusefi_uaefi121.ini +++ b/firmware/tunerstudio/generated/rusefi_uaefi121.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.12.06.uaefi121.3256370372" + signature = "rusEFI master.2024.12.06.uaefi121.359431262" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.06.uaefi121.3256370372" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.06.uaefi121.359431262" ; 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 @@ -3285,14 +3285,14 @@ acCompressorState = bits, U32, 1172, [7:7] acPressureTooLow = bits, U32, 1172, [8:8] acPressureTooHigh = bits, U32, 1172, [9:9] ; total TS size = 1176 -isArmed = bits, U32, 1176, [0:0] -isNitrousSpeedConditionSatisfied = bits, U32, 1176, [1:1] -isTpsConditionSatisfied = bits, U32, 1176, [2:2] -isCltConditionSatisfied = bits, U32, 1176, [3:3] -isMapConditionSatisfied = bits, U32, 1176, [4:4] -isAfrConditionSatisfied = bits, U32, 1176, [5:5] -isNitrousRpmConditionSatisfied = bits, U32, 1176, [6:6] -isNitrousConditionSatisfied = bits, U32, 1176, [7:7] +isNitrousArmed = bits, U32, 1176, [0:0] +isNitrousSpeedCondition = bits, U32, 1176, [1:1] +isNitrousTpsCondition = bits, U32, 1176, [2:2] +isNitrousCltCondition = bits, U32, 1176, [3:3] +isNitrousMapCondition = bits, U32, 1176, [4:4] +isNitrousAfrCondition = bits, U32, 1176, [5:5] +isNitrousRpmCondition = bits, U32, 1176, [6:6] +isNitrousCondition = bits, U32, 1176, [7:7] ; total TS size = 1180 cranking0 = bits, U32, 1180, [0:0] notRunning0 = bits, U32, 1180, [1:1] @@ -5863,14 +5863,14 @@ entry = isDisabledByLua, "AC disabled by Lua", int, "%d" entry = acCompressorState, "AC compressor on", int, "%d" entry = acPressureTooLow, "AC pressure too low", int, "%d" entry = acPressureTooHigh, "AC pressure too high", int, "%d" -entry = isArmed, "isArmed", int, "%d" -entry = isNitrousSpeedConditionSatisfied, "isNitrousSpeedConditionSatisfied", int, "%d" -entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d" -entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d" -entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d" -entry = isAfrConditionSatisfied, "isAfrConditionSatisfied", int, "%d" -entry = isNitrousRpmConditionSatisfied, "isNitrousRpmConditionSatisfied", int, "%d" -entry = isNitrousConditionSatisfied, "isNitrousConditionSatisfied", int, "%d" +entry = isNitrousArmed, "isNitrousArmed", int, "%d" +entry = isNitrousSpeedCondition, "isNitrousSpeedCondition", int, "%d" +entry = isNitrousTpsCondition, "isNitrousTpsCondition", int, "%d" +entry = isNitrousCltCondition, "isNitrousCltCondition", int, "%d" +entry = isNitrousMapCondition, "isNitrousMapCondition", int, "%d" +entry = isNitrousAfrCondition, "isNitrousAfrCondition", int, "%d" +entry = isNitrousRpmCondition, "isNitrousRpmCondition", int, "%d" +entry = isNitrousCondition, "isNitrousCondition", int, "%d" entry = cranking0, "cranking0", int, "%d" entry = notRunning0, "notRunning0", int, "%d" entry = disabledWhileEngineStopped0, "disabledWhileEngineStopped0", int, "%d" @@ -6882,14 +6882,14 @@ dialog = ac_controlDialog, "ac_control" graphLine = acButtonState indicatorPanel = nitrous_control_stateIndicatorPanel, 2 - indicator = {isArmed}, "isArmed No", "isArmed Yes" - indicator = {isNitrousSpeedConditionSatisfied}, "isNitrousSpeedConditionSatisfied No", "isNitrousSpeedConditionSatisfied Yes" - indicator = {isTpsConditionSatisfied}, "isTpsConditionSatisfied No", "isTpsConditionSatisfied Yes" - indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes" - indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes" - indicator = {isAfrConditionSatisfied}, "isAfrConditionSatisfied No", "isAfrConditionSatisfied Yes" - indicator = {isNitrousRpmConditionSatisfied}, "isNitrousRpmConditionSatisfied No", "isNitrousRpmConditionSatisfied Yes" - indicator = {isNitrousConditionSatisfied}, "isNitrousConditionSatisfied No", "isNitrousConditionSatisfied Yes" + indicator = {isNitrousArmed}, "isNitrousArmed No", "isNitrousArmed Yes" + indicator = {isNitrousSpeedCondition}, "isNitrousSpeedCondition No", "isNitrousSpeedCondition Yes" + indicator = {isNitrousTpsCondition}, "isNitrousTpsCondition No", "isNitrousTpsCondition Yes" + indicator = {isNitrousCltCondition}, "isNitrousCltCondition No", "isNitrousCltCondition Yes" + indicator = {isNitrousMapCondition}, "isNitrousMapCondition No", "isNitrousMapCondition Yes" + indicator = {isNitrousAfrCondition}, "isNitrousAfrCondition No", "isNitrousAfrCondition Yes" + indicator = {isNitrousRpmCondition}, "isNitrousRpmCondition No", "isNitrousRpmCondition Yes" + indicator = {isNitrousCondition}, "isNitrousCondition No", "isNitrousCondition Yes" dialog = nitrous_control_stateDialog, "nitrous_control_state" panel = nitrous_control_stateIndicatorPanel @@ -9829,7 +9829,7 @@ commandButton = "VAG i5", cmd_set_engine_type_vag_5 panel = NitrousControlArmingMethodDialog, {nitrousControlEnabled == 1} panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))} - dialog = NitrousControlDialog + dialog = NitrousControlDialog, "", border panel = NitrousControlSettingsDialog, West panel = nitrous_control_stateDialog, East 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 541401d0c5..83900145de 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 @@ -1237,6 +1237,7 @@ public class Fields { public static final int SentInput_INPUT6 = 6; public static final int SentInput_INPUT7 = 7; public static final int SentInput_NONE = 0; + public static final int SIGNATURE_HASH = 319284043; public static final String SIMULATOR_TUNE_BIN_FILE_NAME = "generated/simulator_tune_image.bin"; public static final String SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX = "generated/simulator_tune_image"; public static final String SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX = ".bin"; @@ -1499,7 +1500,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 master.2024.12.06.f407-discovery.3295927249"; + public static final String TS_SIGNATURE = "rusEFI master.2024.12.06.f407-discovery.319284043"; public static final char TS_SIMULATE_CAN = '>'; public static final char TS_SINGLE_WRITE_COMMAND = 'W'; public static final char TS_TEST_COMMAND = 't'; diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/NitrousControl.java b/java_console/models/src/main/java/com/rusefi/config/generated/NitrousControl.java index 5619ef6724..f0707366e3 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/NitrousControl.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/NitrousControl.java @@ -179,22 +179,22 @@ public class NitrousControl { public static final int TCU_GEAR_COUNT = 10; public static final int TPS_2_BYTE_PACKING_MULT = 100; public static final int VE_BLEND_COUNT = 4; - public static final Field ISARMED = Field.create("ISARMED", 0, FieldType.BIT, 0).setBaseOffset(1176); - public static final Field ISNITROUSSPEEDCONDITIONSATISFIED = Field.create("ISNITROUSSPEEDCONDITIONSATISFIED", 0, FieldType.BIT, 1).setBaseOffset(1176); - public static final Field ISTPSCONDITIONSATISFIED = Field.create("ISTPSCONDITIONSATISFIED", 0, FieldType.BIT, 2).setBaseOffset(1176); - public static final Field ISCLTCONDITIONSATISFIED = Field.create("ISCLTCONDITIONSATISFIED", 0, FieldType.BIT, 3).setBaseOffset(1176); - public static final Field ISMAPCONDITIONSATISFIED = Field.create("ISMAPCONDITIONSATISFIED", 0, FieldType.BIT, 4).setBaseOffset(1176); - public static final Field ISAFRCONDITIONSATISFIED = Field.create("ISAFRCONDITIONSATISFIED", 0, FieldType.BIT, 5).setBaseOffset(1176); - public static final Field ISNITROUSRPMCONDITIONSATISFIED = Field.create("ISNITROUSRPMCONDITIONSATISFIED", 0, FieldType.BIT, 6).setBaseOffset(1176); - public static final Field ISNITROUSCONDITIONSATISFIED = Field.create("ISNITROUSCONDITIONSATISFIED", 0, FieldType.BIT, 7).setBaseOffset(1176); + public static final Field ISNITROUSARMED = Field.create("ISNITROUSARMED", 0, FieldType.BIT, 0).setBaseOffset(1176); + public static final Field ISNITROUSSPEEDCONDITION = Field.create("ISNITROUSSPEEDCONDITION", 0, FieldType.BIT, 1).setBaseOffset(1176); + public static final Field ISNITROUSTPSCONDITION = Field.create("ISNITROUSTPSCONDITION", 0, FieldType.BIT, 2).setBaseOffset(1176); + public static final Field ISNITROUSCLTCONDITION = Field.create("ISNITROUSCLTCONDITION", 0, FieldType.BIT, 3).setBaseOffset(1176); + public static final Field ISNITROUSMAPCONDITION = Field.create("ISNITROUSMAPCONDITION", 0, FieldType.BIT, 4).setBaseOffset(1176); + public static final Field ISNITROUSAFRCONDITION = Field.create("ISNITROUSAFRCONDITION", 0, FieldType.BIT, 5).setBaseOffset(1176); + public static final Field ISNITROUSRPMCONDITION = Field.create("ISNITROUSRPMCONDITION", 0, FieldType.BIT, 6).setBaseOffset(1176); + public static final Field ISNITROUSCONDITION = Field.create("ISNITROUSCONDITION", 0, FieldType.BIT, 7).setBaseOffset(1176); public static final Field[] VALUES = { - ISARMED, - ISNITROUSSPEEDCONDITIONSATISFIED, - ISTPSCONDITIONSATISFIED, - ISCLTCONDITIONSATISFIED, - ISMAPCONDITIONSATISFIED, - ISAFRCONDITIONSATISFIED, - ISNITROUSRPMCONDITIONSATISFIED, - ISNITROUSCONDITIONSATISFIED, + ISNITROUSARMED, + ISNITROUSSPEEDCONDITION, + ISNITROUSTPSCONDITION, + ISNITROUSCLTCONDITION, + ISNITROUSMAPCONDITION, + ISNITROUSAFRCONDITION, + ISNITROUSRPMCONDITION, + ISNITROUSCONDITION, }; }