[mupen64plus-input-sdl] 76/196: Imported Upstream version 1.99.4+32+18a45fa6df35

[Sven Eckelmann]

This is an automated email from the git hooks/post-receive script.

ecsv-guest pushed a commit to branch master
in repository mupen64plus-input-sdl.

commit 9af40b4ee848524261b3123fa6138f25c7168f84
Author: Sven Eckelmann <sven at narfation.org>
Date:   Fri Sep 9 09:55:50 2011 +0200

    Imported Upstream version 1.99.4+32+18a45fa6df35
---
 README                | 35 +++++++++++++++++++++++++++++++++--
 data/InputAutoCfg.ini | 23 +++++++++++++++++++++++
 2 files changed, 56 insertions(+), 2 deletions(-)

diff --git a/README b/README
index 35786f9..097e7b7 100644
--- a/README
+++ b/README
@@ -39,7 +39,6 @@ L2 - Z
 Start - Start
 
 6. SAITEK P880:
-Notes:
 The gamepad doesnt have enough keys to real assign all buttons. The second 
 analog stick can be used as button by pushing him insight.
 
@@ -52,7 +51,39 @@ used for A and B and the second and third row was used for C-Buttons - except
 for the Button next to the A button which would be C-Down but got the Z 
 button.
 
-7. Default Keyboard interface:
+7. Xbox Gamepad (userspace driver)
+I created an Input Config for a Xbox 360 controller running with
+xboxdrv on a Linux system (http://pingus.seul.org/~grumbel/xboxdrv/).
+
+Z = Left shoulder button
+L = Left shoulder trigger
+A = A Button
+B = X Button
+
+everything else should be obvious.
+
+Unfortunately, you will also have to make some configuration to
+xboxdrv to make this work properly. xboxdrv has to be started with the
+following config file. The "-as-button" options make sure that the D-
+Pad and Trigger are emulated as buttons and the deadzone options make
+the C buttons work much better.
+The guide=KEY_ESC allows you to quit the emulator by pressing the
+guide key on the controller. This is obviously just nice-to-have and
+not actually neccessary for the config to work.
+
+[xboxdrv]
+silent=true
+trigger-as-button=true
+dpad-as-button=true
+
+[ui-buttonmap]
+guide=KEY_ESC
+
+[axismap]
+x2^deadzone:27000
+y2^deadzone:27000
+
+8. Default Keyboard interface:
 Analog Pad is "Arrow Keys"
 C Up/Left/Down/Right are "I", "J", "K", "L"
 DPad Up/Left/Down/Right are "W", "A", "S", "D"
diff --git a/data/InputAutoCfg.ini b/data/InputAutoCfg.ini
index 4483d9f..fbca015 100644
--- a/data/InputAutoCfg.ini
+++ b/data/InputAutoCfg.ini
@@ -426,6 +426,29 @@ Rumblepak switch =
 X Axis = axis(0-,0+)
 Y Axis = axis(1-,1+)
 
+[Linux: Xbox Gamepad (userspace driver)]
+plugged = True
+plugin = 2
+mouse = False
+DPad R = button(3)
+DPad L = button(2)
+DPad D = button(1)
+DPad U = button(0)
+Start = button(13)
+Z Trig = button(8)
+B Button = button(6)
+A Button = button(4)
+C Button R = axis(2+)
+C Button L = axis(2-)
+C Button D = axis(3+)
+C Button U = axis(3-)
+R Trig = button(9)
+L Trig = button(10)
+Mempak switch =
+Rumblepak switch =
+X Axis = axis(0-,0+)
+Y Axis = axis(1-,1+)
+
 [N64 controller]
 plugged = True
 plugin = 2

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mupen64plus-input-sdl.git