Joystick: SDL & Android cleanup

mavlink · Dec 21, 2024 · fd9e451 · fd9e451
1 parent f1fb8e0
commit fd9e451
Show file tree

Hide file tree

Showing 14 changed files with 321 additions and 324 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -20,5 +20,5 @@
 	path = libs/qmdnsengine
 	url = https://github.com/nitroshare/qmdnsengine.git
 [submodule "resources/SDL_GameControllerDB"]
-	path = resources/SDL_GameControllerDB
+	path = libs/SDL_GameControllerDB
 	url = https://github.com/mdqinc/SDL_GameControllerDB.git
diff --git a/resources/SDL_GameControllerDB → libs/SDL_GameControllerDB b/resources/SDL_GameControllerDB → libs/SDL_GameControllerDB
diff --git a/qgcresources.qrc b/qgcresources.qrc
@@ -100,9 +100,6 @@
         <file alias="radioYawLeft.png">resources/calibration/mode2/radioYawLeft.png</file>
         <file alias="radioYawRight.png">resources/calibration/mode2/radioYawRight.png</file>
     </qresource>
-    <qresource prefix="/db/mapping/joystick">
-        <file alias="gamecontrollerdb.txt">resources/SDL_GameControllerDB/gamecontrollerdb.txt</file>
-    </qresource>
     <qresource prefix="/res/audio">
         <file alias="Alert">resources/audio/alert.wav</file>
     </qresource>

diff --git a/src/Joystick/CMakeLists.txt b/src/Joystick/CMakeLists.txt
@@ -40,7 +40,7 @@ target_sources(Joystick
         JoystickSDL.h
 )
 
-target_compile_definitions(Joystick PRIVATE QGC_SDL_JOYSTICK)
+target_compile_definitions(Joystick PRIVATE QGC_SDL_JOYSTICK SDL_MAIN_HANDLED)
 
 FetchContent_Declare(SDL_GameControllerDB
     GIT_REPOSITORY https://github.com/mdqinc/SDL_GameControllerDB.git
@@ -62,14 +62,10 @@ qt_add_resources(Joystick "gamecontrollerdb.txt"
 qt_add_qml_module(Joystick
     URI QGroundControl.JoystickManager
     VERSION 1.0
-    OUTPUT_TARGETS Joystick_targets
     IMPORT_PATH ${QT_QML_OUTPUT_DIRECTORY}
 )
 
-cmake_print_variables(Joystick_targets)
-
-set(MINIMUM_SDL2_VERSION 2.30.0)
-
+set(MINIMUM_SDL2_VERSION 2.24.0)
 if(NOT QGC_BUILD_DEPENDENCIES)
     find_package(SDL2 ${MINIMUM_SDL2_VERSION})
     if(TARGET SDL2::SDL2)
@@ -93,7 +89,7 @@ message(STATUS "Building JoystickSDL")
 include(FetchContent)
 FetchContent_Declare(SDL
     GIT_REPOSITORY https://github.com/libsdl-org/SDL.git
-    GIT_TAG release-2.30.7
+    GIT_TAG release-2.30.10
     GIT_SHALLOW TRUE
     GIT_PROGRESS TRUE
 )

diff --git a/src/Joystick/Joystick.cc b/src/Joystick/Joystick.cc
@@ -23,7 +23,7 @@
 #include <QtCore/QSettings>
 #include <QtCore/QThread>
 
-// JoystickLog Category declaration moved to QGCLoggingCategory.cc to allow access in Vehicle
+QGC_LOGGING_CATEGORY(JoystickLog, "Joystick")
 QGC_LOGGING_CATEGORY(JoystickValuesLog, "JoystickValuesLog")
 
 int Joystick::_transmitterMode = 2;
@@ -41,8 +41,9 @@ AssignableButtonAction::AssignableButtonAction(QObject* parent, QString action_,
 {
 }
 
-Joystick::Joystick(const QString& name, int axisCount, int buttonCount, int hatCount)
-    : _name                 (name)
+Joystick::Joystick(const QString& name, int axisCount, int buttonCount, int hatCount, QObject *parent)
+    : QThread(parent)
+    , _name                 (name)
     , _axisCount            (axisCount)
     , _buttonCount          (buttonCount)
     , _hatCount             (hatCount)

diff --git a/src/Joystick/Joystick.h b/src/Joystick/Joystick.h
@@ -22,7 +22,7 @@
 #include <QtCore/QLoggingCategory>
 #include <QtQmlIntegration/QtQmlIntegration>
 
-// JoystickLog Category declaration moved to QGCLoggingCategory.cc to allow access in Vehicle
+Q_DECLARE_LOGGING_CATEGORY(JoystickLog)
 Q_DECLARE_LOGGING_CATEGORY(JoystickValuesLog)
 Q_DECLARE_METATYPE(GRIPPER_ACTIONS)
 
@@ -62,7 +62,7 @@ class Joystick : public QThread
     Q_MOC_INCLUDE("QmlObjectListModel.h")
     Q_MOC_INCLUDE("Vehicle.h")
 public:
-    Joystick(const QString& name, int axisCount, int buttonCount, int hatCount);
+    Joystick(const QString& name, int axisCount, int buttonCount, int hatCount, QObject *parent = nullptr);
 
     virtual ~Joystick();