From d36f137bf8f0cfe136f9bf1f9421326e5899b2e1 Mon Sep 17 00:00:00 2001 From: Randy Mackay Date: Sun, 13 Apr 2014 14:38:53 +0900 Subject: [PATCH] Copter: allow arming, disarming in Hybrid mode --- ArduCopter/motors.pde | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ArduCopter/motors.pde b/ArduCopter/motors.pde index 0afc2d1586..c6d1e5ad5a 100644 --- a/ArduCopter/motors.pde +++ b/ArduCopter/motors.pde @@ -24,7 +24,7 @@ static void arm_motors_check() } // allow arming/disarming in Loiter and AltHold if landed - if (ap.land_complete && (control_mode == LOITER || control_mode == ALT_HOLD)) { + if (ap.land_complete && (control_mode == LOITER || control_mode == ALT_HOLD || control_mode == HYBRID)) { allow_arming = true; } @@ -103,7 +103,7 @@ static void auto_disarm_check() } // allow auto disarm in manual flight modes or Loiter/AltHold if we're landed - if(manual_flight_mode(control_mode) || (ap.land_complete && (control_mode == LOITER || control_mode == ALT_HOLD))) { + if(manual_flight_mode(control_mode) || (ap.land_complete && (control_mode == LOITER || control_mode == ALT_HOLD || control_mode == HYBRID))) { auto_disarming_counter++; if(auto_disarming_counter >= AUTO_DISARMING_DELAY) {