ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6224 from hackbar/input-fix-moga 

Android: Handle missing mappings for the Moga Pro 2 HID controller.
This commit is contained in:
Markus Wick 2017-12-19 09:55:57 +01:00 committed by GitHub
parent ed13a8d7a7 0067bf1b3e
commit f547703660
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/ControllerMappingHelper.java
View File

@ -45,6 +45,14 @@ public class ControllerMappingHelper
return 0.0f; return 0.0f;
} }
} }
else if (isMogaPro2Hid(inputDevice))
{
// This controller has a broken axis that reports a constant value. Ignore it.
if (axis == MotionEvent.AXIS_GENERIC_1)
{
return 0.0f;
}
}
return value; return value;
} }
@ -59,4 +67,10 @@ public class ControllerMappingHelper
// Microsoft Xbox One controller // Microsoft Xbox One controller
return inputDevice.getVendorId() == 0x45e && inputDevice.getProductId() == 0x2e0; return inputDevice.getVendorId() == 0x45e && inputDevice.getProductId() == 0x2e0;
} }
private boolean isMogaPro2Hid(InputDevice inputDevice)
{
// Moga Pro 2 HID
return inputDevice.getVendorId() == 0x20d6 && inputDevice.getProductId() == 0x6271;
}
} }