diff options
| author | Thomas Gubler <thomasgubler@gmail.com> | 2015-01-15 12:42:28 +0100 |
|---|---|---|
| committer | Thomas Gubler <thomasgubler@gmail.com> | 2015-01-15 12:42:28 +0100 |
| commit | 96db9e81883ab0e3438e8ffdce8e8dce47d204ce (patch) | |
| tree | 2d41d99f2837630219cc56699b27d2a2190374aa /src/modules/fw_att_control | |
| parent | e60c1a842c856e1a19fcdc1b169dfdbc813e9ce2 (diff) | |
| parent | e62bd37e73139c77f0d60cd91fe3443ed23df074 (diff) | |
| download | px4-firmware-96db9e81883ab0e3438e8ffdce8e8dce47d204ce.tar.gz px4-firmware-96db9e81883ab0e3438e8ffdce8e8dce47d204ce.tar.bz2 px4-firmware-96db9e81883ab0e3438e8ffdce8e8dce47d204ce.zip | |
Merge remote-tracking branch 'upstream/master' into ros
Conflicts:
src/platforms/px4_middleware.h
Diffstat (limited to 'src/modules/fw_att_control')
| -rw-r--r-- | src/modules/fw_att_control/fw_att_control_main.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/modules/fw_att_control/fw_att_control_main.cpp b/src/modules/fw_att_control/fw_att_control_main.cpp index d329ba2b0..e0b61e2e2 100644 --- a/src/modules/fw_att_control/fw_att_control_main.cpp +++ b/src/modules/fw_att_control/fw_att_control_main.cpp @@ -1061,7 +1061,9 @@ FixedwingAttitudeControl::task_main() /* lazily publish the setpoint only once available */ _actuators.timestamp = hrt_absolute_time(); + _actuators.timestamp_sample = _att.timestamp; _actuators_airframe.timestamp = hrt_absolute_time(); + _actuators_airframe.timestamp_sample = _att.timestamp; /* publish the actuator controls */ if (_actuators_0_pub > 0) { |