Browse Source

Fixing syntax

QGC4.4
Gregory Dymarek 9 years ago
parent
commit
b025bec98b
  1. 2
      src/Joystick/Joystick.cc
  2. 1
      src/Joystick/JoystickAndroid.cc
  3. 34
      src/Joystick/JoystickSDL.h

2
src/Joystick/Joystick.cc

@ -44,7 +44,7 @@ const char* Joystick::_rgFunctionSettingsKey[Joystick::maxFunction] = { @@ -44,7 +44,7 @@ const char* Joystick::_rgFunctionSettingsKey[Joystick::maxFunction] = {
};
Joystick::Joystick(const QString& name, int axisCount, int buttonCount, MultiVehicleManager* multiVehicleManager)
, _exitThread(false)
: _exitThread(false)
, _name(name)
, _axisCount(axisCount)
, _buttonCount(buttonCount)

1
src/Joystick/JoystickAndroid.cc

@ -139,6 +139,7 @@ bool JoystickAndroid::handleKeyEvent(jobject event) { @@ -139,6 +139,7 @@ bool JoystickAndroid::handleKeyEvent(jobject event) {
if (btnCode[i]==keyCode) {
if (action==ACTION_DOWN) btnValue[i] = true;
if (action==ACTION_UP) btnValue[i] = false;
qWarning() << "Btn:"<<i;
return true;
}
}

34
src/Joystick/JoystickSDL.h

@ -0,0 +1,34 @@ @@ -0,0 +1,34 @@
#ifndef JOYSTICKSDL_H
#define JOYSTICKSDL_H
#include "Joystick.h"
#include "Vehicle.h"
#include "MultiVehicleManager.h"
#ifdef Q_OS_MAC
#include <SDL.h>
#else
#include <SDL/SDL.h>
#endif
class JoystickSDL : public Joystick
{
public:
JoystickSDL(const QString& name, int axisCount, int buttonCount, int index, MultiVehicleManager* multiVehicleManager);
static QMap<QString, Joystick*> discover(MultiVehicleManager* _multiVehicleManager);
private:
virtual bool open();
virtual void close();
virtual bool update();
virtual bool getButton(int i);
virtual int getAxis(int i);
SDL_Joystick *sdlJoystick;
int _index; ///< Index for SDL_JoystickOpen
};
#endif // JOYSTICKSDL_H
Loading…
Cancel
Save