diff --git a/firmware/tunerstudio/rusefi.ini b/firmware/tunerstudio/rusefi.ini index a9f21ad770..ba5f602bcf 100644 --- a/firmware/tunerstudio/rusefi.ini +++ b/firmware/tunerstudio/rusefi.ini @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Fri Jan 31 14:18:54 EST 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Sun Feb 02 08:25:49 EST 2020 pageSize = 20000 page = 1 @@ -1773,6 +1773,17 @@ fileVersion = { 20191221 } xBins = tpsTpsAccelFromRpmBins, TPSValue yBins = tpsTpsAccelToRpmBins, TPSValue zBins = tpsTpsAccelTable + + table = boostTableTbl, boostMapOpen, "", 1 + xBins = boostRpmBins, RPMValue + yBins = boostMapBins, MAPValue + zBins = boostTableOpenLoop + + table = boostTable2Tbl, boostMapClosed, "", 1 + xBins = boostRpmBins, RPMValue + yBins = boostTpsBins, TPSValue + zBins = boostTableClosedLoop + table = fsioTable1Tbl, fsioTable1Map, "FSIO Table #1", 1 @@ -2320,7 +2331,10 @@ menuDialog = main subMenu = cltIdleCurve, "CLT multiplier" subMenu = iacCoastingCurve, "Coasting IAC Position for Auto-Idle", 0, {useIacTableForCoasting == 1} - menu = "&FSIO" + menu = "&Advanced" + subMenu = boostDialog, "Boost Control" + subMenu = boostPidDialog, "Closed Loop Boost", { boostType == 1 } + subMenu = std_separator subMenu = fsioInputsDialog, "FSIO inputs" subMenu = auxPidDialog, "Aux PID" subMenu = fsioOutputsDialog, "FSIO outputs" @@ -3602,6 +3616,37 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "ADC #2", fsioAdc2 field = "ADC #3", fsioAdc3 field = "ADC #4", fsioAdc4 + +;Boost Open Loop + + dialog = boost_left, "" + field = "Enable", isBoostControlEnabled + field = "Control Mode", boostType, { isBoostControlEnabled } + field = "Output", boostControlPin, { isBoostControlEnabled } + field = "Output Mode", boostControlPinMode, { isBoostControlEnabled } + field = "Frequency", boostPwmFrequency, { isBoostControlEnabled } + + dialog = boostDialog, "", border + panel = boost_left, West + panel = boostTableTbl, Center + +;Boost Closed Loop + + dialog = boostPidleft, "" + field = "!Boost Control is experimental/Alpha Version" + field = "P Gain", boostPid_pFactor, { isBoostControlEnabled && boostType == 1 } + field = "I Gain", boostPid_iFactor, { isBoostControlEnabled && boostType == 1 } + field = "D Gain", boostPid_dFactor, { isBoostControlEnabled && boostType == 1 } + field = "Control Period", boostPid_periodMs, { isBoostControlEnabled && boostType == 1 } + field = "Min Duty", boostPid_minValue, { isBoostControlEnabled && boostType == 1 } + field = "Max Duty", boostPid_maxValue, { isBoostControlEnabled && boostType == 1 } + + dialog = boostTableDialog, "", card + panel = boostTable2Tbl + + dialog = boostPidDialog, "", border + panel = boostPidleft, West + panel = boostTableDialog, Center help = veTableDialogHelp, "Volumetric Efficiency" text = "Volumetric Efficiency is used to calculate fuel in Speed Density mode" diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input index 778aa69118..4cd2de67c6 100644 --- a/firmware/tunerstudio/rusefi.input +++ b/firmware/tunerstudio/rusefi.input @@ -2527,6 +2527,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" ;Boost Closed Loop dialog = boostPidleft, "" + field = "!Boost Control is experimental/Alpha Version" field = "P Gain", boostPid_pFactor, { isBoostControlEnabled && boostType == 1 } field = "I Gain", boostPid_iFactor, { isBoostControlEnabled && boostType == 1 } field = "D Gain", boostPid_dFactor, { isBoostControlEnabled && boostType == 1 } diff --git a/firmware/tunerstudio/rusefi_frankenso.ini b/firmware/tunerstudio/rusefi_frankenso.ini index 1d0af8b014..54874ec2dc 100644 --- a/firmware/tunerstudio/rusefi_frankenso.ini +++ b/firmware/tunerstudio/rusefi_frankenso.ini @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Fri Jan 31 14:18:58 EST 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Sun Feb 02 08:25:56 EST 2020 pageSize = 20000 page = 1 @@ -1773,6 +1773,17 @@ fileVersion = { 20191221 } xBins = tpsTpsAccelFromRpmBins, TPSValue yBins = tpsTpsAccelToRpmBins, TPSValue zBins = tpsTpsAccelTable + + table = boostTableTbl, boostMapOpen, "", 1 + xBins = boostRpmBins, RPMValue + yBins = boostMapBins, MAPValue + zBins = boostTableOpenLoop + + table = boostTable2Tbl, boostMapClosed, "", 1 + xBins = boostRpmBins, RPMValue + yBins = boostTpsBins, TPSValue + zBins = boostTableClosedLoop + table = fsioTable1Tbl, fsioTable1Map, "FSIO Table #1", 1 @@ -2320,7 +2331,10 @@ menuDialog = main subMenu = cltIdleCurve, "CLT multiplier" subMenu = iacCoastingCurve, "Coasting IAC Position for Auto-Idle", 0, {useIacTableForCoasting == 1} - menu = "&FSIO" + menu = "&Advanced" + subMenu = boostDialog, "Boost Control" + subMenu = boostPidDialog, "Closed Loop Boost", { boostType == 1 } + subMenu = std_separator subMenu = fsioInputsDialog, "FSIO inputs" subMenu = auxPidDialog, "Aux PID" subMenu = fsioOutputsDialog, "FSIO outputs" @@ -3602,6 +3616,37 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "ADC #2", fsioAdc2 field = "ADC #3", fsioAdc3 field = "ADC #4", fsioAdc4 + +;Boost Open Loop + + dialog = boost_left, "" + field = "Enable", isBoostControlEnabled + field = "Control Mode", boostType, { isBoostControlEnabled } + field = "Output", boostControlPin, { isBoostControlEnabled } + field = "Output Mode", boostControlPinMode, { isBoostControlEnabled } + field = "Frequency", boostPwmFrequency, { isBoostControlEnabled } + + dialog = boostDialog, "", border + panel = boost_left, West + panel = boostTableTbl, Center + +;Boost Closed Loop + + dialog = boostPidleft, "" + field = "!Boost Control is experimental/Alpha Version" + field = "P Gain", boostPid_pFactor, { isBoostControlEnabled && boostType == 1 } + field = "I Gain", boostPid_iFactor, { isBoostControlEnabled && boostType == 1 } + field = "D Gain", boostPid_dFactor, { isBoostControlEnabled && boostType == 1 } + field = "Control Period", boostPid_periodMs, { isBoostControlEnabled && boostType == 1 } + field = "Min Duty", boostPid_minValue, { isBoostControlEnabled && boostType == 1 } + field = "Max Duty", boostPid_maxValue, { isBoostControlEnabled && boostType == 1 } + + dialog = boostTableDialog, "", card + panel = boostTable2Tbl + + dialog = boostPidDialog, "", border + panel = boostPidleft, West + panel = boostTableDialog, Center help = veTableDialogHelp, "Volumetric Efficiency" text = "Volumetric Efficiency is used to calculate fuel in Speed Density mode" diff --git a/firmware/tunerstudio/rusefi_microrusefi.ini b/firmware/tunerstudio/rusefi_microrusefi.ini index 4c1c57bf49..29d636a25f 100644 --- a/firmware/tunerstudio/rusefi_microrusefi.ini +++ b/firmware/tunerstudio/rusefi_microrusefi.ini @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Fri Jan 31 14:18:56 EST 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Sun Feb 02 08:25:52 EST 2020 pageSize = 20000 page = 1 @@ -1773,6 +1773,17 @@ fileVersion = { 20191221 } xBins = tpsTpsAccelFromRpmBins, TPSValue yBins = tpsTpsAccelToRpmBins, TPSValue zBins = tpsTpsAccelTable + + table = boostTableTbl, boostMapOpen, "", 1 + xBins = boostRpmBins, RPMValue + yBins = boostMapBins, MAPValue + zBins = boostTableOpenLoop + + table = boostTable2Tbl, boostMapClosed, "", 1 + xBins = boostRpmBins, RPMValue + yBins = boostTpsBins, TPSValue + zBins = boostTableClosedLoop + table = fsioTable1Tbl, fsioTable1Map, "FSIO Table #1", 1 @@ -2320,7 +2331,10 @@ menuDialog = main subMenu = cltIdleCurve, "CLT multiplier" subMenu = iacCoastingCurve, "Coasting IAC Position for Auto-Idle", 0, {useIacTableForCoasting == 1} - menu = "&FSIO" + menu = "&Advanced" + subMenu = boostDialog, "Boost Control" + subMenu = boostPidDialog, "Closed Loop Boost", { boostType == 1 } + subMenu = std_separator subMenu = fsioInputsDialog, "FSIO inputs" subMenu = auxPidDialog, "Aux PID" subMenu = fsioOutputsDialog, "FSIO outputs" @@ -3585,6 +3599,37 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "ADC #2", fsioAdc2 field = "ADC #3", fsioAdc3 field = "ADC #4", fsioAdc4 + +;Boost Open Loop + + dialog = boost_left, "" + field = "Enable", isBoostControlEnabled + field = "Control Mode", boostType, { isBoostControlEnabled } + field = "Output", boostControlPin, { isBoostControlEnabled } + field = "Output Mode", boostControlPinMode, { isBoostControlEnabled } + field = "Frequency", boostPwmFrequency, { isBoostControlEnabled } + + dialog = boostDialog, "", border + panel = boost_left, West + panel = boostTableTbl, Center + +;Boost Closed Loop + + dialog = boostPidleft, "" + field = "!Boost Control is experimental/Alpha Version" + field = "P Gain", boostPid_pFactor, { isBoostControlEnabled && boostType == 1 } + field = "I Gain", boostPid_iFactor, { isBoostControlEnabled && boostType == 1 } + field = "D Gain", boostPid_dFactor, { isBoostControlEnabled && boostType == 1 } + field = "Control Period", boostPid_periodMs, { isBoostControlEnabled && boostType == 1 } + field = "Min Duty", boostPid_minValue, { isBoostControlEnabled && boostType == 1 } + field = "Max Duty", boostPid_maxValue, { isBoostControlEnabled && boostType == 1 } + + dialog = boostTableDialog, "", card + panel = boostTable2Tbl + + dialog = boostPidDialog, "", border + panel = boostPidleft, West + panel = boostTableDialog, Center help = veTableDialogHelp, "Volumetric Efficiency" text = "Volumetric Efficiency is used to calculate fuel in Speed Density mode" diff --git a/firmware/tunerstudio/rusefi_prometheus.ini b/firmware/tunerstudio/rusefi_prometheus.ini index 572b5f2849..d8b92ee4d4 100644 --- a/firmware/tunerstudio/rusefi_prometheus.ini +++ b/firmware/tunerstudio/rusefi_prometheus.ini @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Fri Jan 31 14:19:01 EST 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Sun Feb 02 08:25:59 EST 2020 pageSize = 20000 page = 1 @@ -1773,6 +1773,17 @@ fileVersion = { 20191221 } xBins = tpsTpsAccelFromRpmBins, TPSValue yBins = tpsTpsAccelToRpmBins, TPSValue zBins = tpsTpsAccelTable + + table = boostTableTbl, boostMapOpen, "", 1 + xBins = boostRpmBins, RPMValue + yBins = boostMapBins, MAPValue + zBins = boostTableOpenLoop + + table = boostTable2Tbl, boostMapClosed, "", 1 + xBins = boostRpmBins, RPMValue + yBins = boostTpsBins, TPSValue + zBins = boostTableClosedLoop + table = fsioTable1Tbl, fsioTable1Map, "FSIO Table #1", 1 @@ -2320,7 +2331,10 @@ menuDialog = main subMenu = cltIdleCurve, "CLT multiplier" subMenu = iacCoastingCurve, "Coasting IAC Position for Auto-Idle", 0, {useIacTableForCoasting == 1} - menu = "&FSIO" + menu = "&Advanced" + subMenu = boostDialog, "Boost Control" + subMenu = boostPidDialog, "Closed Loop Boost", { boostType == 1 } + subMenu = std_separator subMenu = fsioInputsDialog, "FSIO inputs" subMenu = auxPidDialog, "Aux PID" subMenu = fsioOutputsDialog, "FSIO outputs" @@ -3598,6 +3612,37 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "ADC #2", fsioAdc2 field = "ADC #3", fsioAdc3 field = "ADC #4", fsioAdc4 + +;Boost Open Loop + + dialog = boost_left, "" + field = "Enable", isBoostControlEnabled + field = "Control Mode", boostType, { isBoostControlEnabled } + field = "Output", boostControlPin, { isBoostControlEnabled } + field = "Output Mode", boostControlPinMode, { isBoostControlEnabled } + field = "Frequency", boostPwmFrequency, { isBoostControlEnabled } + + dialog = boostDialog, "", border + panel = boost_left, West + panel = boostTableTbl, Center + +;Boost Closed Loop + + dialog = boostPidleft, "" + field = "!Boost Control is experimental/Alpha Version" + field = "P Gain", boostPid_pFactor, { isBoostControlEnabled && boostType == 1 } + field = "I Gain", boostPid_iFactor, { isBoostControlEnabled && boostType == 1 } + field = "D Gain", boostPid_dFactor, { isBoostControlEnabled && boostType == 1 } + field = "Control Period", boostPid_periodMs, { isBoostControlEnabled && boostType == 1 } + field = "Min Duty", boostPid_minValue, { isBoostControlEnabled && boostType == 1 } + field = "Max Duty", boostPid_maxValue, { isBoostControlEnabled && boostType == 1 } + + dialog = boostTableDialog, "", card + panel = boostTable2Tbl + + dialog = boostPidDialog, "", border + panel = boostPidleft, West + panel = boostTableDialog, Center help = veTableDialogHelp, "Volumetric Efficiency" text = "Volumetric Efficiency is used to calculate fuel in Speed Density mode"