Geri/Controller-Slide-Presenter
1
0
Fork 0
Code Issues Pull requests Projects Releases 4 Packages Wiki Activity Actions

feat: added back non-windows joycon detection support

Browse source
This commit is contained in:
Gerard Gascón 2024-06-28 15:31:23 +02:00
parent 72750c3388
commit 04ebe3f606
1 changed files with 36 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

37
SlidePresenter/GamepadReader/JoyConRead.cs
View file

@ -1,6 +1,7 @@
#if JoyCon #if JoyCon
using System.Text; using System.Text;
using HidSharp; using HidSharp;
using HidSharp.Reports;
using wtf.cluster.JoyCon; using wtf.cluster.JoyCon;
using wtf.cluster.JoyCon.ExtraData; using wtf.cluster.JoyCon.ExtraData;
using wtf.cluster.JoyCon.InputData; using wtf.cluster.JoyCon.InputData;
@ -63,10 +64,44 @@ public class JoyConRead : IGamepadReader {
} }
private static HidDevice? GetHidDevice() { private static HidDevice? GetHidDevice() {
return OperatingSystem.IsWindows()
? GetWindowsHidDevice()
: GetNonWindowsHidDevice();
}
private static HidDevice? GetWindowsHidDevice() {
DeviceList list = DeviceList.Local; DeviceList list = DeviceList.Local;
IEnumerable<HidDevice>? nintendos = list.GetHidDevices(0x057e); IEnumerable<HidDevice>? nintendos = list.GetHidDevices(0x057e);
HidDevice? device = nintendos.FirstOrDefault();
return device;
}
return nintendos.FirstOrDefault(); private static HidDevice? GetNonWindowsHidDevice() {
HidDevice? device = null;
DeviceList list = DeviceList.Local;
IEnumerable<HidDevice>? hidDevices = list.GetHidDevices();
foreach (HidDevice d in hidDevices)
{
ReportDescriptor? rd = d.GetReportDescriptor();
if (rd == null) continue;
if (rd.OutputReports.Count() != 4
|| rd.OutputReports.Count(r => r.ReportID == 0x01) != 1
|| rd.OutputReports.Count(r => r.ReportID == 0x10) != 1
|| rd.OutputReports.Count(r => r.ReportID == 0x11) != 1
|| rd.OutputReports.Count(r => r.ReportID == 0x12) != 1
|| rd.InputReports.Count() != 6
|| rd.InputReports.Count(r => r.ReportID == 0x21) != 1
|| rd.InputReports.Count(r => r.ReportID == 0x30) != 1
|| rd.InputReports.Count(r => r.ReportID == 0x31) != 1
|| rd.InputReports.Count(r => r.ReportID == 0x32) != 1
|| rd.InputReports.Count(r => r.ReportID == 0x33) != 1
|| rd.InputReports.Count(r => r.ReportID == 0x3F) != 1) continue;
device = d;
break;
}
return device;
} }
private Task OnJoyConOnReportReceived(JoyCon _, IJoyConReport input) { private Task OnJoyConOnReportReceived(JoyCon _, IJoyConReport input) {