diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/input_common/helpers/joycon_protocol/common_protocol.cpp | 2 | ||||
| -rw-r--r-- | src/input_common/helpers/joycon_protocol/ringcon.cpp | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/input_common/helpers/joycon_protocol/common_protocol.cpp b/src/input_common/helpers/joycon_protocol/common_protocol.cpp index e10d15c18..a6eecf980 100644 --- a/src/input_common/helpers/joycon_protocol/common_protocol.cpp +++ b/src/input_common/helpers/joycon_protocol/common_protocol.cpp | |||
| @@ -75,7 +75,7 @@ Common::Input::DriverResult JoyconCommonProtocol::SendRawData(std::span<const u8 | |||
| 75 | Common::Input::DriverResult JoyconCommonProtocol::GetSubCommandResponse( | 75 | Common::Input::DriverResult JoyconCommonProtocol::GetSubCommandResponse( |
| 76 | SubCommand sc, SubCommandResponse& output) { | 76 | SubCommand sc, SubCommandResponse& output) { |
| 77 | constexpr int timeout_mili = 66; | 77 | constexpr int timeout_mili = 66; |
| 78 | constexpr int MaxTries = 3; | 78 | constexpr int MaxTries = 10; |
| 79 | int tries = 0; | 79 | int tries = 0; |
| 80 | 80 | ||
| 81 | do { | 81 | do { |
diff --git a/src/input_common/helpers/joycon_protocol/ringcon.cpp b/src/input_common/helpers/joycon_protocol/ringcon.cpp index f31ff6b34..96414fb67 100644 --- a/src/input_common/helpers/joycon_protocol/ringcon.cpp +++ b/src/input_common/helpers/joycon_protocol/ringcon.cpp | |||
| @@ -70,7 +70,7 @@ Common::Input::DriverResult RingConProtocol::StartRingconPolling() { | |||
| 70 | 70 | ||
| 71 | Common::Input::DriverResult RingConProtocol::IsRingConnected(bool& is_connected) { | 71 | Common::Input::DriverResult RingConProtocol::IsRingConnected(bool& is_connected) { |
| 72 | LOG_DEBUG(Input, "IsRingConnected"); | 72 | LOG_DEBUG(Input, "IsRingConnected"); |
| 73 | constexpr std::size_t max_tries = 28; | 73 | constexpr std::size_t max_tries = 42; |
| 74 | SubCommandResponse output{}; | 74 | SubCommandResponse output{}; |
| 75 | std::size_t tries = 0; | 75 | std::size_t tries = 0; |
| 76 | is_connected = false; | 76 | is_connected = false; |
| @@ -78,7 +78,8 @@ Common::Input::DriverResult RingConProtocol::IsRingConnected(bool& is_connected) | |||
| 78 | do { | 78 | do { |
| 79 | const auto result = SendSubCommand(SubCommand::GET_EXTERNAL_DEVICE_INFO, {}, output); | 79 | const auto result = SendSubCommand(SubCommand::GET_EXTERNAL_DEVICE_INFO, {}, output); |
| 80 | 80 | ||
| 81 | if (result != Common::Input::DriverResult::Success) { | 81 | if (result != Common::Input::DriverResult::Success && |
| 82 | result != Common::Input::DriverResult::Timeout) { | ||
| 82 | return result; | 83 | return result; |
| 83 | } | 84 | } |
| 84 | 85 | ||