diff --git a/src/AutoPilotPlugins/PX4/PX4TuningComponent.cc b/src/AutoPilotPlugins/PX4/PX4TuningComponent.cc index 07eab3d073cdb2681f5a1a3fe4b3fd4c993ffd66..e808f8a34cbb8772a4ff6fa8977a3584e7268970 100644 --- a/src/AutoPilotPlugins/PX4/PX4TuningComponent.cc +++ b/src/AutoPilotPlugins/PX4/PX4TuningComponent.cc @@ -77,6 +77,15 @@ QUrl PX4TuningComponent::setupSource(void) const case MAV_TYPE_TRICOPTER: qmlFile = "qrc:/qml/PX4TuningComponentCopter.qml"; break; + case MAV_TYPE_VTOL_DUOROTOR: + case MAV_TYPE_VTOL_QUADROTOR: + case MAV_TYPE_VTOL_TILTROTOR: + case MAV_TYPE_VTOL_RESERVED2: + case MAV_TYPE_VTOL_RESERVED3: + case MAV_TYPE_VTOL_RESERVED4: + case MAV_TYPE_VTOL_RESERVED5: + qmlFile = "qrc:/qml/PX4TuningComponentVTOL.qml"; + break; default: break; } diff --git a/src/AutoPilotPlugins/PX4/PX4TuningComponentCopter.qml b/src/AutoPilotPlugins/PX4/PX4TuningComponentCopter.qml index 12d1422a485d250426802ff624e8a0d7bd2230ac..81802748b254c545eb36a3345a3c8f09cffe66b9 100644 --- a/src/AutoPilotPlugins/PX4/PX4TuningComponentCopter.qml +++ b/src/AutoPilotPlugins/PX4/PX4TuningComponentCopter.qml @@ -34,18 +34,18 @@ FactSliderPanel { 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: "MC_ROLL_TC" - min: 0 - max: 100 - step: 1 + min: 0.15 + max: 0.25 + step: 0.01 } 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." param: "MC_PITCH_TC" - min: 0 - max: 100 - step: 1 + min: 0.15 + max: 0.25 + step: 0.01 } ListElement { @@ -53,8 +53,8 @@ FactSliderPanel { description: "Slide to the left to make altitude control smoother and less twitchy. Slide to the right to make altitude control more accurate and more aggressive." param: "MPC_Z_FF" min: 0 - max: 100 - step: 1 + max: 1.0 + step: 0.1 } ListElement { @@ -62,8 +62,8 @@ FactSliderPanel { description: "Slide to the left to make flight 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: 100 - step: 1 + max: 1.0 + step: 0.1 } } } diff --git a/src/AutoPilotPlugins/PX4/PX4TuningComponentPlane.qml b/src/AutoPilotPlugins/PX4/PX4TuningComponentPlane.qml index 9c291d21d5d1bfd878c32fc933d4420cd6af48a3..1c66847f2dcd2c57ebaf766dd1dccac7f1cc721d 100644 --- a/src/AutoPilotPlugins/PX4/PX4TuningComponentPlane.qml +++ b/src/AutoPilotPlugins/PX4/PX4TuningComponentPlane.qml @@ -30,40 +30,76 @@ FactSliderPanel { anchors.fill: parent sliderModel: ListModel { + + ListElement { + title: "Hover Roll sensitivity" + description: "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: "Hover Pitch sensitivity" + description: "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: "Hover Altitude control sensitivity" + description: "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: "Hover Position control sensitivity" + description: "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: "Roll sensitivity" + title: "Plane 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 - max: 100 - step: 1 + min: 0.2 + max: 0.8 + step: 0.01 } ListElement { - title: "Pitch sensitivity" + title: "Plane 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 - max: 100 - step: 1 + min: 0.2 + max: 0.8 + step: 0.01 } ListElement { - title: "Cruise throttle" - description: "This is the throttle setting required to achieve the desired cruise speed." + title: "Plane 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 - max: 100 - step: 1 + min: 0.2 + max: 0.8 + step: 0.01 } ListElement { - title: "Position control sensitivity" - description: "Slide to the left to make flight in position control mode smoother and less twitchy. Slide to the right to make position control more accurate and more aggressive." + title: "Plane 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: 0 - max: 100 - step: 1 + min: 12 + max: 50 + step: 0.5 } } } diff --git a/src/AutoPilotPlugins/PX4/PX4TuningComponentVTOL.qml b/src/AutoPilotPlugins/PX4/PX4TuningComponentVTOL.qml new file mode 100644 index 0000000000000000000000000000000000000000..9210cda8291f682b4986d26612d1d6fa7b4322ef --- /dev/null +++ b/src/AutoPilotPlugins/PX4/PX4TuningComponentVTOL.qml @@ -0,0 +1,69 @@ +/*===================================================================== + + QGroundControl Open Source Ground Control Station + + (c) 2009 - 2015 QGROUNDCONTROL PROJECT + + This file is part of the QGROUNDCONTROL project + + QGROUNDCONTROL is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + QGROUNDCONTROL is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with QGROUNDCONTROL. If not, see . + + ======================================================================*/ + +import QtQuick 2.5 +import QtQuick.Controls 1.4 + +import QGroundControl.Controls 1.0 + +FactSliderPanel { + anchors.fill: parent + + sliderModel: ListModel { + 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." + param: "FW_R_TC" + min: 0.2 + max: 0.8 + step: 0.01 + } + + 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." + param: "FW_P_TC" + min: 0.2 + max: 0.8 + step: 0.01 + } + + ListElement { + 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 + } + + 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." + param: "FW_L1_PERIOD" + min: 12 + max: 50 + step: 0.5 + } + } +}