MAVLink: Code style

This commit is contained in:
Lorenz Meier
2016-08-26 23:43:33 +02:00
parent e67a6bdfc2
commit 720c445f21
17 changed files with 922 additions and 627 deletions
+32 -24
View File
@@ -170,22 +170,29 @@ public:
BROADCAST_MODE_ON
};
static const char *mavlink_mode_str(enum MAVLINK_MODE mode) {
static const char *mavlink_mode_str(enum MAVLINK_MODE mode)
{
switch (mode) {
case MAVLINK_MODE_NORMAL:
return "Normal";
case MAVLINK_MODE_CUSTOM:
return "Custom";
case MAVLINK_MODE_ONBOARD:
return "Onboard";
case MAVLINK_MODE_OSD:
return "OSD";
case MAVLINK_MODE_MAGIC:
return "Magic";
case MAVLINK_MODE_CONFIG:
return "Config";
default:
return "Unknown";
case MAVLINK_MODE_NORMAL:
return "Normal";
case MAVLINK_MODE_CUSTOM:
return "Custom";
case MAVLINK_MODE_ONBOARD:
return "Onboard";
case MAVLINK_MODE_OSD:
return "OSD";
case MAVLINK_MODE_MAGIC:
return "Magic";
case MAVLINK_MODE_CONFIG:
return "Config";
default:
return "Unknown";
}
}
@@ -230,7 +237,8 @@ public:
*/
void mavlink_pm_message_handler(const mavlink_channel_t chan, const mavlink_message_t *msg);
void get_mavlink_mode_and_state(struct vehicle_status_s *status, struct position_setpoint_triplet_s *pos_sp_triplet, uint8_t *mavlink_state, uint8_t *mavlink_base_mode, uint32_t *mavlink_custom_mode);
void get_mavlink_mode_and_state(struct vehicle_status_s *status, struct position_setpoint_triplet_s *pos_sp_triplet,
uint8_t *mavlink_state, uint8_t *mavlink_base_mode, uint32_t *mavlink_custom_mode);
/**
* Enable / disable Hardware in the Loop simulation mode.
@@ -285,7 +293,7 @@ public:
void handle_message(const mavlink_message_t *msg);
MavlinkOrbSubscription *add_orb_subscription(const orb_id_t topic, int instance=0);
MavlinkOrbSubscription *add_orb_subscription(const orb_id_t topic, int instance = 0);
int get_instance_id();
@@ -339,7 +347,7 @@ public:
void send_statustext(unsigned char severity, const char *string);
void send_autopilot_capabilites();
MavlinkStream * get_streams() const { return _streams; }
MavlinkStream *get_streams() const { return _streams; }
float get_rate_mult();
@@ -380,7 +388,7 @@ public:
/**
* Get the receive status of this MAVLink link
*/
struct telemetry_status_s& get_rx_status() { return _rstatus; }
struct telemetry_status_s &get_rx_status() { return _rstatus; }
ringbuffer::RingBuffer *get_logbuffer() { return &_logbuffer; }
@@ -392,9 +400,9 @@ public:
unsigned short get_remote_port() { return _remote_port; }
int get_socket_fd () { return _socket_fd; };
int get_socket_fd() { return _socket_fd; };
#ifdef __PX4_POSIX
struct sockaddr_in * get_client_source_address() { return &_src_addr; }
struct sockaddr_in *get_client_source_address() { return &_src_addr; }
void set_client_source_initialized() { _src_addr_initialized = true; }
@@ -419,7 +427,7 @@ public:
void set_logging_enabled(bool logging) { _logging_enabled = logging; }
int get_data_rate() { return _datarate; }
void set_data_rate(int rate) { if (rate > 0) _datarate = rate; }
void set_data_rate(int rate) { if (rate > 0) { _datarate = rate; } }
/** get the Mavlink shell. Create a new one if there isn't one. It is *always* created via MavlinkReceiver thread.
* Returns nullptr if shell cannot be created */
@@ -608,6 +616,6 @@ private:
int task_main(int argc, char *argv[]);
/* do not allow copying this class */
Mavlink(const Mavlink&);
Mavlink operator=(const Mavlink&);
Mavlink(const Mavlink &);
Mavlink operator=(const Mavlink &);
};