fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-07-03 00:10:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release_v1.0.0'

Browse Source
This commit is contained in:
Lorenz Meier
2015-07-04 10:47:18 +02:00
parent 234aeb642b 8f4b9c02f0
commit 95eaebb28d
7 changed files with 53 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/platforms/ros/nodes/commander/commander.cpp
+2 -1
View File
@@ -135,7 +135,8 @@ void Commander::SetOffboardControl(const px4::offboard_control_mode &msg_offboar
msg_vehicle_control_mode.flag_control_position_enabled = !msg_offboard_control_mode.ignore_position;
msg_vehicle_control_mode.flag_control_altitude_enabled = !msg_offboard_control_mode.ignore_position;
msg_vehicle_control_mode.flag_control_altitude_enabled = !msg_offboard_control_mode.ignore_velocity ||
!msg_offboard_control_mode.ignore_position;
}
void Commander::EvalSwitches(const px4::manual_control_setpointConstPtr &msg,