mirror of
https://gitee.com/mirrors_PX4/PX4-Autopilot.git
synced 2026-10-28 03:33:33 +08:00
navigator: merging bug fixed
This commit is contained in:
@@ -692,6 +692,9 @@ Navigator::task_main()
|
|||||||
|
|
||||||
/* evaluate state requested by commander */
|
/* evaluate state requested by commander */
|
||||||
if (_control_mode.flag_armed && _control_mode.flag_control_auto_enabled) {
|
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) {
|
if (_vstatus.set_nav_state_timestamp != _set_nav_state_timestamp) {
|
||||||
/* commander requested new navigation mode, try to set it */
|
/* commander requested new navigation mode, try to set it */
|
||||||
switch (_vstatus.set_nav_state) {
|
switch (_vstatus.set_nav_state) {
|
||||||
|
|||||||
Reference in New Issue
Block a user