summaryrefslogtreecommitdiff
path: root/src/input_common/helpers/joycon_protocol/poller.h
diff options
context:
space:
mode:
authorcomex <comexk@gmail.com>2023-07-01 15:01:11 -0700
committercomex <comexk@gmail.com>2023-07-01 15:01:11 -0700
commit98685d48e3cb9f25f6919f004ec62cadf33afad2 (patch)
tree9df2ce7f57370641589bfae7196c77b090bcbe0f /src/input_common/helpers/joycon_protocol/poller.h
parentd885dd5b642807d0587acad43668cfccfdf06d1e (diff)
parent8857911216f16a098231c25e0d2992ab67e33f83 (diff)
Merge remote-tracking branch 'origin/master' into ssl
Diffstat (limited to 'src/input_common/helpers/joycon_protocol/poller.h')
-rw-r--r--src/input_common/helpers/joycon_protocol/poller.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/input_common/helpers/joycon_protocol/poller.h b/src/input_common/helpers/joycon_protocol/poller.h
index 0fa72c6db..3746abe5d 100644
--- a/src/input_common/helpers/joycon_protocol/poller.h
+++ b/src/input_common/helpers/joycon_protocol/poller.h
@@ -36,8 +36,8 @@ public:
void UpdateColor(const Color& color);
void UpdateRing(s16 value, const RingStatus& ring_status);
- void UpdateAmiibo(const std::vector<u8>& amiibo_data);
- void UpdateCamera(const std::vector<u8>& amiibo_data, IrsResolution format);
+ void UpdateAmiibo(const Joycon::TagInfo& tag_info);
+ void UpdateCamera(const std::vector<u8>& camera_data, IrsResolution format);
private:
void UpdateActiveLeftPadInput(const InputReportActive& input,