zrzk
/
zr-v4
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

GCS_MAVLink: remove underscore from method names

master
Randy Mackay 7 years ago
parent
2f81747112
commit
e5c0b1814a
2 changed files with 33 additions and 33 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 28
      libraries/GCS_MAVLink/GCS.h
  2. 38
      libraries/GCS_MAVLink/GCS_Common.cpp

28
libraries/GCS_MAVLink/GCS.h
Unescape View File

@ -450,20 +450,20 @@ private: @@ -450,20 +450,20 @@ private:
void handle_vision_position_estimate(mavlink_message_t *msg);
void handle_global_vision_position_estimate(mavlink_message_t *msg);
void handle_att_pos_mocap(mavlink_message_t *msg);
void _handle_common_vision_position_estimate_data(const uint64_t usec,
const float x,
const float y,
const float z,
const float roll,
const float pitch,
const float yaw);
void _log_vision_position_estimate_data(const uint64_t usec,
const float x,
const float y,
const float z,
const float roll,
const float pitch,
const float yaw);
void handle_common_vision_position_estimate_data(const uint64_t usec,
const float x,
const float y,
const float z,
const float roll,
const float pitch,
const float yaw);
void log_vision_position_estimate_data(const uint64_t usec,
const float x,
const float y,
const float z,
const float roll,
const float pitch,
const float yaw);
void push_deferred_messages();
void lock_channel(mavlink_channel_t chan, bool lock);

38
libraries/GCS_MAVLink/GCS_Common.cpp
Unescape View File

@ -1897,7 +1897,7 @@ void GCS_MAVLINK::handle_vision_position_estimate(mavlink_message_t *msg) @@ -1897,7 +1897,7 @@ void GCS_MAVLINK::handle_vision_position_estimate(mavlink_message_t *msg)
mavlink_vision_position_estimate_t m;
mavlink_msg_vision_position_estimate_decode(msg, &m);
_handle_common_vision_position_estimate_data(m.usec, m.x, m.y, m.z, m.roll, m.pitch, m.yaw);
handle_common_vision_position_estimate_data(m.usec, m.x, m.y, m.z, m.roll, m.pitch, m.yaw);
}
void GCS_MAVLINK::handle_global_vision_position_estimate(mavlink_message_t *msg)
@ -1905,7 +1905,7 @@ void GCS_MAVLINK::handle_global_vision_position_estimate(mavlink_message_t *msg) @@ -1905,7 +1905,7 @@ void GCS_MAVLINK::handle_global_vision_position_estimate(mavlink_message_t *msg)
mavlink_global_vision_position_estimate_t m;
mavlink_msg_global_vision_position_estimate_decode(msg, &m);
_handle_common_vision_position_estimate_data(m.usec, m.x, m.y, m.z, m.roll, m.pitch, m.yaw);
handle_common_vision_position_estimate_data(m.usec, m.x, m.y, m.z, m.roll, m.pitch, m.yaw);
}
void GCS_MAVLINK::handle_vicon_position_estimate(mavlink_message_t *msg)
@ -1913,19 +1913,19 @@ void GCS_MAVLINK::handle_vicon_position_estimate(mavlink_message_t *msg) @@ -1913,19 +1913,19 @@ void GCS_MAVLINK::handle_vicon_position_estimate(mavlink_message_t *msg)
mavlink_vicon_position_estimate_t m;
mavlink_msg_vicon_position_estimate_decode(msg, &m);
_handle_common_vision_position_estimate_data(m.usec, m.x, m.y, m.z, m.roll, m.pitch, m.yaw);
handle_common_vision_position_estimate_data(m.usec, m.x, m.y, m.z, m.roll, m.pitch, m.yaw);
}
// there are several messages which all have identical fields in them.
// This function provides common handling for the data contained in
// these packets
void GCS_MAVLINK::_handle_common_vision_position_estimate_data(const uint64_t usec,
const float x,
const float y,
const float z,
const float roll,
const float pitch,
const float yaw)
void GCS_MAVLINK::handle_common_vision_position_estimate_data(const uint64_t usec,
const float x,
const float y,
const float z,
const float roll,
const float pitch,
const float yaw)
{
// sensor assumed to be at 0,0,0 body-frame; need parameters for this?
// or a new message
@ -1950,16 +1950,16 @@ void GCS_MAVLINK::_handle_common_vision_position_estimate_data(const uint64_t us @@ -1950,16 +1950,16 @@ void GCS_MAVLINK::_handle_common_vision_position_estimate_data(const uint64_t us
timestamp_ms,
reset_timestamp_ms);
_log_vision_position_estimate_data(usec, x, y, z, roll, pitch, yaw);
log_vision_position_estimate_data(usec, x, y, z, roll, pitch, yaw);
}
void GCS_MAVLINK::_log_vision_position_estimate_data(const uint64_t usec,
const float x,
const float y,
const float z,
const float roll,
const float pitch,
const float yaw)
void GCS_MAVLINK::log_vision_position_estimate_data(const uint64_t usec,
const float x,
const float y,
const float z,
const float roll,
const float pitch,
const float yaw)
{
DataFlash_Class::instance()->Log_Write("VISP", "TimeUS,PX,PY,PZ,Roll,Pitch,Yaw",
"smmmrrr", "F000000", "Qffffff",
@ -2004,7 +2004,7 @@ void GCS_MAVLINK::handle_att_pos_mocap(mavlink_message_t *msg) @@ -2004,7 +2004,7 @@ void GCS_MAVLINK::handle_att_pos_mocap(mavlink_message_t *msg)
float yaw;
attitude.to_euler(roll, pitch, yaw);
_log_vision_position_estimate_data(m.time_usec, m.x, m.y, m.z, roll, pitch, yaw);
log_vision_position_estimate_data(m.time_usec, m.x, m.y, m.z, roll, pitch, yaw);
}
void GCS_MAVLINK::handle_command_ack(const mavlink_message_t* msg)

Write Preview
Loading…
Cancel
Save