zhaohuwei
/
QG4
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

PX4: Improve tuning sliders, support all three main vehicle classes.

QGC4.4
Lorenz Meier 10 years ago
parent
354bd669f8
commit
7558a754ac
4 changed files with 142 additions and 28 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 9
      src/AutoPilotPlugins/PX4/PX4TuningComponent.cc
  2. 20
      src/AutoPilotPlugins/PX4/PX4TuningComponentCopter.qml
  3. 72
      src/AutoPilotPlugins/PX4/PX4TuningComponentPlane.qml
  4. 69
      src/AutoPilotPlugins/PX4/PX4TuningComponentVTOL.qml

9
src/AutoPilotPlugins/PX4/PX4TuningComponent.cc
Unescape View File

@ -77,6 +77,15 @@ QUrl PX4TuningComponent::setupSource(void) const
case MAV_TYPE_TRICOPTER: case MAV_TYPE_TRICOPTER:
qmlFile = "qrc:/qml/PX4TuningComponentCopter.qml"; qmlFile = "qrc:/qml/PX4TuningComponentCopter.qml";
break; 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: default:
break; break;
} }

20
src/AutoPilotPlugins/PX4/PX4TuningComponentCopter.qml
Unescape View File

@ -34,18 +34,18 @@ FactSliderPanel {
title: "Roll sensitivity" 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." 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" param: "MC_ROLL_TC"
min: 0 min: 0.15
max: 100 max: 0.25
step: 1 step: 0.01
} }
ListElement { ListElement {
title: "Pitch sensitivity" 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." 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" param: "MC_PITCH_TC"
min: 0 min: 0.15
max: 100 max: 0.25
step: 1 step: 0.01
} }
ListElement { 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." 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" param: "MPC_Z_FF"
min: 0 min: 0
max: 100 max: 1.0
step: 1 step: 0.1
} }
ListElement { 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." 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" param: "MPC_XY_FF"
min: 0 min: 0
max: 100 max: 1.0
step: 1 step: 0.1
} }
} }
} }

72
src/AutoPilotPlugins/PX4/PX4TuningComponentPlane.qml
Unescape View File

@ -30,40 +30,76 @@ FactSliderPanel {
anchors.fill: parent anchors.fill: parent
sliderModel: ListModel { 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 { 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." 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" param: "FW_R_TC"
min: 0 min: 0.2
max: 100 max: 0.8
step: 1 step: 0.01
} }
ListElement { 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." 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" param: "FW_P_TC"
min: 0 min: 0.2
max: 100 max: 0.8
step: 1 step: 0.01
} }
ListElement { ListElement {
title: "Cruise throttle" title: "Plane Cruise throttle"
description: "This is the throttle setting required to achieve the desired cruise speed." description: "This is the throttle setting required to achieve the desired cruise speed. Most planes need 50-60%."
param: "FW_THR_CRUISE" param: "FW_THR_CRUISE"
min: 0 min: 0.2
max: 100 max: 0.8
step: 1 step: 0.01
} }
ListElement { ListElement {
title: "Position control sensitivity" title: "Plane Mission mode 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." 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" param: "FW_L1_PERIOD"
min: 0 min: 12
max: 100 max: 50
step: 1 step: 0.5
} }
} }
} }

69
src/AutoPilotPlugins/PX4/PX4TuningComponentVTOL.qml
Unescape View File

@ -0,0 +1,69 @@
/*=====================================================================
QGroundControl Open Source Ground Control Station
(c) 2009 - 2015 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
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 <http://www.gnu.org/licenses/>.
======================================================================*/
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
}
}
}
Write Preview
Loading…
Cancel
Save