Commit 82b92297 authored by Remek Zajac's avatar Remek Zajac

introduce gimbal yaw visiblity setting

parent c34499fa
......@@ -1464,6 +1464,7 @@ void MissionController::_recalcMissionFlightStatus()
bool foundRTL = false;
bool vehicleYawSpecificallySet = false;
double totalHorizontalDistance = 0;
bool showGimbalOnlyWhenSet = _planViewSettings->showGimbalWhen()->enumStringValue() == "Set";
for (int i=0; i<_visualItems->count(); i++) {
VisualMissionItem* item = qobject_cast<VisualMissionItem*>(_visualItems->get(i));
......@@ -1511,11 +1512,11 @@ void MissionController::_recalcMissionFlightStatus()
// Look for specific gimbal changes
double gimbalYaw = item->specifiedGimbalYaw();
if (!qIsNaN(gimbalYaw)) {
if (!qIsNaN(gimbalYaw) || showGimbalOnlyWhenSet) {
_missionFlightStatus.gimbalYaw = gimbalYaw;
}
double gimbalPitch = item->specifiedGimbalPitch();
if (!qIsNaN(gimbalPitch)) {
if (!qIsNaN(gimbalPitch) || showGimbalOnlyWhenSet) {
_missionFlightStatus.gimbalPitch = gimbalPitch;
}
......
......@@ -24,9 +24,18 @@
"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": "showGimbalWhen",
"shortDescription": "Show gimbal yaw visual when yaw known/set",
"longDescription": "Shows the gimbal yaw when the it's explcitly set by the user or simply when known (propagated from previous)",
"type": "uint32",
"enumValues": "0,1",
"enumStrings": "Known,Set",
"defaultValue": 0
}
]
......@@ -22,3 +22,4 @@ DECLARE_SETTINGSFACT(PlanViewSettings, aboveTerrainWarning)
DECLARE_SETTINGSFACT(PlanViewSettings, showMissionItemStatus)
DECLARE_SETTINGSFACT(PlanViewSettings, useConditionGate)
DECLARE_SETTINGSFACT(PlanViewSettings, takeoffItemNotRequired)
DECLARE_SETTINGSFACT(PlanViewSettings, showGimbalWhen)
......@@ -25,4 +25,5 @@ public:
DEFINE_SETTINGFACT(showMissionItemStatus)
DEFINE_SETTINGFACT(useConditionGate)
DEFINE_SETTINGFACT(takeoffItemNotRequired)
DEFINE_SETTINGFACT(showGimbalWhen)
};
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