Unverified Commit 18623e92 authored by Don Gagne's avatar Don Gagne Committed by GitHub

Merge pull request #8729 from airmap/gimbal-yaw-indicators

Introduce gimbal yaw visiblity setting
parents 909a9889 472b2acf
......@@ -1513,11 +1513,11 @@ void MissionController::_recalcMissionFlightStatus()
// Look for specific gimbal changes
double gimbalYaw = item->specifiedGimbalYaw();
if (!qIsNaN(gimbalYaw)) {
if (!qIsNaN(gimbalYaw) || _planViewSettings->showGimbalOnlyWhenSet()->rawValue().toBool()) {
_missionFlightStatus.gimbalYaw = gimbalYaw;
}
double gimbalPitch = item->specifiedGimbalPitch();
if (!qIsNaN(gimbalPitch)) {
if (!qIsNaN(gimbalPitch) || _planViewSettings->showGimbalOnlyWhenSet()->rawValue().toBool()) {
_missionFlightStatus.gimbalPitch = gimbalPitch;
}
......
......@@ -28,10 +28,16 @@
"defaultValue": false
},
{
"name": "useConditionGate",
"shortDescription": "Use MAV_CMD_CONDITION_GATE for pattern generation",
"type": "bool",
"defaultValue": false
"name": "useConditionGate",
"shortDescription": "Use MAV_CMD_CONDITION_GATE for pattern generation",
"type": "bool",
"defaultValue": false
},
{
"name": "showGimbalOnlyWhenSet",
"shortDescription": "Show gimbal yaw visual only when set explicitly for the waypoint",
"type": "bool",
"defaultValue": false
}
]
}
......@@ -22,3 +22,4 @@ DECLARE_SETTINGSFACT(PlanViewSettings, aboveTerrainWarning)
DECLARE_SETTINGSFACT(PlanViewSettings, showMissionItemStatus)
DECLARE_SETTINGSFACT(PlanViewSettings, useConditionGate)
DECLARE_SETTINGSFACT(PlanViewSettings, takeoffItemNotRequired)
DECLARE_SETTINGSFACT(PlanViewSettings, showGimbalOnlyWhenSet)
......@@ -25,4 +25,5 @@ public:
DEFINE_SETTINGFACT(showMissionItemStatus)
DEFINE_SETTINGFACT(useConditionGate)
DEFINE_SETTINGFACT(takeoffItemNotRequired)
DEFINE_SETTINGFACT(showGimbalOnlyWhenSet)
};
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