Merge pull request #7595 from mavlink/joystickMakeOver

Joystick make over

ChangeLog.md

@@ -6,6 +6,7 @@ Note: This file only contains high level features or important fixes.
 
 ### 3.6.0 - Daily Build
 
+* Rework joysticks. Fixed several issues and updated setup UI.
 * Adding support for UDP RTP h.265 video streams
 * For text to speech engine on Linux to English (all messages are in English)
 * Automated the ingestion of localization from Crowdin

qgcresources.qrc

@@ -98,48 +98,4 @@
     <qresource prefix="/opengl">
         <file>resources/opengl/buglist.json</file>
     </qresource>
-    <qresource prefix="/qml/calibration/joystick/mode1">
-        <file alias="joystickCenter.png">resources/calibration/joystick/mode1/joystickCenter.png</file>
-        <file alias="joystickPitchDown.png">resources/calibration/joystick/mode1/joystickPitchDown.png</file>
-        <file alias="joystickPitchUp.png">resources/calibration/joystick/mode1/joystickPitchUp.png</file>
-        <file alias="joystickRollLeft.png">resources/calibration/joystick/mode1/joystickRollLeft.png</file>
-        <file alias="joystickRollRight.png">resources/calibration/joystick/mode1/joystickRollRight.png</file>
-        <file alias="joystickThrottleDown.png">resources/calibration/joystick/mode1/joystickThrottleDown.png</file>
-        <file alias="joystickThrottleUp.png">resources/calibration/joystick/mode1/joystickThrottleUp.png</file>
-        <file alias="joystickYawLeft.png">resources/calibration/joystick/mode1/joystickYawLeft.png</file>
-        <file alias="joystickYawRight.png">resources/calibration/joystick/mode1/joystickYawRight.png</file>
-    </qresource>
-    <qresource prefix="/qml/calibration/joystick/mode2">
-        <file alias="joystickCenter.png">resources/calibration/joystick/mode2/joystickCenter.png</file>
-        <file alias="joystickPitchDown.png">resources/calibration/joystick/mode2/joystickPitchDown.png</file>
-        <file alias="joystickPitchUp.png">resources/calibration/joystick/mode2/joystickPitchUp.png</file>
-        <file alias="joystickRollLeft.png">resources/calibration/joystick/mode2/joystickRollLeft.png</file>
-        <file alias="joystickRollRight.png">resources/calibration/joystick/mode2/joystickRollRight.png</file>
-        <file alias="joystickThrottleDown.png">resources/calibration/joystick/mode2/joystickThrottleDown.png</file>
-        <file alias="joystickThrottleUp.png">resources/calibration/joystick/mode2/joystickThrottleUp.png</file>
-        <file alias="joystickYawLeft.png">resources/calibration/joystick/mode2/joystickYawLeft.png</file>
-        <file alias="joystickYawRight.png">resources/calibration/joystick/mode2/joystickYawRight.png</file>
-    </qresource>
-    <qresource prefix="/qml/calibration/joystick/mode3">
-        <file alias="joystickCenter.png">resources/calibration/joystick/mode3/joystickCenter.png</file>
-        <file alias="joystickPitchDown.png">resources/calibration/joystick/mode3/joystickPitchDown.png</file>
-        <file alias="joystickPitchUp.png">resources/calibration/joystick/mode3/joystickPitchUp.png</file>
-        <file alias="joystickRollLeft.png">resources/calibration/joystick/mode3/joystickRollLeft.png</file>
-        <file alias="joystickRollRight.png">resources/calibration/joystick/mode3/joystickRollRight.png</file>
-        <file alias="joystickThrottleDown.png">resources/calibration/joystick/mode3/joystickThrottleDown.png</file>
-        <file alias="joystickThrottleUp.png">resources/calibration/joystick/mode3/joystickThrottleUp.png</file>
-        <file alias="joystickYawLeft.png">resources/calibration/joystick/mode3/joystickYawLeft.png</file>
-        <file alias="joystickYawRight.png">resources/calibration/joystick/mode3/joystickYawRight.png</file>
-    </qresource>
-    <qresource prefix="/qml/calibration/joystick/mode4">
-        <file alias="joystickCenter.png">resources/calibration/joystick/mode4/joystickCenter.png</file>
-        <file alias="joystickPitchDown.png">resources/calibration/joystick/mode4/joystickPitchDown.png</file>
-        <file alias="joystickPitchUp.png">resources/calibration/joystick/mode4/joystickPitchUp.png</file>
-        <file alias="joystickRollLeft.png">resources/calibration/joystick/mode4/joystickRollLeft.png</file>
-        <file alias="joystickRollRight.png">resources/calibration/joystick/mode4/joystickRollRight.png</file>
-        <file alias="joystickThrottleDown.png">resources/calibration/joystick/mode4/joystickThrottleDown.png</file>
-        <file alias="joystickThrottleUp.png">resources/calibration/joystick/mode4/joystickThrottleUp.png</file>
-        <file alias="joystickYawLeft.png">resources/calibration/joystick/mode4/joystickYawLeft.png</file>
-        <file alias="joystickYawRight.png">resources/calibration/joystick/mode4/joystickYawRight.png</file>
-    </qresource>
 </RCC>

