summaryrefslogtreecommitdiffstats
path: root/src/input_common
diff options
context:
space:
mode:
authorNarr the Reg <juangerman-13@hotmail.com>2022-12-23 03:47:51 +0100
committerNarr the Reg <juangerman-13@hotmail.com>2023-01-20 01:05:22 +0100
commit1c08d532e059fab603facb43f758f37fe148c1fc (patch)
tree7451b6e38166cb3c422b22678ae0b989cd447de3 /src/input_common
parentinput_common: Implement joycon nfc (diff)
downloadyuzu-1c08d532e059fab603facb43f758f37fe148c1fc.tar
yuzu-1c08d532e059fab603facb43f758f37fe148c1fc.tar.gz
yuzu-1c08d532e059fab603facb43f758f37fe148c1fc.tar.bz2
yuzu-1c08d532e059fab603facb43f758f37fe148c1fc.tar.lz
yuzu-1c08d532e059fab603facb43f758f37fe148c1fc.tar.xz
yuzu-1c08d532e059fab603facb43f758f37fe148c1fc.tar.zst
yuzu-1c08d532e059fab603facb43f758f37fe148c1fc.zip
Diffstat (limited to 'src/input_common')
-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 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() {
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 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() {
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) {