zrzk
/
ardupilot
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Copter: allow arming, disarming in Hybrid mode

mission-4.1.18
Randy Mackay 11 years ago
parent
e2aaafe40b
commit
d36f137bf8
1 changed files with 2 additions and 2 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      ArduCopter/motors.pde

4
ArduCopter/motors.pde
Unescape View File

@ -24,7 +24,7 @@ static void arm_motors_check()
} }
// allow arming/disarming in Loiter and AltHold if landed // 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; 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 // 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++; auto_disarming_counter++;
if(auto_disarming_counter >= AUTO_DISARMING_DELAY) { if(auto_disarming_counter >= AUTO_DISARMING_DELAY) {

Write Preview
Loading…
Cancel
Save