navigator: merging bug fixed

This commit is contained in:
Anton Babushkin
2014-04-23 15:26:24 +02:00
parent dc8a0b291a
commit 34597599fc

View File

@@ -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) {