UAS: Add braces for logic operators

bc23c2db · Lorenz Meier · cf360ee9 · bc23c2db
Commit bc23c2db authored May 19, 2014 by Lorenz Meier
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

UAS.cc src/uas/UAS.cc +3 -3

No files found.
--- a/src/uas/UAS.cc
+++ b/src/uas/UAS.cc
@@ -2851,17 +2851,17 @@ void UAS::armSystem()
 */
 void UAS::disarmSystem()
 {
-    setModeArm(base_mode & ~MAV_MODE_FLAG_SAFETY_ARMED, custom_mode);
+    setModeArm(base_mode & ~(MAV_MODE_FLAG_SAFETY_ARMED), custom_mode);
 }

 void UAS::toggleArmedState()
 {
-    setModeArm(base_mode ^ MAV_MODE_FLAG_SAFETY_ARMED, custom_mode);
+    setModeArm(base_mode ^ (MAV_MODE_FLAG_SAFETY_ARMED), custom_mode);
 }

 void UAS::goAutonomous()
 {
-    setMode((base_mode & ~MAV_MODE_FLAG_MANUAL_INPUT_ENABLED) | (MAV_MODE_FLAG_AUTO_ENABLED | MAV_MODE_FLAG_STABILIZE_ENABLED | MAV_MODE_FLAG_GUIDED_ENABLED), 0);
+    setMode((base_mode & ~(MAV_MODE_FLAG_MANUAL_INPUT_ENABLED)) | (MAV_MODE_FLAG_AUTO_ENABLED | MAV_MODE_FLAG_STABILIZE_ENABLED | MAV_MODE_FLAG_GUIDED_ENABLED), 0);
 }

 void UAS::goManual()