aboutsummaryrefslogtreecommitdiff
path: root/src/input_common/helpers
diff options
context:
space:
mode:
authorNarr the Reg <juangerman-13@hotmail.com>2022-12-22 20:47:51 -0600
committerNarr the Reg <juangerman-13@hotmail.com>2023-01-19 18:05:22 -0600
commit8dbef30cb7feab5073a6bf5037fcdce933555983 (patch)
tree7451b6e38166cb3c422b22678ae0b989cd447de3 /src/input_common/helpers
parentb40c5ba2c389ba282102c5ba293be938740bc7c6 (diff)
core: hid: Fix input regressions
Diffstat (limited to 'src/input_common/helpers')
-rw-r--r--src/input_common/helpers/joycon_driver.cpp2
-rw-r--r--src/input_common/helpers/joycon_protocol/ringcon.cpp3
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 c3debffd11..db9ff4875e 100644
--- a/src/input_common/helpers/joycon_driver.cpp
+++ b/src/input_common/helpers/joycon_driver.cpp
@@ -396,7 +396,7 @@ DriverResult JoyconDriver::SetActiveMode() {
DriverResult JoyconDriver::SetNfcMode() {
std::scoped_lock lock{mutex};
- motion_enabled = false;
+ motion_enabled = true;
hidbus_enabled = false;
nfc_enabled = true;
passive_enabled = false;
diff --git a/src/input_common/helpers/joycon_protocol/ringcon.cpp b/src/input_common/helpers/joycon_protocol/ringcon.cpp
index 2d137b85d3..47769f3441 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() {
SetBlocking();
if (result == DriverResult::Success) {
- result = WaitSetMCUMode(ReportMode::STANDARD_FULL_60HZ, MCUMode::Standby);
- }
- if (result == DriverResult::Success) {
result = IsRingConnected(is_connected);
}
if (result == DriverResult::Success && is_connected) {