diff options
| author | Helen Oleynikova <helenoleynikova@gmail.com> | 2014-04-09 17:28:00 +0200 |
|---|---|---|
| committer | Helen Oleynikova <helenoleynikova@gmail.com> | 2014-04-09 17:28:00 +0200 |
| commit | a39382dc174d646c5ecda8c15c6e0db9c1c4e703 (patch) | |
| tree | 14a2189e17a8d5fb3919bd478238e910ad7efde3 /src/modules | |
| parent | 5b090a7095a25f31dd040935defa2363a60b3107 (diff) | |
| download | px4-firmware-a39382dc174d646c5ecda8c15c6e0db9c1c4e703.tar.gz px4-firmware-a39382dc174d646c5ecda8c15c6e0db9c1c4e703.tar.bz2 px4-firmware-a39382dc174d646c5ecda8c15c6e0db9c1c4e703.zip | |
VICON -> VICN really this time.
Diffstat (limited to 'src/modules')
| -rw-r--r-- | src/modules/sdlog2/sdlog2.c | 18 | ||||
| -rw-r--r-- | src/modules/sdlog2/sdlog2_messages.h | 6 |
2 files changed, 12 insertions, 12 deletions
diff --git a/src/modules/sdlog2/sdlog2.c b/src/modules/sdlog2/sdlog2.c index 8dfe17228..1bf6f1de3 100644 --- a/src/modules/sdlog2/sdlog2.c +++ b/src/modules/sdlog2/sdlog2.c @@ -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 --- */ diff --git a/src/modules/sdlog2/sdlog2_messages.h b/src/modules/sdlog2/sdlog2_messages.h index affd512cc..d0585df39 100644 --- a/src/modules/sdlog2/sdlog2_messages.h +++ b/src/modules/sdlog2/sdlog2_messages.h @@ -301,9 +301,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; |