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

Merge pull request #7356 from DonLakeFlyer/LoiterNaN 

Better handling of NaN in LOITER_* commands
QGC4.4
Don Gagne 6 years ago committed by GitHub
parent
7a56aaeaa9 929d4210ec
commit
0871b019d4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 70 additions and 38 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 30
      src/FirmwarePlugin/APM/MavCmdInfoCommon.json
  2. 22
      src/FirmwarePlugin/APM/MavCmdInfoFixedWing.json
  3. 33
      src/FirmwarePlugin/PX4/MavCmdInfoCommon.json
  4. 6
      src/MissionManager/FixedWingLandingComplexItem.cc
  5. 6
      src/MissionManager/MavCmdInfoCommon.json
  6. 7
      src/PlanView/FWLandingPatternEditor.qml

30
src/FirmwarePlugin/APM/MavCmdInfoCommon.json
Unescape View File

@ -10,6 +10,36 @@ @@ -10,6 +10,36 @@
"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,
"comment": "MAV_CMD_NAV_TAKEOFF",
"specifiesCoordinate": false,

22
src/FirmwarePlugin/APM/MavCmdInfoFixedWing.json
Unescape View File

@ -10,6 +10,28 @@ @@ -10,6 +10,28 @@
"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,
"comment": "MAV_CMD_NAV_LAND",
"paramRemove": "4"

33
src/FirmwarePlugin/PX4/MavCmdInfoCommon.json
Unescape View File

@ -10,39 +10,6 @@ @@ -10,39 +10,6 @@
"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,
"comment": "MAV_CMD_NAV_LAND",
"paramRemove": "1"

6
src/MissionManager/FixedWingLandingComplexItem.cc
Unescape View File

@ -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::exitCoordinateHasRelativeAltitudeChanged);
if (vehicle->apmFirmware()) {
// ArduPilot does not support camera commands
_stopTakingVideoFact.setRawValue(false);
_stopTakingPhotosFact.setRawValue(false);
}
if (_valueSetIsDistanceFact.rawValue().toBool()) {
_recalcFromHeadingAndDistanceChange();
} else {

6
src/MissionManager/MavCmdInfoCommon.json
Unescape View File

@ -101,7 +101,8 @@ @@ -101,7 +101,8 @@
"param4": {
"label": "Heading",
"units": "radians",
"default": 0,
"nanUnchanged": true,
"default": null,
"decimalPlaces": 2
}
},
@ -128,7 +129,8 @@ @@ -128,7 +129,8 @@
"param4": {
"label": "Heading",
"units": "radians",
"default": 0,
"nanUnchanged": true,
"default": null,
"decimalPlaces": 2
}
},

7
src/PlanView/FWLandingPatternEditor.qml
Unescape View File

@ -32,11 +32,15 @@ Rectangle { @@ -32,11 +32,15 @@ Rectangle {
//property real availableWidth ///< Width for control
//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 _spacer: ScreenTools.defaultFontPixelWidth / 2
property var _activeVehicle: QGroundControl.multiVehicleManager.activeVehicle
property string _setToVehicleHeadingStr: qsTr("Set to vehicle heading")
property string _setToVehicleLocationStr: qsTr("Set to vehicle location")
property bool _showCameraSection: !_missionVehicle.apmFirmware
ExclusiveGroup { id: distanceGlideGroup }
@ -168,13 +172,14 @@ Rectangle { @@ -168,13 +172,14 @@ Rectangle {
SectionHeader {
id: cameraSection
text: qsTr("Camera")
visible: _showCameraSection
}
Column {
anchors.left: parent.left
anchors.right: parent.right
spacing: _margin
visible: cameraSection.checked
visible: _showCameraSection && cameraSection.checked
Item { width: 1; height: _spacer }

Write Preview
Loading…
Cancel
Save