Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Disabled merging for Mayflash 2 port SNES controller and Xinmo 2 player usb encoder #188

Merged
Merged
Changes from all commits
Commits
File filter
Filter file types
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.

Always

Just for now

@@ -2730,9 +2730,20 @@ void mergedevs()
// merge multifunctional devices by id
for (int i = 0; i < NUMDEV; i++)
{
// Raphnet uses buggy firmware, don't merge it.
if (input[i].vid == 0x289B) continue;

//Bypass merging of specified 2 port/player controllers
if (input[i].vid == 0x289B) // Raphnet uses buggy firmware, don't merge it.
continue;
else if(input[i].vid == 0x0E8F) //Vendor -Mayflash
{
if(input[i].pid == 0x3013) //SNES controller 2 port adapter
continue;
}
else if(input[i].vid == 0x16C0) //Vendor - XinMo
{
if(input[i].pid == 0x05E1) //XM-10 2 player USB Encoder
continue;
}

input[i].bind = i;
if (input[i].id[0] && !input[i].mouse)
{
ProTip! Use n and p to navigate between commits in a pull request.