mavlink_mission: set INT frame correctly

Also when formatting malvink mission items from internal mission items, the INT flag should be obeyed.
PX4 · Mar 31, 2017 · af8f292 · af8f292
1 parent ee6d58b
commit af8f292
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/src/modules/mavlink/mavlink_mission.cpp b/src/modules/mavlink/mavlink_mission.cpp
@@ -1138,10 +1138,20 @@ MavlinkMissionManager::format_mavlink_mission_item(const struct mission_item_s *
 		mavlink_mission_item->z = mission_item->altitude;
 
 		if (mission_item->altitude_is_relative) {
-			mavlink_mission_item->frame = MAV_FRAME_GLOBAL_RELATIVE_ALT;
+			if (_int_mode) {
+				mavlink_mission_item->frame = MAV_FRAME_GLOBAL_RELATIVE_ALT_INT;
+
+			} else {
+				mavlink_mission_item->frame = MAV_FRAME_GLOBAL_RELATIVE_ALT;
+			}
 
 		} else {
-			mavlink_mission_item->frame = MAV_FRAME_GLOBAL;
+			if (_int_mode) {
+				mavlink_mission_item->frame = MAV_FRAME_GLOBAL_INT;
+
+			} else {
+				mavlink_mission_item->frame = MAV_FRAME_GLOBAL;
+			}
 		}
 
 		switch (mission_item->nav_cmd) {