Skip to content

Q
qgroundcontrol
Commit df67dff5 authored by Jacob Walser's avatar Jacob Walser Committed by Willian Galvani
Browse files
Options

Add tuning component for Sub vehicles setup

parent c9419973
Hide whitespace changes
Inline Side-by-side
Showing with 166 additions and 0 deletions
src/AutoPilotPlugins/APM/APMTuningComponent.cc
View file @ df67dff5
......@@ -65,6 +65,9 @@ QUrl APMTuningComponent::setupSource(void) const
qmlFile = QStringLiteral("qrc:/qml/APMTuningComponentCopter.qml");
}
break;
case MAV_TYPE_SUBMARINE:
qmlFile = QStringLiteral("qrc:/qml/APMTuningComponentSub.qml");
break;
default:
// No tuning panel
break;
......
src/AutoPilotPlugins/APM/APMTuningComponentSub.qml 0 → 100644
View file @ df67dff5
/****************************************************************************
*
* (c) 2009-2018 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
*
* QGroundControl is licensed according to the terms in the file
* COPYING.md in the root of the source code directory.
*
****************************************************************************/
import QtQuick 2.3
import QtQuick.Controls 1.2
import QGroundControl.FactSystem 1.0
import QGroundControl.FactControls 1.0
import QGroundControl.Palette 1.0
import QGroundControl.Controls 1.0
import QGroundControl.ScreenTools 1.0
SetupPage {
id: tuningPage
pageComponent: tuningPageComponent
Component {
id: tuningPageComponent
Column {
width: availableWidth
spacing: _margins
FactPanelController { id: controller; factPanel: tuningPage.viewPanel }
QGCPalette { id: palette; colorGroupEnabled: true }
property real _margins: ScreenTools.defaultFontPixelHeight
ExclusiveGroup { id: buttonGroup }
Row {
spacing: _margins
QGCButton {
id: atcButton
text: qsTr("Attitude Controller Parameters")
exclusiveGroup: buttonGroup
checked: true
onClicked: checked = true
}
QGCButton {
id: posButton
text: qsTr("Position Controller Parameters")
exclusiveGroup: buttonGroup
onClicked: checked = true
}
QGCButton {
id: navButton
text: qsTr("Waypoint navigation parameters")
exclusiveGroup: buttonGroup
onClicked: checked = true
}
}
Rectangle {
id: atcParams
visible: atcButton.checked
anchors.left: parent.left
anchors.right: parent.right
height: posColumn.height + _margins*2
color: palette.windowShade
Column {
id: posColumn
width: parent.width/2
anchors.margins: _margins
anchors.left: parent.left
anchors.right: parent.right
anchors.top: parent.top
spacing: _margins*1.5
FactTextFieldSlider { fact: controller.getParameterFact(-1, "ATC_ANG_PIT_P") }
FactTextFieldSlider { fact: controller.getParameterFact(-1, "ATC_ANG_RLL_P") }
FactTextFieldSlider { fact: controller.getParameterFact(-1, "ATC_ANG_YAW_P") }
FactTextFieldSlider { fact: controller.getParameterFact(-1, "ATC_RAT_PIT_P") }
FactTextFieldSlider { fact: controller.getParameterFact(-1, "ATC_RAT_PIT_I") }
FactTextFieldSlider { fact: controller.getParameterFact(-1, "ATC_RAT_PIT_IMAX") }
FactTextFieldSlider { fact: controller.getParameterFact(-1, "ATC_RAT_PIT_D") }
FactTextFieldSlider { fact: controller.getParameterFact(-1, "ATC_RAT_RLL_P") }
FactTextFieldSlider { fact: controller.getParameterFact(-1, "ATC_RAT_RLL_I") }
FactTextFieldSlider { fact: controller.getParameterFact(-1, "ATC_RAT_RLL_IMAX") }
FactTextFieldSlider { fact: controller.getParameterFact(-1, "ATC_RAT_RLL_D") }
FactTextFieldSlider { fact: controller.getParameterFact(-1, "ATC_RAT_YAW_P") }
FactTextFieldSlider { fact: controller.getParameterFact(-1, "ATC_RAT_YAW_I") }
FactTextFieldSlider { fact: controller.getParameterFact(-1, "ATC_RAT_YAW_IMAX") }
FactTextFieldSlider { fact: controller.getParameterFact(-1, "ATC_RAT_YAW_D") }
} // Column - Position Controller Parameters
} // Rectangle - Position Controller Parameters
Rectangle {
id: posParams
visible: posButton.checked
anchors.left: parent.left
anchors.right: parent.right
height: velColumn.height + _margins*2
color: palette.windowShade
Column {
id: velColumn
anchors.margins: _margins
anchors.left: parent.left
anchors.right: parent.right
anchors.top: parent.top
spacing: _margins*1.5
FactTextFieldSlider { fact: controller.getParameterFact(-1, "POS_XY_P") }
FactTextFieldSlider { fact: controller.getParameterFact(-1, "POS_Z_P") }
FactTextFieldSlider { fact: controller.getParameterFact(-1, "VEL_XY_P") }
FactTextFieldSlider { fact: controller.getParameterFact(-1, "VEL_XY_I") }
FactTextFieldSlider { fact: controller.getParameterFact(-1, "VEL_XY_IMAX") }
FactTextFieldSlider { fact: controller.getParameterFact(-1, "VEL_Z_P") }
FactTextFieldSlider { fact: controller.getParameterFact(-1, "ACCEL_Z_D") }
FactTextFieldSlider { fact: controller.getParameterFact(-1, "ACCEL_Z_FILT") }
FactTextFieldSlider { fact: controller.getParameterFact(-1, "ACCEL_Z_I") }
FactTextFieldSlider { fact: controller.getParameterFact(-1, "ACCEL_Z_IMAX") }
FactTextFieldSlider { fact: controller.getParameterFact(-1, "ACCEL_Z_P") }
} // Column - VEL parameters
} // Rectangle - VEL parameters
Rectangle {
id: navParams
visible: navButton.checked
anchors.left: parent.left
anchors.right: parent.right
height: wpnavColumn.height + _margins*2
color: palette.windowShade
Column {
id: wpnavColumn
anchors.margins: _margins
anchors.left: parent.left
anchors.right: parent.right
anchors.top: parent.top
spacing: _margins*1.5
FactTextFieldSlider { fact: controller.getParameterFact(-1, "WPNAV_ACCEL") }
FactTextFieldSlider { fact: controller.getParameterFact(-1, "WPNAV_ACCEL_Z") }
FactTextFieldSlider { fact: controller.getParameterFact(-1, "WPNAV_LOIT_JERK") }
FactTextFieldSlider { fact: controller.getParameterFact(-1, "WPNAV_LOIT_MAXA") }
FactTextFieldSlider { fact: controller.getParameterFact(-1, "WPNAV_LOIT_MINA") }
FactTextFieldSlider { fact: controller.getParameterFact(-1, "WPNAV_LOIT_SPEED") }
FactTextFieldSlider { fact: controller.getParameterFact(-1, "WPNAV_RADIUS") }
FactTextFieldSlider { fact: controller.getParameterFact(-1, "WPNAV_SPEED") }
FactTextFieldSlider { fact: controller.getParameterFact(-1, "WPNAV_SPEED_DN") }
FactTextFieldSlider { fact: controller.getParameterFact(-1, "WPNAV_SPEED_UP") }
} // Column - WPNAV parameters
} // Rectangle - WPNAV parameters
} // Column
} // Component
} // SetupView
src/FirmwarePlugin/APM/APMResources.qrc
View file @ df67dff5
......@@ -25,6 +25,7 @@
<file alias="APMSensorsComponent.qml">../../AutoPilotPlugins/APM/APMSensorsComponent.qml</file>
<file alias="APMSensorsComponentSummary.qml">../../AutoPilotPlugins/APM/APMSensorsComponentSummary.qml</file>
<file alias="APMTuningComponentCopter.qml">../../AutoPilotPlugins/APM/APMTuningComponentCopter.qml</file>
<file alias="APMTuningComponentSub.qml">../../AutoPilotPlugins/APM/APMTuningComponentSub.qml</file>
<file alias="QGroundControl/ArduPilot/APMSensorParams.qml">APMSensorParams.qml</file>
<file alias="QGroundControl/ArduPilot/qmldir">QGroundControl.ArduPilot.qmldir</file>
</qresource>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment