From cdb21ed702a552f8a65be528b1a094b960d9375d Mon Sep 17 00:00:00 2001 From: rusefillc Date: Tue, 26 Mar 2024 21:39:54 -0400 Subject: [PATCH] hide more of UI #6279 --- .../boards/hellen/hellen-honda-k/prepend.txt | 3 +++ .../hellen/hellen154hyundai/prepend.txt | 4 ++++ firmware/integration/rusefi_config.txt | 6 ++++++ firmware/tunerstudio/tunerstudio.template.ini | 20 +++++++++---------- 4 files changed, 23 insertions(+), 10 deletions(-) diff --git a/firmware/config/boards/hellen/hellen-honda-k/prepend.txt b/firmware/config/boards/hellen/hellen-honda-k/prepend.txt index afff933302..87f80c42d1 100644 --- a/firmware/config/boards/hellen/hellen-honda-k/prepend.txt +++ b/firmware/config/boards/hellen/hellen-honda-k/prepend.txt @@ -23,6 +23,9 @@ #define ts_show_tps2 false #define ts_show_speedo_settings false +#define ts_show_bank2_cam1 false +#define ts_show_bank2_cam2 false + #define ts_show_starter_disable false #define ts_show_status_leds false #define ts_show_hd false diff --git a/firmware/config/boards/hellen/hellen154hyundai/prepend.txt b/firmware/config/boards/hellen/hellen154hyundai/prepend.txt index 7687c57048..afa39053ee 100644 --- a/firmware/config/boards/hellen/hellen154hyundai/prepend.txt +++ b/firmware/config/boards/hellen/hellen154hyundai/prepend.txt @@ -21,6 +21,10 @@ #define ts_show_tps2 false #define ts_show_speedo_settings false +#define ts_show_bank2_cam1 false +#define ts_show_bank2_cam2 false + + #define ts_show_starter_disable false #define ts_show_fuel_pump false #define ts_show_status_leds false diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index 545971a3b0..797fe18340 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -1950,6 +1950,12 @@ end_struct #define GAUGE_NAME_TRG_ERR "Trigger Error Counter" #define GAUGE_NAME_TRG_GAP "Sync: Trigger Latest Ratio" +#define CAM_1_MODE_NAME "Cam mode (intake)" +#define CAM_2_MODE_NAME "Cam mode (exhaust)" +#define ts_show_cam2 true +#define ts_show_bank2_cam1 true +#define ts_show_bank2_cam2 true +#define ts_show_sync_cam true #define INJECTOR_1_NAME "Injector #1" #define INJECTOR_2_NAME "Injector #2" diff --git a/firmware/tunerstudio/tunerstudio.template.ini b/firmware/tunerstudio/tunerstudio.template.ini index 4a7a2a6a23..a8dfedaf8b 100644 --- a/firmware/tunerstudio/tunerstudio.template.ini +++ b/firmware/tunerstudio/tunerstudio.template.ini @@ -2442,24 +2442,24 @@ cmd_set_engine_type_default = "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_ ; todo: code generator to hard-code all triggers not requiring VVT? ; todo: https://github.com/rusefi/rusefi/issues/2077 - field = "Cam mode (intake)", vvtMode1, {trigger_type != @@trigger_type_e_TT_MAZDA_MIATA_NA@@} + field = @@CAM_1_MODE_NAME@@, vvtMode1, {trigger_type != @@trigger_type_e_TT_MAZDA_MIATA_NA@@} field = "2JZ Position", camDecoder2jzPosition, 1, {vvtMode1 == @@vvt_mode_e_VVT_TOYOTA_3_TOOTH@@} field = "2JZ Precision", camDecoder2jzPrecision, 1, {vvtMode1 == @@vvt_mode_e_VVT_TOYOTA_3_TOOTH@@} - field = "Cam mode (exhaust)", vvtMode2, {trigger_type != @@trigger_type_e_TT_MAZDA_MIATA_NA@@} + field = @@CAM_2_MODE_NAME@@, vvtMode2, {trigger_type != @@trigger_type_e_TT_MAZDA_MIATA_NA@@}@@if_ts_show_cam2 field = "" field = "Cam sensor bank 1 intake", camInputs1, { camInputs1 != 0 || (vvtMode1 != @@vvt_mode_e_VVT_INACTIVE@@ ) } - field = "Cam sensor bank 1 exhaust", camInputs2, { camInputs2 != 0 || (vvtMode2 != @@vvt_mode_e_VVT_INACTIVE@@ && camInputs1 != 0 ) } - field = "Cam sensor bank 2 intake", camInputs3, { camInputs3 != 0 || (vvtMode1 != @@vvt_mode_e_VVT_INACTIVE@@ && camInputs1 != 0 ) } - field = "Cam sensor bank 2 exhaust", camInputs4, { camInputs4 != 0 || (vvtMode2 != @@vvt_mode_e_VVT_INACTIVE@@ && camInputs2 != 0 ) } + field = "Cam sensor bank 1 exhaust", camInputs2, { camInputs2 != 0 || (vvtMode2 != @@vvt_mode_e_VVT_INACTIVE@@ && camInputs1 != 0 ) }@@if_ts_show_cam2 + field = "Cam sensor bank 2 intake", camInputs3, { camInputs3 != 0 || (vvtMode1 != @@vvt_mode_e_VVT_INACTIVE@@ && camInputs1 != 0 ) }@@if_ts_show_bank2_cam1 + field = "Cam sensor bank 2 exhaust", camInputs4, { camInputs4 != 0 || (vvtMode2 != @@vvt_mode_e_VVT_INACTIVE@@ && camInputs2 != 0 ) }@@if_ts_show_bank2_cam2 field = "Cam Edge Select", invertCamVVTSignal, { camInputs1 != 0 } field = "" field = "#Set offset so VVT indicates 0 degrees in default position" field = "VVT offset bank 1 intake", vvtOffsets1, { camInputs1 != 0 } - field = "VVT offset bank 1 exhaust", vvtOffsets2, { camInputs2 != 0 } - field = "VVT offset bank 2 intake", vvtOffsets3, { camInputs3 != 0 } - field = "VVT offset bank 2 exhaust", vvtOffsets4, { camInputs4 != 0 } - field = "" - field = "Cam for engine sync resolution", engineSyncCam, { vvtMode1 != @@vvt_mode_e_VVT_INACTIVE@@ || vvtMode2 != @@vvt_mode_e_VVT_INACTIVE@@ } + field = "VVT offset bank 1 exhaust", vvtOffsets2, { camInputs2 != 0 }@@if_ts_show_cam2 + field = "VVT offset bank 2 intake", vvtOffsets3, { camInputs3 != 0 }@@if_ts_show_bank2_cam1 + field = "VVT offset bank 2 exhaust", vvtOffsets4, { camInputs4 != 0 }@@if_ts_show_bank2_cam2 + field = ""@@if_ts_show_sync_cam + field = "Cam for engine sync resolution", engineSyncCam, { vvtMode1 != @@vvt_mode_e_VVT_INACTIVE@@ || vvtMode2 != @@vvt_mode_e_VVT_INACTIVE@@ }@@if_ts_show_sync_cam dialog = triggerConfiguration_gap, "Trigger Gap Override" field = "!This is a pretty advanced feature for when you are debugging trigger synchronization"