diff options
| author | 2023-05-18 18:10:38 -0700 | |
|---|---|---|
| committer | 2023-05-18 18:10:38 -0700 | |
| commit | 1e398e6c36bf8839ca530497fee3772f51d62126 (patch) | |
| tree | 9bc394d7aaf886b65ee18ba18088e0f057ae8225 /src/input_common/drivers/joycon.h | |
| parent | externals: update cubeb (#10362) (diff) | |
| parent | input_common: Fix pro controller amiibo support (diff) | |
| download | yuzu-1e398e6c36bf8839ca530497fee3772f51d62126.tar.gz yuzu-1e398e6c36bf8839ca530497fee3772f51d62126.tar.xz yuzu-1e398e6c36bf8839ca530497fee3772f51d62126.zip | |
Merge pull request #10344 from german77/pro-amiibo
input_common: Fix pro controller amiibo support
Diffstat (limited to '')
| -rw-r--r-- | src/input_common/drivers/joycon.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/input_common/drivers/joycon.h b/src/input_common/drivers/joycon.h index 5b40817e2..e3f0ad78f 100644 --- a/src/input_common/drivers/joycon.h +++ b/src/input_common/drivers/joycon.h | |||
| @@ -81,7 +81,8 @@ private: | |||
| 81 | void OnMotionUpdate(std::size_t port, Joycon::ControllerType type, int id, | 81 | void OnMotionUpdate(std::size_t port, Joycon::ControllerType type, int id, |
| 82 | const Joycon::MotionData& value); | 82 | const Joycon::MotionData& value); |
| 83 | void OnRingConUpdate(f32 ring_data); | 83 | void OnRingConUpdate(f32 ring_data); |
| 84 | void OnAmiiboUpdate(std::size_t port, const std::vector<u8>& amiibo_data); | 84 | void OnAmiiboUpdate(std::size_t port, Joycon::ControllerType type, |
| 85 | const std::vector<u8>& amiibo_data); | ||
| 85 | void OnCameraUpdate(std::size_t port, const std::vector<u8>& camera_data, | 86 | void OnCameraUpdate(std::size_t port, const std::vector<u8>& camera_data, |
| 86 | Joycon::IrsResolution format); | 87 | Joycon::IrsResolution format); |
| 87 | 88 | ||