dark0707
/
px4-firmware
forked from Archive/PX4-Autopilot
1
0
Fork 0
Code Pull Requests Activity

VICON -> VICN really this time.

This commit is contained in:
Helen Oleynikova 2014-04-09 17:28:00 +02:00 committed by Julian Oes
parent df0ab0ecd0
commit 99ab001a5a
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/modules/sdlog2/sdlog2.c
View File

@ -833,7 +833,7 @@ int sdlog2_thread_main(int argc, char *argv[])
struct log_TELE_s log_TELE;
struct log_ESTM_s log_ESTM;
struct log_PWR_s log_PWR;
struct log_VICON_s log_VICON;
struct log_VICN_s log_VICN;
} body;
} log_msg = {
LOG_PACKET_HEADER_INIT(0)
@ -1164,14 +1164,14 @@ int sdlog2_thread_main(int argc, char *argv[])
/* --- VICON POSITION --- */
if (copy_if_updated(ORB_ID(vehicle_vicon_position), subs.vicon_pos_sub, &buf.vicon_pos)) {
log_msg.msg_type = LOG_VICON_MSG;
log_msg.body.log_VICON.x = buf.vicon_pos.x;
log_msg.body.log_VICON.y = buf.vicon_pos.y;
log_msg.body.log_VICON.z = buf.vicon_pos.z;
log_msg.body.log_VICON.pitch = buf.vicon_pos.pitch;
log_msg.body.log_VICON.roll = buf.vicon_pos.roll;
log_msg.body.log_VICON.yaw = buf.vicon_pos.yaw;
LOGBUFFER_WRITE_AND_COUNT(VICON);
log_msg.msg_type = LOG_VICN_MSG;
log_msg.body.log_VICN.x = buf.vicon_pos.x;
log_msg.body.log_VICN.y = buf.vicon_pos.y;
log_msg.body.log_VICN.z = buf.vicon_pos.z;
log_msg.body.log_VICN.pitch = buf.vicon_pos.pitch;
log_msg.body.log_VICN.roll = buf.vicon_pos.roll;
log_msg.body.log_VICN.yaw = buf.vicon_pos.yaw;
LOGBUFFER_WRITE_AND_COUNT(VICN);
}
/* --- FLOW --- */

6
src/modules/sdlog2/sdlog2_messages.h
View File

@ -302,9 +302,9 @@ struct log_PWR_s {
uint8_t high_power_rail_overcurrent;
};
/* --- VICON - VICON POSITION --- */
#define LOG_VICON_MSG 25
struct log_VICON_s {
/* --- VICN - VICON POSITION --- */
#define LOG_VICN_MSG 25
struct log_VICN_s {
float x;
float y;
float z;