Merged mavlink_beta2

src/modules/uORB/topics/mission_result.h

@@ -54,7 +54,8 @@
 struct mission_result_s
 {
 	bool mission_reached;		/**< true if mission has been reached			*/
-	unsigned mission_index;		/**< index of the mission which has been reached	*/
+	unsigned mission_index_reached;	/**< index of the mission which has been reached	*/
+	unsigned index_current_mission; /**< index of the current mission			*/
 };
 
 /**

src/modules/uORB/topics/vehicle_attitude.h

@@ -76,7 +76,7 @@ struct vehicle_attitude_s {
 	float rate_offsets[3];	/**< Offsets of the body angular rates from zero		*/
 	float R[3][3];		/**< Rotation matrix body to world, (Tait-Bryan, NED)		*/
 	float q[4];		/**< Quaternion (NED)						*/
-	float g_comp[3];	/**< Compensated gravity vector				*/
+	float g_comp[3];	/**< Compensated gravity vector					*/
 	bool R_valid;		/**< Rotation matrix valid					*/
 	bool q_valid;		/**< Quaternion valid						*/