diff options
Diffstat (limited to 'src/input_common/helpers')
| -rw-r--r-- | src/input_common/helpers/joycon_driver.cpp | 2 | ||||
| -rw-r--r-- | src/input_common/helpers/joycon_protocol/ringcon.cpp | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/src/input_common/helpers/joycon_driver.cpp b/src/input_common/helpers/joycon_driver.cpp index c3debffd1..db9ff4875 100644 --- a/src/input_common/helpers/joycon_driver.cpp +++ b/src/input_common/helpers/joycon_driver.cpp | |||
| @@ -396,7 +396,7 @@ DriverResult JoyconDriver::SetActiveMode() { | |||
| 396 | 396 | ||
| 397 | DriverResult JoyconDriver::SetNfcMode() { | 397 | DriverResult JoyconDriver::SetNfcMode() { |
| 398 | std::scoped_lock lock{mutex}; | 398 | std::scoped_lock lock{mutex}; |
| 399 | motion_enabled = false; | 399 | motion_enabled = true; |
| 400 | hidbus_enabled = false; | 400 | hidbus_enabled = false; |
| 401 | nfc_enabled = true; | 401 | nfc_enabled = true; |
| 402 | passive_enabled = false; | 402 | passive_enabled = false; |
diff --git a/src/input_common/helpers/joycon_protocol/ringcon.cpp b/src/input_common/helpers/joycon_protocol/ringcon.cpp index 2d137b85d..47769f344 100644 --- a/src/input_common/helpers/joycon_protocol/ringcon.cpp +++ b/src/input_common/helpers/joycon_protocol/ringcon.cpp | |||
| @@ -56,9 +56,6 @@ DriverResult RingConProtocol::StartRingconPolling() { | |||
| 56 | SetBlocking(); | 56 | SetBlocking(); |
| 57 | 57 | ||
| 58 | if (result == DriverResult::Success) { | 58 | if (result == DriverResult::Success) { |
| 59 | result = WaitSetMCUMode(ReportMode::STANDARD_FULL_60HZ, MCUMode::Standby); | ||
| 60 | } | ||
| 61 | if (result == DriverResult::Success) { | ||
| 62 | result = IsRingConnected(is_connected); | 59 | result = IsRingConnected(is_connected); |
| 63 | } | 60 | } |
| 64 | if (result == DriverResult::Success && is_connected) { | 61 | if (result == DriverResult::Success && is_connected) { |