Merge pull request #561 from tensafefrogs/next

Fix missing curly braces and adjust some formatting.
This commit is contained in:
Bertrand Songis
2014-01-19 13:09:19 -08:00
+38 -39
View File
@@ -204,7 +204,7 @@ static inline void REC_MAVLINK_MSG_ID_VFR_HUD(const mavlink_message_t* msg) {
/*! \brief Heartbeat message /*! \brief Heartbeat message
* \details Heartbeat message is used for the following information: * \details Heartbeat message is used for the following information:
* type and autopilot is used to determain if the UAV is a ArduPlane or Arducopter * type and autopilot is used to determine if the UAV is an ArduPlane or Arducopter
*/ */
static inline void REC_MAVLINK_MSG_ID_HEARTBEAT(const mavlink_message_t* msg) { static inline void REC_MAVLINK_MSG_ID_HEARTBEAT(const mavlink_message_t* msg) {
telemetry_data.mode = mavlink_msg_heartbeat_get_base_mode(msg); telemetry_data.mode = mavlink_msg_heartbeat_get_base_mode(msg);
@@ -214,38 +214,38 @@ static inline void REC_MAVLINK_MSG_ID_HEARTBEAT(const mavlink_message_t* msg) {
telemetry_data.mav_compid = msg->compid; telemetry_data.mav_compid = msg->compid;
uint8_t type = mavlink_msg_heartbeat_get_type(msg); uint8_t type = mavlink_msg_heartbeat_get_type(msg);
uint8_t autopilot = mavlink_msg_heartbeat_get_autopilot(msg); uint8_t autopilot = mavlink_msg_heartbeat_get_autopilot(msg);
if ((type != telemetry_data.type) || (autopilot != telemetry_data.autopilot)) if (type != telemetry_data.type || autopilot != telemetry_data.autopilot) {
{
telemetry_data.type = mavlink_msg_heartbeat_get_type(msg); telemetry_data.type = mavlink_msg_heartbeat_get_type(msg);
telemetry_data.autopilot = mavlink_msg_heartbeat_get_autopilot(msg); telemetry_data.autopilot = mavlink_msg_heartbeat_get_autopilot(msg);
if (autopilot == MAV_AUTOPILOT_ARDUPILOTMEGA) if (autopilot == MAV_AUTOPILOT_ARDUPILOTMEGA) {
{ if (type == MAV_TYPE_QUADROTOR ||
if ((type == MAV_TYPE_QUADROTOR) || type == MAV_TYPE_COAXIAL ||
(type == MAV_TYPE_COAXIAL) || type == MAV_TYPE_HELICOPTER ||
(type == MAV_TYPE_HELICOPTER) || type == MAV_TYPE_HEXAROTOR ||
(type == MAV_TYPE_HEXAROTOR) || type == MAV_TYPE_OCTOROTOR ||
(type == MAV_TYPE_OCTOROTOR) || type == MAV_TYPE_TRICOPTER) {
(type == MAV_TYPE_TRICOPTER)) telemetry_data.type_autopilot = MAVLINK_ARDUCOPTER;
{ }
telemetry_data.type_autopilot = MAVLINK_ARDUCOPTER; else if (type == MAV_TYPE_FIXED_WING) {
} telemetry_data.type_autopilot = MAVLINK_ARDUPLANE;
else if (type == MAV_TYPE_FIXED_WING) }
{ else {
telemetry_data.type_autopilot = MAVLINK_ARDUPLANE;
}
else
telemetry_data.type_autopilot = MAVLINK_INVALID_TYPE; telemetry_data.type_autopilot = MAVLINK_INVALID_TYPE;
}
} }
else else {
telemetry_data.type_autopilot = MAVLINK_INVALID_TYPE; telemetry_data.type_autopilot = MAVLINK_INVALID_TYPE;
}
} }
telemetry_data.active = (telemetry_data.mode & MAV_MODE_FLAG_SAFETY_ARMED) ? true : false; telemetry_data.active = (telemetry_data.mode & MAV_MODE_FLAG_SAFETY_ARMED) ? true : false;
mav_heartbeat = 3; // 450ms display '*' mav_heartbeat = 3; // 450ms display '*'
mav_heartbeat_recv = 1; mav_heartbeat_recv = 1;
} }
static inline void REC_MAVLINK_MSG_ID_HIL_CONTROLS(const mavlink_message_t* msg) { static inline void REC_MAVLINK_MSG_ID_HIL_CONTROLS(const mavlink_message_t* msg) {
telemetry_data.nav_mode = mavlink_msg_hil_controls_get_mode(msg); telemetry_data.nav_mode = mavlink_msg_hil_controls_get_mode(msg);
} }
/*! \brief Process GPS raw intger message /*! \brief Process GPS raw intger message
* \details This message contains the following data: * \details This message contains the following data:
* - fix type: 0-1: no fix, 2: 2D fix, 3: 3D fix. * - fix type: 0-1: no fix, 2: 2D fix, 3: 3D fix.
@@ -266,26 +266,25 @@ static inline void REC_MAVLINK_MSG_ID_GPS_RAW_INT(const mavlink_message_t* msg)
telemetry_data.satellites_visible = mavlink_msg_gps_raw_int_get_satellites_visible(msg); telemetry_data.satellites_visible = mavlink_msg_gps_raw_int_get_satellites_visible(msg);
} }
#ifdef MAVLINK_PARAMS #ifdef MAVLINK_PARAMS
const pm_char * getParamId(uint8_t idx) { const pm_char *getParamId(uint8_t idx) {
const pm_char *mav_params_id [((NB_PID_PARAMS / 2) + 4)] = { // const pm_char *mav_params_id [((NB_PID_PARAMS / 2) + 4)] = {
// PSTR("RATE_YAW"), // Rate Yaw
PSTR("RATE_YAW"), // Rate Yaw PSTR("STB_YAW"), // Stabilize Yaw
PSTR("STB_YAW"), // Stabilize Yaw PSTR("RATE_PIT"), // Rate Pitch
PSTR("RATE_PIT"), // Rate Pitch PSTR("STB_PIT"), // Stabilize Pitch
PSTR("STB_PIT"), // Stabilize Pitch PSTR("RATE_RLL"), // Rate Roll
PSTR("RATE_RLL"), // Rate Roll PSTR("STB_RLL"), // Stabilize Roll
PSTR("STB_RLL"), // Stabilize Roll PSTR("THR_ALT"), // PSTR("THR_BAR"), // Altitude Hold
PSTR("THR_ALT"), // PSTR("THR_BAR"), // Altitude Hold PSTR("HLD_LON"), // Loiter
PSTR("HLD_LON"), // Loiter PSTR("HLD_LAT"), // Loiter
PSTR("HLD_LAT"), // Loiter PSTR("NAV_LON"), // Nav WP
PSTR("NAV_LON"), // Nav WP PSTR("NAV_LAT"), // Nav WP
PSTR("NAV_LAT"), // Nav WP PSTR("LOW_VOLT"), // Battery low voltage
PSTR("LOW_VOLT"), // Battery low voltage PSTR("VOLT_DIVIDER"), //
PSTR("VOLT_DIVIDER"), // PSTR("BATT_MONITOR"), //
PSTR("BATT_MONITOR"), // PSTR("BATT_CAPACITY")
PSTR("BATT_CAPACITY") }; };
uint8_t i; uint8_t i;
if (idx < NB_PID_PARAMS) { if (idx < NB_PID_PARAMS) {
i = idx / 2; i = idx / 2;