From 9540869c208f202073aae742ef8877c3257a84bf Mon Sep 17 00:00:00 2001 From: mcsauder Date: Sat, 9 Mar 2019 12:29:00 -0700 Subject: [PATCH] Alphabetize a few methods and variable orders in mavlink_receiver.h. --- src/modules/mavlink/mavlink_receiver.cpp | 4 ++-- src/modules/mavlink/mavlink_receiver.h | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/modules/mavlink/mavlink_receiver.cpp b/src/modules/mavlink/mavlink_receiver.cpp index 8d541408e3..6c4f3b6cf9 100644 --- a/src/modules/mavlink/mavlink_receiver.cpp +++ b/src/modules/mavlink/mavlink_receiver.cpp @@ -84,11 +84,11 @@ using matrix::wrap_2pi; MavlinkReceiver::MavlinkReceiver(Mavlink *parent) : _mavlink(parent), - _mission_manager(parent), - _parameters_manager(parent), _mavlink_ftp(parent), _mavlink_log_handler(parent), _mavlink_timesync(parent), + _mission_manager(parent), + _parameters_manager(parent), _p_bat_emergen_thr(param_find("BAT_EMERGEN_THR")), _p_bat_crit_thr(param_find("BAT_CRIT_THR")), _p_bat_low_thr(param_find("BAT_LOW_THR")), diff --git a/src/modules/mavlink/mavlink_receiver.h b/src/modules/mavlink/mavlink_receiver.h index caa294ea6e..0ed02ed625 100644 --- a/src/modules/mavlink/mavlink_receiver.h +++ b/src/modules/mavlink/mavlink_receiver.h @@ -119,9 +119,6 @@ public: private: void acknowledge(uint8_t sysid, uint8_t compid, uint16_t command, uint8_t result); - void handle_message(mavlink_message_t *msg); - void handle_message_command_long(mavlink_message_t *msg); - void handle_message_command_int(mavlink_message_t *msg); /** * Common method to handle both mavlink command types. T is one of mavlink_command_int_t or mavlink_command_long_t. @@ -130,11 +127,14 @@ private: void handle_message_command_both(mavlink_message_t *msg, const T &cmd_mavlink, const vehicle_command_s &vehicle_command); + void handle_message(mavlink_message_t *msg); void handle_message_adsb_vehicle(mavlink_message_t *msg); void handle_message_att_pos_mocap(mavlink_message_t *msg); void handle_message_battery_status(mavlink_message_t *msg); void handle_message_collision(mavlink_message_t *msg); void handle_message_command_ack(mavlink_message_t *msg); + void handle_message_command_int(mavlink_message_t *msg); + void handle_message_command_long(mavlink_message_t *msg); void handle_message_debug(mavlink_message_t *msg); void handle_message_debug_float_array(mavlink_message_t *msg); void handle_message_debug_vect(mavlink_message_t *msg); @@ -199,11 +199,11 @@ private: Mavlink *_mavlink; - MavlinkMissionManager _mission_manager; - MavlinkParametersManager _parameters_manager; MavlinkFTP _mavlink_ftp; MavlinkLogHandler _mavlink_log_handler; MavlinkTimesync _mavlink_timesync; + MavlinkMissionManager _mission_manager; + MavlinkParametersManager _parameters_manager; mavlink_status_t _status{}; ///< receiver status, used for mavlink_parse_char()