[Wii] added menu fix for 3rd-party classic controllers with invalid calibration settings

This commit is contained in:
EkeEke 2014-09-14 13:20:37 +02:00
parent 620f372cb2
commit dfb7bd8861
2 changed files with 30 additions and 0 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.8 MiB

After

Width:  |  Height:  |  Size: 3.8 MiB

View File

@ -1539,6 +1539,36 @@ void gx_input_UpdateMenu(void)
/* WPAD held keys (direction/selection) */ /* WPAD held keys (direction/selection) */
u32 hw = data->btns_h & WPAD_BUTTONS_HELD; u32 hw = data->btns_h & WPAD_BUTTONS_HELD;
/* Some 3rd party classic controllers return invalid factory calibration data */
if (data->exp.type == EXP_CLASSIC)
{
/* Left analog stick */
struct joystick_t* js = &data->exp.classic.ljs;
/* Check acquired calibration data */
if ((js->max.x <= js->center.x) || (js->min.x >= js->center.x) ||
(js->max.y <= js->center.y) || (js->min.y >= js->center.y))
{
/* Reset to default values */
js->min.x = js->min.y = 0;
js->max.x = js->max.y = 64;
js->center.x = js->center.y = 32;
}
/* Right analog stick */
js = &data->exp.classic.rjs;
/* Check acquired calibration data */
if ((js->max.x <= js->center.x) || (js->min.x >= js->center.x) ||
(js->max.y <= js->center.y) || (js->min.y >= js->center.y))
{
/* Reset to default values */
js->min.x = js->min.y = 0;
js->max.x = js->max.y = 32;
js->center.x = js->center.y = 16;
}
}
/* WPAD analog sticks (handled as PAD held direction keys) */ /* WPAD analog sticks (handled as PAD held direction keys) */
x = wpad_StickX(data, 0); x = wpad_StickX(data, 0);
y = wpad_StickY(data, 0); y = wpad_StickY(data, 0);