qgroundcontrol.qrc

@@ -38,6 +38,10 @@
         <file alias="HealthPageWidget.qml">src/FlightMap/Widgets/HealthPageWidget.qml</file>
         <file alias="HelpSettings.qml">src/ui/preferences/HelpSettings.qml</file>
         <file alias="JoystickConfig.qml">src/VehicleSetup/JoystickConfig.qml</file>
+        <file alias="JoystickConfigButtons.qml">src/VehicleSetup/JoystickConfigButtons.qml</file>
+        <file alias="JoystickConfigAdvanced.qml">src/VehicleSetup/JoystickConfigAdvanced.qml</file>
+        <file alias="JoystickConfigGeneral.qml">src/VehicleSetup/JoystickConfigGeneral.qml</file>
+        <file alias="JoystickConfigCalibration.qml">src/VehicleSetup/JoystickConfigCalibration.qml</file>
         <file alias="LinkSettings.qml">src/ui/preferences/LinkSettings.qml</file>
         <file alias="LogDownloadPage.qml">src/AnalyzeView/LogDownloadPage.qml</file>
         <file alias="LogReplaySettings.qml">src/ui/preferences/LogReplaySettings.qml</file>
@@ -60,6 +64,7 @@
         <file alias="QGCViewDialogContainer.qml">src/QmlControls/QGCViewDialogContainer.qml</file>
         <file alias="QGroundControl/Controls/AnalyzePage.qml">src/AnalyzeView/AnalyzePage.qml</file>
         <file alias="QGroundControl/Controls/AppMessages.qml">src/QmlControls/AppMessages.qml</file>
+        <file alias="QGroundControl/Controls/AxisMonitor.qml">src/QmlControls/AxisMonitor.qml</file>
         <file alias="QGroundControl/Controls/CameraCalc.qml">src/PlanView/CameraCalc.qml</file>
         <file alias="QGroundControl/Controls/CameraSection.qml">src/PlanView/CameraSection.qml</file>
         <file alias="QGroundControl/Controls/ClickableColor.qml">src/QmlControls/ClickableColor.qml</file>
@@ -120,6 +125,8 @@
         <file alias="QGroundControl/Controls/QGCRadioButton.qml">src/QmlControls/QGCRadioButton.qml</file>
         <file alias="QGroundControl/Controls/QGCSlider.qml">src/QmlControls/QGCSlider.qml</file>
         <file alias="QGroundControl/Controls/QGCSwitch.qml">src/QmlControls/QGCSwitch.qml</file>
+        <file alias="QGroundControl/Controls/QGCTabBar.qml">src/QmlControls/QGCTabBar.qml</file>
+        <file alias="QGroundControl/Controls/QGCTabButton.qml">src/QmlControls/QGCTabButton.qml</file>
         <file alias="QGroundControl/Controls/QGCTextField.qml">src/QmlControls/QGCTextField.qml</file>
         <file alias="QGroundControl/Controls/QGCToolBarButton.qml">src/QmlControls/QGCToolBarButton.qml</file>
         <file alias="QGroundControl/Controls/QGCViewDialog.qml">src/QmlControls/QGCViewDialog.qml</file>