Merge branch 'AndroidJoystick' of https://github.com/gregd72002/qgroundcontrol into AndroidJoystick

src/Joystick/joysticksdl.h

-#ifndef JOYSTICKSDL_H
-#define JOYSTICKSDL_H
-
-#include "Joystick.h"
-#include "Vehicle.h"
-#include "MultiVehicleManager.h"
-
-#include <SDL.h>
-
-class JoystickSDL : public Joystick
-{
-public:
-    JoystickSDL(const QString& name, int axisCount, int buttonCount, int hatCount, int index, bool isGameController, MultiVehicleManager* multiVehicleManager);
-
-    static QMap<QString, Joystick*> discover(MultiVehicleManager* _multiVehicleManager); 
-
-private:
-    static void _loadGameControllerMappings();
-
-    bool _open() final;
-    void _close() final;
-    bool _update() final;
-
-    bool _getButton(int i) final;
-    int _getAxis(int i) final;
-    uint8_t _getHat(int hat,int i) final;
-
-    SDL_Joystick *sdlJoystick;
-    SDL_GameController *sdlController;
-    bool    _isGameController;
-    int     _index;      ///< Index for SDL_JoystickOpen
-};
-
-#endif // JOYSTICKSDL_H