Added support for the ASUS TV500BG Android gamepad
authorSam Lantinga <slouken@libsdl.org>
Sat, 16 Dec 2017 10:40:43 -0800
changeset 11778db38a635e2c6
parent 11777 5b29597e48b6
child 11779 b71dcf275cd5
Added support for the ASUS TV500BG Android gamepad
src/joystick/SDL_gamecontrollerdb.h
src/joystick/android/SDL_sysjoystick.c
     1.1 --- a/src/joystick/SDL_gamecontrollerdb.h	Sat Dec 16 10:40:41 2017 -0800
     1.2 +++ b/src/joystick/SDL_gamecontrollerdb.h	Sat Dec 16 10:40:43 2017 -0800
     1.3 @@ -105,6 +105,7 @@
     1.4      "03000000790000001100000006010000,Retrolink SNES Controller,a:b2,b:b1,back:b8,dpdown:+a4,dpleft:-a3,dpright:+a3,dpup:-a4,leftshoulder:b4,rightshoulder:b5,start:b9,x:b3,y:b0,",
     1.5      "030000006b140000010d000000010000,Revolution Pro Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,",
     1.6      "030000003512000021ab000000000000,SFC30 Joystick,a:b1,b:b0,back:b10,leftshoulder:b6,leftx:a0,lefty:a1,rightshoulder:b7,start:b11,x:b4,y:b3,",
     1.7 +    "030000005e0400008e02000001000000,Steam Virtual GamePad,a:b0,b:b1,back:b9,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,start:b8,x:b2,y:b3,",
     1.8      "03000000110100002014000001000000,SteelSeries Nimbus,a:b0,b:b1,dpdown:b9,dpleft:b11,dpright:b10,dpup:b8,guide:b12,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1~,rightshoulder:b5,righttrigger:b7,rightx:a2,righty:a3~,x:b2,y:b3,",
     1.9      "03000000381000002014000001000000,SteelSeries Nimbus,a:b0,b:b1,dpdown:b9,dpleft:b11,dpright:b10,dpup:b8,guide:b12,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1~,rightshoulder:b5,righttrigger:b7,rightx:a2,righty:a3~,x:b2,y:b3,",
    1.10      "03000000110100001714000000000000,SteelSeries Stratus XL,a:b0,b:b1,dpdown:b9,dpleft:b11,dpright:b10,dpup:b8,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1~,rightshoulder:b5,righttrigger:b7,rightx:a2,righty:a3~,start:b12,x:b2,y:b3,",
    1.11 @@ -120,7 +121,6 @@
    1.12      "03000000172700004431000029010000,XiaoMi Game Controller,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b15,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a6,rightx:a2,righty:a5,start:b11,x:b3,y:b4,",
    1.13      "03000000120c0000100e000000010000,ZEROPLUS P4 Gamepad,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,",
    1.14      "03000000830500006020000000010000,iBuffalo SNES Controller,a:b1,b:b0,back:b6,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b4,rightshoulder:b5,start:b7,x:b3,y:b2,",
    1.15 -    "030000005e0400008e02000001000000,Steam Virtual GamePad,a:b0,b:b1,x:b2,y:b3,back:b9,start:b8,leftstick:b6,rightstick:b7,leftshoulder:b4,rightshoulder:b5,dpup:b11,dpdown:b12,dpleft:b13,dpright:b14,leftx:a0,lefty:a1,rightx:a3,righty:a4,lefttrigger:a2,righttrigger:a5,",
    1.16  #endif
    1.17  #if defined(__LINUX__)
    1.18      "03000000022000000090000011010000,8Bitdo NES30 Pro,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b4,y:b3,",
    1.19 @@ -207,6 +207,7 @@
    1.20      "03000000830500006020000010010000,iBuffalo SNES Controller,a:b1,b:b0,back:b6,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b4,rightshoulder:b5,start:b7,x:b3,y:b2,",
    1.21  #endif
    1.22  #if defined(__ANDROID__)
    1.23 +    "34323662653333636330306631326233,ASUS Gamepad,a:b0,b:b1,back:b4,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b6,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,x:b2,y:b3,",
    1.24      "64633436313965656664373634323364,Microsoft X-Box 360 pad,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,x:b2,y:b3,",
    1.25      "4e564944494120436f72706f72617469,NVIDIA Controller,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,",
    1.26      "61363931656135336130663561616264,NVIDIA Controller,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,",
     2.1 --- a/src/joystick/android/SDL_sysjoystick.c	Sat Dec 16 10:40:41 2017 -0800
     2.2 +++ b/src/joystick/android/SDL_sysjoystick.c	Sat Dec 16 10:40:43 2017 -0800
     2.3 @@ -78,7 +78,7 @@
     2.4  static int
     2.5  keycode_to_SDL(int keycode)
     2.6  {
     2.7 -    /* FIXME: If this function gets too unwiedly in the future, replace with a lookup table */
     2.8 +    /* FIXME: If this function gets too unwieldy in the future, replace with a lookup table */
     2.9      int button = 0;
    2.10      switch(keycode) 
    2.11      {
    2.12 @@ -110,6 +110,7 @@
    2.13          case AKEYCODE_BUTTON_START:
    2.14              button = SDL_CONTROLLER_BUTTON_START;
    2.15              break;
    2.16 +        case AKEYCODE_BACK:
    2.17          case AKEYCODE_BUTTON_SELECT:
    2.18              button = SDL_CONTROLLER_BUTTON_BACK;
    2.19              break;
    2.20 @@ -148,10 +149,6 @@
    2.21              button = SDL_CONTROLLER_BUTTON_A;
    2.22              break;
    2.23  
    2.24 -        case AKEYCODE_BACK:
    2.25 -            button = SDL_CONTROLLER_BUTTON_B;
    2.26 -            break;
    2.27 -
    2.28          /* More gamepad buttons (API 12), these get mapped to 20...35*/
    2.29          case AKEYCODE_BUTTON_1:
    2.30          case AKEYCODE_BUTTON_2: