From 5ac1293a52e007fbd7238e21dae27f5f46d58d4e Mon Sep 17 00:00:00 2001
From: Grant Morphett <grant@gmorph.com>
Date: Tue, 23 May 2017 14:51:22 +1000
Subject: [PATCH] Rover: Make base_mode armed status depend upon the arming
 library, not soft armed

This change brings it in line with Plane.
---
 APMrover2/GCS_Mavlink.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/APMrover2/GCS_Mavlink.cpp b/APMrover2/GCS_Mavlink.cpp
index 5feeafbcef..476c0a9aca 100644
--- a/APMrover2/GCS_Mavlink.cpp
+++ b/APMrover2/GCS_Mavlink.cpp
@@ -56,7 +56,7 @@ void Rover::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;
     }