Implement a custom option for DS4 polling rate

Author: Banz99

common/controller_profiles.hpp

@@ -24,6 +24,7 @@ struct ControllerProfileConfig {
         struct {
             bool use_western_layout;
             uint32_t sony_led_brightness;
+            uint32_t dualshock_reportrate;
             bool swap_dpad_lstick;
             bool invert_lstick_xaxis;
             bool invert_lstick_yaxis;
@@ -41,6 +42,7 @@ constexpr ControllerProfileConfig g_cp_global_config = {
     .misc = {
         .use_western_layout = false,
         .sony_led_brightness = 8,
+        .dualshock_reportrate = 8,
         .swap_dpad_lstick = false,
         .invert_lstick_xaxis = false,
         .invert_lstick_yaxis = false,

mc_mitm/default.ini

@@ -9,6 +9,8 @@
 ;use_western_layout=false
 ; Specify the LED lightbar brightness on Sony controllers (range 0(off)-63(max)) [default 8]
 ;sony_led_brightness=8
+; Specifies a different polling rate value for DualShock 4 controllers (see https://github.com/ndeadly/MissionControl/blob/master/mc_mitm/source/controllers/dualshock4_controller.hpp#L21 for a list of valid values) [default 8(125hz)]
+;dualshock_reportrate=8
 ; Map the dpad of the controller to the left stick and viceversa [default false]
 ;swap_dpad_lstick=false
 ; A series of stick axis reversal settings [default false]

mc_mitm/source/controllers/controller_profiles_management.cpp

@@ -32,6 +32,14 @@ namespace ams::controller {
             else *out = 8;
         }
 
+        void ValidateReportRate(const char *value, uint32_t *out){
+            uint32_t temp=8;
+            utils::ParseUInt32(value, &temp);
+            if(temp <= 16)
+                *out = temp;
+            else *out = 8;
+        }
+
         int ControllerProfileIniHandler(void *user, const char *section, const char *name, const char *value) {
                 auto config = reinterpret_cast<ControllerProfileConfig *>(user);
 
@@ -46,6 +54,8 @@ namespace ams::controller {
                         utils::ParseBoolean(value, &config->misc.use_western_layout);
                     else if (strcasecmp(name, "sony_led_brightness") == 0)
                         ValidateBrightness(value, &config->misc.sony_led_brightness);
+                    else if (strcasecmp(name, "dualshock_reportrate") == 0)
+                        ValidateReportRate(value, &config->misc.dualshock_reportrate);
                     else if (strcasecmp(name, "swap_dpad_lstick") == 0)
                         utils::ParseBoolean(value, &config->misc.swap_dpad_lstick);
                     else if (strcasecmp(name, "invert_lstick_xaxis") == 0)

mc_mitm/source/controllers/dualshock4_controller.cpp

@@ -164,7 +164,7 @@ namespace ams::controller {
     }
 
     Result Dualshock4Controller::PushRumbleLedState(void) {
-        Dualshock4OutputReport0x11 report = {0xa2, 0x11, static_cast<uint8_t>(0xc0 | (m_report_rate & 0xff)), 0x20, 0xf3, 0x04, 0x00,
+        Dualshock4OutputReport0x11 report = {0xa2, 0x11, static_cast<uint8_t>(0xc0 | (static_cast<Dualshock4ReportRate>(m_profile.misc.dualshock_reportrate) & 0xff)), 0x20, 0xf3, 0x04, 0x00,
             m_rumble_state.amp_motor_right, m_rumble_state.amp_motor_left,
             m_led_colour.r, m_led_colour.g, m_led_colour.b
         };

mc_mitm/source/controllers/dualshock4_controller.hpp

@@ -67,7 +67,7 @@ namespace ams::controller {
         uint8_t cross      : 1;
         uint8_t circle     : 1;
         uint8_t triangle   : 1;
-        
+
         uint8_t L1         : 1;
         uint8_t R1         : 1;
         uint8_t L2         : 1;
@@ -76,7 +76,7 @@ namespace ams::controller {
         uint8_t options    : 1;
         uint8_t L3         : 1;
         uint8_t R3         : 1;
-        
+
         uint8_t ps         : 1;
         uint8_t tpad       : 1;
         uint8_t counter    : 6;
@@ -151,7 +151,6 @@ namespace ams::controller {
 
             Dualshock4Controller(const bluetooth::Address *address, HardwareID id)
             : EmulatedSwitchController(address, id)
-            , m_report_rate(Dualshock4ReportRate_125Hz)
             , m_led_colour({0, 0, 0})
             , m_rumble_state({0, 0}) { }
 
@@ -168,11 +167,10 @@ namespace ams::controller {
             void HandleInputReport0x11(const Dualshock4ReportData *src);
 
             void MapButtons(const Dualshock4ButtonData *buttons);
-            
+
             Result PushRumbleLedState(void);
 
-            Dualshock4ReportRate m_report_rate;
-            RGBColour m_led_colour; 
+            RGBColour m_led_colour;
             Dualshock4RumbleData m_rumble_state;
     };