Commit 3363879c authored by Nate Weibley's avatar Nate Weibley

Defer joystick probe until after MainWindow is created

parent 9570aecc
...@@ -53,7 +53,10 @@ void JoystickManager::setToolbox(QGCToolbox *toolbox) ...@@ -53,7 +53,10 @@ void JoystickManager::setToolbox(QGCToolbox *toolbox)
_multiVehicleManager = _toolbox->multiVehicleManager(); _multiVehicleManager = _toolbox->multiVehicleManager();
QQmlEngine::setObjectOwnership(this, QQmlEngine::CppOwnership); QQmlEngine::setObjectOwnership(this, QQmlEngine::CppOwnership);
}
void JoystickManager::discoverJoysticks()
{
#ifdef __sdljoystick__ #ifdef __sdljoystick__
_name2JoystickMap = JoystickSDL::discover(_multiVehicleManager); _name2JoystickMap = JoystickSDL::discover(_multiVehicleManager);
#elif defined(__android__) #elif defined(__android__)
......
...@@ -48,6 +48,9 @@ public: ...@@ -48,6 +48,9 @@ public:
// Override from QGCTool // Override from QGCTool
virtual void setToolbox(QGCToolbox *toolbox); virtual void setToolbox(QGCToolbox *toolbox);
public slots:
void discoverJoysticks();
signals: signals:
void activeJoystickChanged(Joystick* joystick); void activeJoystickChanged(Joystick* joystick);
void activeJoystickNameChanged(const QString& name); void activeJoystickNameChanged(const QString& name);
......
...@@ -429,6 +429,9 @@ bool QGCApplication::_initForNormalAppBoot(void) ...@@ -429,6 +429,9 @@ bool QGCApplication::_initForNormalAppBoot(void)
// Load known link configurations // Load known link configurations
toolbox()->linkManager()->loadLinkConfigurationList(); toolbox()->linkManager()->loadLinkConfigurationList();
// Probe for joysticks - TODO: manage on a timer or use events to deal with hotplug
toolbox()->joystickManager()->discoverJoysticks();
if (_settingsUpgraded) { if (_settingsUpgraded) {
settings.clear(); settings.clear();
settings.setValue(_settingsVersionKey, QGC_SETTINGS_VERSION); settings.setValue(_settingsVersionKey, QGC_SETTINGS_VERSION);
......
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