The-Homebrew-Cloud/cemu-DS4Windows
2
0
Fork 0
mirror of https://github.com/cemu-project/DS4Windows.git synced 2025-02-17 00:16:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add timeout test to allow fallback disconnect method to work

Browse Source
This commit is contained in:
Travis Nickles 2017-05-31 20:37:53 -07:00
parent f7d3d1bf47
commit f61cd593c5
1 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
DS4Windows/DS4Library/DS4Device.cs
View File

@ -115,7 +115,7 @@ namespace DS4Windows
private const int BT_OUTPUT_REPORT_LENGTH = 78; private const int BT_OUTPUT_REPORT_LENGTH = 78;
private const int BT_INPUT_REPORT_LENGTH = 547; private const int BT_INPUT_REPORT_LENGTH = 547;
// Use large value for worst case scenario // Use large value for worst case scenario
private const int READ_STREAM_TIMEOUT = 100; private const int READ_STREAM_TIMEOUT = 1000;
// Isolated BT report can have latency as high as 15 ms // Isolated BT report can have latency as high as 15 ms
// due to hardware. // due to hardware.
private const int WARN_INTERVAL_BT = 20; private const int WARN_INTERVAL_BT = 20;
@ -387,6 +387,10 @@ namespace DS4Windows
private Queue<Action> eventQueue = new Queue<Action>(); private Queue<Action> eventQueue = new Queue<Action>();
private object eventQueueLock = new object(); private object eventQueueLock = new object();
private Thread timeoutCheckThread = null;
private bool timeoutExecuted = false;
private bool timeoutEvent = false;
public DS4Device(HidDevice hidDevice) public DS4Device(HidDevice hidDevice)
{ {
hDevice = hidDevice; hDevice = hidDevice;
@ -426,6 +430,23 @@ namespace DS4Windows
uiContext = SynchronizationContext.Current; uiContext = SynchronizationContext.Current;
} }
private void timeoutTestThread()
{
while (!timeoutExecuted)
{
if (timeoutEvent)
{
timeoutExecuted = true;
this.sendOutputReport(true); // Kick Windows into noticing the disconnection.
}
else
{
timeoutEvent = true;
Thread.Sleep(READ_STREAM_TIMEOUT);
}
}
}
public void StartUpdate() public void StartUpdate()
{ {
if (ds4Input == null) if (ds4Input == null)
@ -447,6 +468,10 @@ namespace DS4Windows
ds4Output.Name = "DS4 Output thread: " + Mac; ds4Output.Name = "DS4 Output thread: " + Mac;
ds4Output.IsBackground = true; ds4Output.IsBackground = true;
ds4Output.Start(); ds4Output.Start();
timeoutCheckThread = new Thread(timeoutTestThread);
timeoutCheckThread.IsBackground = true;
timeoutCheckThread.Start();
} }
ds4Input = new Thread(performDs4Input); ds4Input = new Thread(performDs4Input);
@ -610,6 +635,7 @@ namespace DS4Windows
long oldtime = 0; long oldtime = 0;
Stopwatch sw = new Stopwatch(); Stopwatch sw = new Stopwatch();
sw.Start(); sw.Start();
timeoutEvent = false;
while (!exitInputThread) while (!exitInputThread)
{ {
@ -634,6 +660,7 @@ namespace DS4Windows
//HidDevice.ReadStatus res = hDevice.ReadFile(btInputReport); //HidDevice.ReadStatus res = hDevice.ReadFile(btInputReport);
//HidDevice.ReadStatus res = hDevice.ReadAsyncWithFileStream(btInputReport, READ_STREAM_TIMEOUT); //HidDevice.ReadStatus res = hDevice.ReadAsyncWithFileStream(btInputReport, READ_STREAM_TIMEOUT);
HidDevice.ReadStatus res = hDevice.ReadWithFileStream(btInputReport); HidDevice.ReadStatus res = hDevice.ReadWithFileStream(btInputReport);
timeoutEvent = false;
//HidDevice.ReadStatus res = hDevice.ReadFileOverlapped(btInputReport, READ_STREAM_TIMEOUT); //HidDevice.ReadStatus res = hDevice.ReadFileOverlapped(btInputReport, READ_STREAM_TIMEOUT);
if (res == HidDevice.ReadStatus.Success) if (res == HidDevice.ReadStatus.Success)
{ {
@ -888,6 +915,8 @@ namespace DS4Windows
//eventQueue.Clear(); //eventQueue.Clear();
} }
} }
timeoutExecuted = true;
} }
public void FlushHID() public void FlushHID()