Added label to wii controllers, inverted the right stick Y axis of classic controller

The right stick Y axis of classic controller was wrong
This commit is contained in:
Fabio 2017-12-09 08:24:19 +01:00 committed by GitHub
parent ed1a920f46
commit 0d58d9ca0d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -361,58 +361,61 @@ DECL_AXIS(r_y_plus, -3) \
DECL_AXIS(r_y_minus, +3) DECL_AXIS(r_y_minus, +3)
#define GXINPUT_WIIMOTE_DEFAULT_BINDS \ #define GXINPUT_WIIMOTE_DEFAULT_BINDS \
DECL_BTN(a, 31) \ DECL_BTN_EX(a, 31, "2") \
DECL_BTN(b, 30) \ DECL_BTN_EX(b, 30, "1") \
DECL_BTN(x, 29) \ DECL_BTN_EX(x, 29, "B") \
DECL_BTN(y, 28) \ DECL_BTN_EX(y, 28, "A") \
DECL_BTN(start, 32) \ DECL_BTN_EX(start, 32, "+") \
DECL_BTN(select, 33) \ DECL_BTN_EX(select, 33, "-") \
DECL_BTN(up, 35) \ DECL_BTN_EX(menu_toggle, 34, "Home") \
DECL_BTN(down, 36) \ DECL_BTN_EX(up, 35, "D-Pad Up") \
DECL_BTN(left, 37) \ DECL_BTN_EX(down, 36, "D-Pad Down") \
DECL_BTN(right, 38) DECL_BTN_EX(left, 37, "D-Pad Left") \
DECL_BTN_EX(right, 38, "D-Pad right")
#define GXINPUT_NUNCHUK_DEFAULT_BINDS \ #define GXINPUT_NUNCHUK_DEFAULT_BINDS \
DECL_BTN(a, 28) \ DECL_BTN_EX(a, 28, "A") \
DECL_BTN(b, 29) \ DECL_BTN_EX(b, 29, "B") \
DECL_BTN(x, 30) \ DECL_BTN_EX(x, 30, "1") \
DECL_BTN(y, 31) \ DECL_BTN_EX(y, 31, "2") \
DECL_BTN(start, 32) \ DECL_BTN_EX(start, 32, "+") \
DECL_BTN(select, 33) \ DECL_BTN_EX(select, 33, "-") \
DECL_BTN(up, 35) \ DECL_BTN_EX(menu_toggle, 34, "Home") \
DECL_BTN(down, 36) \ DECL_BTN_EX(up, 35, "D-Pad Up" ) \
DECL_BTN(left, 37) \ DECL_BTN_EX(down, 36, "D-Pad Down") \
DECL_BTN(right, 38) \ DECL_BTN_EX(left, 37, "D-Pad Left") \
DECL_BTN(l, 39) \ DECL_BTN_EX(right, 38, "D-Pad right") \
DECL_BTN(r, 40) \ DECL_BTN_EX(l, 39, "Z") \
DECL_AXIS(l_x_plus, +0) \ DECL_BTN_EX(r, 40, "C") \
DECL_AXIS(l_x_minus, -0) \ DECL_AXIS_EX(l_x_plus, +0, "Stick Right") \
DECL_AXIS(l_y_plus, +1) \ DECL_AXIS_EX(l_x_minus, -0, "Stick Left") \
DECL_AXIS(l_y_minus, -1) DECL_AXIS_EX(l_y_plus, +1, "Stick Down") \
DECL_AXIS_EX(l_y_minus, -1, "Stick Up")
#define GXINPUT_CLASSIC_DEFAULT_BINDS \ #define GXINPUT_CLASSIC_DEFAULT_BINDS \
DECL_BTN(a, 13) \ DECL_BTN_EX(a, 13, "A") \
DECL_BTN(b, 14) \ DECL_BTN_EX(b, 14, "B") \
DECL_BTN(x, 15) \ DECL_BTN_EX(x, 15, "X") \
DECL_BTN(y, 16) \ DECL_BTN_EX(y, 16, "Y") \
DECL_BTN(start, 17) \ DECL_BTN_EX(start, 17, "+") \
DECL_BTN(select, 18) \ DECL_BTN_EX(select, 18, "-") \
DECL_BTN(up, 24) \ DECL_BTN_EX(menu_toggle, 19, "Home") \
DECL_BTN(down, 25) \ DECL_BTN_EX(up, 24, "D-Pad Up") \
DECL_BTN(left, 26) \ DECL_BTN_EX(down, 25, "D-Pad Down") \
DECL_BTN(right, 27) \ DECL_BTN_EX(left, 26, "D-Pad left") \
DECL_BTN(l, 20) \ DECL_BTN_EX(right, 27, "D-Pad right") \
DECL_BTN(r, 21) \ DECL_BTN_EX(l, 20, "L") \
DECL_BTN(l2, 22) \ DECL_BTN_EX(r, 21, "R") \
DECL_BTN(r2, 23) \ DECL_BTN_EX(l2, 22, "ZL") \
DECL_AXIS(l_x_plus, +0) \ DECL_BTN_EX(r2, 23, "ZR") \
DECL_AXIS(l_x_minus, -0) \ DECL_AXIS_EX(l_x_plus, +0, "L-Stick Right") \
DECL_AXIS(l_y_plus, +1) \ DECL_AXIS_EX(l_x_minus, -0, "L-Stick Left") \
DECL_AXIS(l_y_minus, -1) \ DECL_AXIS_EX(l_y_plus, +1, "L-Stick Down") \
DECL_AXIS(r_x_plus, +2) \ DECL_AXIS_EX(l_y_minus, -1, "L-Stick Up") \
DECL_AXIS(r_x_minus, -2) \ DECL_AXIS_EX(r_x_plus, +2, "R-Stick Right") \
DECL_AXIS(r_y_plus, -3) \ DECL_AXIS_EX(r_x_minus, -2, "R-Stick Left") \
DECL_AXIS(r_y_minus, +3) DECL_AXIS_EX(r_y_plus, +3, "R-Stick Down") \
DECL_AXIS_EX(r_y_minus, -3, "R-Stick Up")
#define PS3INPUT_DEFAULT_BINDS \ #define PS3INPUT_DEFAULT_BINDS \
DECL_BTN(a, 8) \ DECL_BTN(a, 8) \