From 1155b488bed2077210c17ee2f064ff5672e219e5 Mon Sep 17 00:00:00 2001 From: cathery Date: Sat, 9 Nov 2019 23:24:29 +0300 Subject: [PATCH] Remove fluff --- .../include/Controllers/Dualshock3Controller.h | 7 ------- .../include/Controllers/Dualshock4Controller.h | 7 ------- .../include/Controllers/Xbox360Controller.h | 7 ------- .../include/Controllers/XboxOneController.h | 8 -------- .../source/Controllers/Dualshock4Controller.cpp | 3 +-- .../source/Controllers/Xbox360Controller.cpp | 3 +-- .../Controllers/Xbox360WirelessController.cpp | 3 +-- .../source/Controllers/XboxController.cpp | 3 +-- .../source/Controllers/XboxOneController.cpp | 3 +-- SwitchUSB/source/SwitchAbstractedPadHandler.cpp | 14 -------------- 10 files changed, 5 insertions(+), 53 deletions(-) diff --git a/ControllerUSB/include/Controllers/Dualshock3Controller.h b/ControllerUSB/include/Controllers/Dualshock3Controller.h index 1763ffa..0414024 100644 --- a/ControllerUSB/include/Controllers/Dualshock3Controller.h +++ b/ControllerUSB/include/Controllers/Dualshock3Controller.h @@ -128,13 +128,6 @@ private: Dualshock3ButtonData m_buttonData; - /* - int8_t kLeftThumbDeadzone = 10; - int8_t kRightThumbDeadzone = 10; - int8_t kTriggerMax = 0; - int8_t kTriggerDeadzone = 0; - */ - public: Dualshock3Controller(std::unique_ptr &&interface); virtual ~Dualshock3Controller(); diff --git a/ControllerUSB/include/Controllers/Dualshock4Controller.h b/ControllerUSB/include/Controllers/Dualshock4Controller.h index a11d98f..8d6f798 100644 --- a/ControllerUSB/include/Controllers/Dualshock4Controller.h +++ b/ControllerUSB/include/Controllers/Dualshock4Controller.h @@ -51,13 +51,6 @@ private: Dualshock4ButtonData m_buttonData; - /* - int16_t kLeftThumbDeadzone = 2000; //7849; - int16_t kRightThumbDeadzone = 2000; //8689; - uint16_t kTriggerMax = 0; //1023; - uint16_t kTriggerDeadzone = 0; //120; - */ - public: Dualshock4Controller(std::unique_ptr &&interface); virtual ~Dualshock4Controller(); diff --git a/ControllerUSB/include/Controllers/Xbox360Controller.h b/ControllerUSB/include/Controllers/Xbox360Controller.h index d203a63..13be98d 100644 --- a/ControllerUSB/include/Controllers/Xbox360Controller.h +++ b/ControllerUSB/include/Controllers/Xbox360Controller.h @@ -87,13 +87,6 @@ private: IUSBEndpoint *m_outPipe = nullptr; Xbox360ButtonData m_buttonData; - /* - - int16_t kLeftThumbDeadzone = 8000; //7849; - int16_t kRightThumbDeadzone = 8000; //8689; - uint16_t kTriggerMax = 0; //1023; - uint16_t kTriggerDeadzone = 0; //120; - */ public: Xbox360Controller(std::unique_ptr &&interface); diff --git a/ControllerUSB/include/Controllers/XboxOneController.h b/ControllerUSB/include/Controllers/XboxOneController.h index c5196e0..b0ec12f 100644 --- a/ControllerUSB/include/Controllers/XboxOneController.h +++ b/ControllerUSB/include/Controllers/XboxOneController.h @@ -83,14 +83,6 @@ private: //Meant to be incremented with each out packet uint8_t m_outPacketSerial = 0; - /* - - int16_t kLeftThumbDeadzone = 2500; //7849; - int16_t kRightThumbDeadzone = 3500; //8689; - uint16_t kTriggerMax = 0; //1023; - uint16_t kTriggerDeadzone = 0; //120; - - */ public: XboxOneController(std::unique_ptr &&interface); diff --git a/ControllerUSB/source/Controllers/Dualshock4Controller.cpp b/ControllerUSB/source/Controllers/Dualshock4Controller.cpp index b9858d1..4594608 100644 --- a/ControllerUSB/source/Controllers/Dualshock4Controller.cpp +++ b/ControllerUSB/source/Controllers/Dualshock4Controller.cpp @@ -159,8 +159,7 @@ void Dualshock4Controller::NormalizeAxis(int16_t x, // magnitude value of 0.0 to 1.0 //ratio = (currentValue / maxValue) / realValue float ratio = (magnitude / (32767 - real_deadzone)) / real_magnitude; - // Y is negated because xbox controllers have an opposite sign from - // the 'standard controller' recommendations. + *x_out = x_val * ratio; *y_out = y_val * ratio; } diff --git a/ControllerUSB/source/Controllers/Xbox360Controller.cpp b/ControllerUSB/source/Controllers/Xbox360Controller.cpp index 544c87b..00bec38 100644 --- a/ControllerUSB/source/Controllers/Xbox360Controller.cpp +++ b/ControllerUSB/source/Controllers/Xbox360Controller.cpp @@ -155,8 +155,7 @@ void Xbox360Controller::NormalizeAxis(int16_t x, // magnitude value of 0.0 to 1.0 //ratio = (currentValue / maxValue) / realValue float ratio = (magnitude / (32767 - real_deadzone)) / real_magnitude; - // Y is negated because xbox controllers have an opposite sign from - // the 'standard controller' recommendations. + *x_out = x_val * ratio; *y_out = y_val * ratio; } diff --git a/ControllerUSB/source/Controllers/Xbox360WirelessController.cpp b/ControllerUSB/source/Controllers/Xbox360WirelessController.cpp index 0a8bd51..d6f691a 100644 --- a/ControllerUSB/source/Controllers/Xbox360WirelessController.cpp +++ b/ControllerUSB/source/Controllers/Xbox360WirelessController.cpp @@ -177,8 +177,7 @@ void Xbox360WirelessController::NormalizeAxis(int16_t x, // magnitude value of 0.0 to 1.0 //ratio = (currentValue / maxValue) / realValue float ratio = (magnitude / (32767 - real_deadzone)) / real_magnitude; - // Y is negated because xbox controllers have an opposite sign from - // the 'standard controller' recommendations. + *x_out = x_val * ratio; *y_out = y_val * ratio; } diff --git a/ControllerUSB/source/Controllers/XboxController.cpp b/ControllerUSB/source/Controllers/XboxController.cpp index 18b209d..1ca0510 100644 --- a/ControllerUSB/source/Controllers/XboxController.cpp +++ b/ControllerUSB/source/Controllers/XboxController.cpp @@ -131,8 +131,7 @@ void XboxController::NormalizeAxis(int16_t x, // magnitude value of 0.0 to 1.0 //ratio = (currentValue / maxValue) / realValue float ratio = (magnitude / (32767 - real_deadzone)) / real_magnitude; - // Y is negated because xbox controllers have an opposite sign from - // the 'standard controller' recommendations. + *x_out = x_val * ratio; *y_out = y_val * ratio; } diff --git a/ControllerUSB/source/Controllers/XboxOneController.cpp b/ControllerUSB/source/Controllers/XboxOneController.cpp index d7737ef..3c4cc22 100644 --- a/ControllerUSB/source/Controllers/XboxOneController.cpp +++ b/ControllerUSB/source/Controllers/XboxOneController.cpp @@ -233,8 +233,7 @@ void XboxOneController::NormalizeAxis(int16_t x, // magnitude value of 0.0 to 1.0 //ratio = (currentValue / maxValue) / realValue float ratio = (magnitude / (32767 - real_deadzone)) / real_magnitude; - // Y is negated because xbox controllers have an opposite sign from - // the 'standard controller' recommendations. + *x_out = x_val * ratio; *y_out = y_val * ratio; } diff --git a/SwitchUSB/source/SwitchAbstractedPadHandler.cpp b/SwitchUSB/source/SwitchAbstractedPadHandler.cpp index cfb58f4..cea55e9 100644 --- a/SwitchUSB/source/SwitchAbstractedPadHandler.cpp +++ b/SwitchUSB/source/SwitchAbstractedPadHandler.cpp @@ -26,20 +26,6 @@ Result SwitchAbstractedPadHandler::Initialize() if (R_FAILED(rc)) return rc; - /* - svcSleepThread(1e+7L); - hidScanInput(); - - //WriteToLog("Is last offline id connected? ", hidIsControllerConnected(lastOfflineID)); - //WriteToLog("Last offline id type: ", hidGetControllerType(lastOfflineID)); - - Result rc2 = hidInitializeVibrationDevices(&m_vibrationDeviceHandle, 1, lastOfflineID, hidGetControllerType(lastOfflineID)); - if (R_SUCCEEDED(rc2)) - InitOutputThread(); - else - WriteToLog("Failed to iniitalize vibration device with error ", rc2); - */ - if (DoesControllerSupport(m_controllerHandler.GetController()->GetType(), SUPPORTS_PAIRING)) { rc = InitOutputThread();