Added detection of wireless gamepads - #64

juliagoda · Nov 11, 2019 · 7c6c5d6 · 7c6c5d6
1 parent 1bcf412
commit 7c6c5d6
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 9 deletions.
diff --git a/src/gamecontroller/gamecontroller.cpp b/src/gamecontroller/gamecontroller.cpp
@@ -36,7 +36,7 @@
 
 GameController::GameController(SDL_GameController *controller, int deviceIndex,
                                AntiMicroSettings *settings, QObject *parent) :
-    InputDevice(deviceIndex, settings, parent)
+    InputDevice(SDL_GameControllerGetJoystick(controller), deviceIndex, settings, parent)
 {
 
     qInstallMessageHandler(MessageHandler::myMessageOutput);

diff --git a/src/inputdevice.cpp b/src/inputdevice.cpp
@@ -34,7 +34,7 @@
 #include <QDebug>
 
 
-InputDevice::InputDevice(int deviceIndex, AntiMicroSettings *settings, QObject *parent) :
+InputDevice::InputDevice(SDL_Joystick* joystick, int deviceIndex, AntiMicroSettings *settings, QObject *parent) :
     QObject(parent)
 {
     qInstallMessageHandler(MessageHandler::myMessageOutput);
@@ -44,6 +44,7 @@ InputDevice::InputDevice(int deviceIndex, AntiMicroSettings *settings, QObject *
     active_set = 0;
     joystickID = 0;
     keyPressTime = 0;
+    m_joyhandle = joystick;
     deviceEdited = false;
 #ifdef Q_OS_WIN
     keyRepeatEnabled = true;

diff --git a/src/inputdevice.h b/src/inputdevice.h
@@ -38,7 +38,7 @@ class InputDevice : public QObject
     Q_OBJECT
 
 public:
-    explicit InputDevice(int deviceIndex, AntiMicroSettings *settings, QObject *parent = nullptr);
+    explicit InputDevice(SDL_Joystick* joystick, int deviceIndex, AntiMicroSettings *settings, QObject *parent = nullptr);
     virtual ~InputDevice();
 
     virtual int getNumberButtons();
@@ -135,13 +135,11 @@ class InputDevice : public QObject
     bool elementsHaveNames();
 
     QHash<int, SetJoystick*>& getJoystick_sets();
+    SDL_Joystick* getJoyHandle() const;
 
 protected:
     void enableSetConnections(SetJoystick *setstick);
 
-    SDL_Joystick* getJoyHandle() const;
-
-
     QHash<int, JoyAxis::ThrottleTypes>& getCali();
     SDL_JoystickID* getJoystickID();
 

diff --git a/src/joystick.cpp b/src/joystick.cpp
@@ -32,7 +32,7 @@
 
 Joystick::Joystick(SDL_Joystick *joyhandle, int deviceIndex,
                    AntiMicroSettings *settings, QObject *parent) :
-    InputDevice(deviceIndex, settings, parent)
+    InputDevice(joyhandle, deviceIndex, settings, parent)
 {
     qInstallMessageHandler(MessageHandler::myMessageOutput);
 

diff --git a/src/joytabwidget.cpp b/src/joytabwidget.cpp
@@ -925,8 +925,17 @@ void JoyTabWidget::changeJoyConfig(int index)
         removeCurrentButtons();
         emit forceTabUnflash(this);
 
-        QMetaObject::invokeMethod(&tabHelper, "readConfigFile", Qt::BlockingQueuedConnection,
-                                  Q_ARG(QString, filename));
+        qDebug() << "SDL Current Powerl Level: " << SDL_JoystickCurrentPowerLevel(m_joystick->getJoyHandle()) << "\n";
+
+        if (SDL_JoystickCurrentPowerLevel(m_joystick->getJoyHandle()) == SDL_JOYSTICK_POWER_WIRED ||
+            SDL_JoystickCurrentPowerLevel(m_joystick->getJoyHandle()) == SDL_JOYSTICK_POWER_UNKNOWN)
+        {
+            QMetaObject::invokeMethod(&tabHelper, "readConfigFile", Qt::BlockingQueuedConnection, Q_ARG(QString, filename));
+        }
+        else
+        {
+            tabHelper.readConfigFile(filename);
+        }
 
         fillButtons();
         refreshSetButtons();