The-Homebrew-Cloud/cemu-DS4Windows
2
0
Fork 0
mirror of https://github.com/cemu-project/DS4Windows.git synced 2024-12-24 15:41:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Tweak updating of pending output report

Browse Source
This commit is contained in:
Travis Nickles 2017-10-07 00:55:14 -05:00
parent 3425a0edb3
commit 957ad3b1d5
1 changed files with 78 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

154
DS4Windows/DS4Library/DS4Device.cs
View File

@ -570,51 +570,55 @@ namespace DS4Windows
private void performDs4Output() private void performDs4Output()
{ {
lock (outputReport) try
{ {
try int lastError = 0;
while (!exitOutputThread)
{ {
int lastError = 0; bool result = false;
while (!exitOutputThread)
{
bool result = false;
if (outputRumble)
{
result = writeOutput();
if (!result) if (outputRumble)
{ {
int thisError = Marshal.GetLastWin32Error(); lock (outputReportBuffer)
if (lastError != thisError) {
{ outputReportBuffer.CopyTo(outputReport, 0);
Console.WriteLine(Mac.ToString() + " " + System.DateTime.UtcNow.ToString("o") + "> encountered write failure: " + thisError); outputRumble = false;
//Log.LogToGui(Mac.ToString() + " encountered write failure: " + thisError, true);
lastError = thisError;
}
}
else
{
outputRumble = false;
}
} }
if (!outputRumble) result = writeOutput();
if (!result)
{ {
lastError = 0; outputRumble = true;
Monitor.Wait(outputReport); int thisError = Marshal.GetLastWin32Error();
/*if (testRumble.IsRumbleSet()) // repeat test rumbles periodically; rumble has auto-shut-off in the DS4 firmware if (lastError != thisError)
Monitor.Wait(outputReport, 10000); // DS4 firmware stops it after 5 seconds, so let the motors rest for that long, too. {
else Console.WriteLine(Mac.ToString() + " " + System.DateTime.UtcNow.ToString("o") + "> encountered write failure: " + thisError);
Monitor.Wait(outputReport); //Log.LogToGui(Mac.ToString() + " encountered write failure: " + thisError, true);
*/ lastError = thisError;
}
} }
} }
}
catch (ThreadInterruptedException)
{
if (!outputRumble)
{
lastError = 0;
lock (outputReportBuffer)
{
Monitor.Wait(outputReportBuffer);
}
/*if (testRumble.IsRumbleSet()) // repeat test rumbles periodically; rumble has auto-shut-off in the DS4 firmware
Monitor.Wait(outputReport, 10000); // DS4 firmware stops it after 5 seconds, so let the motors rest for that long, too.
else
Monitor.Wait(outputReport);
*/
}
} }
} }
catch (ThreadInterruptedException)
{
}
} }
/** Is the device alive and receiving valid sensor input reports? */ /** Is the device alive and receiving valid sensor input reports? */
@ -1020,48 +1024,47 @@ namespace DS4Windows
setTestRumble(); setTestRumble();
setHapticState(); setHapticState();
if (conType == ConnectionType.BT)
{
outputReportBuffer[0] = 0x11;
//outputReportBuffer[1] = 0x80;
//outputReportBuffer[1] = 0x84;
outputReportBuffer[1] = (byte)(0x80 | btPollRate); // input report rate
// enable rumble (0x01), lightbar (0x02), flash (0x04)
outputReportBuffer[3] = 0xf7;
outputReportBuffer[6] = rightLightFastRumble; // fast motor
outputReportBuffer[7] = leftHeavySlowRumble; // slow motor
outputReportBuffer[8] = ligtBarColor.red; // red
outputReportBuffer[9] = ligtBarColor.green; // green
outputReportBuffer[10] = ligtBarColor.blue; // blue
outputReportBuffer[11] = ledFlashOn; // flash on duration
outputReportBuffer[12] = ledFlashOff; // flash off duration
}
else
{
outputReportBuffer[0] = 0x05;
// enable rumble (0x01), lightbar (0x02), flash (0x04)
outputReportBuffer[1] = 0xf7;
outputReportBuffer[4] = rightLightFastRumble; // fast motor
outputReportBuffer[5] = leftHeavySlowRumble; // slow motor
outputReportBuffer[6] = ligtBarColor.red; // red
outputReportBuffer[7] = ligtBarColor.green; // green
outputReportBuffer[8] = ligtBarColor.blue; // blue
outputReportBuffer[9] = ledFlashOn; // flash on duration
outputReportBuffer[10] = ledFlashOff; // flash off duration
if (audio != null)
{
// Headphone volume levels
outputReportBuffer[19] = outputReportBuffer[20] =
Convert.ToByte(audio.getVolume());
// Microphone volume level
outputReportBuffer[21] = Convert.ToByte(micAudio.getVolume());
}
}
bool quitOutputThread = false; bool quitOutputThread = false;
lock (outputReportBuffer)
lock (outputReport)
{ {
if (conType == ConnectionType.BT)
{
outputReportBuffer[0] = 0x11;
//outputReportBuffer[1] = 0x80;
//outputReportBuffer[1] = 0x84;
outputReportBuffer[1] = (byte)(0x80 | btPollRate); // input report rate
// enable rumble (0x01), lightbar (0x02), flash (0x04)
outputReportBuffer[3] = 0xf7;
outputReportBuffer[6] = rightLightFastRumble; // fast motor
outputReportBuffer[7] = leftHeavySlowRumble; // slow motor
outputReportBuffer[8] = ligtBarColor.red; // red
outputReportBuffer[9] = ligtBarColor.green; // green
outputReportBuffer[10] = ligtBarColor.blue; // blue
outputReportBuffer[11] = ledFlashOn; // flash on duration
outputReportBuffer[12] = ledFlashOff; // flash off duration
}
else
{
outputReportBuffer[0] = 0x05;
// enable rumble (0x01), lightbar (0x02), flash (0x04)
outputReportBuffer[1] = 0xf7;
outputReportBuffer[4] = rightLightFastRumble; // fast motor
outputReportBuffer[5] = leftHeavySlowRumble; // slow motor
outputReportBuffer[6] = ligtBarColor.red; // red
outputReportBuffer[7] = ligtBarColor.green; // green
outputReportBuffer[8] = ligtBarColor.blue; // blue
outputReportBuffer[9] = ledFlashOn; // flash on duration
outputReportBuffer[10] = ledFlashOff; // flash off duration
if (audio != null)
{
// Headphone volume levels
outputReportBuffer[19] = outputReportBuffer[20] =
Convert.ToByte(audio.getVolume());
// Microphone volume level
outputReportBuffer[21] = Convert.ToByte(micAudio.getVolume());
}
}
if (synchronous) if (synchronous)
{ {
outputRumble = false; outputRumble = false;
@ -1090,8 +1093,7 @@ namespace DS4Windows
if (output) if (output)
{ {
outputRumble = true; outputRumble = true;
outputReportBuffer.CopyTo(outputReport, 0); Monitor.Pulse(outputReportBuffer);
Monitor.Pulse(outputReport);
} }
} }
} }