Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-22 00:28:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Rover: Make base_mode armed status depend upon the arming library, not

Browse Source 
soft armed

This change brings it in line with Plane.
This commit is contained in:
Grant Morphett 2017-05-23 14:51:22 +10:00
parent a0c5ac1949
commit 5ac1293a52
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
APMrover2/GCS_Mavlink.cpp
View File

@ -56,7 +56,7 @@ void Rover::send_heartbeat(mavlink_channel_t chan)
#endif #endif
// we are armed if we are not initialising // we are armed if we are not initialising
if (control_mode != INITIALISING && hal.util->get_soft_armed()) { if (control_mode != INITIALISING && arming.is_armed()) {
base_mode |= MAV_MODE_FLAG_SAFETY_ARMED; base_mode |= MAV_MODE_FLAG_SAFETY_ARMED;
} }