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

Merge pull request #7392 from DonLakeFlyer/master 

ArduPilot: Rover Frame setup support, Copter advanced tuning
QGC4.4
Don Gagne 6 years ago committed by GitHub
parent
2c32b46392 696bd66a58
commit
64eebbef96
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 228 additions and 89 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. 2
      ChangeLog.md
  2. 40
      src/AutoPilotPlugins/APM/APMAirframeComponent.cc
  3. 6
      src/AutoPilotPlugins/APM/APMAirframeComponent.h
  4. 17
      src/AutoPilotPlugins/APM/APMAirframeComponent.qml
  5. 128
      src/AutoPilotPlugins/APM/APMAirframeComponentController.cc
  6. 3
      src/AutoPilotPlugins/APM/APMAirframeComponentController.h
  7. 17
      src/AutoPilotPlugins/APM/APMAirframeComponentSummary.qml
  8. 102
      src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml
  9. 2
      src/FactSystem/FactControls/FactPanelController.cc

2
ChangeLog.md
Unescape View File

@ -6,6 +6,8 @@ Note: This file only contains high level features or important fixes.
### 3.6.0 - Daily Build ### 3.6.0 - Daily Build
* ArduPilot: Copter - Advanced Tuning support
* ArduPilot: Rover - Frame setup support
* ArduPilot: Copter - Update support to 3.5+ * ArduPilot: Copter - Update support to 3.5+
* ArduPilot: Plane - Update support to 3.8+ * ArduPilot: Plane - Update support to 3.8+
* ArduPilot: Rover - Update support to 3.4+ * ArduPilot: Rover - Update support to 3.4+

40
src/AutoPilotPlugins/APM/APMAirframeComponent.cc
Unescape View File

@ -11,28 +11,22 @@
#include "ArduCopterFirmwarePlugin.h" #include "ArduCopterFirmwarePlugin.h"
#include "ParameterManager.h" #include "ParameterManager.h"
const char* APMAirframeComponent::_oldFrameParam = "FRAME"; const char* APMAirframeComponent::_frameClassParam = "FRAME_CLASS";
const char* APMAirframeComponent::_newFrameParam = "FRAME_CLASS";
APMAirframeComponent::APMAirframeComponent(Vehicle* vehicle, AutoPilotPlugin* autopilot, QObject* parent) APMAirframeComponent::APMAirframeComponent(Vehicle* vehicle, AutoPilotPlugin* autopilot, QObject* parent)
: VehicleComponent(vehicle, autopilot, parent) : VehicleComponent (vehicle, autopilot, parent)
, _requiresFrameSetup(false) , _requiresFrameSetup (false)
, _name(tr("Airframe")) , _name (tr("Frame"))
{ {
if (qobject_cast<ArduCopterFirmwarePlugin*>(_vehicle->firmwarePlugin()) != NULL) { ParameterManager* paramMgr = vehicle->parameterManager();
ParameterManager* paramMgr = _vehicle->parameterManager();
_requiresFrameSetup = true; if (paramMgr->parameterExists(FactSystem::defaultComponentId, _frameClassParam)) {
if (paramMgr->parameterExists(FactSystem::defaultComponentId, _oldFrameParam)) { _frameClassFact = paramMgr->getParameter(FactSystem::defaultComponentId, _frameClassParam);
_useNewFrameParam = false; if (vehicle->vehicleType() != MAV_TYPE_HELICOPTER) {
_frameParamFact = paramMgr->getParameter(FactSystem::defaultComponentId, _oldFrameParam); _requiresFrameSetup = true;
MAV_TYPE vehicleType = vehicle->vehicleType();
if (vehicleType == MAV_TYPE_TRICOPTER || vehicleType == MAV_TYPE_HELICOPTER) {
_requiresFrameSetup = false;
}
} else {
_useNewFrameParam = true;
_frameParamFact = paramMgr->getParameter(FactSystem::defaultComponentId, _newFrameParam);
} }
} else {
_frameClassFact = nullptr;
} }
} }
@ -43,7 +37,7 @@ QString APMAirframeComponent::name(void) const
QString APMAirframeComponent::description(void) const QString APMAirframeComponent::description(void) const
{ {
return tr("Airframe Setup is used to select the airframe which matches your vehicle."); return tr("Frame Setup is used to select the airframe which matches your vehicle.");
} }
QString APMAirframeComponent::iconResource(void) const QString APMAirframeComponent::iconResource(void) const
@ -59,11 +53,7 @@ bool APMAirframeComponent::requiresSetup(void) const
bool APMAirframeComponent::setupComplete(void) const bool APMAirframeComponent::setupComplete(void) const
{ {
if (_requiresFrameSetup) { if (_requiresFrameSetup) {
if (_useNewFrameParam) { return _frameClassFact->rawValue().toInt() != 0;
return _frameParamFact->rawValue().toInt() > 0;
} else {
return _frameParamFact->rawValue().toInt() >= 0;
}
} else { } else {
return true; return true;
} }
@ -74,7 +64,7 @@ QStringList APMAirframeComponent::setupCompleteChangedTriggerList(void) const
QStringList list; QStringList list;
if (_requiresFrameSetup) { if (_requiresFrameSetup) {
list << (_useNewFrameParam ? _newFrameParam : _oldFrameParam); list << _frameClassParam;
} }
return list; return list;

6
src/AutoPilotPlugins/APM/APMAirframeComponent.h
Unescape View File

@ -35,11 +35,9 @@ public:
private: private:
bool _requiresFrameSetup; ///< true: FRAME parameter must be set bool _requiresFrameSetup; ///< true: FRAME parameter must be set
const QString _name; const QString _name;
Fact* _frameParamFact; Fact* _frameClassFact;
bool _useNewFrameParam;
static const char* _oldFrameParam; static const char* _frameClassParam;
static const char* _newFrameParam;
}; };
#endif #endif

