From bab1a52ff69df289f7eee70f3929d019027605dd Mon Sep 17 00:00:00 2001
From: WujekFoliarz <igorpodstawek14@gmail.com>
Date: Thu, 29 May 2025 20:47:04 +0200
Subject: [PATCH] limit new gyro and touchpad logic to controller 1

---
 src/core/libraries/pad/pad.cpp | 60 +++++++++++++++++++---------------
 1 file changed, 34 insertions(+), 26 deletions(-)

diff --git a/src/core/libraries/pad/pad.cpp b/src/core/libraries/pad/pad.cpp
index 49cc5f56a..b44ddfe6e 100644
--- a/src/core/libraries/pad/pad.cpp
+++ b/src/core/libraries/pad/pad.cpp
@@ -440,7 +440,8 @@ int PS4_SYSV_ABI scePadReadState(s32 handle, OrbisPadData* pData) {
     pData->angularVelocity.z = state.angularVelocity.z;
     pData->orientation = {0.0f, 0.0f, 0.0f, 1.0f};
 
-    if (engine) {
+    // Only do this on handle 1 for now
+    if (engine && handle == 1) {
         const auto gyro_poll_rate = engine->GetAccelPollRate();
         if (gyro_poll_rate != 0.0f) {
             auto now = std::chrono::steady_clock::now();
@@ -455,43 +456,50 @@ int PS4_SYSV_ABI scePadReadState(s32 handle, OrbisPadData* pData) {
                                                  deltaTime, lastOrientation, outputOrientation);
             pData->orientation = outputOrientation;
             controller->SetLastOrientation(outputOrientation);
+            std::cout << pData->orientation.x << std::endl;
         }
     }
     pData->touchData.touchNum =
         (state.touchpad[0].state ? 1 : 0) + (state.touchpad[1].state ? 1 : 0);
 
-    if (controller->GetTouchCount() >= 127) {
-        controller->SetTouchCount(0);
-    }
+    // Only do this on handle 1 for now
+    if(handle == 1) {
+        if (controller->GetTouchCount() >= 127) {
+            controller->SetTouchCount(0);
+        }
 
-    if (controller->GetSecondaryTouchCount() >= 127) {
-        controller->SetSecondaryTouchCount(0);
-    }
+        if (controller->GetSecondaryTouchCount() >= 127) {
+            controller->SetSecondaryTouchCount(0);
+        }
 
-    if (pData->touchData.touchNum == 1 && controller->GetPreviousTouchNum() == 0) {
-        controller->SetTouchCount(controller->GetTouchCount() + 1);
-        controller->SetSecondaryTouchCount(controller->GetTouchCount());
-    } else if (pData->touchData.touchNum == 2 && controller->GetPreviousTouchNum() == 1) {
-        controller->SetSecondaryTouchCount(controller->GetSecondaryTouchCount() + 1);
-    } else if (pData->touchData.touchNum == 0 && controller->GetPreviousTouchNum() > 0) {
-        if (controller->GetTouchCount() < controller->GetSecondaryTouchCount()) {
-            controller->SetTouchCount(controller->GetSecondaryTouchCount());
-        } else {
-            if (controller->WasSecondaryTouchReset()) {
+        if (pData->touchData.touchNum == 1 && controller->GetPreviousTouchNum() == 0) {
+            controller->SetTouchCount(controller->GetTouchCount() + 1);
+            controller->SetSecondaryTouchCount(controller->GetTouchCount());
+        } else if (pData->touchData.touchNum == 2 && controller->GetPreviousTouchNum() == 1) {
+            controller->SetSecondaryTouchCount(controller->GetSecondaryTouchCount() + 1);
+        } else if (pData->touchData.touchNum == 0 && controller->GetPreviousTouchNum() > 0) {
+            if (controller->GetTouchCount() < controller->GetSecondaryTouchCount()) {
                 controller->SetTouchCount(controller->GetSecondaryTouchCount());
-                controller->UnsetSecondaryTouchResetBool();
+            } else {
+                if (controller->WasSecondaryTouchReset()) {
+                    controller->SetTouchCount(controller->GetSecondaryTouchCount());
+                    controller->UnsetSecondaryTouchResetBool();
+                }
             }
         }
-    }
 
-    controller->SetPreviousTouchNum(pData->touchData.touchNum);
+        controller->SetPreviousTouchNum(pData->touchData.touchNum);
 
-    if (pData->touchData.touchNum == 1) {
-        state.touchpad[0].ID = controller->GetTouchCount();
-        state.touchpad[1].ID = 0;
-    } else if (pData->touchData.touchNum == 2) {
-        state.touchpad[0].ID = controller->GetTouchCount();
-        state.touchpad[1].ID = controller->GetSecondaryTouchCount();
+        if (pData->touchData.touchNum == 1) {
+            state.touchpad[0].ID = controller->GetTouchCount();
+            state.touchpad[1].ID = 0;
+        } else if (pData->touchData.touchNum == 2) {
+            state.touchpad[0].ID = controller->GetTouchCount();
+            state.touchpad[1].ID = controller->GetSecondaryTouchCount();
+        }
+    } else {
+        state.touchpad[0].ID = 1;
+        state.touchpad[1].ID = 2;
     }
 
     pData->touchData.touch[0].x = state.touchpad[0].x;