From 4eaee039f004b5f4088f569535c82cfb9608f4b1 Mon Sep 17 00:00:00 2001 From: Peter Barker Date: Sat, 30 Mar 2019 09:05:13 +1100 Subject: [PATCH] Tools: autotest: avoid touch RC*_OPTION on sub --- Tools/autotest/common.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/Tools/autotest/common.py b/Tools/autotest/common.py index 36b4759053..121bf4eae3 100644 --- a/Tools/autotest/common.py +++ b/Tools/autotest/common.py @@ -2090,11 +2090,12 @@ class AutoTest(ABC): # TEST ARMING/DISARM if not self.is_sub() and not self.is_tracker(): self.set_parameter("ARMING_RUDDER", 2) # allow arm and disarm with rudder on first tests - interlock_channel = 8 # Plane got flighmode_ch on channel 8 - if not self.is_heli(): # heli don't need interlock option - interlock_channel = 9 - self.set_parameter("RC%u_OPTION" % interlock_channel, 32) - self.set_rc(interlock_channel, 1000) + if self.is_copter(): + interlock_channel = 8 # Plane got flighmode_ch on channel 8 + if not self.is_heli(): # heli don't need interlock option + interlock_channel = 9 + self.set_parameter("RC%u_OPTION" % interlock_channel, 32) + self.set_rc(interlock_channel, 1000) self.zero_throttle() # Disable auto disarm for next tests # Rover and Sub don't have auto disarm