diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2014-07-02 00:33:36 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-07-02 00:33:36 +0200 |
| commit | a9fd5ed90ad67a8081aec3dd3c05034c3d64f81c (patch) | |
| tree | 74065b07dc620e8e22751563d548a140b17966e4 /src/modules/sdlog2 | |
| parent | 43b9d96cf4306bc472d16956f5437dbef7c630c0 (diff) | |
| parent | 4cd66a3242aa2dfb03a3e58ffcc8d27e1350b7ac (diff) | |
| download | px4-firmware-a9fd5ed90ad67a8081aec3dd3c05034c3d64f81c.tar.gz px4-firmware-a9fd5ed90ad67a8081aec3dd3c05034c3d64f81c.tar.bz2 px4-firmware-a9fd5ed90ad67a8081aec3dd3c05034c3d64f81c.zip | |
Merged master to gnss_rework
Diffstat (limited to 'src/modules/sdlog2')
| -rw-r--r-- | src/modules/sdlog2/sdlog2.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/modules/sdlog2/sdlog2.c b/src/modules/sdlog2/sdlog2.c index 6ff56d223..39e5b6c41 100644 --- a/src/modules/sdlog2/sdlog2.c +++ b/src/modules/sdlog2/sdlog2.c @@ -1079,7 +1079,7 @@ int sdlog2_thread_main(int argc, char *argv[]) if (log_on_start) { /* check GPS topic to get GPS time */ if (log_name_timestamp) { - if (copy_if_updated(ORB_ID(vehicle_gps_position), subs.gps_pos_sub, &buf_gps_pos)) { + if (!orb_copy(ORB_ID(vehicle_gps_position), subs.gps_pos_sub, &buf_gps_pos)) { gps_time = buf_gps_pos.time_gps_usec; } } @@ -1406,8 +1406,8 @@ int sdlog2_thread_main(int argc, char *argv[]) if (copy_if_updated(ORB_ID(rc_channels), subs.rc_sub, &buf.rc)) { log_msg.msg_type = LOG_RC_MSG; /* Copy only the first 8 channels of 14 */ - memcpy(log_msg.body.log_RC.channel, buf.rc.chan, sizeof(log_msg.body.log_RC.channel)); - log_msg.body.log_RC.channel_count = buf.rc.chan_count; + memcpy(log_msg.body.log_RC.channel, buf.rc.channels, sizeof(log_msg.body.log_RC.channel)); + log_msg.body.log_RC.channel_count = buf.rc.channel_count; log_msg.body.log_RC.signal_lost = buf.rc.signal_lost; LOGBUFFER_WRITE_AND_COUNT(RC); } |