Skip to content

Q
qgroundcontrol
Commit bc23c2db authored by Lorenz Meier's avatar Lorenz Meier
Browse files
Options

UAS: Add braces for logic operators

parent cf360ee9
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
src/uas/UAS.cc
View file @ bc23c2db
...@@ -2851,17 +2851,17 @@ void UAS::armSystem() ...@@ -2851,17 +2851,17 @@ void UAS::armSystem()
*/ */
void UAS::disarmSystem() 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() 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() 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() void UAS::goManual()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment