The-Homebrew-Cloud/Genesis-Plus-GX
2
0
Fork 0
mirror of https://github.com/ekeeke/Genesis-Plus-GX.git synced 2025-01-12 11:19:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

[Wii] added support for Wii U Pro Controller & fixed in-game support for 3rd party Classic Controllers with invalid calibration data

Browse Source
This commit is contained in:
EkeEke 2015-01-24 17:24:34 +01:00
parent 65c61b3643
commit bc97990c87
7 changed files with 50 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.wii
View File

@ -30,7 +30,7 @@ INCLUDES := core core/m68k core/z80 core/sound core/tremor core/ntsc core/input_
CFLAGS = -O3 -fomit-frame-pointer --param large-function-growth=800 --param inline-unit-growth=200 -Wall -Winline -Wno-strict-aliasing $(MACHDEP) $(INCLUDE) -DUSE_LIBTREMOR -DUSE_16BPP_RENDERING -DALT_RENDERER -DHW_RVL
CXXFLAGS = $(CFLAGS)
LDFLAGS = $(MACHDEP) -Wl,-Map,$(notdir $@).map
LDFLAGS = $(MACHDEP) -Wl,-Map,$(notdir $@).map,-wrap,wiiuse_set_ir,-wrap,wiiuse_handshake,-wrap,classic_ctrl_handshake,-wrap,classic_ctrl_event
#---------------------------------------------------------------------------------
# any extra libraries we wish to link with the project

BIN
builds/genplus_cube.dol
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.7 MiB

After

Width:  |  Height:  |  Size: 3.7 MiB

BIN
builds/genplus_wii.dol
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.8 MiB

After

Width:  |  Height:  |  Size: 3.8 MiB

51
gx/gui/menu.c
View File

