Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-03 06:28:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

Rover: arming revert to single &

Browse Source 
Using a single & here means that all checks are run even if the first fails. && would run only the first check and return if it fails.
This commit is contained in:
Iampete1 2020-07-29 10:00:19 +01:00 committed by Randy Mackay
parent 89217a3804
commit 653e5524f6
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Rover/AP_Arming.cpp
View File

@ -88,11 +88,11 @@ bool AP_Arming_Rover::pre_arm_checks(bool report)
} }
return (AP_Arming::pre_arm_checks(report) return (AP_Arming::pre_arm_checks(report)
&& rover.g2.motors.pre_arm_check(report) & rover.g2.motors.pre_arm_check(report)
&& fence_checks(report) & fence_checks(report)
&& oa_check(report) & oa_check(report)
&& parameter_checks(report) & parameter_checks(report)
&& mode_checks(report)); & mode_checks(report));
} }
bool AP_Arming_Rover::arm_checks(AP_Arming::Method method) bool AP_Arming_Rover::arm_checks(AP_Arming::Method method)