diff --git a/firmware/config/boards/hellen/alphax-4chan/prepend.txt b/firmware/config/boards/hellen/alphax-4chan/prepend.txt index 67cfd92e33..51495751e5 100644 --- a/firmware/config/boards/hellen/alphax-4chan/prepend.txt +++ b/firmware/config/boards/hellen/alphax-4chan/prepend.txt @@ -17,6 +17,8 @@ #define ts_show_vr_threshold_all true #define ts_show_vr_threshold_pins false #define ts_show_vr_threshold_2 true +#define ts_show_tcu true +#define ts_show_gdi true #define show_4chan_presets true diff --git a/firmware/config/boards/hellen/hellen-honda-k/prepend.txt b/firmware/config/boards/hellen/hellen-honda-k/prepend.txt index 280446697f..a9f1c84013 100644 --- a/firmware/config/boards/hellen/hellen-honda-k/prepend.txt +++ b/firmware/config/boards/hellen/hellen-honda-k/prepend.txt @@ -20,6 +20,12 @@ #define ts_show_ignitionPinMode false #define ts_show_tps2 false +#define ts_show_starter_disable false +#define ts_show_status_leds false +#define ts_show_hd false +#define ts_show_odd_fire false +#define ts_show_rotary false + #define ts_show_cylinder_5 false #define ts_show_cylinder_6 false #define ts_show_cylinder_7 false diff --git a/firmware/config/boards/hellen/hellen154hyundai/prepend.txt b/firmware/config/boards/hellen/hellen154hyundai/prepend.txt index 06a0b21639..05ad82de42 100644 --- a/firmware/config/boards/hellen/hellen154hyundai/prepend.txt +++ b/firmware/config/boards/hellen/hellen154hyundai/prepend.txt @@ -20,6 +20,15 @@ #define ts_show_ignitionPinMode false #define ts_show_tps2 false +#define ts_show_starter_disable false +#define ts_show_fuel_pump false +#define ts_show_status_leds false +#define ts_show_idle_hardware false +#define ts_show_hd false +#define ts_show_odd_fire false +#define ts_show_rotary false + +#define ts_show_cylinder_9 false #define ts_show_cylinder_10 false #define ts_show_cylinder_11 false #define ts_show_cylinder_12 false diff --git a/firmware/config/boards/hellen/uaefi/prepend.txt b/firmware/config/boards/hellen/uaefi/prepend.txt index ad0e2f9fba..0de80cf89f 100644 --- a/firmware/config/boards/hellen/uaefi/prepend.txt +++ b/firmware/config/boards/hellen/uaefi/prepend.txt @@ -20,6 +20,8 @@ #define ts_show_vr_threshold_pins false #define ts_show_vr_threshold_2 false +#define ts_show_tcu true +#define ts_show_gdi true diff --git a/firmware/config/boards/microrusefi/prepend.txt b/firmware/config/boards/microrusefi/prepend.txt index c05723330b..c29b3dad98 100644 --- a/firmware/config/boards/microrusefi/prepend.txt +++ b/firmware/config/boards/microrusefi/prepend.txt @@ -24,6 +24,8 @@ #define ts_show_inj_diag true #define ts_show_output_diag true #define ts_show_tle8888 true +#define ts_show_tcu true +#define ts_show_gdi true #define ts_show_spi2_enable false #define ts_show_spi2_pins false diff --git a/firmware/config/boards/proteus/prepend.txt b/firmware/config/boards/proteus/prepend.txt index e0d52fd85a..95abe3c631 100644 --- a/firmware/config/boards/proteus/prepend.txt +++ b/firmware/config/boards/proteus/prepend.txt @@ -14,6 +14,9 @@ #define ts_show_sd_pins false #define ts_show_vbatt false #define ts_show_clt_iat_pullup false +#define ts_show_tcu true +#define ts_show_gdi true + ! in case of direct Lua control we need UI to undo defaults #define ts_show_etb_pins true diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input index 6b2775c451..36e82e0c9a 100644 --- a/firmware/tunerstudio/rusefi.input +++ b/firmware/tunerstudio/rusefi.input @@ -1899,7 +1899,7 @@ menuDialog = main menu = "&Idle" subMenu = idleSettings, "Idle settings" - subMenu = idlehw, "Idle hardware" + subMenu = idlehw, "Idle hardware"@@if_ts_show_idle_hardware subMenu = std_separator subMenu = cltIdleRPMCurve, "Target RPM" subMenu = cltIdleCurve, "CLT multiplier" @@ -1913,7 +1913,7 @@ menuDialog = main menu = "&Advanced" subMenu = smLaunchControl, "Launch Control" - subMenu = ignitionCylExtra, "Cylinder offsets", 0 + subMenu = ignitionCylExtra, "Cylinder offsets", 0@if_ts_show_odd_fire subMenu = std_separator subMenu = boostDialog, "Boost control" @@ -1971,16 +1971,16 @@ menuDialog = main groupChildMenu = scriptCurve5Settings, "Script Curve #5" groupChildMenu = scriptCurve6Settings, "Script Curve #6" - subMenu = std_separator - subMenu = tcuControls, "Transmission Settings (alpha)" - subMenu = gearControls, "Gear Selection Settings (alpha)" - subMenu = inputSpeedSensor, "Input Speed Sensor (alpha)" - subMenu = tcuSolenoidTableTbl, "Shift Solenoids (alpha)" - subMenu = tccCurves, "TCC Lock/Unlock Speed (alpha)" - subMenu = pcPerGearDialog, "Line Pressure Per Gear (alpha)" - subMenu = pcPerShiftDialog, "Line Pressure Per Shift (alpha)" - subMenu = 32Dialog, "3-2 Shift Solenoid Percent by Speed (alpha)" - subMenu = rangeMatrixDialog, "Range Selector Input Matrix (alpha)" + subMenu = std_separator@@if_ts_show_tcu + subMenu = tcuControls, "Transmission Settings (alpha)"@@if_ts_show_tcu + subMenu = gearControls, "Gear Selection Settings (alpha)"@@if_ts_show_tcu + subMenu = inputSpeedSensor, "Input Speed Sensor (alpha)"@@if_ts_show_tcu + subMenu = tcuSolenoidTableTbl, "Shift Solenoids (alpha)"@@if_ts_show_tcu + subMenu = tccCurves, "TCC Lock/Unlock Speed (alpha)"@@if_ts_show_tcu + subMenu = pcPerGearDialog, "Line Pressure Per Gear (alpha)"@@if_ts_show_tcu + subMenu = pcPerShiftDialog, "Line Pressure Per Shift (alpha)"@@if_ts_show_tcu + subMenu = 32Dialog, "3-2 Shift Solenoid Percent by Speed (alpha)"@@if_ts_show_tcu + subMenu = rangeMatrixDialog, "Range Selector Input Matrix (alpha)"@@if_ts_show_tcu menu = "&Sensors" # Base analog input settings @@ -2058,15 +2058,16 @@ menuDialog = main subMenu = allPins1, "Full pinout 1/3" @@if_ts_show_full_pinout subMenu = allPins2, "Full pinout 2/3" @@if_ts_show_full_pinout subMenu = allPins3_1_and_2 "Full pinout 3/3" @@if_ts_show_full_pinout - subMenu = std_separator - # EXPERIMENTAL FEATURES - subMenu = mc33Dialog, "PT2001 control" - subMenu = hpfpCamDialog, "HPFP Cam Configuration" - subMenu = hpfpPumpDialog, "HPFP Pump Configuration", {hpfpCamLobes != 0} - subMenu = hpfpTargetTable, "HPFP Target Pressure", {hpfpCamLobes != 0} - subMenu = hpfpCompensationTable, "HPFP Pump Compensation", {hpfpCamLobes != 0} + subMenu = std_separator@@if_ts_show_gdi + subMenu = mc33Dialog, "PT2001 control"@@if_ts_show_gdi + subMenu = hpfpCamDialog, "HPFP Cam Configuration"@@if_ts_show_gdi + subMenu = hpfpPumpDialog, "HPFP Pump Configuration", {hpfpCamLobes != 0}@@if_ts_show_gdi + subMenu = hpfpTargetTable, "HPFP Target Pressure", {hpfpCamLobes != 0}@@if_ts_show_gdi + subMenu = hpfpCompensationTable, "HPFP Pump Compensation", {hpfpCamLobes != 0}@@if_ts_show_gdi + + subMenu = std_separator subMenu = fancyHardwareDialog, "Fancy Hardware" subMenu = tractionEtbTableTbl, "Traction Control ETB Drop" @@ -2084,9 +2085,9 @@ menuDialog = main subMenu = kLineDialog, "K-Line" subMenu = parkingLot, "Experimental/Broken" subMenu = parkingLot2, "Experimental 2" - subMenu = harleyAcr, "HD" + subMenu = harleyAcr, "HD"@@if_ts_show_hd subMenu = antiLagDialog, "Anti-Lag ALS" - subMenu = rotaryDialog, "Rotary" + subMenu = rotaryDialog, "Rotary"@@if_ts_show_rotary subMenu = throttleEffectiveArea, "Throttle effective area" menu = "Help" @@ -3694,7 +3695,7 @@ cmd_set_engine_type_default = "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_ dialog = outputsDialogRight panel = startStopDialog - panel = starterRelayDialog + panel = starterRelayDialog@@if_ts_show_starter_disable panel = speedoSettings panel = malfunctionDialog @@ -4736,8 +4737,6 @@ dialog = tcuControls, "Transmission Settings" field = "E4 Digital Input 4 Pull-Down", boardUseD4PullDown @@if_show_4chan_presets field = "B16 Digital Input 4 Pull-Down", boardUseD4PullDown @@if_show_8chan_presets field = "F3 Digital Input 5 Pull-Down", boardUseD5PullDown @@if_show_4chan_presets - field = "etbDutyThreshold", etbDutyThreshold - field = "etbDutyShutdownThreshold", etbDutyShutdownThreshold dialog = parkingLot2, "Experimental 2" field = dacOutputPins1, dacOutputPins1