diff options
| author | Julian Oes <julian@oes.ch> | 2013-06-27 09:23:11 +0200 |
|---|---|---|
| committer | Julian Oes <julian@oes.ch> | 2013-06-27 09:23:11 +0200 |
| commit | f052442c2b9dac56ead301e9208a392d7f2fe43d (patch) | |
| tree | 0112e0227436998d3aa7c95909ae12ba80c2427b /src/modules/sdlog2/sdlog2.c | |
| parent | 0ecc9c4bf4f2bf9fe1d99b5cbdf398718d2dccdd (diff) | |
| parent | 8191130bbc8f2cbd53e69a7bcd1a4d4b1b2d68bb (diff) | |
| download | px4-firmware-f052442c2b9dac56ead301e9208a392d7f2fe43d.tar.gz px4-firmware-f052442c2b9dac56ead301e9208a392d7f2fe43d.tar.bz2 px4-firmware-f052442c2b9dac56ead301e9208a392d7f2fe43d.zip | |
Merge remote-tracking branch 'upstream/master' into new_state_machine
Conflicts:
src/modules/sdlog2/sdlog2.c
src/modules/sdlog2/sdlog2_messages.h
Diffstat (limited to 'src/modules/sdlog2/sdlog2.c')
| -rw-r--r-- | src/modules/sdlog2/sdlog2.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/modules/sdlog2/sdlog2.c b/src/modules/sdlog2/sdlog2.c index 33b3c657b..bdb98a24e 100644 --- a/src/modules/sdlog2/sdlog2.c +++ b/src/modules/sdlog2/sdlog2.c @@ -695,6 +695,7 @@ int sdlog2_thread_main(int argc, char *argv[]) struct log_OUT0_s log_OUT0; struct log_AIRS_s log_AIRS; struct log_ARSP_s log_ARSP; + struct log_FLOW_s log_FLOW; } body; } log_msg = { LOG_PACKET_HEADER_INIT(0) @@ -1131,10 +1132,13 @@ int sdlog2_thread_main(int argc, char *argv[]) if (fds[ifds++].revents & POLLIN) { orb_copy(ORB_ID(optical_flow), subs.flow_sub, &buf.flow); log_msg.msg_type = LOG_FLOW_MSG; - log_msg.body.log_FLOW.flow_comp_x_m = buf.flow.flow_comp_x_m; - log_msg.body.log_FLOW.flow_comp_y_m = buf.flow.flow_comp_y_m; - log_msg.body.log_FLOW.ground_distance_m = buf.flow.ground_distance_m; + log_msg.body.log_FLOW.flow_raw_x = buf.flow.flow_raw_x; + log_msg.body.log_FLOW.flow_raw_y = buf.flow.flow_raw_y; + log_msg.body.log_FLOW.flow_comp_x = buf.flow.flow_comp_x_m; + log_msg.body.log_FLOW.flow_comp_y = buf.flow.flow_comp_y_m; + log_msg.body.log_FLOW.distance = buf.flow.ground_distance_m; log_msg.body.log_FLOW.quality = buf.flow.quality; + log_msg.body.log_FLOW.sensor_id = buf.flow.sensor_id; LOGBUFFER_WRITE_AND_COUNT(FLOW); } |