early-access version 3380
This commit is contained in:
		| @@ -1,7 +1,7 @@ | ||||
| yuzu emulator early access | ||||
| ============= | ||||
|  | ||||
| This is the source code for early-access 3378. | ||||
| This is the source code for early-access 3380. | ||||
|  | ||||
| ## Legal Notice | ||||
|  | ||||
|   | ||||
| @@ -302,11 +302,21 @@ std::vector<std::string> ListCubebSinkDevices(bool capture) { | ||||
|     std::vector<std::string> device_list; | ||||
|     cubeb* ctx; | ||||
|  | ||||
| #ifdef _WIN32 | ||||
|     auto com_init_result = CoInitializeEx(nullptr, COINIT_MULTITHREADED); | ||||
| #endif | ||||
|  | ||||
|     if (cubeb_init(&ctx, "yuzu Device Enumerator", nullptr) != CUBEB_OK) { | ||||
|         LOG_CRITICAL(Audio_Sink, "cubeb_init failed"); | ||||
|         return {}; | ||||
|     } | ||||
|  | ||||
| #ifdef _WIN32 | ||||
|     if (SUCCEEDED(com_init_result)) { | ||||
|         CoUninitialize(); | ||||
|     } | ||||
| #endif | ||||
|  | ||||
|     auto type{capture ? CUBEB_DEVICE_TYPE_INPUT : CUBEB_DEVICE_TYPE_OUTPUT}; | ||||
|     cubeb_device_collection collection; | ||||
|     if (cubeb_enumerate_devices(ctx, type, &collection) != CUBEB_OK) { | ||||
| @@ -329,12 +339,22 @@ std::vector<std::string> ListCubebSinkDevices(bool capture) { | ||||
| u32 GetCubebLatency() { | ||||
|     cubeb* ctx; | ||||
|  | ||||
| #ifdef _WIN32 | ||||
|     auto com_init_result = CoInitializeEx(nullptr, COINIT_MULTITHREADED); | ||||
| #endif | ||||
|  | ||||
|     if (cubeb_init(&ctx, "yuzu Latency Getter", nullptr) != CUBEB_OK) { | ||||
|         LOG_CRITICAL(Audio_Sink, "cubeb_init failed"); | ||||
|         // Return a large latency so we choose SDL instead. | ||||
|         return 10000u; | ||||
|     } | ||||
|  | ||||
| #ifdef _WIN32 | ||||
|     if (SUCCEEDED(com_init_result)) { | ||||
|         CoUninitialize(); | ||||
|     } | ||||
| #endif | ||||
|  | ||||
|     cubeb_stream_params params{}; | ||||
|     params.rate = TargetSampleRate; | ||||
|     params.channels = 2; | ||||
|   | ||||
| @@ -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"}; | ||||
|   | ||||
| @@ -957,7 +957,7 @@ void EmulatedController::SetMotion(const Common::Input::CallbackStatus& callback | ||||
|         raw_status.gyro.y.value, | ||||
|         raw_status.gyro.z.value, | ||||
|     }); | ||||
|     emulated.SetGyroThreshold(raw_status.gyro.x.properties.threshold); | ||||
|     emulated.SetUserGyroThreshold(raw_status.gyro.x.properties.threshold); | ||||
|     emulated.UpdateRotation(raw_status.delta_timestamp); | ||||
|     emulated.UpdateOrientation(raw_status.delta_timestamp); | ||||
|     force_update_motion = raw_status.force_update; | ||||
| @@ -1284,6 +1284,26 @@ void EmulatedController::SetLedPattern() { | ||||
|     } | ||||
| } | ||||
|  | ||||
| void EmulatedController::SetGyroscopeZeroDriftMode(GyroscopeZeroDriftMode mode) { | ||||
|     for (auto& motion : controller.motion_values) { | ||||
|         switch (mode) { | ||||
|         case GyroscopeZeroDriftMode::Loose: | ||||
|             motion_sensitivity = motion.emulated.IsAtRestLoose; | ||||
|             motion.emulated.SetGyroThreshold(motion.emulated.ThresholdLoose); | ||||
|             break; | ||||
|         case GyroscopeZeroDriftMode::Tight: | ||||
|             motion_sensitivity = motion.emulated.IsAtRestThight; | ||||
|             motion.emulated.SetGyroThreshold(motion.emulated.ThresholdThight); | ||||
|             break; | ||||
|         case GyroscopeZeroDriftMode::Standard: | ||||
|         default: | ||||
|             motion_sensitivity = motion.emulated.IsAtRestStandard; | ||||
|             motion.emulated.SetGyroThreshold(motion.emulated.ThresholdStandard); | ||||
|             break; | ||||
|         } | ||||
|     } | ||||
| } | ||||
|  | ||||
| void EmulatedController::SetSupportedNpadStyleTag(NpadStyleTag supported_styles) { | ||||
|     supported_style_tag = supported_styles; | ||||
|     if (!is_connected) { | ||||
|   | ||||
| @@ -398,6 +398,9 @@ public: | ||||
|     /// Asks the output device to change the player led pattern | ||||
|     void SetLedPattern(); | ||||
|  | ||||
|     /// Changes sensitivity of the motion sensor | ||||
|     void SetGyroscopeZeroDriftMode(GyroscopeZeroDriftMode mode); | ||||
|  | ||||
|     /** | ||||
|      * Adds a callback to the list of events | ||||
|      * @param update_callback A ConsoleUpdateCallback that will be triggered | ||||
| @@ -523,7 +526,7 @@ private: | ||||
|     bool is_connected{false}; | ||||
|     bool is_configuring{false}; | ||||
|     bool system_buttons_enabled{true}; | ||||
|     f32 motion_sensitivity{0.01f}; | ||||
|     f32 motion_sensitivity{Core::HID::MotionInput::IsAtRestStandard}; | ||||
|     bool force_update_motion{false}; | ||||
|     u32 turbo_button_state{0}; | ||||
|  | ||||
|   | ||||
| @@ -282,6 +282,13 @@ enum class VibrationGcErmCommand : u64 { | ||||
|     StopHard = 2, | ||||
| }; | ||||
|  | ||||
| // This is nn::hid::GyroscopeZeroDriftMode | ||||
| enum class GyroscopeZeroDriftMode : u32 { | ||||
|     Loose = 0, | ||||
|     Standard = 1, | ||||
|     Tight = 2, | ||||
| }; | ||||
|  | ||||
| // This is nn::hid::NpadStyleTag | ||||
| struct NpadStyleTag { | ||||
|     union { | ||||
|   | ||||
| @@ -9,7 +9,7 @@ namespace Core::HID { | ||||
| MotionInput::MotionInput() { | ||||
|     // Initialize PID constants with default values | ||||
|     SetPID(0.3f, 0.005f, 0.0f); | ||||
|     SetGyroThreshold(0.007f); | ||||
|     SetGyroThreshold(ThresholdStandard); | ||||
| } | ||||
|  | ||||
| void MotionInput::SetPID(f32 new_kp, f32 new_ki, f32 new_kd) { | ||||
| @@ -26,11 +26,11 @@ void MotionInput::SetGyroscope(const Common::Vec3f& gyroscope) { | ||||
|     gyro = gyroscope - gyro_bias; | ||||
|  | ||||
|     // Auto adjust drift to minimize drift | ||||
|     if (!IsMoving(0.1f)) { | ||||
|     if (!IsMoving(IsAtRestRelaxed)) { | ||||
|         gyro_bias = (gyro_bias * 0.9999f) + (gyroscope * 0.0001f); | ||||
|     } | ||||
|  | ||||
|     if (gyro.Length() < gyro_threshold) { | ||||
|     if (gyro.Length() < gyro_threshold * user_gyro_threshold) { | ||||
|         gyro = {}; | ||||
|     } else { | ||||
|         only_accelerometer = false; | ||||
| @@ -49,6 +49,10 @@ void MotionInput::SetGyroThreshold(f32 threshold) { | ||||
|     gyro_threshold = threshold; | ||||
| } | ||||
|  | ||||
| void MotionInput::SetUserGyroThreshold(f32 threshold) { | ||||
|     user_gyro_threshold = threshold / ThresholdStandard; | ||||
| } | ||||
|  | ||||
| void MotionInput::EnableReset(bool reset) { | ||||
|     reset_enabled = reset; | ||||
| } | ||||
| @@ -208,7 +212,7 @@ void MotionInput::ResetOrientation() { | ||||
|     if (!reset_enabled || only_accelerometer) { | ||||
|         return; | ||||
|     } | ||||
|     if (!IsMoving(0.5f) && accel.z <= -0.9f) { | ||||
|     if (!IsMoving(IsAtRestRelaxed) && accel.z <= -0.9f) { | ||||
|         ++reset_counter; | ||||
|         if (reset_counter > 900) { | ||||
|             quat.w = 0; | ||||
|   | ||||
| @@ -11,6 +11,15 @@ namespace Core::HID { | ||||
|  | ||||
| class MotionInput { | ||||
| public: | ||||
|     static constexpr float ThresholdLoose = 0.01f; | ||||
|     static constexpr float ThresholdStandard = 0.007f; | ||||
|     static constexpr float ThresholdThight = 0.002f; | ||||
|  | ||||
|     static constexpr float IsAtRestRelaxed = 0.05f; | ||||
|     static constexpr float IsAtRestLoose = 0.02f; | ||||
|     static constexpr float IsAtRestStandard = 0.01f; | ||||
|     static constexpr float IsAtRestThight = 0.005f; | ||||
|  | ||||
|     explicit MotionInput(); | ||||
|  | ||||
|     MotionInput(const MotionInput&) = default; | ||||
| @@ -26,6 +35,9 @@ public: | ||||
|     void SetGyroBias(const Common::Vec3f& bias); | ||||
|     void SetGyroThreshold(f32 threshold); | ||||
|  | ||||
|     /// Applies a modifier on top of the normal gyro threshold | ||||
|     void SetUserGyroThreshold(f32 threshold); | ||||
|  | ||||
|     void EnableReset(bool reset); | ||||
|     void ResetRotations(); | ||||
|  | ||||
| @@ -74,6 +86,9 @@ private: | ||||
|     // Minimum gyro amplitude to detect if the device is moving | ||||
|     f32 gyro_threshold = 0.0f; | ||||
|  | ||||
|     // Multiplies gyro_threshold by this value | ||||
|     f32 user_gyro_threshold = 0.0f; | ||||
|  | ||||
|     // Number of invalid sequential data | ||||
|     u32 reset_counter = 0; | ||||
|  | ||||
|   | ||||
| @@ -35,11 +35,11 @@ constexpr inline u32 EncodeKernelVersion(u32 major, u32 minor) { | ||||
| } | ||||
|  | ||||
| constexpr inline u32 GetKernelMajorVersion(u32 encoded) { | ||||
|     return std::bit_cast<decltype(KernelVersion::major_version)>(encoded).Value(); | ||||
|     return decltype(KernelVersion::major_version)::ExtractValue(encoded); | ||||
| } | ||||
|  | ||||
| constexpr inline u32 GetKernelMinorVersion(u32 encoded) { | ||||
|     return std::bit_cast<decltype(KernelVersion::minor_version)>(encoded).Value(); | ||||
|     return decltype(KernelVersion::minor_version)::ExtractValue(encoded); | ||||
| } | ||||
|  | ||||
| // Nintendo doesn't support programs targeting SVC versions < 3.0. | ||||
|   | ||||
| @@ -1132,7 +1132,8 @@ Result Controller_NPad::DisconnectNpad(Core::HID::NpadIdType npad_id) { | ||||
|     return ResultSuccess; | ||||
| } | ||||
| Result Controller_NPad::SetGyroscopeZeroDriftMode( | ||||
|     const Core::HID::SixAxisSensorHandle& sixaxis_handle, GyroscopeZeroDriftMode drift_mode) { | ||||
|     const Core::HID::SixAxisSensorHandle& sixaxis_handle, | ||||
|     Core::HID::GyroscopeZeroDriftMode drift_mode) { | ||||
|     const auto is_valid = VerifyValidSixAxisSensorHandle(sixaxis_handle); | ||||
|     if (is_valid.IsError()) { | ||||
|         LOG_ERROR(Service_HID, "Invalid handle, error_code={}", is_valid.raw); | ||||
| @@ -1140,14 +1141,16 @@ Result Controller_NPad::SetGyroscopeZeroDriftMode( | ||||
|     } | ||||
|  | ||||
|     auto& sixaxis = GetSixaxisState(sixaxis_handle); | ||||
|     auto& controller = GetControllerFromHandle(sixaxis_handle); | ||||
|     sixaxis.gyroscope_zero_drift_mode = drift_mode; | ||||
|     controller.device->SetGyroscopeZeroDriftMode(drift_mode); | ||||
|  | ||||
|     return ResultSuccess; | ||||
| } | ||||
|  | ||||
| Result Controller_NPad::GetGyroscopeZeroDriftMode( | ||||
|     const Core::HID::SixAxisSensorHandle& sixaxis_handle, | ||||
|     GyroscopeZeroDriftMode& drift_mode) const { | ||||
|     Core::HID::GyroscopeZeroDriftMode& drift_mode) const { | ||||
|     const auto is_valid = VerifyValidSixAxisSensorHandle(sixaxis_handle); | ||||
|     if (is_valid.IsError()) { | ||||
|         LOG_ERROR(Service_HID, "Invalid handle, error_code={}", is_valid.raw); | ||||
|   | ||||
| @@ -52,13 +52,6 @@ public: | ||||
|     // When the controller is requesting a motion update for the shared memory | ||||
|     void OnMotionUpdate(const Core::Timing::CoreTiming& core_timing) override; | ||||
|  | ||||
|     // This is nn::hid::GyroscopeZeroDriftMode | ||||
|     enum class GyroscopeZeroDriftMode : u32 { | ||||
|         Loose = 0, | ||||
|         Standard = 1, | ||||
|         Tight = 2, | ||||
|     }; | ||||
|  | ||||
|     // This is nn::hid::NpadJoyHoldType | ||||
|     enum class NpadJoyHoldType : u64 { | ||||
|         Vertical = 0, | ||||
| @@ -146,9 +139,9 @@ public: | ||||
|     Result DisconnectNpad(Core::HID::NpadIdType npad_id); | ||||
|  | ||||
|     Result SetGyroscopeZeroDriftMode(const Core::HID::SixAxisSensorHandle& sixaxis_handle, | ||||
|                                      GyroscopeZeroDriftMode drift_mode); | ||||
|                                      Core::HID::GyroscopeZeroDriftMode drift_mode); | ||||
|     Result GetGyroscopeZeroDriftMode(const Core::HID::SixAxisSensorHandle& sixaxis_handle, | ||||
|                                      GyroscopeZeroDriftMode& drift_mode) const; | ||||
|                                      Core::HID::GyroscopeZeroDriftMode& drift_mode) const; | ||||
|     Result IsSixAxisSensorAtRest(const Core::HID::SixAxisSensorHandle& sixaxis_handle, | ||||
|                                  bool& is_at_rest) const; | ||||
|     Result IsFirmwareUpdateAvailableForSixAxisSensor( | ||||
| @@ -489,7 +482,8 @@ private: | ||||
|         Core::HID::SixAxisSensorFusionParameters fusion{}; | ||||
|         Core::HID::SixAxisSensorCalibrationParameter calibration{}; | ||||
|         Core::HID::SixAxisSensorIcInformation ic_information{}; | ||||
|         GyroscopeZeroDriftMode gyroscope_zero_drift_mode{GyroscopeZeroDriftMode::Standard}; | ||||
|         Core::HID::GyroscopeZeroDriftMode gyroscope_zero_drift_mode{ | ||||
|             Core::HID::GyroscopeZeroDriftMode::Standard}; | ||||
|     }; | ||||
|  | ||||
|     struct NpadControllerData { | ||||
|   | ||||
| @@ -712,7 +712,7 @@ void Hid::ResetSixAxisSensorFusionParameters(Kernel::HLERequestContext& ctx) { | ||||
| void Hid::SetGyroscopeZeroDriftMode(Kernel::HLERequestContext& ctx) { | ||||
|     IPC::RequestParser rp{ctx}; | ||||
|     const auto sixaxis_handle{rp.PopRaw<Core::HID::SixAxisSensorHandle>()}; | ||||
|     const auto drift_mode{rp.PopEnum<Controller_NPad::GyroscopeZeroDriftMode>()}; | ||||
|     const auto drift_mode{rp.PopEnum<Core::HID::GyroscopeZeroDriftMode>()}; | ||||
|     const auto applet_resource_user_id{rp.Pop<u64>()}; | ||||
|  | ||||
|     auto& controller = GetAppletResource()->GetController<Controller_NPad>(HidController::NPad); | ||||
| @@ -739,7 +739,7 @@ void Hid::GetGyroscopeZeroDriftMode(Kernel::HLERequestContext& ctx) { | ||||
|  | ||||
|     const auto parameters{rp.PopRaw<Parameters>()}; | ||||
|  | ||||
|     auto drift_mode{Controller_NPad::GyroscopeZeroDriftMode::Standard}; | ||||
|     auto drift_mode{Core::HID::GyroscopeZeroDriftMode::Standard}; | ||||
|     auto& controller = GetAppletResource()->GetController<Controller_NPad>(HidController::NPad); | ||||
|     const auto result = controller.GetGyroscopeZeroDriftMode(parameters.sixaxis_handle, drift_mode); | ||||
|  | ||||
| @@ -764,7 +764,7 @@ void Hid::ResetGyroscopeZeroDriftMode(Kernel::HLERequestContext& ctx) { | ||||
|  | ||||
|     const auto parameters{rp.PopRaw<Parameters>()}; | ||||
|  | ||||
|     const auto drift_mode{Controller_NPad::GyroscopeZeroDriftMode::Standard}; | ||||
|     const auto drift_mode{Core::HID::GyroscopeZeroDriftMode::Standard}; | ||||
|     auto& controller = GetAppletResource()->GetController<Controller_NPad>(HidController::NPad); | ||||
|     const auto result = controller.SetGyroscopeZeroDriftMode(parameters.sixaxis_handle, drift_mode); | ||||
|  | ||||
|   | ||||
| @@ -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 exist | ||||
|     switch (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 pairs | ||||
|     for (std::size_t i = 0; i < MaxSupportedControllers; i++) { | ||||
|   | ||||
| @@ -106,6 +106,7 @@ private: | ||||
|     // Joycon types are split by type to ease supporting dualjoycon configurations | ||||
|     std::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 InputCommon | ||||
|   | ||||
| @@ -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_en | ||||
|     SDL_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 enabled | ||||
|     if (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. | ||||
|   | ||||
| @@ -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; | ||||
|  | ||||
|   | ||||
| @@ -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); | ||||
|   | ||||
| @@ -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(); | ||||
| } | ||||
|   | ||||
| @@ -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> | ||||
|   | ||||
| @@ -805,6 +805,8 @@ void GMainWindow::WebBrowserOpenWebPage(const std::string& main_url, | ||||
|                                 layout.screen.GetHeight() / scale_ratio); | ||||
|         web_browser_view.move(layout.screen.left / scale_ratio, | ||||
|                               (layout.screen.top / scale_ratio) + menuBar()->height()); | ||||
|         web_browser_view.setZoomFactor(static_cast<qreal>(layout.screen.GetWidth() / scale_ratio) / | ||||
|                                        static_cast<qreal>(Layout::ScreenUndocked::Width)); | ||||
|  | ||||
|         web_browser_view.setFocus(); | ||||
|         web_browser_view.show(); | ||||
|   | ||||
| @@ -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); | ||||
|   | ||||
		Reference in New Issue
	
	Block a user