Merged master

This commit is contained in:
Lorenz Meier 2014-10-31 09:30:58 +01:00
commit c04c0e1ea3
2 changed files with 2 additions and 2 deletions

View File

@ -392,7 +392,7 @@ MavlinkReceiver::handle_message_hil_optical_flow(mavlink_message_t *msg)
struct optical_flow_s f;
memset(&f, 0, sizeof(f));
f.timestamp = flow.time_usec;
f.timestamp = hrt_absolute_time(); // XXX we rely on the system time for now and not flow.time_usec;
f.integration_timespan = flow.integration_time_us;
f.pixel_flow_x_integral = flow.integrated_x;
f.pixel_flow_y_integral = flow.integrated_y;

View File

@ -38,6 +38,6 @@
MODULE_COMMAND = nshterm
SRCS = nshterm.c
MODULE_STACKSIZE = 1400
MODULE_STACKSIZE = 1600
MAXOPTIMIZATION = -Os