Merge branch 'mika-n-jay' into jay

This commit is contained in:
Travis Nickles 2019-05-19 20:09:59 -05:00
commit ede2d2b999
2 changed files with 7 additions and 1 deletions

View File

@ -46,6 +46,9 @@ namespace DS4Windows
new VidPidInfo(0x2E95, 0x7725), // Scuf Vantage gamepad
new VidPidInfo(0x11C0, 0x4001), // PS4 Fun Controller
new VidPidInfo(RAZER_VID, 0x1007), // Razer Raiju Tournament Edition
new VidPidInfo(RAZER_VID, 0x1004), // Razer Raiju Ultimate Edition (wired)
new VidPidInfo(RAZER_VID, 0x1009), // Razer Raiju Ultimate Edition (BT). Doesn't work yet for some reason even when non-steam Razer driver lists the BT Razer Ultimate with this ID.
new VidPidInfo(SONY_VID, 0x05C5), // CronusMax (PS4 Output Mode)
};
private static string devicePathToInstanceId(string devicePath)

View File

@ -43,6 +43,7 @@ namespace DS4Windows
public static IEnumerable<HidDevice> EnumerateDS4(VidPidInfo[] devInfo)
{
//int iDebugDevCount = 0;
List<HidDevice> foundDevs = new List<HidDevice>();
int devInfoLen = devInfo.Length;
IEnumerable<DeviceInfo> temp = EnumerateDevices();
@ -52,6 +53,8 @@ namespace DS4Windows
DeviceInfo x = devEnum.Current;
//DeviceInfo x = temp.ElementAt(i);
HidDevice tempDev = new HidDevice(x.Path, x.Description);
//iDebugDevCount++;
//AppLogger.LogToGui($"DEBUG: HID#{iDebugDevCount} Path={x.Path} Description={x.Description} VID={tempDev.Attributes.VendorHexId} PID={tempDev.Attributes.ProductHexId} Usage=0x{tempDev.Capabilities.Usage.ToString("X")} Version=0x{tempDev.Attributes.Version.ToString("X")}", false);
bool found = false;
for (int j = 0; !found && j < devInfoLen; j++)
{