From 85f36f957d40da50aa561f1b0bc147af0ffc814d Mon Sep 17 00:00:00 2001
From: Peter Barker <pbarker@barker.dropbear.id.au>
Date: Thu, 1 Jul 2021 12:45:02 +1000
Subject: [PATCH] autotest: add force option to arm_vehicle

---
 Tools/autotest/common.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/Tools/autotest/common.py b/Tools/autotest/common.py
index e1275ad39d..0d17fe5c78 100644
--- a/Tools/autotest/common.py
+++ b/Tools/autotest/common.py
@@ -3677,14 +3677,17 @@ class AutoTest(ABC):
                     target_compid=None,
                 ))
 
-    def arm_vehicle(self, timeout=20):
+    def arm_vehicle(self, timeout=20, force=False):
         """Arm vehicle with mavlink arm message."""
         self.progress("Arm motors with MAVLink cmd")
         self.drain_mav()
+        p2 = 0
+        if force:
+            p2 = 2989
         try:
             self.run_cmd(mavutil.mavlink.MAV_CMD_COMPONENT_ARM_DISARM,
                          1,  # ARM
-                         0,
+                         p2,
                          0,
                          0,
                          0,