Added haptic enable state checks on most modes supporting it

OpenStickCommunity · Sep 3, 2024 · ed19a4b · ed19a4b
1 parent f3c98dc
commit ed19a4b
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 17 deletions.
diff --git a/src/drivers/ps3/PS3Driver.cpp b/src/drivers/ps3/PS3Driver.cpp
@@ -6,6 +6,7 @@
 #include "drivers/ps3/PS3Driver.h"
 #include "drivers/ps3/PS3Descriptors.h"
 #include "drivers/shared/driverhelper.h"
+#include "storagemanager.h"
 
 void PS3Driver::initialize() {
     //stdio_init_all();
@@ -262,7 +263,18 @@ void PS3Driver::set_report(uint8_t report_id, hid_report_type_t report_type, uin
         }
         switch(report_id) {
             case PS3ReportTypes::PS3_FEATURE_01:
+                Gamepad * gamepad = Storage::getInstance().GetGamepad();
                 memcpy(&ps3Features, buf, bufsize);
+
+                if (gamepad->auxState.haptics.leftActuator.enabled) {
+                    gamepad->auxState.haptics.leftActuator.active = (ps3Features.leftMotorPower > 0);
+                    gamepad->auxState.haptics.leftActuator.intensity = ps3Features.leftMotorPower;
+                }
+
+                if (gamepad->auxState.haptics.rightActuator.enabled) {
+                    gamepad->auxState.haptics.rightActuator.active = (ps3Features.rightMotorPower > 0);
+                    gamepad->auxState.haptics.rightActuator.intensity = ps3Features.rightMotorPower;
+                }
                 break;
         }
     }

diff --git a/src/drivers/ps4/PS4Driver.cpp b/src/drivers/ps4/PS4Driver.cpp
@@ -417,15 +417,22 @@ void PS4Driver::set_report(uint8_t report_id, hid_report_type_t report_type, uin
             //report[8] = Flash On Period
             //report[9] = Flash Off Period
 
-            gamepad->auxState.haptics.leftActuator.active = (buffer[4] > 0);
-            gamepad->auxState.haptics.leftActuator.intensity = buffer[4];
-            gamepad->auxState.haptics.rightActuator.active = (buffer[5] > 0);
-            gamepad->auxState.haptics.rightActuator.intensity = buffer[5];
-
-            gamepad->auxState.sensors.statusLight.enabled = true;
-            gamepad->auxState.sensors.statusLight.color.red = buffer[6];
-            gamepad->auxState.sensors.statusLight.color.green = buffer[7];
-            gamepad->auxState.sensors.statusLight.color.blue = buffer[8];
+            if (gamepad->auxState.haptics.leftActuator.enabled) {
+                gamepad->auxState.haptics.leftActuator.active = (buffer[4] > 0);
+                gamepad->auxState.haptics.leftActuator.intensity = buffer[4];
+            }
+
+            if (gamepad->auxState.haptics.rightActuator.enabled) {
+                gamepad->auxState.haptics.rightActuator.active = (buffer[5] > 0);
+                gamepad->auxState.haptics.rightActuator.intensity = buffer[5];
+            }
+
+            if (gamepad->auxState.sensors.statusLight.enabled) {
+                gamepad->auxState.sensors.statusLight.active = true;
+                gamepad->auxState.sensors.statusLight.color.red = buffer[6];
+                gamepad->auxState.sensors.statusLight.color.green = buffer[7];
+                gamepad->auxState.sensors.statusLight.color.blue = buffer[8];
+            }
         } else {
             //for (uint8_t i = 0; i < bufsize; i++) {
             //    printf("%02x ", buffer[i]);

diff --git a/src/drivers/xboxog/XboxOriginalDriver.cpp b/src/drivers/xboxog/XboxOriginalDriver.cpp
@@ -73,10 +73,16 @@ void XboxOriginalDriver::process(Gamepad * gamepad, uint8_t * outBuffer) {
     {
         uint8_t leftValue = (xboxOriginalReportOut.lValue >> 8);
         uint8_t rightValue = (xboxOriginalReportOut.rValue >> 8);
-        gamepad->auxState.haptics.leftActuator.active = (leftValue > 0);
-        gamepad->auxState.haptics.leftActuator.intensity = leftValue;
-        gamepad->auxState.haptics.rightActuator.active = (rightValue > 0);
-        gamepad->auxState.haptics.rightActuator.intensity = rightValue;
+
+        if (gamepad->auxState.haptics.leftActuator.enabled) {
+            gamepad->auxState.haptics.leftActuator.active = (leftValue > 0);
+            gamepad->auxState.haptics.leftActuator.intensity = leftValue;
+        }
+
+        if (gamepad->auxState.haptics.rightActuator.enabled) {
+            gamepad->auxState.haptics.rightActuator.active = (rightValue > 0);
+            gamepad->auxState.haptics.rightActuator.intensity = rightValue;
+        }
     }
 }
 

diff --git a/src/drivers/xinput/XInputDriver.cpp b/src/drivers/xinput/XInputDriver.cpp
@@ -127,10 +127,15 @@ static void check_and_set_rumble(Gamepad * gamepad, uint8_t * buffer) {
 	if (!(buffer[0] == 0x00 && buffer[1] == 0x08))
 		return;
 
-	gamepad->auxState.haptics.leftActuator.active = (buffer[3] > 0);
-	gamepad->auxState.haptics.leftActuator.intensity = buffer[3];
-	gamepad->auxState.haptics.rightActuator.active = (buffer[4] > 0);
-	gamepad->auxState.haptics.rightActuator.intensity = buffer[4];
+    if (gamepad->auxState.haptics.leftActuator.enabled) {
+        gamepad->auxState.haptics.leftActuator.active = (buffer[3] > 0);
+        gamepad->auxState.haptics.leftActuator.intensity = buffer[3];
+    }
+
+    if (gamepad->auxState.haptics.rightActuator.enabled) {
+        gamepad->auxState.haptics.rightActuator.active = (buffer[4] > 0);
+        gamepad->auxState.haptics.rightActuator.intensity = buffer[4];
+    }
 }
 
 void XInputDriver::initialize() {