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
a18ca238
Commit
a18ca238
authored
Mar 04, 2017
by
Gregory Dymarek
Browse files
Comments
parent
4a49c702
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/Joystick/JoystickManager.cc
View file @
a18ca238
...
...
@@ -52,8 +52,7 @@ void JoystickManager::setToolbox(QGCToolbox *toolbox)
QQmlEngine
::
setObjectOwnership
(
this
,
QQmlEngine
::
CppOwnership
);
}
void
JoystickManager
::
init
()
{
void
JoystickManager
::
init
()
{
#ifdef __sdljoystick__
if
(
JoystickSDL
::
init
())
{
_setActiveJoystickFromSettings
();
...
...
@@ -181,6 +180,9 @@ void JoystickManager::setActiveJoystickName(const QString& name)
setActiveJoystick
(
_name2JoystickMap
[
name
]);
}
/*
* TODO: move this to the right place: JoystickSDL.cc and JoystickAndroid.cc respectively and call through Joystick.cc
*/
void
JoystickManager
::
_updateAvailableJoysticks
(
void
)
{
#ifdef __sdljoystick__
...
...
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