mirrors/suyu
1
0
Fork 0
mirror of https://git.suyu.dev/suyu/suyu.git synced 2024-11-15 22:54:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #11852 from german77/async_brr

Browse source 
input_common: joycon: Move vibrations to a queue
This commit is contained in:
liamwhite 2023-10-29 11:25:02 -04:00 committed by GitHub
commit 40c97c0549
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/input_common/helpers/joycon_driver.cpp
View file

@ -139,7 +139,7 @@ void JoyconDriver::InputThread(std::stop_token stop_token) {
input_thread_running = true; input_thread_running = true;
// Max update rate is 5ms, ensure we are always able to read a bit faster // Max update rate is 5ms, ensure we are always able to read a bit faster
constexpr int ThreadDelay = 2; constexpr int ThreadDelay = 3;
std::vector<u8> buffer(MaxBufferSize); std::vector<u8> buffer(MaxBufferSize);
while (!stop_token.stop_requested()) { while (!stop_token.stop_requested()) {
@ -163,6 +163,17 @@ void JoyconDriver::InputThread(std::stop_token stop_token) {
OnNewData(buffer); OnNewData(buffer);
} }
if (!vibration_queue.Empty()) {
VibrationValue vibration_value;
vibration_queue.Pop(vibration_value);
last_vibration_result = rumble_protocol->SendVibration(vibration_value);
}
// We can't keep up with vibrations. Start skipping.
while (vibration_queue.Size() > 6) {
vibration_queue.Pop();
}
std::this_thread::yield(); std::this_thread::yield();
} }
@ -402,7 +413,8 @@ Common::Input::DriverResult JoyconDriver::SetVibration(const VibrationValue& vib
if (disable_input_thread) { if (disable_input_thread) {
return Common::Input::DriverResult::HandleInUse; return Common::Input::DriverResult::HandleInUse;
} }
return rumble_protocol->SendVibration(vibration); vibration_queue.Push(vibration);
return last_vibration_result;
} }
Common::Input::DriverResult JoyconDriver::SetLedConfig(u8 led_pattern) { Common::Input::DriverResult JoyconDriver::SetLedConfig(u8 led_pattern) {

5
src/input_common/helpers/joycon_driver.h
View file

@ -9,6 +9,7 @@
#include <span> #include <span>
#include <thread> #include <thread>
#include "common/threadsafe_queue.h"
#include "input_common/helpers/joycon_protocol/joycon_types.h" #include "input_common/helpers/joycon_protocol/joycon_types.h"
namespace Common::Input { namespace Common::Input {
@ -152,6 +153,10 @@ private:
SerialNumber handle_serial_number{}; // Serial number type reported by hidapi SerialNumber handle_serial_number{}; // Serial number type reported by hidapi
SupportedFeatures supported_features{}; SupportedFeatures supported_features{};
/// Queue of vibration request to controllers
Common::Input::DriverResult last_vibration_result{Common::Input::DriverResult::Success};
Common::SPSCQueue<VibrationValue> vibration_queue;
// Thread related // Thread related
mutable std::mutex mutex; mutable std::mutex mutex;
std::jthread input_thread; std::jthread input_thread;