From 0bc4d975188b376e7f3515288f6342711a67fe6c Mon Sep 17 00:00:00 2001 From: Matthew Kennedy Date: Fri, 29 Oct 2021 12:24:45 -0700 Subject: [PATCH] Split boost dialogs (#3425) * split boost dialog * more --- firmware/tunerstudio/rusefi.input | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input index 52bd995035..8c191dbf31 100644 --- a/firmware/tunerstudio/rusefi.input +++ b/firmware/tunerstudio/rusefi.input @@ -1512,7 +1512,9 @@ menuDialog = main menu = "&Advanced" subMenu = boostDialog, "Boost Control" - subMenu = boostPidDialog, "Closed Loop Boost", { isBoostControlEnabled && boostType == 1 } + subMenu = boostOpenLoopDialog, "Open Loop", { isBoostControlEnabled } + subMenu = boostPidDialog, "Closed Loop", { isBoostControlEnabled && boostType == 1 } + subMenu = boostTargetDialog, "Boost Target", { isBoostControlEnabled } subMenu = boostEtbPid, "ETB-style Wastegate Actuator", { isBoostControlEnabled } subMenu = std_separator @@ -3382,21 +3384,20 @@ cmd_set_engine_type_default = "@@TS_IO_TEST_COMMAND_char@@\x00\x31\x00\x00" ;Boost Open Loop - dialog = boost_left, "" - field = "Enable", isBoostControlEnabled - field = "Control Mode", boostType, { isBoostControlEnabled } + dialog = boostDialog, "" + field = "Enable", isBoostControlEnabled + field = "Control Mode", boostType, { isBoostControlEnabled } field = "Output", boostControlPin, { isBoostControlEnabled } field = "Output Mode", boostControlPinMode, { isBoostControlEnabled } field = "Frequency", boostPwmFrequency, { isBoostControlEnabled } - field = "Safe duty cycle", boostControlSafeDutyCycle, { isBoostControlEnabled } - dialog = boostDialog, "", border - panel = boost_left, West - panel = boostTableTbl, Center + + dialog = boostOpenLoopDialog, "", border + panel = boostTableTbl, Center ;Boost Closed Loop - dialog = boostPidleft, "" + dialog = boostPidDialog, "" field = "Enable closed loop above", minimumBoostClosedLoopMap, { isBoostControlEnabled && boostType == 1 } field = "P Gain", boostPid_pFactor, { isBoostControlEnabled && boostType == 1 } field = "I Gain", boostPid_iFactor, { isBoostControlEnabled && boostType == 1 } @@ -3404,13 +3405,9 @@ cmd_set_engine_type_default = "@@TS_IO_TEST_COMMAND_char@@\x00\x31\x00\x00" field = "Min adjustment", boostPid_minValue, { isBoostControlEnabled && boostType == 1 } field = "Max adjustment", boostPid_maxValue, { isBoostControlEnabled && boostType == 1 } - dialog = boostTableDialog, "", card + dialog = boostTargetDialog, "", card panel = boostTable2Tbl - dialog = boostPidDialog, "", border - panel = boostPidleft, West - panel = boostTableDialog, Center - dialog = boostEtbPid, "" field = "!This section is for advanced users only!" field = "H-Bridge #1 function", etbFunctions1