The-Homebrew-Cloud/cemu-DS4Windows
2
0
Fork 0
mirror of https://github.com/cemu-project/DS4Windows.git synced 2024-11-26 11:04:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Change interval used for warnings depending on protocol

Browse Source
This commit is contained in:
Travis Nickles 2017-03-23 01:12:50 -07:00
parent bd73978204
commit 3e0e5bebfc
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
DS4Windows/DS4Library/DS4Device.cs
View File

@ -115,6 +115,10 @@ namespace DS4Windows
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 static int READ_STREAM_TIMEOUT = 100; private static int READ_STREAM_TIMEOUT = 100;
// Isolated BT report can have latency as high as 15 ms
// due to hardware.
private static int WARN_INTERVAL_BT = 20;
private static int WARN_INTERVAL_USB = 10;
private HidDevice hDevice; private HidDevice hDevice;
private string Mac; private string Mac;
private DS4State cState = new DS4State(); private DS4State cState = new DS4State();
@ -138,6 +142,7 @@ namespace DS4Windows
public DateTime firstActive = DateTime.UtcNow; public DateTime firstActive = DateTime.UtcNow;
private bool charging; private bool charging;
private bool outputRumble = false; private bool outputRumble = false;
private int warnInterval = WARN_INTERVAL_USB;
public event EventHandler<EventArgs> Report = null; public event EventHandler<EventArgs> Report = null;
public event EventHandler<EventArgs> Removal = null; public event EventHandler<EventArgs> Removal = null;
@ -228,6 +233,7 @@ namespace DS4Windows
inputReport2 = new byte[64]; inputReport2 = new byte[64];
outputReport = new byte[hDevice.Capabilities.OutputReportByteLength]; outputReport = new byte[hDevice.Capabilities.OutputReportByteLength];
outputReportBuffer = new byte[hDevice.Capabilities.OutputReportByteLength]; outputReportBuffer = new byte[hDevice.Capabilities.OutputReportByteLength];
warnInterval = WARN_INTERVAL_USB;
} }
else else
{ {
@ -235,6 +241,7 @@ namespace DS4Windows
inputReport = new byte[btInputReport.Length - 2]; inputReport = new byte[btInputReport.Length - 2];
outputReport = new byte[BT_OUTPUT_REPORT_LENGTH]; outputReport = new byte[BT_OUTPUT_REPORT_LENGTH];
outputReportBuffer = new byte[BT_OUTPUT_REPORT_LENGTH]; outputReportBuffer = new byte[BT_OUTPUT_REPORT_LENGTH];
warnInterval = WARN_INTERVAL_BT;
} }
touchpad = new DS4Touchpad(); touchpad = new DS4Touchpad();
sixAxis = new DS4SixAxis(); sixAxis = new DS4SixAxis();
@ -358,7 +365,7 @@ namespace DS4Windows
} }
private byte priorInputReport30 = 0xff; private byte priorInputReport30 = 0xff;
public double Latency = 0; public double Latency = 0;
bool warn; bool warn = false;
public string error; public string error;
private void performDs4Input() private void performDs4Input()
{ {
@ -381,12 +388,12 @@ namespace DS4Windows
this.Latency = Latency.Average(); this.Latency = Latency.Average();
if (this.Latency > 10 && !warn && sw.ElapsedMilliseconds > 4000) if (this.Latency > warnInterval && !warn && sw.ElapsedMilliseconds > 4000)
{ {
warn = true; warn = true;
//System.Diagnostics.Trace.WriteLine(System.DateTime.UtcNow.ToString("o") + "> " + "Controller " + /*this.DeviceNum*/ + 1 + " (" + this.MacAddress + ") is experiencing latency issues. Currently at " + Math.Round(this.Latency, 2).ToString() + "ms of recomended maximum 10ms"); //System.Diagnostics.Trace.WriteLine(System.DateTime.UtcNow.ToString("o") + "> " + "Controller " + /*this.DeviceNum*/ + 1 + " (" + this.MacAddress + ") is experiencing latency issues. Currently at " + Math.Round(this.Latency, 2).ToString() + "ms of recomended maximum 10ms");
} }
else if (this.Latency <= 10 && warn) warn = false; else if (this.Latency <= warnInterval && warn) warn = false;
if (readTimeout.Interval != 3000.0) if (readTimeout.Interval != 3000.0)
{ {