fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-27 04:53:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merged master

Browse Source
This commit is contained in:
Lorenz Meier
2014-10-31 09:30:58 +01:00
parent 4689c2db0a 9f3c352959
commit c04c0e1ea3
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/mavlink/mavlink_receiver.cpp
+1 -1
View File
@@ -392,7 +392,7 @@ MavlinkReceiver::handle_message_hil_optical_flow(mavlink_message_t *msg)
struct optical_flow_s f; struct optical_flow_s f;
memset(&f, 0, sizeof(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.integration_timespan = flow.integration_time_us;
f.pixel_flow_x_integral = flow.integrated_x; f.pixel_flow_x_integral = flow.integrated_x;
f.pixel_flow_y_integral = flow.integrated_y; f.pixel_flow_y_integral = flow.integrated_y;
src/systemcmds/nshterm/module.mk
+1 -1
View File
@@ -38,6 +38,6 @@
MODULE_COMMAND = nshterm MODULE_COMMAND = nshterm
SRCS = nshterm.c SRCS = nshterm.c
MODULE_STACKSIZE = 1400 MODULE_STACKSIZE = 1600
MAXOPTIMIZATION = -Os MAXOPTIMIZATION = -Os