Implement controller profiles for emulated controllers and a few QOL options

Makefile

@@ -39,6 +39,7 @@ dist: all
 	mkdir -p dist/config/MissionControl
 	mkdir -p dist/config/MissionControl/controllers
 	cp mc_mitm/config.ini dist/config/MissionControl/missioncontrol.ini.template
+	cp mc_mitm/default.ini dist/config/MissionControl/controllers/default.ini
 
 	cd dist; zip -r $(PROJECT_NAME)-$(BUILD_VERSION).zip ./*; cd ../;
 

common/controller_profiles.hpp

@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2020-2021 ndeadly
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+struct ControllerProfileConfig {
+        struct {
+            uint8_t controller_type;
+            bool enable_rumble;
+            bool enable_motion;
+        } general;
+
+        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;
+            bool invert_rstick_xaxis;
+            bool invert_rstick_yaxis;
+            bool disable_home_button;
+        } misc;
+};
+
+constexpr ControllerProfileConfig g_cp_global_config = {
+    .general = {
+        .controller_type = 3,
+        .enable_rumble = true,
+        .enable_motion = true
+    },
+    .misc = {
+        .use_western_layout = false,
+        .sony_led_brightness = 8,
+        .dualshock_reportrate = 8,
+        .swap_dpad_lstick = false,
+        .invert_lstick_xaxis = false,
+        .invert_lstick_yaxis = false,
+        .invert_rstick_xaxis = false,
+        .invert_rstick_yaxis = false,
+        .disable_home_button = false
+    }
+};

mc_mitm/Makefile

@@ -13,6 +13,8 @@ ifneq ($(BUILD),$(notdir $(CURDIR)))
 export OUTPUT	:=	$(CURDIR)/$(TARGET)
 export TOPDIR	:=	$(CURDIR)
 
+SOURCES += ../common
+
 export VPATH	:=	$(foreach dir,$(SOURCES),$(CURDIR)/$(dir)) \
 			$(foreach dir,$(DATA),$(CURDIR)/$(dir))
 

mc_mitm/config.ini

@@ -1,15 +1,9 @@
 [general]
-; Enable vibration support for unofficial controllers [default true]
-;enable_rumble=true
-; Enable motion controls support for unoffical controllers [default true]
-;enable_motion=true
+; Completely disable the use of any controller profiles present on the SD card and fall back to program defaults
+;disable_custom_profiles=false
 
 [bluetooth]
 ; Override host name of Bluetooth adapter
 ;host_name=Nintendo Switch!
 ; Override host mac address of Bluetooth adapter
 ;host_address=04:20:69:04:20:69
-
-[misc]
-; Disable the LED lightbar on Sony Dualshock 4 and Dualsense controllers [default false]
-;disable_sony_leds=false

mc_mitm/default.ini

@@ -0,0 +1,24 @@
+[general]
+; Specifies which kind of controller should be emulated (1 = LeftJoyCon, 2 = RightJoyCon, 3 = ProController) [default 3]
+;controller_type=3
+; Enable vibration support for unofficial controllers [default true]
+;enable_rumble=true
+; Enable motion controls support for unoffical controllers [default true]
+;enable_motion=true
+
+[misc]
+; Automatically 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
+; 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]
+;invert_lstick_xaxis=false
+;invert_lstick_yaxis=false
+;invert_rstick_xaxis=false
+;invert_rstick_yaxis=false
+; Disable the use of the HOME button system-wide (still accessible via button combos) [default false]
+;disable_home_button=false

mc_mitm/source/bluetooth_mitm/bluetooth/bluetooth_hid.cpp

@@ -67,6 +67,51 @@ namespace ams::bluetooth::hid {
         g_system_event_fwd.Signal();
     }
 
+    Result VirtualReconnect(const bluetooth::Address *address) {
+
+        if (hos::GetVersion() >= hos::Version_12_0_0) {
+            struct ConnectionState {
+                BtdrvHidConnectionStatus status;
+                BtdrvAddress address;
+            };
+
+            // Signal fake disconnection event
+            ConnectionState disconnected = { BtdrvHidConnectionStatus_Closed, *address };
+            SignalFakeEvent(BtdrvHidEventType_Connection, &disconnected, sizeof(disconnected));
+            g_data_read_event.Wait();
+
+            // If we don't wait a bit the console disconnects the controller for real
+            svcSleepThread(100'000'000ULL);
+
+            // Signal fake connection event
+            ConnectionState connected = { BtdrvHidConnectionStatus_Opened, *address };
+            SignalFakeEvent(BtdrvHidEventType_Connection, &connected, sizeof(connected));
+            g_data_read_event.Wait();
+        }
+        else {
+            struct ConnectionState {
+                BtdrvAddress address;
+                uint8_t pad[2];
+                BtdrvHidConnectionStatus status;
+            };
+
+            // Signal fake disconnection event
+            ConnectionState disconnected = { *address, {0}, BtdrvHidConnectionStatusOld_Closed };
+            SignalFakeEvent(BtdrvHidEventTypeOld_Connection, &disconnected, sizeof(disconnected));
+            g_data_read_event.Wait();
+
+            // If we don't wait a bit the console disconnects the controller for real
+            svcSleepThread(100'000'000ULL);
+
+            // Signal fake connection event
+            ConnectionState connected = { *address, {0}, BtdrvHidConnectionStatusOld_Opened };
+            SignalFakeEvent(BtdrvHidEventTypeOld_Connection, &connected, sizeof(connected));
+            g_data_read_event.Wait();
+        }
+
+        return ams::ResultSuccess();
+    }
+
     Result GetEventInfo(bluetooth::HidEventType *type, void *buffer, size_t size) {
         std::scoped_lock lk(g_event_info_lock);
 

mc_mitm/source/bluetooth_mitm/bluetooth/bluetooth_hid.hpp

@@ -28,6 +28,7 @@ namespace ams::bluetooth::hid {
     os::SystemEvent *GetForwardEvent(void);
     os::SystemEvent *GetUserForwardEvent(void);
 
+    Result VirtualReconnect(const bluetooth::Address *address);
     void SignalFakeEvent(bluetooth::HidEventType type, const void *data, size_t size);
     Result GetEventInfo(bluetooth::HidEventType *type, void *buffer, size_t size);
     void HandleEvent(void);

mc_mitm/source/btm_mitm/btm_mitm_service.cpp

@@ -16,6 +16,7 @@
 #include "btm_mitm_service.hpp"
 #include "btm_shim.h"
 #include "../controllers/controller_management.hpp"
+//#include "../controllers/switch_controller.hpp"
 #include <cstring>
 
 namespace ams::mitm::btm {
@@ -24,9 +25,14 @@ namespace ams::mitm::btm {
 
         void RenameConnectedDevices(BtmConnectedDeviceV1 devices[], size_t count) {
             for (unsigned int i = 0; i < count; ++i) {
-                auto device = &devices[i];
-                if (!controller::IsOfficialSwitchControllerName(device->name)) {
-                    std::strncpy(device->name, controller::pro_controller_name, sizeof(device->name) - 1);
+                auto device = controller::LocateHandler(&devices[i].address);
+                if (device) {
+                    if (!device->IsOfficialController()) {
+                        if (device->GetControllerType() == controller::SwitchControllerType_ProController)
+                            std::strncpy(devices[i].name, controller::pro_controller_name, sizeof(devices[i].name) - 1);
+                        else
+                            std::strncpy(devices[i].name, "Joy-Con (R)", sizeof(devices[i].name) - 1);
+                    }
                 }
             }
         }
@@ -80,9 +86,14 @@ namespace ams::mitm::btm {
         R_TRY(btmGetDeviceInfoDeprecatedFwd(m_forward_service.get(), device_info));
 
         for (unsigned int i = 0; i < device_info->device_count; ++i) {
-            auto device = &device_info->devices[i];
-            if (!controller::IsOfficialSwitchControllerName(device->name.name)) {
-                std::strncpy(device->name.name, controller::pro_controller_name, sizeof(device->name) - 1);
+            auto device = controller::LocateHandler(&device_info->devices[i].addr);
+            if (device) {
+                if (!device->IsOfficialController()) {
+                    if (device->GetControllerType() == controller::SwitchControllerType_ProController)
+                        std::strncpy(device_info->devices[i].name.name, controller::pro_controller_name, sizeof(device_info->devices[i].name) - 1);
+                    else
+                        std::strncpy(device_info->devices[i].name.name, "Joy-Con (R)", sizeof(device_info->devices[i].name) - 1);
+                }
             }
         }
 

mc_mitm/source/controllers/controller_management.hpp

@@ -75,7 +75,7 @@ namespace ams::controller {
         public:
             UnknownController(const bluetooth::Address *address, HardwareID id)
             : EmulatedSwitchController(address, id) {
-                m_colours.buttons = {0xff, 0x00, 0x00};
+                //m_colours.buttons = {0xff, 0x00, 0x00}; TODO: Replicate this behaviour with the SPI flash into account
             };
     };
 

mc_mitm/source/controllers/controller_profiles_management.cpp

@@ -0,0 +1,117 @@
+/*
+ * Copyright (c) 2020-2021 ndeadly
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include "controller_profiles_management.hpp"
+#include "../utils.hpp"
+#include "../mcmitm_config.hpp"
+
+namespace ams::controller {
+
+    namespace {
+        constexpr const char cp_default_path[] = "sdmc:/config/MissionControl/controllers/default.ini";
+        constexpr const char controllers_folder[] = "sdmc:/config/MissionControl/controllers/";
+        constexpr const char profile_container[] = "profile.ini";
+
+        void ValidateBrightness(const char *value, uint32_t *out){
+            uint32_t temp=8;
+            utils::ParseUInt32(value, &temp);
+            if(temp <= 63)
+                *out = temp;
+            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;
+        }
+
+        void ValidateControllerType(const char *value, uint8_t *out){
+            uint32_t temp=3;
+            utils::ParseUInt32(value, &temp);
+            if(temp>=1 && temp <= 3)
+                *out = static_cast<uint8_t>(temp);
+            else *out = 3;
+        }
+
+        int ControllerProfileIniHandler(void *user, const char *section, const char *name, const char *value) {
+                auto config = reinterpret_cast<ControllerProfileConfig *>(user);
+
+                if (strcasecmp(section, "general") == 0) {
+                    if (strcasecmp(name, "controller_type") == 0)
+                        ValidateControllerType(value, &config->general.controller_type);
+                    else if (strcasecmp(name, "enable_rumble") == 0)
+                        utils::ParseBoolean(value, &config->general.enable_rumble);
+                    else if (strcasecmp(name, "enable_motion") == 0)
+                        utils::ParseBoolean(value, &config->general.enable_motion);
+                }
+                else if (strcasecmp(section, "misc") == 0) {
+                    if (strcasecmp(name, "use_western_layout") == 0)
+                        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)
+                        utils::ParseBoolean(value, &config->misc.invert_lstick_xaxis);
+                    else if (strcasecmp(name, "invert_lstick_yaxis") == 0)
+                        utils::ParseBoolean(value, &config->misc.invert_lstick_yaxis);
+                    else if (strcasecmp(name, "invert_rstick_xaxis") == 0)
+                        utils::ParseBoolean(value, &config->misc.invert_rstick_xaxis);
+                    else if (strcasecmp(name, "invert_rstick_yaxis") == 0)
+                        utils::ParseBoolean(value, &config->misc.invert_rstick_yaxis);
+                    else if (strcasecmp(name, "disable_home_button") == 0)
+                        utils::ParseBoolean(value, &config->misc.disable_home_button);
+                }
+                else {
+                    return 0;
+                }
+
+                return 1;
+        }
+    }
+
+    Result GetControllerConfig(const bluetooth::Address *address, ControllerProfileConfig *config) {
+        *config = g_cp_global_config;
+        if (mitm::GetGlobalConfig()->general.disable_custom_profiles)
+            return 1;
+        char custom_config_path[100] = "";
+        std::strcat(custom_config_path, controllers_folder);
+        char btaddress_string[2 * sizeof(bluetooth::Address) + 1] = "";
+        utils::BluetoothAddressToString(address, btaddress_string, 2 * sizeof(bluetooth::Address) + 1);
+        std::strcat(custom_config_path, btaddress_string);
+        std::strcat(custom_config_path, "/");
+        std::strcat(custom_config_path, profile_container);
+        bool has_file = false;
+        R_TRY(fs::HasFile(&has_file, custom_config_path));
+        if (!has_file) {
+            std::strcpy(custom_config_path, cp_default_path);
+        }
+        /* Open the file. */
+        fs::FileHandle file;
+        {
+            if (R_FAILED(fs::OpenFile(std::addressof(file), custom_config_path, fs::OpenMode_Read))) {
+                return 1;
+            }
+        }
+        ON_SCOPE_EXIT { fs::CloseFile(file); };
+        util::ini::ParseFile(file, config, ControllerProfileIniHandler);
+        return ams::ResultSuccess();
+    }
+}

mc_mitm/source/controllers/controller_profiles_management.hpp

@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 2020-2021 ndeadly
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#pragma once
+#include <stratosphere.hpp>
+#include "../../../common/controller_profiles.hpp"
+#include "../bluetooth_mitm/bluetooth/bluetooth_types.hpp"
+
+namespace ams::controller {
+
+    Result GetControllerConfig(const bluetooth::Address *address, ControllerProfileConfig *config);
+
+}