From baae1b7732f027e761ccedd2cfe2589a02b8d03c Mon Sep 17 00:00:00 2001 From: Andy Piper Date: Wed, 14 Jun 2023 11:26:30 -0400 Subject: [PATCH] Copter: squash bitwise & warnings --- ArduCopter/AP_Arming.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/ArduCopter/AP_Arming.cpp b/ArduCopter/AP_Arming.cpp index 8f7ae71866..8dc5245a3d 100644 --- a/ArduCopter/AP_Arming.cpp +++ b/ArduCopter/AP_Arming.cpp @@ -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