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

Minor tweaks

Browse Source
This commit is contained in:
Travis Nickles 2017-09-05 03:34:49 -05:00
parent acb15eb7f8
commit ec3ebb73b5
1 changed files with 17 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
DS4Windows/DS4Library/DS4Device.cs
View File

@ -112,18 +112,18 @@ namespace DS4Windows
public class DS4Device public class DS4Device
{ {
private const int BT_OUTPUT_REPORT_LENGTH = 78; internal const int BT_OUTPUT_REPORT_LENGTH = 78;
private const int BT_INPUT_REPORT_LENGTH = 547; internal 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 = 3000; internal const int READ_STREAM_TIMEOUT = 3000;
// 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; internal const int WARN_INTERVAL_BT = 20;
private const int WARN_INTERVAL_USB = 10; internal const int WARN_INTERVAL_USB = 10;
// Maximum values for battery level when no USB cable is connected // Maximum values for battery level when no USB cable is connected
// and when a USB cable is connected // and when a USB cable is connected
private const int BATTERY_MAX = 8; internal const int BATTERY_MAX = 8;
private const int BATTERY_MAX_USB = 11; internal const int BATTERY_MAX_USB = 11;
public const string blankSerial = "00:00:00:00:00:00"; public const string blankSerial = "00:00:00:00:00:00";
private HidDevice hDevice; private HidDevice hDevice;
private string Mac; private string Mac;
@ -664,6 +664,7 @@ namespace DS4Windows
timeoutEvent = false; timeoutEvent = false;
ds4InactiveFrame = true; ds4InactiveFrame = true;
idleInput = true; idleInput = true;
bool syncWriteReport = true;
int maxBatteryValue = 0; int maxBatteryValue = 0;
int tempBattery = 0; int tempBattery = 0;
@ -818,21 +819,17 @@ namespace DS4Windows
cState.TouchButton = (inputReport[7] & 0x02) != 0; cState.TouchButton = (inputReport[7] & 0x02) != 0;
cState.FrameCounter = (byte)(inputReport[7] >> 2); cState.FrameCounter = (byte)(inputReport[7] >> 2);
try charging = (inputReport[30] & 0x10) != 0;
maxBatteryValue = charging ? BATTERY_MAX_USB : BATTERY_MAX;
tempBattery = (inputReport[30] & 0x0f) * 100 / maxBatteryValue;
battery = Math.Min((byte)tempBattery, (byte)100);
cState.Battery = (byte)battery;
//System.Diagnostics.Debug.WriteLine("CURRENT BATTERY: " + (inputReport[30] & 0x0f) + " | " + tempBattery + " | " + battery);
if (inputReport[30] != priorInputReport30)
{ {
charging = (inputReport[30] & 0x10) != 0; priorInputReport30 = inputReport[30];
maxBatteryValue = charging ? BATTERY_MAX_USB : BATTERY_MAX; //Console.WriteLine(MacAddress.ToString() + " " + System.DateTime.UtcNow.ToString("o") + "> power subsystem octet: 0x" + inputReport[30].ToString("x02"));
tempBattery = (inputReport[30] & 0x0f) * 100 / maxBatteryValue;
battery = Math.Min((byte)tempBattery, (byte)100);
cState.Battery = (byte)battery;
//System.Diagnostics.Debug.WriteLine("CURRENT BATTERY: " + (inputReport[30] & 0x0f) + " | " + tempBattery + " | " + battery);
if (inputReport[30] != priorInputReport30)
{
priorInputReport30 = inputReport[30];
//Console.WriteLine(MacAddress.ToString() + " " + System.DateTime.UtcNow.ToString("o") + "> power subsystem octet: 0x" + inputReport[30].ToString("x02"));
}
} }
catch { currerror = "Index out of bounds: battery"; }
// XXX DS4State mapping needs fixup, turn touches into an array[4] of structs. And include the touchpad details there instead. // XXX DS4State mapping needs fixup, turn touches into an array[4] of structs. And include the touchpad details there instead.
try try
@ -979,7 +976,6 @@ namespace DS4Windows
if (Report != null) if (Report != null)
Report(this, EventArgs.Empty); Report(this, EventArgs.Empty);
bool syncWriteReport = true;
if (conType == ConnectionType.BT) if (conType == ConnectionType.BT)
{ {
syncWriteReport = false; syncWriteReport = false;