Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
bc23c2db
Commit
bc23c2db
authored
May 19, 2014
by
Lorenz Meier
Browse files
UAS: Add braces for logic operators
parent
cf360ee9
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/uas/UAS.cc
View file @
bc23c2db
...
...
@@ -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
()
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment