VERY experimental Nintendo Switch 2 emulator
C++
input_common: Reintroduce custom pro controller support
Narr the Reg75039440f326
diff --git a/src/common/settings.h b/src/common/settings.hindex 64db66f379..6d27dd5ee4 100644--- a/src/common/settings.h+++ b/src/common/settings.h@@ -488,6 +488,7 @@ struct Values {Setting<bool> enable_raw_input{false, "enable_raw_input"};Setting<bool> controller_navigation{true, "controller_navigation"};Setting<bool> enable_joycon_driver{true, "enable_joycon_driver"};+ Setting<bool> enable_procon_driver{false, "enable_procon_driver"};SwitchableSetting<bool> vibration_enabled{true, "vibration_enabled"};SwitchableSetting<bool> enable_accurate_vibrations{false, "enable_accurate_vibrations"};diff --git a/src/input_common/drivers/joycon.cpp b/src/input_common/drivers/joycon.cppindex 4fcfb45108..afc33db572 100644--- a/src/input_common/drivers/joycon.cpp+++ b/src/input_common/drivers/joycon.cpp@@ -16,7 +16,7 @@ namespace InputCommon {Joycons::Joycons(const std::string& input_engine_) : InputEngine(input_engine_) {// Avoid conflicting with SDL driver- if (!Settings::values.enable_joycon_driver) {+ if (!Settings::values.enable_joycon_driver && !Settings::values.enable_procon_driver) {return;}LOG_INFO(Input, "Joycon driver Initialization started");@@ -46,6 +46,12 @@ void Joycons::Reset() {}device->Stop();}+ for (const auto& device : pro_controller) {+ if (!device) {+ continue;+ }+ device->Stop();+ }SDL_hid_exit();}@@ -61,6 +67,11 @@ void Joycons::Setup() {PreSetController(GetIdentifier(port, Joycon::ControllerType::Right));device = std::make_shared<Joycon::JoyconDriver>(port++);}+ port = 0;+ for (auto& device : pro_controller) {+ PreSetController(GetIdentifier(port, Joycon::ControllerType::Pro));+ device = std::make_shared<Joycon::JoyconDriver>(port++);+ }scan_thread = std::jthread([this](std::stop_token stop_token) { ScanThread(stop_token); });}@@ -116,6 +127,9 @@ bool Joycons::IsDeviceNew(SDL_hid_device_info* device_info) const {// Check if device already existswitch (type) {case Joycon::ControllerType::Left:+ if (!Settings::values.enable_joycon_driver) {+ return false;+ }for (const auto& device : left_joycons) {if (is_handle_identical(device)) {return false;@@ -123,12 +137,25 @@ bool Joycons::IsDeviceNew(SDL_hid_device_info* device_info) const {}break;case Joycon::ControllerType::Right:+ if (!Settings::values.enable_joycon_driver) {+ return false;+ }for (const auto& device : right_joycons) {if (is_handle_identical(device)) {return false;}}break;+ case Joycon::ControllerType::Pro:+ if (!Settings::values.enable_procon_driver) {+ return false;+ }+ for (const auto& device : pro_controller) {+ if (is_handle_identical(device)) {+ return false;+ }+ }+ break;default:return false;}@@ -199,6 +226,14 @@ std::shared_ptr<Joycon::JoyconDriver> Joycons::GetNextFreeHandle(return *unconnected_device;}}+ if (type == Joycon::ControllerType::Pro) {+ const auto unconnected_device = std::ranges::find_if(+ pro_controller, [](auto& device) { return !device->IsConnected(); });++ if (unconnected_device != pro_controller.end()) {+ return *unconnected_device;+ }+ }return nullptr;}@@ -409,6 +444,15 @@ std::shared_ptr<Joycon::JoyconDriver> Joycons::GetHandle(PadIdentifier identifie}}+ if (type == Joycon::ControllerType::Pro) {+ const auto matching_device = std::ranges::find_if(+ pro_controller, [is_handle_active](auto& device) { return is_handle_active(device); });++ if (matching_device != pro_controller.end()) {+ return *matching_device;+ }+ }+return nullptr;}@@ -455,6 +499,9 @@ std::vector<Common::ParamPackage> Joycons::GetInputDevices() const {for (const auto& controller : right_joycons) {add_entry(controller);}+ for (const auto& controller : pro_controller) {+ add_entry(controller);+ }// List dual joycon pairsfor (std::size_t i = 0; i < MaxSupportedControllers; i++) {diff --git a/src/input_common/drivers/joycon.h b/src/input_common/drivers/joycon.hindex 2149ab7fdc..473ba1b9e7 100644--- a/src/input_common/drivers/joycon.h+++ b/src/input_common/drivers/joycon.h@@ -106,6 +106,7 @@ private:// Joycon types are split by type to ease supporting dualjoycon configurationsstd::array<std::shared_ptr<Joycon::JoyconDriver>, MaxSupportedControllers> left_joycons{};std::array<std::shared_ptr<Joycon::JoyconDriver>, MaxSupportedControllers> right_joycons{};+ std::array<std::shared_ptr<Joycon::JoyconDriver>, MaxSupportedControllers> pro_controller{};};} // namespace InputCommondiff --git a/src/input_common/drivers/sdl_driver.cpp b/src/input_common/drivers/sdl_driver.cppindex d975eb8152..88cacd6156 100644--- a/src/input_common/drivers/sdl_driver.cpp+++ b/src/input_common/drivers/sdl_driver.cpp@@ -343,6 +343,14 @@ void SDLDriver::InitJoystick(int joystick_index) {}}+ if (Settings::values.enable_procon_driver) {+ if (guid.uuid[5] == 0x05 && guid.uuid[4] == 0x7e && guid.uuid[8] == 0x09) {+ LOG_WARNING(Input, "Preferring joycon driver for device index {}", joystick_index);+ SDL_JoystickClose(sdl_joystick);+ return;+ }+ }+std::scoped_lock lock{joystick_map_mutex};if (joystick_map.find(guid) == joystick_map.end()) {auto joystick = std::make_shared<SDLJoystick>(guid, 0, sdl_joystick, sdl_gamecontroller);@@ -465,13 +473,19 @@ SDLDriver::SDLDriver(std::string input_engine_) : InputEngine(std::move(input_enSDL_SetHint(SDL_HINT_JOYSTICK_HIDAPI_PS5_RUMBLE, "1");SDL_SetHint(SDL_HINT_JOYSTICK_ALLOW_BACKGROUND_EVENTS, "1");- // Disable hidapi drivers for switch controllers when the custom joycon driver is enabled+ // Disable hidapi drivers for joycon controllers when the custom joycon driver is enabledif (Settings::values.enable_joycon_driver) {SDL_SetHint(SDL_HINT_JOYSTICK_HIDAPI_JOY_CONS, "0");} else {SDL_SetHint(SDL_HINT_JOYSTICK_HIDAPI_JOY_CONS, "1");}- SDL_SetHint(SDL_HINT_JOYSTICK_HIDAPI_SWITCH, "1");++ // Disable hidapi drivers for pro controllers when the custom joycon driver is enabled+ if (Settings::values.enable_procon_driver) {+ SDL_SetHint(SDL_HINT_JOYSTICK_HIDAPI_SWITCH, "0");+ } else {+ SDL_SetHint(SDL_HINT_JOYSTICK_HIDAPI_SWITCH, "1");+ }// Disable hidapi driver for xbox. Already default on Windows, this causes conflict with native// driver on Linux.diff --git a/src/input_common/helpers/joycon_driver.cpp b/src/input_common/helpers/joycon_driver.cppindex 8f94c9f45d..e65b6b845b 100644--- a/src/input_common/helpers/joycon_driver.cpp+++ b/src/input_common/helpers/joycon_driver.cpp@@ -543,9 +543,10 @@ void JoyconDriver::SetCallbacks(const JoyconCallbacks& callbacks) {DriverResult JoyconDriver::GetDeviceType(SDL_hid_device_info* device_info,ControllerType& controller_type) {- static constexpr std::array<std::pair<u32, ControllerType>, 2> supported_devices{+ static constexpr std::array<std::pair<u32, ControllerType>, 6> supported_devices{std::pair<u32, ControllerType>{0x2006, ControllerType::Left},{0x2007, ControllerType::Right},+ {0x2009, ControllerType::Pro},};constexpr u16 nintendo_vendor_id = 0x057e;diff --git a/src/yuzu/configuration/config.cpp b/src/yuzu/configuration/config.cppindex 35fef506a5..31209fb2e5 100644--- a/src/yuzu/configuration/config.cpp+++ b/src/yuzu/configuration/config.cpp@@ -441,6 +441,7 @@ void Config::ReadControlValues() {Settings::values.mouse_panning = false;ReadBasicSetting(Settings::values.mouse_panning_sensitivity);ReadBasicSetting(Settings::values.enable_joycon_driver);+ ReadBasicSetting(Settings::values.enable_procon_driver);ReadBasicSetting(Settings::values.tas_enable);ReadBasicSetting(Settings::values.tas_loop);@@ -1141,6 +1142,7 @@ void Config::SaveControlValues() {WriteGlobalSetting(Settings::values.motion_enabled);WriteBasicSetting(Settings::values.enable_raw_input);WriteBasicSetting(Settings::values.enable_joycon_driver);+ WriteBasicSetting(Settings::values.enable_procon_driver);WriteBasicSetting(Settings::values.keyboard_enabled);WriteBasicSetting(Settings::values.emulate_analog_keyboard);WriteBasicSetting(Settings::values.mouse_panning_sensitivity);diff --git a/src/yuzu/configuration/configure_input_advanced.cpp b/src/yuzu/configuration/configure_input_advanced.cppindex 77b976e740..8d81322f3a 100644--- a/src/yuzu/configuration/configure_input_advanced.cpp+++ b/src/yuzu/configuration/configure_input_advanced.cpp@@ -139,6 +139,7 @@ void ConfigureInputAdvanced::ApplyConfiguration() {Settings::values.enable_ring_controller = ui->enable_ring_controller->isChecked();Settings::values.enable_ir_sensor = ui->enable_ir_sensor->isChecked();Settings::values.enable_joycon_driver = ui->enable_joycon_driver->isChecked();+ Settings::values.enable_procon_driver = ui->enable_procon_driver->isChecked();}void ConfigureInputAdvanced::LoadConfiguration() {@@ -174,6 +175,7 @@ void ConfigureInputAdvanced::LoadConfiguration() {ui->enable_ring_controller->setChecked(Settings::values.enable_ring_controller.GetValue());ui->enable_ir_sensor->setChecked(Settings::values.enable_ir_sensor.GetValue());ui->enable_joycon_driver->setChecked(Settings::values.enable_joycon_driver.GetValue());+ ui->enable_procon_driver->setChecked(Settings::values.enable_procon_driver.GetValue());UpdateUIEnabled();}diff --git a/src/yuzu/configuration/configure_input_advanced.ui b/src/yuzu/configuration/configure_input_advanced.uiindex 75d96d3ab5..0eb2b34bcc 100644--- a/src/yuzu/configuration/configure_input_advanced.ui+++ b/src/yuzu/configuration/configure_input_advanced.ui@@ -2712,6 +2712,22 @@</widget></item><item row="6" column="0">+ <widget class="QCheckBox" name="enable_procon_driver">+ <property name="toolTip">+ <string>Requires restarting yuzu</string>+ </property>+ <property name="minimumSize">+ <size>+ <width>0</width>+ <height>23</height>+ </size>+ </property>+ <property name="text">+ <string>Enable direct Pro Controller driver [EXPERIMENTAL]</string>+ </property>+ </widget>+ </item>+ <item row="7" column="0"><widget class="QCheckBox" name="mouse_panning"><property name="minimumSize"><size>@@ -2724,7 +2740,7 @@</property></widget></item>- <item row="6" column="2">+ <item row="7" column="2"><widget class="QSpinBox" name="mouse_panning_sensitivity"><property name="toolTip"><string>Mouse sensitivity</string>@@ -2746,14 +2762,14 @@</property></widget></item>- <item row="7" column="0">+ <item row="8" column="0"><widget class="QLabel" name="motion_touch"><property name="text"><string>Motion / Touch</string></property></widget></item>- <item row="7" column="2">+ <item row="8" column="2"><widget class="QPushButton" name="buttonMotionTouch"><property name="text"><string>Configure</string>diff --git a/src/yuzu_cmd/config.cpp b/src/yuzu_cmd/config.cppindex 9c34cdc6eb..3b6dce296b 100644--- a/src/yuzu_cmd/config.cpp+++ b/src/yuzu_cmd/config.cpp@@ -178,6 +178,7 @@ void Config::ReadValues() {ReadSetting("ControlsGeneral", Settings::values.enable_raw_input);ReadSetting("ControlsGeneral", Settings::values.enable_joycon_driver);+ ReadSetting("ControlsGeneral", Settings::values.enable_procon_driver);ReadSetting("ControlsGeneral", Settings::values.emulate_analog_keyboard);ReadSetting("ControlsGeneral", Settings::values.vibration_enabled);ReadSetting("ControlsGeneral", Settings::values.enable_accurate_vibrations);