@ -3,7 +3,7 @@
*
* Genesis Plus GX menu
*
* Copyright Eke-Eke (2009-2014)
* Copyright Eke-Eke (2009-2015)
*
* Redistribution and use of this code or any derivative works are permitted
* provided that the following conditions are met:
@ -395,11 +395,11 @@ static gui_item items_video[] =
{NULL,NULL,"Display: PROGRESSIVE", "Select video mode", 56,132,276,48},
{NULL,NULL,"TV mode: 50/60HZ", "Select video refresh rate", 56,132,276,48},
{NULL,NULL,"VSYNC: AUTO", "Enable/disable sync with video hardware", 56,132,276,48},
{NULL,NULL,"GX Bilinear Filter: OFF", "Enable/disable hardware texture filtering", 56,132,276,48},
{NULL,NULL,"GX Deflickering Filter: OFF", "Enable/disable hardware GX filtering", 56,132,276,48},
{NULL,NULL,"Bilinear Filter: OFF", "Enable/disable GX hardware texture filtering", 56,132,276,48},
{NULL,NULL,"Deflickering Filter: AUTO", "Enable/disable GX hardware framebuffer filtering", 56,132,276,48},
#ifdef HW_RVL
{NULL,NULL,"VI Trap Filter: ON", "Enable/disable hardware composite video filtering", 56,132,276,48},
{NULL,NULL,"VI Gamma Correction: 1.0", "Adjust video hardware gamma correction", 56,132,276,48},
{NULL,NULL,"Trap Filter: ON", "Enable/disable VI hardware composite out filtering",56,132,276,48},
{NULL,NULL,"Gamma Correction: 1.0", "Adjust VI hardware gamma correction", 56,132,276,48},
#endif
{NULL,NULL,"LCD Ghosting Filter: OFF", "Enable/disable software LCD image persistence", 56,132,276,48},
{NULL,NULL,"NTSC Filter: COMPOSITE", "Enable/disable software NTSC filtering", 56,132,276,48},
@ -1679,12 +1679,12 @@ static void videomenu ()
else
sprintf (items[2].text, "VSYNC: OFF");
sprintf (items[3].text, "GX Bilinear Filter: %s", config.bilinear ? " ON" : "OFF");
sprintf (items[4].text, "GX Deflickering Filter: %s", config.vfilter ? " ON" : "OFF");
sprintf (items[3].text, "Bilinear Filter: %s", config.bilinear ? " ON" : "OFF");
sprintf (items[4].text, "Deflickering Filter: %s", config.vfilter ? "AUTO" : "OFF");
#ifdef HW_RVL
sprintf (items[5].text, "VI Trap Filter: %s", config.trap ? " ON" : "OFF");
sprintf (items[6].text, "VI Gamma Correction: %1.1f", config.gamma);
sprintf (items[5].text, "Trap Filter: %s", config.trap ? " ON" : "OFF");
sprintf (items[6].text, "Gamma Correction: %1.1f", config.gamma);
#endif
if (config.lcd > 0)
@ -1820,14 +1820,14 @@ static void videomenu ()
case 3: /*** GX Texture filtering ***/
{
config.bilinear ^= 1;
sprintf (items[3].text, "GX Bilinear Filter: %s", config.bilinear ? " ON" : "OFF");
sprintf (items[3].text, "Bilinear Filter: %s", config.bilinear ? " ON" : "OFF");
break;
}
case 4: /*** GX Copy filtering (deflickering filter) ***/
{
config.vfilter ^= 1;
sprintf (items[4].text, "GX Deflicker Filter: %s", config.vfilter ? " ON" : "OFF");
sprintf (items[4].text, "Deflickering Filter: %s", config.vfilter ? "AUTO" : "OFF");
break;
}
@ -1835,7 +1835,7 @@ static void videomenu ()
case 5: /*** VIDEO Trap filtering ***/
{
config.trap ^= 1;
sprintf (items[5].text, "VI Trap Filter: %s", config.trap ? " ON" : "OFF");
sprintf (items[5].text, "Trap Filter: %s", config.trap ? " ON" : "OFF");
break;
}
@ -1852,14 +1852,14 @@ static void videomenu ()
m->arrows[1]->state = 0;
m->screenshot = 255;
strcpy(m->title,"");
GUI_OptionBox(m,update_gamma,"VI Gamma Correction",(void *)&config.gamma,0.1,0.1,3.0,0);
GUI_OptionBox(m,update_gamma,"Gamma Correction",(void *)&config.gamma,0.1,0.1,3.0,0);
m->max_buttons = 4;
m->max_images = 6;
m->arrows[0]->state = state[0];
m->arrows[1]->state = state[1];
m->screenshot = 0;
strcpy(m->title,"Video Settings");
sprintf (items[6].text, "VI Gamma Correction: %1.1f", config.gamma);
sprintf (items[6].text, "Gamma Correction: %1.1f", config.gamma);
VIDEO_SetGamma(VI_GM_1_0);
VIDEO_Flush();
}
@ -2825,23 +2825,22 @@ static void ctrlmenu(void)
/* autodetect connected wiimotes (without nunchuk) */
if (config.input[player].device == 1)
{
/* test current port */
exp = 255;
if (config.input[player].port < 4)
{
WPAD_Probe(config.input[player].port,&exp);
}
/* find first connected controller */
exp = 255;
while ((config.input[player].port < 4) && (exp == 255))
{
/* try next port */
config.input[player].port ++;
if (config.input[player].port < 4)
WPAD_Probe(config.input[player].port,&exp);
/* check if this is a Wii U Pro Controller */
if (exp == WPAD_EXP_CLASSIC)
{
exp = 255;
WPAD_Probe(config.input[player].port,&exp);
WPADData *data = WPAD_Data(config.input[player].port);
exp = data->exp.classic.rjs.max.x;
}
/* try next port if no wimote available */
if (exp == 255)
config.input[player].port ++;
}
/* no more wiimote */

2
gx/gui/menu.h
View File

@ -3,7 +3,7 @@
*
* Genesis Plus GX menus
*
* Copyright Eke-Eke (2009-2014)
* Copyright Eke-Eke (2009-2015)
*
* Redistribution and use of this code or any derivative works are permitted
* provided that the following conditions are met:

92
gx/gx_input.c
View File

@ -3,7 +3,7 @@
*
* Genesis Plus GX input support
*
* Copyright Eke-Eke (2007-2014)
* Copyright Eke-Eke (2007-2015)
*
* Redistribution and use of this code or any derivative works are permitted
* provided that the following conditions are met:
@ -1168,7 +1168,17 @@ int gx_input_FindDevices(void)
{
wpad = 255;
WPAD_Probe(config.input[player].port, &wpad);
if (wpad != 255)
/* make sure this is not a Wii U Pro Controller */
if (wpad == WPAD_EXP_CLASSIC)
{
WPADData *data = WPAD_Data(config.input[player].port);
if (data->exp.classic.rjs.max.x != 255)
{
found++;
}
}
else if (wpad != 255)
{
found++;
}
@ -1183,39 +1193,6 @@ int gx_input_FindDevices(void)
if (wpad == (config.input[player].device - 1))
{
found++;
/* some 3rd party classic controllers return invalid factory calibration data */
if (wpad == EXP_CLASSIC)
{
/* WPAD data */
WPADData *data = WPAD_Data(config.input[player].port);
/* 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;
}
}
}
break;
}
@ -1329,12 +1306,17 @@ void gx_input_SetDefault(void)
/* look for unused Wiimotes */
for (j=0; j<i; j++)
{
/* Classic Controller is assigned, which means Wiimote is free to use */
if (config.input[j].device == (WPAD_EXP_CLASSIC + 1))
/* Wiimote could still be used when Classic Controller has been assigned */
if (config.input[j].device == 3)
{
/* assign wiimote */
config.input[i].device = 1;
config.input[i].port = j;
/* make sure this is not a Wii U Pro Controller */
WPADData *data = WPAD_Data(config.input[j].port);
if (data->exp.classic.rjs.max.x != 255)
{
/* Wiimote is available */
config.input[i].device = 1;
config.input[i].port = j;
}
}
}
}
@ -1608,36 +1590,6 @@ void gx_input_UpdateMenu(void)
/* WPAD held keys (direction/selection) */
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) */
x = wpad_StickX(data, 0);
y = wpad_StickY(data, 0);

2
gx/gx_input.h
View File

@ -3,7 +3,7 @@
*
* Genesis Plus GX input support
*
* Copyright Eke-Eke (2007-2014)
* Copyright Eke-Eke (2007-2015)
*
* Redistribution and use of this code or any derivative works are permitted
* provided that the following conditions are met: