summaryrefslogtreecommitdiff
path: root/src/setup
diff options
context:
space:
mode:
authorSimon Howard2014-08-18 23:55:17 -0400
committerSimon Howard2014-08-18 23:55:17 -0400
commit4bddc00244c2e1561d2d24a322156c7887e7e2ed (patch)
treef53fc62fb35851fdd2215301313aec2aa150f27a /src/setup
parent97f1de66497c1071ac138e0c63152267b9d2978f (diff)
downloadchocolate-doom-4bddc00244c2e1561d2d24a322156c7887e7e2ed.tar.gz
chocolate-doom-4bddc00244c2e1561d2d24a322156c7887e7e2ed.tar.bz2
chocolate-doom-4bddc00244c2e1561d2d24a322156c7887e7e2ed.zip
setup: Add config for Multilaser JS030 gamepad.
Thanks to "Absolute Zero" for the report with the gamepad settings.
Diffstat (limited to 'src/setup')
-rw-r--r--src/setup/joystick.c23
1 files changed, 23 insertions, 0 deletions
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)