Merge branch 'master' into mavlink_stack

src/modules/mavlink/mavlink_main.h

@@ -93,6 +93,7 @@ struct mavlink_wpm_storage {
 	uint8_t current_partner_compid;
 	uint64_t timestamp_lastaction;
 	uint64_t timestamp_last_send_setpoint;
+	uint64_t timestamp_last_send_request;
 	uint32_t timeout;
 	int current_dataman_id;
 };
@@ -221,8 +222,6 @@ private:
 	int		_mavlink_fd;
 	bool		_task_running;
 
-	perf_counter_t	_loop_perf;			/**< loop performance counter */
-
 	/* states */
 	bool		_hil_enabled;		/**< Hardware In the Loop mode */
 	bool		_use_hil_gps;		/**< Accept GPS HIL messages (for example from an external motion capturing system to fake indoor gps) */
@@ -282,6 +281,7 @@ private:
 
 	pthread_mutex_t		_message_buffer_mutex;
 
+	perf_counter_t	_loop_perf;			/**< loop performance counter */
 	bool			_param_initialized;
 	param_t			_param_system_id;
 	param_t			_param_component_id;