summaryrefslogtreecommitdiff
path: root/src/input_common/helpers/joycon_driver.h
diff options
context:
space:
mode:
authorGravatar Narr the Reg2022-12-20 19:10:42 -0600
committerGravatar Narr the Reg2023-01-19 18:05:21 -0600
commit751d36e7392b0b1637f17988cfc1ef0d7cd95753 (patch)
tree8ba772846be04719e41f82ef059ee81491a7c0e9 /src/input_common/helpers/joycon_driver.h
parentinput_common: Add support for joycon input reports (diff)
downloadyuzu-751d36e7392b0b1637f17988cfc1ef0d7cd95753.tar.gz
yuzu-751d36e7392b0b1637f17988cfc1ef0d7cd95753.tar.xz
yuzu-751d36e7392b0b1637f17988cfc1ef0d7cd95753.zip
input_common: Add support for joycon ring controller
Diffstat (limited to 'src/input_common/helpers/joycon_driver.h')
-rw-r--r--src/input_common/helpers/joycon_driver.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/input_common/helpers/joycon_driver.h b/src/input_common/helpers/joycon_driver.h
index 48ba859f4..dc5d60221 100644
--- a/src/input_common/helpers/joycon_driver.h
+++ b/src/input_common/helpers/joycon_driver.h
@@ -12,6 +12,7 @@
12#include "input_common/helpers/joycon_protocol/generic_functions.h" 12#include "input_common/helpers/joycon_protocol/generic_functions.h"
13#include "input_common/helpers/joycon_protocol/joycon_types.h" 13#include "input_common/helpers/joycon_protocol/joycon_types.h"
14#include "input_common/helpers/joycon_protocol/poller.h" 14#include "input_common/helpers/joycon_protocol/poller.h"
15#include "input_common/helpers/joycon_protocol/ringcon.h"
15#include "input_common/helpers/joycon_protocol/rumble.h" 16#include "input_common/helpers/joycon_protocol/rumble.h"
16 17
17namespace InputCommon::Joycon { 18namespace InputCommon::Joycon {
@@ -86,6 +87,7 @@ private:
86 std::unique_ptr<CalibrationProtocol> calibration_protocol = nullptr; 87 std::unique_ptr<CalibrationProtocol> calibration_protocol = nullptr;
87 std::unique_ptr<GenericProtocol> generic_protocol = nullptr; 88 std::unique_ptr<GenericProtocol> generic_protocol = nullptr;
88 std::unique_ptr<JoyconPoller> joycon_poller = nullptr; 89 std::unique_ptr<JoyconPoller> joycon_poller = nullptr;
90 std::unique_ptr<RingConProtocol> ring_protocol = nullptr;
89 std::unique_ptr<RumbleProtocol> rumble_protocol = nullptr; 91 std::unique_ptr<RumbleProtocol> rumble_protocol = nullptr;
90 92
91 // Connection status 93 // Connection status
@@ -118,6 +120,7 @@ private:
118 JoyStickCalibration left_stick_calibration{}; 120 JoyStickCalibration left_stick_calibration{};
119 JoyStickCalibration right_stick_calibration{}; 121 JoyStickCalibration right_stick_calibration{};
120 MotionCalibration motion_calibration{}; 122 MotionCalibration motion_calibration{};
123 RingCalibration ring_calibration{};
121 124
122 // Fixed joycon info 125 // Fixed joycon info
123 FirmwareVersion version{}; 126 FirmwareVersion version{};