foxygit / doom Log in
commit 4bddc00244c2e1561d2d24a322156c7887e7e2ed
Author:     Simon Howard <fraggle@gmail.com>
AuthorDate: Mon Aug 18 23:55:17 2014 -0400
Commit:     Simon Howard <fraggle@gmail.com>
CommitDate: Mon Aug 18 23:55:17 2014 -0400

    setup: Add config for Multilaser JS030 gamepad.

    Thanks to "Absolute Zero" for the report with the gamepad settings.
---
 src/setup/joystick.c | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/src/setup/joystick.c b/src/setup/joystick.c
index 2d39470a..39e8873d 100644
--- a/src/setup/joystick.c
+++ b/src/setup/joystick.c
@@ -243,6 +243,23 @@ static const joystick_config_t logitech_f310_controller[] =
     {NULL, 0},
 };

+// Multilaser JS030 gamepad, similar to a PS2 controller.
+static const joystick_config_t multilaser_js030_controller[] =
+{
+    {"joystick_x_axis",        0},   // Left stick / D-pad
+    {"joystick_y_axis",        1},
+    {"joyb_fire",              3},   // Square
+    {"joyb_speed",             2},   // X
+    {"joyb_use",               1},   // Circle
+    {"joyb_jump",              0},   // Triangle
+    {"joyb_strafeleft",        6},   // Bottom shoulder buttons
+    {"joyb_straferight",       7},
+    {"joyb_prevweapon",        4},   // Top shoulder buttons
+    {"joyb_nextweapon",        5},
+    {"joyb_menu_activate",     9},   // Start
+    {NULL, 0},
+};
+
 static const known_joystick_t known_joysticks[] =
 {
     {
@@ -287,6 +304,12 @@ static const known_joystick_t known_joysticks[] =
         4, 12, 1,
         logitech_f310_controller,
     },
+
+    {
+        "USB Vibration Joystick",
+        4, 12, 1,
+        multilaser_js030_controller,
+    },
 };

 static const known_joystick_t *GetJoystickType(int index)