diff options
| author | Anton Babushkin <anton.babushkin@me.com> | 2014-04-23 14:22:52 +0200 |
|---|---|---|
| committer | Anton Babushkin <anton.babushkin@me.com> | 2014-04-23 14:22:52 +0200 |
| commit | 2998685a3ac593c7b5341f684491e5faef3cc564 (patch) | |
| tree | 6a614a6f7f95e9c17160c3ce837f77c351d667cd /src/modules/navigator/navigator_main.cpp | |
| parent | 8634780e80f728ccbd4bc63860aeaa11727aeedb (diff) | |
| parent | 60554c8a5682bc5b2edb66e1ca6b7a9163b1dbf9 (diff) | |
| download | px4-firmware-2998685a3ac593c7b5341f684491e5faef3cc564.tar.gz px4-firmware-2998685a3ac593c7b5341f684491e5faef3cc564.tar.bz2 px4-firmware-2998685a3ac593c7b5341f684491e5faef3cc564.zip | |
Merge branch 'mpc_local_pos' into mpc_rc
Diffstat (limited to 'src/modules/navigator/navigator_main.cpp')
| -rw-r--r-- | src/modules/navigator/navigator_main.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/modules/navigator/navigator_main.cpp b/src/modules/navigator/navigator_main.cpp index ca71aab70..56983a0c3 100644 --- a/src/modules/navigator/navigator_main.cpp +++ b/src/modules/navigator/navigator_main.cpp @@ -777,8 +777,8 @@ Navigator::task_main() if (fds[1].revents & POLLIN) { global_position_update(); - /* publish position setpoint triplet on each position update if navigator active */ if (_control_mode.flag_armed && _control_mode.flag_control_auto_enabled) { + /* publish position setpoint triplet on each position update if navigator active */ _pos_sp_triplet_updated = true; if (myState == NAV_STATE_LAND && !_global_pos_valid) { |