pandory500/redquark-amiberry-rb
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

improve joystick management

Browse source
This commit is contained in:
Chips-fr 2015-05-30 10:37:14 +00:00
parent e63c383947
commit d0b09c1c3d
1 changed files with 8 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/od-pandora/joystick.cpp
View file

@ -55,7 +55,11 @@ void read_joystick(int nr, unsigned int *dir, int *button)
SDL_JoystickUpdate (); SDL_JoystickUpdate ();
#ifdef RASPBERRY
// Always check joystick state on Raspberry pi.
#else
if (!triggerR /*R+dpad = arrow keys*/ && currprefs.pandora_custom_dpad==0) if (!triggerR /*R+dpad = arrow keys*/ && currprefs.pandora_custom_dpad==0)
#endif
{ {
// get joystick direction via dPad or joystick // get joystick direction via dPad or joystick
int hat=SDL_JoystickGetHat(joy,0); int hat=SDL_JoystickGetHat(joy,0);
@ -151,6 +155,10 @@ void read_joystick(int nr, unsigned int *dir, int *button)
*button |= ((buttonB || SDL_JoystickGetButton(joy, currprefs.pandora_button2)) & 1) << 1; *button |= ((buttonB || SDL_JoystickGetButton(joy, currprefs.pandora_button2)) & 1) << 1;
} }
#ifdef RASPBERRY
*button |= (SDL_JoystickGetButton(joy, 0)) & 1;
*button |= ((SDL_JoystickGetButton(joy, 1)) & 1) << 1;
#endif
#ifdef SIX_AXIS_WORKAROUND #ifdef SIX_AXIS_WORKAROUND
*button |= (SDL_JoystickGetButton(joy, 13)) & 1; *button |= (SDL_JoystickGetButton(joy, 13)) & 1;