aepko/Ardupilot2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Michael du Breuil 2016-02-26 17:44:38 -07:00 committed by Andrew Tridgell
parent 1d46ca048a
commit 35bb6a634e
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ArduPlane/GCS_Mavlink.cpp
View File

@ -84,7 +84,7 @@ void Plane::send_heartbeat(mavlink_channel_t chan)
#endif
// 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;
}