Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Copter: squash bitwise & warnings

This commit is contained in:
Andy Piper 2023-06-14 11:26:30 -04:00 committed by Peter Barker
parent 504fdb4ca3
commit baae1b7732
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ArduCopter/AP_Arming.cpp
View File

@ -1,5 +1,10 @@
#include "Copter.h"
#pragma GCC diagnostic push
#if defined(__clang__)
#pragma GCC diagnostic ignored "-Wbitwise-instead-of-logical"
#endif
bool AP_Arming_Copter::pre_arm_checks(bool display_failure)
{
const bool passed = run_pre_arm_checks(display_failure);
@ -49,6 +54,7 @@ bool AP_Arming_Copter::run_pre_arm_checks(bool display_failure)
return mandatory_checks(display_failure);
}
// bitwise & ensures all checks are run
return parameter_checks(display_failure)
& oa_checks(display_failure)
& gcs_failsafe_check(display_failure)
@ -332,6 +338,7 @@ bool AP_Arming_Copter::rc_calibration_checks(bool display_failure)
copter.channel_yaw
};
// bitwise & ensures all checks are run
copter.ap.pre_arm_rc_check = rc_checks_copter_sub(display_failure, channels)
& AP_Arming::rc_calibration_checks(display_failure);
@ -845,3 +852,5 @@ bool AP_Arming_Copter::disarm(const AP_Arming::Method method, bool do_disarm_che
return true;
}
#pragma GCC diagnostic pop