Replace the option to disable Sony controllers LEDs with a specific setting for brightness level

Author: Banz99

mc_mitm/default.ini

@@ -18,8 +18,8 @@
 [misc]
 ; Remaps the controller buttons to behave similarly to how they do on western consoles (i.e A to confirm on Xbox controllers, X on Playstation ones)
 ;use_western_layout=false
-; Disable the LED lightbar on Sony Dualshock 4 and Dualsense controllers [default false]
-;disable_sony_leds=false
+; Specify the LED lightbar brightness on Sony controllers (range 0(off)-63(max)) [default 8]
+;sony_led_brightness=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/dualsense_controller.cpp

@@ -39,15 +39,15 @@ namespace ams::controller {
 
         const RGBColour player_led_colours[] = {
             // Same colours used by PS4
-            {0x00, 0x00, 0x40}, // blue
-            {0x40, 0x00, 0x00}, // red
-            {0x00, 0x40, 0x00}, // green
-            {0x20, 0x00, 0x20}, // pink
+            {0x00, 0x00, 0x04}, // blue
+            {0x04, 0x00, 0x00}, // red
+            {0x00, 0x04, 0x00}, // green
+            {0x02, 0x00, 0x02}, // pink
             // New colours for controllers 5-8
-            {0x00, 0x20, 0x20}, // cyan
-            {0x30, 0x10, 0x00}, // orange
-            {0x20, 0x20, 0x00}, // yellow
-            {0x10, 0x00, 0x30}  // purple
+            {0x00, 0x02, 0x02}, // cyan
+            {0x03, 0x01, 0x00}, // orange
+            {0x02, 0x02, 0x00}, // yellow
+            {0x01, 0x00, 0x03}  // purple
         };
 
     }
@@ -82,7 +82,9 @@ namespace ams::controller {
     Result DualsenseController::SetLightbarColour(RGBColour colour) {
         mitm::ControllerProfileConfig config;
         mitm::GetCustomIniConfig(&this->Address(), &config);
-        m_led_colour = config.misc.disable_sony_leds ? led_disable : colour;
+        m_led_colour.r = colour.r * config.misc.sony_led_brightness;
+        m_led_colour.g = colour.g * config.misc.sony_led_brightness;
+        m_led_colour.b = colour.b * config.misc.sony_led_brightness;
         return this->PushRumbleLedState();
     }
 

mc_mitm/source/controllers/dualshock4_controller.cpp

@@ -29,15 +29,15 @@ namespace ams::controller {
 
         const RGBColour player_led_colours[] = {
             // Same colours used by PS4
-            {0x00, 0x00, 0x40}, // blue
-            {0x40, 0x00, 0x00}, // red
-            {0x00, 0x40, 0x00}, // green
-            {0x20, 0x00, 0x20}, // pink
+            {0x00, 0x00, 0x04}, // blue
+            {0x04, 0x00, 0x00}, // red
+            {0x00, 0x04, 0x00}, // green
+            {0x02, 0x00, 0x02}, // pink
             // New colours for controllers 5-8
-            {0x00, 0x20, 0x20}, // cyan
-            {0x30, 0x10, 0x00}, // orange
-            {0x20, 0x20, 0x00}, // yellow
-            {0x10, 0x00, 0x30}  // purple
+            {0x00, 0x02, 0x02}, // cyan
+            {0x03, 0x01, 0x00}, // orange
+            {0x02, 0x02, 0x00}, // yellow
+            {0x01, 0x00, 0x03}  // purple
         };
 
     }
@@ -74,7 +74,9 @@ namespace ams::controller {
     Result Dualshock4Controller::SetLightbarColour(RGBColour colour) {
         mitm::ControllerProfileConfig config;
         mitm::GetCustomIniConfig(&this->Address(), &config);
-        m_led_colour = config.misc.disable_sony_leds ? led_disable : colour;
+        m_led_colour.r = colour.r * config.misc.sony_led_brightness;
+        m_led_colour.g = colour.g * config.misc.sony_led_brightness;
+        m_led_colour.b = colour.b * config.misc.sony_led_brightness;
         return this->PushRumbleLedState();
     }
 

mc_mitm/source/mcmitm_config.cpp

@@ -43,8 +43,8 @@ namespace ams::mitm {
                 .right_grip = {0x46, 0x46, 0x46}
             },
             .misc = {
-                .use_western_layout=false,
-                .disable_sony_leds = false,
+                .use_western_layout = false,
+                .sony_led_brightness = 8,
                 .dualshock_pollingrate_divisor = 8,
                 .swap_dpad_lstick = false,
                 .invert_lstick_xaxis = false,
@@ -96,7 +96,15 @@ namespace ams::mitm {
             int32_t temp=8;
             ParseInt(value, &temp);
             if(temp >= 0 && temp <= 16)
-            *out = temp;
+                *out = temp;
+            else *out = 8;
+        }
+
+        void ParseBrightness(const char *value, int32_t *out){
+            int32_t temp=8;
+            ParseInt(value, &temp);
+            if(temp >= 0 && temp <= 63)
+                *out = temp;
             else *out = 8;
         }
 
@@ -233,8 +241,8 @@ namespace ams::mitm {
             else if (strcasecmp(section, "misc") == 0) {
                 if (strcasecmp(name, "use_western_layout") == 0)
                     ParseBoolean(value, &config->misc.use_western_layout);
-                else if (strcasecmp(name, "disable_sony_leds") == 0)
-                    ParseBoolean(value, &config->misc.disable_sony_leds);
+                else if (strcasecmp(name, "sony_led_brightness") == 0)
+                    ParseBrightness(value, &config->misc.sony_led_brightness);
                 else if (strcasecmp(name, "dualshock_pollingrate_divisor") == 0)
                     ParsePollingRate(value, &config->misc.dualshock_pollingrate_divisor);
                 else if (strcasecmp(name, "swap_dpad_lstick") == 0)

mc_mitm/source/mcmitm_config.hpp

@@ -44,7 +44,7 @@ namespace ams::mitm {
 
         struct {
             bool use_western_layout;
-            bool disable_sony_leds;
+            int32_t sony_led_brightness;
             int32_t dualshock_pollingrate_divisor;
             bool swap_dpad_lstick;
             bool invert_lstick_xaxis;