diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2014-10-31 09:30:58 +0100 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-10-31 09:30:58 +0100 |
| commit | c04c0e1ea3b2cbb7023d0549fda761e200fcb986 (patch) | |
| tree | d45343a7631123eb4fb53aeef773c587a58c0edb /src | |
| parent | 4689c2db0a67f6346e928a5f7054a64f0c6c9558 (diff) | |
| parent | 9f3c3529593033d9acc94fb978a2aa6e34a3d1d9 (diff) | |
| download | px4-firmware-c04c0e1ea3b2cbb7023d0549fda761e200fcb986.tar.gz px4-firmware-c04c0e1ea3b2cbb7023d0549fda761e200fcb986.tar.bz2 px4-firmware-c04c0e1ea3b2cbb7023d0549fda761e200fcb986.zip | |
Merged master
Diffstat (limited to 'src')
| -rw-r--r-- | src/modules/mavlink/mavlink_receiver.cpp | 2 | ||||
| -rw-r--r-- | src/systemcmds/nshterm/module.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/modules/mavlink/mavlink_receiver.cpp b/src/modules/mavlink/mavlink_receiver.cpp index bee58f89b..75b0c6e17 100644 --- a/src/modules/mavlink/mavlink_receiver.cpp +++ b/src/modules/mavlink/mavlink_receiver.cpp @@ -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; diff --git a/src/systemcmds/nshterm/module.mk b/src/systemcmds/nshterm/module.mk index 7d2c59f91..41706e137 100644 --- a/src/systemcmds/nshterm/module.mk +++ b/src/systemcmds/nshterm/module.mk @@ -38,6 +38,6 @@ MODULE_COMMAND = nshterm SRCS = nshterm.c -MODULE_STACKSIZE = 1400 +MODULE_STACKSIZE = 1600 MAXOPTIMIZATION = -Os |