diff options
| author | bunnei <bunneidev@gmail.com> | 2023-05-18 18:10:38 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-18 18:10:38 -0700 |
| commit | 1e398e6c36bf8839ca530497fee3772f51d62126 (patch) | |
| tree | 9bc394d7aaf886b65ee18ba18088e0f057ae8225 /src/input_common/drivers/joycon.cpp | |
| parent | 55d740fffa540ffae483a46b4a3b907b40fc3b15 (diff) | |
| parent | 5693434b8ad74a5c46155f1e60fa0d3f475aa153 (diff) | |
Merge pull request #10344 from german77/pro-amiibomainline-0-1439
input_common: Fix pro controller amiibo support
Diffstat (limited to 'src/input_common/drivers/joycon.cpp')
| -rw-r--r-- | src/input_common/drivers/joycon.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/input_common/drivers/joycon.cpp b/src/input_common/drivers/joycon.cpp index 8b57ebe07e..653862a727 100644 --- a/src/input_common/drivers/joycon.cpp +++ b/src/input_common/drivers/joycon.cpp @@ -195,8 +195,8 @@ void Joycons::RegisterNewDevice(SDL_hid_device_info* device_info) { OnMotionUpdate(port, type, id, value); }}, .on_ring_data = {[this](f32 ring_data) { OnRingConUpdate(ring_data); }}, - .on_amiibo_data = {[this, port](const std::vector<u8>& amiibo_data) { - OnAmiiboUpdate(port, amiibo_data); + .on_amiibo_data = {[this, port, type](const std::vector<u8>& amiibo_data) { + OnAmiiboUpdate(port, type, amiibo_data); }}, .on_camera_data = {[this, port](const std::vector<u8>& camera_data, Joycon::IrsResolution format) { @@ -398,8 +398,9 @@ void Joycons::OnRingConUpdate(f32 ring_data) { SetAxis(identifier, 100, ring_data); } -void Joycons::OnAmiiboUpdate(std::size_t port, const std::vector<u8>& amiibo_data) { - const auto identifier = GetIdentifier(port, Joycon::ControllerType::Right); +void Joycons::OnAmiiboUpdate(std::size_t port, Joycon::ControllerType type, + const std::vector<u8>& amiibo_data) { + const auto identifier = GetIdentifier(port, type); const auto nfc_state = amiibo_data.empty() ? Common::Input::NfcState::AmiiboRemoved : Common::Input::NfcState::NewAmiibo; SetNfc(identifier, {nfc_state, amiibo_data}); |