From b604edaa070ffda957c867593ac86c0671bb49ef Mon Sep 17 00:00:00 2001 From: Lorenz Meier Date: Thu, 28 Apr 2016 12:50:47 +0200 Subject: [PATCH] Fix PX4 tuning panels for new cooked param ranges --- .../PX4/PX4TuningComponentCopter.qml | 26 +++---- .../PX4/PX4TuningComponentPlane.qml | 58 +++----------- .../PX4/PX4TuningComponentVTOL.qml | 76 ++++++++++++++++--- 3 files changed, 89 insertions(+), 71 deletions(-) diff --git a/src/AutoPilotPlugins/PX4/PX4TuningComponentCopter.qml b/src/AutoPilotPlugins/PX4/PX4TuningComponentCopter.qml index 16d4a07a1..06ae6aa3b 100644 --- a/src/AutoPilotPlugins/PX4/PX4TuningComponentCopter.qml +++ b/src/AutoPilotPlugins/PX4/PX4TuningComponentCopter.qml @@ -32,12 +32,21 @@ FactSliderPanel { sliderModel: ListModel { ListElement { - title: qsTr("Throttle Hover") + title: qsTr("Hover Throttle") description: qsTr("Adjust throttle so hover is at mid-throttle. Slide to the left if hover is lower than throttle center. Slide to the right if hover is higher than throttle center.") param: "MPC_THR_HOVER" - min: 0.2 - max: 0.8 - step: 0.01 + min: 20 + max: 60 + step: 1 + } + + ListElement { + title: qsTr("Manual minimum throttle") + description: qsTr("Slide to the left to start the motors with less idle power. Slide to the right if descending in manual flight becomes unstable.") + param: "MPC_MANTHR_MIN" + min: 0 + max: 15 + step: 1 } ListElement { @@ -75,14 +84,5 @@ FactSliderPanel { max: 1.0 step: 0.1 } - - ListElement { - title: qsTr("Manual minimum throttle") - description: qsTr("Slide to the left to start the motors with less idle power. Slide to the right if descending in manual flight becomes unstable.") - param: "MPC_MANTHR_MIN" - min: 0 - max: 0.15 - step: 0.01 - } } } diff --git a/src/AutoPilotPlugins/PX4/PX4TuningComponentPlane.qml b/src/AutoPilotPlugins/PX4/PX4TuningComponentPlane.qml index dc9c26546..85af9c542 100644 --- a/src/AutoPilotPlugins/PX4/PX4TuningComponentPlane.qml +++ b/src/AutoPilotPlugins/PX4/PX4TuningComponentPlane.qml @@ -30,45 +30,9 @@ FactSliderPanel { anchors.fill: parent sliderModel: ListModel { - - ListElement { - title: qsTr("Hover Roll sensitivity") - description: qsTr("Slide to the left to make roll control during hover faster and more accurate. Slide to the right if roll oscillates or is too twitchy.") - param: "MC_ROLL_TC" - min: 0.15 - max: 0.25 - step: 0.01 - } - - ListElement { - title: qsTr("Hover Pitch sensitivity") - description: qsTr("Slide to the left to make pitch control during hover faster and more accurate. Slide to the right if pitch oscillates or is too twitchy.") - param: "MC_PITCH_TC" - min: 0.15 - max: 0.25 - step: 0.01 - } - ListElement { - title: qsTr("Hover Altitude control sensitivity") - description: qsTr("Slide to the left to make altitude control during hover smoother and less twitchy. Slide to the right to make altitude control more accurate and more aggressive.") - param: "MPC_Z_FF" - min: 0 - max: 1.0 - step: 0.1 - } - - ListElement { - title: qsTr("Hover Position control sensitivity") - description: qsTr("Slide to the left to make flight during hover in position control mode smoother and less twitchy. Slide to the right to make position control more accurate and more aggressive.") - param: "MPC_XY_FF" - min: 0 - max: 1.0 - step: 0.1 - } - ListElement { - title: qsTr("Plane Roll sensitivity") - description: qsTr("Slide to the left to make roll control faster and more accurate. Slide to the right if roll oscillates or is too twitchy.") + title: "Roll sensitivity" + description: "Slide to the left to make roll control faster and more accurate. Slide to the right if roll oscillates or is too twitchy." param: "FW_R_TC" min: 0.2 max: 0.8 @@ -76,8 +40,8 @@ FactSliderPanel { } ListElement { - title: qsTr("Plane Pitch sensitivity") - description: qsTr("Slide to the left to make pitch control faster and more accurate. Slide to the right if pitch oscillates or is too twitchy.") + title: "Pitch sensitivity" + description: "Slide to the left to make pitch control faster and more accurate. Slide to the right if pitch oscillates or is too twitchy." param: "FW_P_TC" min: 0.2 max: 0.8 @@ -85,17 +49,17 @@ FactSliderPanel { } ListElement { - title: qsTr("Plane Cruise throttle") - description: qsTr("This is the throttle setting required to achieve the desired cruise speed. Most planes need 50-60%.") + title: "Cruise throttle" + description: "This is the throttle setting required to achieve the desired cruise speed. Most planes need 50-60%." param: "FW_THR_CRUISE" - min: 0.2 - max: 0.8 - step: 0.01 + min: 20 + max: 80 + step: 1 } ListElement { - title: qsTr("Plane Mission mode sensitivity") - description: qsTr("Slide to the left to make position control more accurate and more aggressive. Slide to the right to make flight in mission mode smoother and less twitchy.") + title: "Mission mode sensitivity" + description: "Slide to the left to make position control more accurate and more aggressive. Slide to the right to make flight in mission mode smoother and less twitchy." param: "FW_L1_PERIOD" min: 12 max: 50 diff --git a/src/AutoPilotPlugins/PX4/PX4TuningComponentVTOL.qml b/src/AutoPilotPlugins/PX4/PX4TuningComponentVTOL.qml index 9210cda82..adf4c2137 100644 --- a/src/AutoPilotPlugins/PX4/PX4TuningComponentVTOL.qml +++ b/src/AutoPilotPlugins/PX4/PX4TuningComponentVTOL.qml @@ -30,9 +30,45 @@ FactSliderPanel { anchors.fill: parent sliderModel: ListModel { + + ListElement { + title: qsTr("Hover Roll sensitivity") + description: qsTr("Slide to the left to make roll control during hover faster and more accurate. Slide to the right if roll oscillates or is too twitchy.") + param: "MC_ROLL_TC" + min: 0.15 + max: 0.25 + step: 0.01 + } + + ListElement { + title: qsTr("Hover Pitch sensitivity") + description: qsTr("Slide to the left to make pitch control during hover faster and more accurate. Slide to the right if pitch oscillates or is too twitchy.") + param: "MC_PITCH_TC" + min: 0.15 + max: 0.25 + step: 0.01 + } + + ListElement { + title: qsTr("Hover Altitude control sensitivity") + description: qsTr("Slide to the left to make altitude control during hover smoother and less twitchy. Slide to the right to make altitude control more accurate and more aggressive.") + param: "MPC_Z_FF" + min: 0 + max: 1.0 + step: 0.1 + } + ListElement { - title: "Roll sensitivity" - description: "Slide to the left to make roll control faster and more accurate. Slide to the right if roll oscillates or is too twitchy." + title: qsTr("Hover Position control sensitivity") + description: qsTr("Slide to the left to make flight during hover in position control mode smoother and less twitchy. Slide to the right to make position control more accurate and more aggressive.") + param: "MPC_XY_FF" + min: 0 + max: 1.0 + step: 0.1 + } + ListElement { + title: qsTr("Plane Roll sensitivity") + description: qsTr("Slide to the left to make roll control faster and more accurate. Slide to the right if roll oscillates or is too twitchy.") param: "FW_R_TC" min: 0.2 max: 0.8 @@ -40,8 +76,8 @@ FactSliderPanel { } ListElement { - title: "Pitch sensitivity" - description: "Slide to the left to make pitch control faster and more accurate. Slide to the right if pitch oscillates or is too twitchy." + title: qsTr("Plane Pitch sensitivity") + description: qsTr("Slide to the left to make pitch control faster and more accurate. Slide to the right if pitch oscillates or is too twitchy.") param: "FW_P_TC" min: 0.2 max: 0.8 @@ -49,17 +85,35 @@ FactSliderPanel { } ListElement { - title: "Cruise throttle" - description: "This is the throttle setting required to achieve the desired cruise speed. Most planes need 50-60%." + title: qsTr("Plane Cruise throttle") + description: qsTr("This is the throttle setting required to achieve the desired cruise speed. Most planes need 50-60%.") param: "FW_THR_CRUISE" - min: 0.2 - max: 0.8 - step: 0.01 + min: 20 + max: 80 + step: 1 + } + + ListElement { + title: qsTr("Hover Throttle") + description: qsTr("Adjust throttle so hover is at mid-throttle. Slide to the left if hover is lower than throttle center. Slide to the right if hover is higher than throttle center.") + param: "MPC_THR_HOVER" + min: 20 + max: 60 + step: 1 + } + + ListElement { + title: qsTr("Hoever manual minimum throttle") + description: qsTr("Slide to the left to start the motors with less idle power. Slide to the right if descending in manual flight becomes unstable.") + param: "MPC_MANTHR_MIN" + min: 0 + max: 15 + step: 1 } ListElement { - title: "Mission mode sensitivity" - description: "Slide to the left to make position control more accurate and more aggressive. Slide to the right to make flight in mission mode smoother and less twitchy." + title: qsTr("Plane Mission mode sensitivity") + description: qsTr("Slide to the left to make position control more accurate and more aggressive. Slide to the right to make flight in mission mode smoother and less twitchy.") param: "FW_L1_PERIOD" min: 12 max: 50 -- 2.22.0