17
src/AutoPilotPlugins/APM/APMAirframeComponent.qml
Unescape View File

@ -31,12 +31,13 @@ SetupPage {
id: mainColumn id: mainColumn
width: availableWidth width: availableWidth
property real _minW: ScreenTools.defaultFontPixelWidth * 20 property real _minW: ScreenTools.defaultFontPixelWidth * 20
property real _boxWidth: _minW property real _boxWidth: _minW
property real _boxSpace: ScreenTools.defaultFontPixelWidth property real _boxSpace: ScreenTools.defaultFontPixelWidth
property real _margins: ScreenTools.defaultFontPixelWidth property real _margins: ScreenTools.defaultFontPixelWidth
property Fact _frameClass: controller.getParameterFact(-1, "FRAME_CLASS") property Fact _frameClass: controller.getParameterFact(-1, "FRAME_CLASS")
property Fact _frameType: controller.getParameterFact(-1, "FRAME_TYPE") property Fact _frameType: controller.getParameterFact(-1, "FRAME_TYPE", false) // FRAME_TYPE is not available on all Rover versions
property bool _frameTypeAvailable: controller.parameterExists(-1, "FRAME_TYPE")
readonly property real spacerHeight: ScreenTools.defaultFontPixelHeight readonly property real spacerHeight: ScreenTools.defaultFontPixelHeight
@ -71,7 +72,9 @@ SetupPage {
Layout.fillWidth: true Layout.fillWidth: true
text: (_frameClass.rawValue === 0 ? text: (_frameClass.rawValue === 0 ?
qsTr("Airframe is currently not set.") : qsTr("Airframe is currently not set.") :
qsTr("Currently set to frame class '%1' and frame type '%2'.").arg(_frameClass.enumStringValue).arg(_frameType.enumStringValue)) + qsTr("Currently set to frame class '%1'").arg(_frameClass.enumStringValue) +
(_frameTypeAvailable ? qsTr(" and frame type '%2'").arg(_frameType.enumStringValue) : "") +
qsTr(".", "period for end of sentence")) +
qsTr(" To change this configuration, select the desired frame class below and frame type.") qsTr(" To change this configuration, select the desired frame class below and frame type.")
font.family: ScreenTools.demiboldFontFamily font.family: ScreenTools.demiboldFontFamily
wrapMode: Text.WordWrap wrapMode: Text.WordWrap

128
src/AutoPilotPlugins/APM/APMAirframeComponentController.cc
Unescape View File

@ -13,6 +13,8 @@
#include "QGCApplication.h" #include "QGCApplication.h"
#include "QGCFileDownload.h" #include "QGCFileDownload.h"
#include "ParameterManager.h" #include "ParameterManager.h"
#include "ArduCopterFirmwarePlugin.h"
#include "ArduRoverFirmwarePlugin.h"
#include <QVariant> #include <QVariant>
#include <QQmlProperty> #include <QQmlProperty>
@ -21,8 +23,7 @@
#include <QJsonParseError> #include <QJsonParseError>
#include <QJsonObject> #include <QJsonObject>
// These should match the ArduCopter FRAME_CLASS parameter enum meta data
// These should match the FRAME_CLASS parameter enum meta data
#define FRAME_CLASS_UNDEFINED 0 #define FRAME_CLASS_UNDEFINED 0
#define FRAME_CLASS_QUAD 1 #define FRAME_CLASS_QUAD 1
#define FRAME_CLASS_HEX 2 #define FRAME_CLASS_HEX 2
@ -38,7 +39,7 @@
#define FRAME_CLASS_DODECAHEXA 12 #define FRAME_CLASS_DODECAHEXA 12
#define FRAME_CLASS_HELIQUAD 13 #define FRAME_CLASS_HELIQUAD 13
// These should match the FRAME_TYPE parameter enum meta data // These should match the ArduCopter FRAME_TYPE parameter enum meta data
#define FRAME_TYPE_PLUS 0 #define FRAME_TYPE_PLUS 0
#define FRAME_TYPE_X 1 #define FRAME_TYPE_X 1
#define FRAME_TYPE_V 2 #define FRAME_TYPE_V 2
@ -51,13 +52,24 @@
#define FRAME_TYPE_DJIX 13 #define FRAME_TYPE_DJIX 13
#define FRAME_TYPE_CLOCKWISEX 14 #define FRAME_TYPE_CLOCKWISEX 14
// These should match the Rover FRAME_CLASS parameter enum meta data
#define FRAME_CLASS_ROVER 1
#define FRAME_CLASS_BOAT 2
#define FRAME_CLASS_BALANCEBOT 3
// These should match the Rover FRAME_TYPE parameter enum meta data
#define FRAME_TYPE_UNDEFINED 0
#define FRAME_TYPE_OMNI3 1
#define FRAME_TYPE_OMNIX 2
#define FRAME_TYPE_OMNIPLUS 3
typedef struct { typedef struct {
int frameClass; int frameClass;
int frameType; int frameType;
const char* imageResource; const char* imageResource;
} FrameToImageInfo_t; } FrameToImageInfo_t;
static const FrameToImageInfo_t s_rgFrameToImage[] = { static const FrameToImageInfo_t s_rgFrameToImageCopter[] = {
{ FRAME_CLASS_QUAD, FRAME_TYPE_PLUS, "QuadRotorPlus" }, { FRAME_CLASS_QUAD, FRAME_TYPE_PLUS, "QuadRotorPlus" },
{ FRAME_CLASS_QUAD, FRAME_TYPE_X, "QuadRotorX" }, { FRAME_CLASS_QUAD, FRAME_TYPE_X, "QuadRotorX" },
{ FRAME_CLASS_QUAD, FRAME_TYPE_V, "QuadRotorWide" }, { FRAME_CLASS_QUAD, FRAME_TYPE_V, "QuadRotorWide" },
@ -77,10 +89,15 @@ static const FrameToImageInfo_t s_rgFrameToImage[] = {
{ FRAME_CLASS_TRI, -1, "YPlus" }, { FRAME_CLASS_TRI, -1, "YPlus" },
}; };
static QString s_findImageResource(int frameClass, int frameType) static const FrameToImageInfo_t s_rgFrameToImageRover[] = {
{ FRAME_CLASS_ROVER, -1, "Rover" },
{ FRAME_CLASS_BOAT, -1, "Boat" },
};
static QString s_findImageResourceCopter(int frameClass, int frameType)
{ {
for (size_t i=0; i<sizeof(s_rgFrameToImage)/sizeof(s_rgFrameToImage[0]); i++) { for (size_t i=0; i<sizeof(s_rgFrameToImageCopter)/sizeof(s_rgFrameToImageCopter[0]); i++) {
const FrameToImageInfo_t* pFrameToImageInfo = &s_rgFrameToImage[i]; const FrameToImageInfo_t* pFrameToImageInfo = &s_rgFrameToImageCopter[i];
if (pFrameToImageInfo->frameClass == frameClass && pFrameToImageInfo->frameType == frameType) { if (pFrameToImageInfo->frameClass == frameClass && pFrameToImageInfo->frameType == frameType) {
return pFrameToImageInfo->imageResource; return pFrameToImageInfo->imageResource;
@ -92,9 +109,24 @@ static QString s_findImageResource(int frameClass, int frameType)
return QStringLiteral("AirframeUnknown"); return QStringLiteral("AirframeUnknown");
} }
static QString s_findImageResourceRover(int frameClass, int frameType)
{
Q_UNUSED(frameType);
for (size_t i=0; i<sizeof(s_rgFrameToImageRover)/sizeof(s_rgFrameToImageRover[0]); i++) {
const FrameToImageInfo_t* pFrameToImageInfo = &s_rgFrameToImageRover[i];
if (pFrameToImageInfo->frameClass == frameClass) {
return pFrameToImageInfo->imageResource;
}
}
return QStringLiteral("AirframeUnknown");
}
APMAirframeComponentController::APMAirframeComponentController(void) APMAirframeComponentController::APMAirframeComponentController(void)
: _frameClassFact (getParameterFact(FactSystem::defaultComponentId, QStringLiteral("FRAME_CLASS"))) : _frameClassFact (getParameterFact(FactSystem::defaultComponentId, QStringLiteral("FRAME_CLASS")))
, _frameTypeFact (getParameterFact(FactSystem::defaultComponentId, QStringLiteral("FRAME_TYPE"))) , _frameTypeFact (getParameterFact(FactSystem::defaultComponentId, QStringLiteral("FRAME_TYPE"), false /* reportMissing */))
, _frameClassModel (new QmlObjectListModel(this)) , _frameClassModel (new QmlObjectListModel(this))
{ {
_fillFrameClasses(); _fillFrameClasses();
@ -107,26 +139,48 @@ APMAirframeComponentController::~APMAirframeComponentController()
void APMAirframeComponentController::_fillFrameClasses() void APMAirframeComponentController::_fillFrameClasses()
{ {
QList<int> frameTypeNotSupported; FirmwarePlugin* fwPlugin = _vehicle->firmwarePlugin();
frameTypeNotSupported << FRAME_CLASS_HELI if (qobject_cast<ArduCopterFirmwarePlugin*>(fwPlugin)) {
<< FRAME_CLASS_SINGLECOPTER QList<int> frameTypeNotSupported;
<< FRAME_CLASS_COAXCOPTER
<< FRAME_CLASS_BICOPTER frameTypeNotSupported << FRAME_CLASS_HELI
<< FRAME_CLASS_HELI_DUAL << FRAME_CLASS_SINGLECOPTER
<< FRAME_CLASS_HELIQUAD; << FRAME_CLASS_COAXCOPTER
<< FRAME_CLASS_BICOPTER
for (int i=1; i<_frameClassFact->enumStrings().count(); i++) { << FRAME_CLASS_HELI_DUAL
QString frameClassName = _frameClassFact->enumStrings()[i]; << FRAME_CLASS_HELIQUAD;
int frameClass = _frameClassFact->enumValues()[i].toInt();
int defaultFrameType; for (int i=1; i<_frameClassFact->enumStrings().count(); i++) {
QString frameClassName = _frameClassFact->enumStrings()[i];
if (frameTypeNotSupported.contains(frameClass)) { int frameClass = _frameClassFact->enumValues()[i].toInt();
defaultFrameType = -1; int defaultFrameType;
} else {
defaultFrameType = FRAME_TYPE_X; if (frameClass == FRAME_CLASS_HELI) {
// Heli requires it's own firmware variant. You can't switch to Heli from a Copter variant firmware.
continue;
}
if (frameTypeNotSupported.contains(frameClass)) {
defaultFrameType = -1;
} else {
defaultFrameType = FRAME_TYPE_X;
}
_frameClassModel->append(new APMFrameClass(frameClassName, true /* copter */, frameClass, _frameTypeFact, defaultFrameType, _frameClassModel));
}
} else if (qobject_cast<ArduRoverFirmwarePlugin*>(fwPlugin)) {
for (int i=1; i<_frameClassFact->enumStrings().count(); i++) {
QString frameClassName = _frameClassFact->enumStrings()[i];
int frameClass = _frameClassFact->enumValues()[i].toInt();
int defaultFrameType;
if (_frameTypeFact) {
defaultFrameType = FRAME_TYPE_UNDEFINED;
} else {
defaultFrameType = -1;
}
_frameClassModel->append(new APMFrameClass(frameClassName, false /* copter */, frameClass, _frameTypeFact, defaultFrameType, _frameClassModel));
} }
_frameClassModel->append(new APMFrameClass(frameClassName, frameClass, _frameTypeFact, defaultFrameType, _frameClassModel));
} }
} }
@ -216,16 +270,19 @@ void APMAirframeComponentController::_paramFileDownloadError(QString errorMsg)
qgcApp()->restoreOverrideCursor(); qgcApp()->restoreOverrideCursor();
} }
APMFrameClass::APMFrameClass(const QString& name, int frameClass, Fact* frameTypeFact, int defaultFrameType, QObject* parent) APMFrameClass::APMFrameClass(const QString& name, bool copter, int frameClass, Fact* frameTypeFact, int defaultFrameType, QObject* parent)
: QObject (parent) : QObject (parent)
, _name (name) , _name (name)
, _copter (copter)
, _frameClass (frameClass) , _frameClass (frameClass)
, _defaultFrameType (defaultFrameType) , _defaultFrameType (defaultFrameType)
, _frameTypeSupported (defaultFrameType != -1) , _frameTypeSupported (defaultFrameType != -1)
, _frameTypeFact (frameTypeFact) , _frameTypeFact (frameTypeFact)
{ {
connect(frameTypeFact, &Fact::rawValueChanged, this, &APMFrameClass::imageResourceChanged); if (frameTypeFact) {
connect(frameTypeFact, &Fact::rawValueChanged, this, &APMFrameClass::frameTypeChanged); connect(frameTypeFact, &Fact::rawValueChanged, this, &APMFrameClass::imageResourceChanged);
connect(frameTypeFact, &Fact::rawValueChanged, this, &APMFrameClass::frameTypeChanged);
}
} }
APMFrameClass::~APMFrameClass() APMFrameClass::~APMFrameClass()
@ -235,5 +292,14 @@ APMFrameClass::~APMFrameClass()
QString APMFrameClass::imageResource(void) QString APMFrameClass::imageResource(void)
{ {
return QStringLiteral("/qmlimages/Airframe/%1").arg(s_findImageResource(_frameClass, _frameTypeFact->rawValue().toInt())); QString imageResource;
int frameType = _frameTypeFact ? _frameTypeFact->rawValue().toInt() : -1;
if (_copter) {
imageResource = s_findImageResourceCopter(_frameClass, frameType);
} else {
imageResource = s_findImageResourceRover(_frameClass, frameType);
}
return QStringLiteral("/qmlimages/Airframe/%1").arg(imageResource);
} }

3
src/AutoPilotPlugins/APM/APMAirframeComponentController.h
Unescape View File

@ -54,7 +54,7 @@ class APMFrameClass : public QObject
Q_OBJECT Q_OBJECT
public: public:
APMFrameClass(const QString& name, int frameClass, Fact* frameTypeFact, int defaultFrameType, QObject* parent = nullptr); APMFrameClass(const QString& name, bool copter, int frameClass, Fact* frameTypeFact, int defaultFrameType, QObject* parent = nullptr);
~APMFrameClass(); ~APMFrameClass();
Q_PROPERTY(QString name MEMBER _name CONSTANT) Q_PROPERTY(QString name MEMBER _name CONSTANT)
@ -68,6 +68,7 @@ public:
QString imageResource (void); QString imageResource (void);
QString _name; QString _name;
bool _copter;
QString _imageResource; QString _imageResource;
int _frameClass; int _frameClass;
int _defaultFrameType; int _defaultFrameType;

17
src/AutoPilotPlugins/APM/APMAirframeComponentSummary.qml
Unescape View File

@ -18,32 +18,23 @@ FactPanel {
factPanel: panel factPanel: panel
} }
property bool _frameAvailable: controller.parameterExists(-1, "FRAME") property Fact _frameClass: controller.getParameterFact(-1, "FRAME_CLASS")
property Fact _frame: controller.getParameterFact(-1, "FRAME", false)
property Fact _frameClass: controller.getParameterFact(-1, "FRAME_CLASS", false)
property Fact _frameType: controller.getParameterFact(-1, "FRAME_TYPE", false) property Fact _frameType: controller.getParameterFact(-1, "FRAME_TYPE", false)
property bool _frameTypeAvailable: controller.parameterExists(-1, "FRAME_TYPE")
Column { Column {
anchors.fill: parent anchors.fill: parent
VehicleSummaryRow { VehicleSummaryRow {
labelText: qsTr("Frame Type")
valueText: visible ? controller.currentAirframeTypeName() + " " + _frame.enumStringValue : ""
visible: _frameAvailable
}
VehicleSummaryRow {
labelText: qsTr("Frame Class") labelText: qsTr("Frame Class")
valueText: visible ? _frameClass.enumStringValue : "" valueText: _frameClass.enumStringValue
visible: !_frameAvailable
} }
VehicleSummaryRow { VehicleSummaryRow {
labelText: qsTr("Frame Type") labelText: qsTr("Frame Type")
valueText: visible ? _frameType.enumStringValue : "" valueText: visible ? _frameType.enumStringValue : ""
visible: !_frameAvailable visible: _frameTypeAvailable
} }
VehicleSummaryRow { VehicleSummaryRow {

102
src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml
Unescape View File

@ -10,6 +10,7 @@
import QtQuick 2.3 import QtQuick 2.3
import QtQuick.Controls 1.2 import QtQuick.Controls 1.2
import QtQuick.Layouts 1.2
import QGroundControl.FactSystem 1.0 import QGroundControl.FactSystem 1.0
import QGroundControl.FactControls 1.0 import QGroundControl.FactControls 1.0
@ -36,12 +37,14 @@ SetupPage {
property bool _atcInputTCAvailable: controller.parameterExists(-1, "ATC_INPUT_TC") property bool _atcInputTCAvailable: controller.parameterExists(-1, "ATC_INPUT_TC")
property Fact _rcFeel: controller.getParameterFact(-1, "RC_FEEL", false) property Fact _rcFeel: controller.getParameterFact(-1, "RC_FEEL", false)
property Fact _atcInputTC: controller.getParameterFact(-1, "ATC_INPUT_TC", false) property Fact _atcInputTC: controller.getParameterFact(-1, "ATC_INPUT_TC", false)
property Fact _rateRollP: controller.getParameterFact(-1, "r.ATC_RAT_RLL_P") property Fact _rateRollP: controller.getParameterFact(-1, "ATC_RAT_RLL_P")
property Fact _rateRollI: controller.getParameterFact(-1, "r.ATC_RAT_RLL_I") property Fact _rateRollI: controller.getParameterFact(-1, "ATC_RAT_RLL_I")
property Fact _ratePitchP: controller.getParameterFact(-1, "r.ATC_RAT_PIT_P") property Fact _ratePitchP: controller.getParameterFact(-1, "ATC_RAT_PIT_P")
property Fact _ratePitchI: controller.getParameterFact(-1, "r.ATC_RAT_PIT_I") property Fact _ratePitchI: controller.getParameterFact(-1, "ATC_RAT_PIT_I")
property Fact _rateClimbP: controller.getParameterFact(-1, "r.PSC_ACCZ_P") property Fact _rateClimbP: controller.getParameterFact(-1, "PSC_ACCZ_P")
property Fact _rateClimbI: controller.getParameterFact(-1, "r.PSC_ACCZ_I") property Fact _rateClimbI: controller.getParameterFact(-1, "PSC_ACCZ_I")
property Fact _motSpinArm: controller.getParameterFact(-1, "MOT_SPIN_ARM")
property Fact _motSpinMin: controller.getParameterFact(-1, "MOT_SPIN_MIN")
property Fact _ch7Opt: controller.getParameterFact(-1, "r.RC7_OPTION") property Fact _ch7Opt: controller.getParameterFact(-1, "r.RC7_OPTION")
property Fact _ch8Opt: controller.getParameterFact(-1, "r.RC8_OPTION") property Fact _ch8Opt: controller.getParameterFact(-1, "r.RC8_OPTION")
@ -122,7 +125,6 @@ SetupPage {
Connections { target: _ch12Opt; onValueChanged: calcAutoTuneChannel() } Connections { target: _ch12Opt; onValueChanged: calcAutoTuneChannel() }
QGCLabel { QGCLabel {
id: basicLabel
text: qsTr("Basic Tuning") text: qsTr("Basic Tuning")
font.family: ScreenTools.demiboldFontFamily font.family: ScreenTools.demiboldFontFamily
} }
@ -271,6 +273,92 @@ SetupPage {
} }
} // Rectangle - Basic tuning } // Rectangle - Basic tuning
QGCLabel {
text: qsTr("Advanced Tuning")
font.family: ScreenTools.demiboldFontFamily
}
Rectangle {
anchors.left: parent.left
anchors.right: parent.right
height: advColumnLayout.y + advColumnLayout.height + _margins
color: palette.windowShade
ColumnLayout {
id: advColumnLayout
anchors.margins: _margins
anchors.left: parent.left
anchors.right: parent.right
anchors.top: parent.top
spacing: _margins
Column {
Layout.fillWidth: true
QGCLabel {
text: qsTr("Spin While Armed")
font.family: ScreenTools.demiboldFontFamily
}
QGCLabel {
text: qsTr("Adjust the amount the motors spin to indicate armed")
}
Slider {
anchors.left: parent.left
anchors.right: parent.right
minimumValue: 0
maximumValue: Math.max(0.3, _motSpinArm.rawValue)
stepSize: 0.01
tickmarksEnabled: true
value: _motSpinArm.rawValue
onValueChanged: {
if (_loadComplete) {
_motSpinArm.rawValue = value
}
}
}
}
Column {
id: lastAdvTuningColumn
Layout.fillWidth: true
QGCLabel {
text: qsTr("Minimum Thrust")
font.family: ScreenTools.demiboldFontFamily
}
QGCLabel {
text: qsTr("Adjust the minimum amount of thrust for a stable minimum throttle descent")
}
QGCLabel {
text: qsTr("Warning: This setting should be higher than 'Spin While Armed'")
color: palette.warningText
visible: _motSpinMin.rawValue < _motSpinArm.rawValue
}
Slider {
anchors.left: parent.left
anchors.right: parent.right
minimumValue: 0
maximumValue: Math.max(0.3, _motSpinMin.rawValue)
stepSize: 0.01
tickmarksEnabled: true
value: _motSpinMin.rawValue
onValueChanged: {
if (_loadComplete) {
_motSpinMin.rawValue = value
}
}
}
}
}
} // Rectangle - Advanced tuning
Flow { Flow {
id: flowLayout id: flowLayout
anchors.left: parent.left anchors.left: parent.left

2
src/FactSystem/FactControls/FactPanelController.cc
Unescape View File

@ -132,7 +132,7 @@ Fact* FactPanelController::getParameterFact(int componentId, const QString& name
if (reportMissing) { if (reportMissing) {
_reportMissingParameter(componentId, name); _reportMissingParameter(componentId, name);
} }
return NULL; return nullptr;
} }
} }

Write Preview
Loading…
Cancel
Save