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

Change how haptic state changes happen

Browse Source
This commit is contained in:
Travis Nickles 2019-01-10 18:15:14 -06:00
parent fee5c42fe6
commit 2c471e6eff
2 changed files with 39 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
DS4Windows/DS4Control/DS4LightBar.cs
View File

@ -304,7 +304,8 @@ namespace DS4Windows
if (tempLightBarOnDuration != haptics.LightBarFlashDurationOn && tempLightBarOnDuration != 1 && haptics.LightBarFlashDurationOn == 0) if (tempLightBarOnDuration != haptics.LightBarFlashDurationOn && tempLightBarOnDuration != 1 && haptics.LightBarFlashDurationOn == 0)
haptics.LightBarFlashDurationOff = haptics.LightBarFlashDurationOn = 1; haptics.LightBarFlashDurationOff = haptics.LightBarFlashDurationOn = 1;
device.pushHapticState(ref haptics); device.SetHapticState(ref haptics);
//device.pushHapticState(ref haptics);
} }
public static bool defaultLight = false, shuttingdown = false; public static bool defaultLight = false, shuttingdown = false;

53
DS4Windows/DS4Library/DS4Device.cs
View File

@ -1140,8 +1140,9 @@ namespace DS4Windows
private unsafe void sendOutputReport(bool synchronous, bool force = false) private unsafe void sendOutputReport(bool synchronous, bool force = false)
{ {
setTestRumble(); MergeStates();
setHapticState(); //setTestRumble();
//setHapticState();
bool quitOutputThread = false; bool quitOutputThread = false;
bool usingBT = conType == ConnectionType.BT; bool usingBT = conType == ConnectionType.BT;
@ -1156,13 +1157,13 @@ namespace DS4Windows
outReportBuffer[1] = (byte)(0x80 | btPollRate); // input report rate outReportBuffer[1] = (byte)(0x80 | btPollRate); // input report rate
// enable rumble (0x01), lightbar (0x02), flash (0x04) // enable rumble (0x01), lightbar (0x02), flash (0x04)
outReportBuffer[3] = 0xf7; outReportBuffer[3] = 0xf7;
outReportBuffer[6] = rightLightFastRumble; // fast motor outReportBuffer[6] = currentHap.RumbleMotorStrengthRightLightFast; // fast motor
outReportBuffer[7] = leftHeavySlowRumble; // slow motor outReportBuffer[7] = currentHap.RumbleMotorStrengthLeftHeavySlow; // slow motor
outReportBuffer[8] = ligtBarColor.red; // red outReportBuffer[8] = currentHap.LightBarColor.red; // red
outReportBuffer[9] = ligtBarColor.green; // green outReportBuffer[9] = currentHap.LightBarColor.green; // green
outReportBuffer[10] = ligtBarColor.blue; // blue outReportBuffer[10] = currentHap.LightBarColor.blue; // blue
outReportBuffer[11] = ledFlashOn; // flash on duration outReportBuffer[11] = currentHap.LightBarFlashDurationOn; // flash on duration
outReportBuffer[12] = ledFlashOff; // flash off duration outReportBuffer[12] = currentHap.LightBarFlashDurationOff; // flash off duration
fixed (byte* byteR = outputReport, byteB = outReportBuffer) fixed (byte* byteR = outputReport, byteB = outReportBuffer)
{ {
@ -1175,13 +1176,13 @@ namespace DS4Windows
outReportBuffer[0] = 0x05; outReportBuffer[0] = 0x05;
// enable rumble (0x01), lightbar (0x02), flash (0x04) // enable rumble (0x01), lightbar (0x02), flash (0x04)
outReportBuffer[1] = 0xf7; outReportBuffer[1] = 0xf7;
outReportBuffer[4] = rightLightFastRumble; // fast motor outReportBuffer[4] = currentHap.RumbleMotorStrengthRightLightFast; // fast motor
outReportBuffer[5] = leftHeavySlowRumble; // slow motor outReportBuffer[5] = currentHap.RumbleMotorStrengthLeftHeavySlow; // slow motor
outReportBuffer[6] = ligtBarColor.red; // red outReportBuffer[6] = currentHap.LightBarColor.red; // red
outReportBuffer[7] = ligtBarColor.green; // green outReportBuffer[7] = currentHap.LightBarColor.green; // green
outReportBuffer[8] = ligtBarColor.blue; // blue outReportBuffer[8] = currentHap.LightBarColor.blue; // blue
outReportBuffer[9] = ledFlashOn; // flash on duration outReportBuffer[9] = currentHap.LightBarFlashDurationOn; // flash on duration
outReportBuffer[10] = ledFlashOff; // flash off duration outReportBuffer[10] = currentHap.LightBarFlashDurationOff; // flash off duration
fixed (byte* byteR = outputReport, byteB = outReportBuffer) fixed (byte* byteR = outputReport, byteB = outReportBuffer)
{ {
@ -1399,6 +1400,20 @@ namespace DS4Windows
pushHapticState(ref testRumble); pushHapticState(ref testRumble);
if (testRumble.RumbleMotorsExplicitlyOff) if (testRumble.RumbleMotorsExplicitlyOff)
testRumble.RumbleMotorsExplicitlyOff = false; testRumble.RumbleMotorsExplicitlyOff = false;
}
}
private void MergeStates()
{
if (testRumble.IsRumbleSet())
{
if (testRumble.RumbleMotorsExplicitlyOff)
testRumble.RumbleMotorsExplicitlyOff = false;
currentHap.RumbleMotorStrengthLeftHeavySlow = testRumble.RumbleMotorStrengthLeftHeavySlow;
currentHap.RumbleMotorStrengthRightLightFast = testRumble.RumbleMotorStrengthRightLightFast;
} }
} }
@ -1509,6 +1524,12 @@ namespace DS4Windows
hapticState[hapticStackIndex++] = hs; hapticState[hapticStackIndex++] = hs;
} }
private DS4HapticState currentHap = new DS4HapticState();
public void SetHapticState(ref DS4HapticState hs)
{
currentHap = hs;
}
override override
public string ToString() public string ToString()
{ {