diff options
| author | Anton Babushkin <anton.babushkin@me.com> | 2014-04-23 15:26:24 +0200 |
|---|---|---|
| committer | Anton Babushkin <anton.babushkin@me.com> | 2014-04-23 15:26:24 +0200 |
| commit | 34597599fcac2d76e9c8f35b12f18f1bbcb04bbe (patch) | |
| tree | 1ccead2b96d725b2953ec8ff8ab998bdbd3f6656 /src/modules | |
| parent | dc8a0b291a8de863ea8746a6d8ddf5127d1ea609 (diff) | |
| download | px4-firmware-34597599fcac2d76e9c8f35b12f18f1bbcb04bbe.tar.gz px4-firmware-34597599fcac2d76e9c8f35b12f18f1bbcb04bbe.tar.bz2 px4-firmware-34597599fcac2d76e9c8f35b12f18f1bbcb04bbe.zip | |
navigator: merging bug fixed
Diffstat (limited to 'src/modules')
| -rw-r--r-- | src/modules/navigator/navigator_main.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/modules/navigator/navigator_main.cpp b/src/modules/navigator/navigator_main.cpp index 29b82fe75..12fd35a0a 100644 --- a/src/modules/navigator/navigator_main.cpp +++ b/src/modules/navigator/navigator_main.cpp @@ -692,6 +692,9 @@ Navigator::task_main() /* evaluate state requested by commander */ if (_control_mode.flag_armed && _control_mode.flag_control_auto_enabled) { + /* publish position setpoint triplet on each status update if navigator active */ + _pos_sp_triplet_updated = true; + if (_vstatus.set_nav_state_timestamp != _set_nav_state_timestamp) { /* commander requested new navigation mode, try to set it */ switch (_vstatus.set_nav_state) { |