Skip to content

Q
qgroundcontrol
Unverified Commit 0871b019 authored by Don Gagne's avatar Don Gagne Committed by GitHub
Browse files
Options

Merge pull request #7356 from DonLakeFlyer/LoiterNaN 

Better handling of NaN in LOITER_* commands
parents 7a56aaea 929d4210
Show whitespace changes
Inline Side-by-side
Showing with 70 additions and 38 deletions
src/FirmwarePlugin/APM/MavCmdInfoCommon.json
View file @ 0871b019
...@@ -9,6 +9,36 @@ ...@@ -9,6 +9,36 @@
"comment": "MAV_CMD_NAV_WAYPOINT", "comment": "MAV_CMD_NAV_WAYPOINT",
"paramRemove": "2" "paramRemove": "2"
}, },
{
"id": 17,
"comment": "MAV_CMD_NAV_LOITER_UNLIM",
"param4": {
"label": "Heading",
"units": "radians",
"default": 0,
"decimalPlaces": 2
}
},
{
"id": 18,
"comment": "MAV_CMD_NAV_LOITER_TURNS",
"param4": {
"label": "Heading",
"units": "radians",
"default": 0,
"decimalPlaces": 2
}
},
{
"id": 19,
"comment": "MAV_CMD_NAV_LOITER_TIME",
"param4": {
"label": "Heading",
"units": "radians",
"default": 0,
"decimalPlaces": 2
}
},
{ {
"id": 22, "id": 22,
"comment": "MAV_CMD_NAV_TAKEOFF", "comment": "MAV_CMD_NAV_TAKEOFF",
......
src/FirmwarePlugin/APM/MavCmdInfoFixedWing.json
View file @ 0871b019
...@@ -9,6 +9,28 @@ ...@@ -9,6 +9,28 @@
"comment": "MAV_CMD_NAV_WAYPOINT", "comment": "MAV_CMD_NAV_WAYPOINT",
"paramRemove": "1,3,4" "paramRemove": "1,3,4"
}, },
{
"id": 18,
"comment": "MAV_CMD_NAV_LOITER_TURNS",
"param4": {
"label": "Exit loiter from",
"enumStrings": "Center,Tangent",
"enumValues": "0,1",
"default": 1,
"decimalPlaces": 0
}
},
{
"id": 19,
"comment": "MAV_CMD_NAV_LOITER_TIME",
"param4": {
"label": "Exit loiter from",
"enumStrings": "Center,Tangent",
"enumValues": "0,1",
"default": 1,
"decimalPlaces": 0
}
},
{ {
"id": 21, "id": 21,
"comment": "MAV_CMD_NAV_LAND", "comment": "MAV_CMD_NAV_LAND",
......
src/FirmwarePlugin/PX4/MavCmdInfoCommon.json
View file @ 0871b019
...@@ -9,39 +9,6 @@ ...@@ -9,39 +9,6 @@
"comment": "MAV_CMD_NAV_WAYPOINT", "comment": "MAV_CMD_NAV_WAYPOINT",
"paramRemove": "2,3" "paramRemove": "2,3"
}, },
{
"id": 17,
"comment": "MAV_CMD_NAV_LOITER_UNLIM",
"param4": {
"label": "Heading",
"units": "radians",
"nanUnchanged": true,
"default": null,
"decimalPlaces": 2
}
},
{
"id": 18,
"comment": "MAV_CMD_NAV_LOITER_TURNS",
"param4": {
"label": "Heading",
"units": "radians",
"nanUnchanged": true,
"default": null,
"decimalPlaces": 2
}
},
{
"id": 19,
"comment": "MAV_CMD_NAV_LOITER_TIME",
"param4": {
"label": "Heading",
"units": "radians",
"nanUnchanged": true,
"default": null,
"decimalPlaces": 2
}
},
{ {
"id": 21, "id": 21,
"comment": "MAV_CMD_NAV_LAND", "comment": "MAV_CMD_NAV_LAND",
......
src/MissionManager/FixedWingLandingComplexItem.cc
View file @ 0871b019
...@@ -100,6 +100,12 @@ FixedWingLandingComplexItem::FixedWingLandingComplexItem(Vehicle* vehicle, bool ...@@ -100,6 +100,12 @@ FixedWingLandingComplexItem::FixedWingLandingComplexItem(Vehicle* vehicle, bool
connect(this, &FixedWingLandingComplexItem::altitudesAreRelativeChanged, this, &FixedWingLandingComplexItem::coordinateHasRelativeAltitudeChanged); connect(this, &FixedWingLandingComplexItem::altitudesAreRelativeChanged, this, &FixedWingLandingComplexItem::coordinateHasRelativeAltitudeChanged);
connect(this, &FixedWingLandingComplexItem::altitudesAreRelativeChanged, this, &FixedWingLandingComplexItem::exitCoordinateHasRelativeAltitudeChanged); connect(this, &FixedWingLandingComplexItem::altitudesAreRelativeChanged, this, &FixedWingLandingComplexItem::exitCoordinateHasRelativeAltitudeChanged);
if (vehicle->apmFirmware()) {
// ArduPilot does not support camera commands
_stopTakingVideoFact.setRawValue(false);
_stopTakingPhotosFact.setRawValue(false);
}
if (_valueSetIsDistanceFact.rawValue().toBool()) { if (_valueSetIsDistanceFact.rawValue().toBool()) {
_recalcFromHeadingAndDistanceChange(); _recalcFromHeadingAndDistanceChange();
} else { } else {
......
src/MissionManager/MavCmdInfoCommon.json
View file @ 0871b019
...@@ -101,7 +101,8 @@ ...@@ -101,7 +101,8 @@
"param4": { "param4": {
"label": "Heading", "label": "Heading",
"units": "radians", "units": "radians",
"default": 0, "nanUnchanged": true,
"default": null,
"decimalPlaces": 2 "decimalPlaces": 2
} }
}, },
...@@ -128,7 +129,8 @@ ...@@ -128,7 +129,8 @@
"param4": { "param4": {
"label": "Heading", "label": "Heading",
"units": "radians", "units": "radians",
"default": 0, "nanUnchanged": true,
"default": null,
"decimalPlaces": 2 "decimalPlaces": 2
} }
}, },
......
src/PlanView/FWLandingPatternEditor.qml
View file @ 0871b019
...@@ -32,11 +32,15 @@ Rectangle { ...@@ -32,11 +32,15 @@ Rectangle {
//property real availableWidth ///< Width for control //property real availableWidth ///< Width for control
//property var missionItem ///< Mission Item for editor //property var missionItem ///< Mission Item for editor
property var _masterControler: masterController
property var _missionController: _masterControler.missionController
property var _missionVehicle: _masterControler.controllerVehicle
property real _margin: ScreenTools.defaultFontPixelWidth / 2 property real _margin: ScreenTools.defaultFontPixelWidth / 2
property real _spacer: ScreenTools.defaultFontPixelWidth / 2 property real _spacer: ScreenTools.defaultFontPixelWidth / 2
property var _activeVehicle: QGroundControl.multiVehicleManager.activeVehicle property var _activeVehicle: QGroundControl.multiVehicleManager.activeVehicle
property string _setToVehicleHeadingStr: qsTr("Set to vehicle heading") property string _setToVehicleHeadingStr: qsTr("Set to vehicle heading")
property string _setToVehicleLocationStr: qsTr("Set to vehicle location") property string _setToVehicleLocationStr: qsTr("Set to vehicle location")
property bool _showCameraSection: !_missionVehicle.apmFirmware
ExclusiveGroup { id: distanceGlideGroup } ExclusiveGroup { id: distanceGlideGroup }
...@@ -168,13 +172,14 @@ Rectangle { ...@@ -168,13 +172,14 @@ Rectangle {
SectionHeader { SectionHeader {
id: cameraSection id: cameraSection
text: qsTr("Camera") text: qsTr("Camera")
visible: _showCameraSection
} }
Column { Column {
anchors.left: parent.left anchors.left: parent.left
anchors.right: parent.right anchors.right: parent.right
spacing: _margin spacing: _margin
visible: cameraSection.checked visible: _showCameraSection && cameraSection.checked
Item { width: 1; height: _spacer } Item { width: 1; height: _spacer }
......
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