diff options
Diffstat (limited to 'src/input_common/udp/client.h')
| -rw-r--r-- | src/input_common/udp/client.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/input_common/udp/client.h b/src/input_common/udp/client.h index 523dc6a7a..2491a03a2 100644 --- a/src/input_common/udp/client.h +++ b/src/input_common/udp/client.h | |||
| @@ -84,8 +84,8 @@ public: | |||
| 84 | 84 | ||
| 85 | bool DeviceConnected(std::size_t pad) const; | 85 | bool DeviceConnected(std::size_t pad) const; |
| 86 | void ReloadUDPClient(); | 86 | void ReloadUDPClient(); |
| 87 | void ReloadSocket(const std::string& host = "127.0.0.1", u16 port = 26760, u8 pad_index = 0, | 87 | void ReloadSocket(const std::string& host = "127.0.0.1", u16 port = 26760, |
| 88 | u32 client_id = 24872); | 88 | std::size_t pad_index = 0, u32 client_id = 24872); |
| 89 | 89 | ||
| 90 | std::array<Common::SPSCQueue<UDPPadStatus>, 4>& GetPadQueue(); | 90 | std::array<Common::SPSCQueue<UDPPadStatus>, 4>& GetPadQueue(); |
| 91 | const std::array<Common::SPSCQueue<UDPPadStatus>, 4>& GetPadQueue() const; | 91 | const std::array<Common::SPSCQueue<UDPPadStatus>, 4>& GetPadQueue() const; |
| @@ -99,7 +99,7 @@ private: | |||
| 99 | DeviceStatus status; | 99 | DeviceStatus status; |
| 100 | std::thread thread; | 100 | std::thread thread; |
| 101 | u64 packet_sequence = 0; | 101 | u64 packet_sequence = 0; |
| 102 | u8 active; | 102 | u8 active = 0; |
| 103 | 103 | ||
| 104 | // Realtime values | 104 | // Realtime values |
| 105 | // motion is initalized with PID values for drift correction on joycons | 105 | // motion is initalized with PID values for drift correction on joycons |
| @@ -113,8 +113,8 @@ private: | |||
| 113 | void OnVersion(Response::Version); | 113 | void OnVersion(Response::Version); |
| 114 | void OnPortInfo(Response::PortInfo); | 114 | void OnPortInfo(Response::PortInfo); |
| 115 | void OnPadData(Response::PadData); | 115 | void OnPadData(Response::PadData); |
| 116 | void StartCommunication(std::size_t client, const std::string& host, u16 port, u8 pad_index, | 116 | void StartCommunication(std::size_t client, const std::string& host, u16 port, |
| 117 | u32 client_id); | 117 | std::size_t pad_index, u32 client_id); |
| 118 | void UpdateYuzuSettings(std::size_t client, const Common::Vec3<float>& acc, | 118 | void UpdateYuzuSettings(std::size_t client, const Common::Vec3<float>& acc, |
| 119 | const Common::Vec3<float>& gyro, bool touch); | 119 | const Common::Vec3<float>& gyro, bool touch); |
| 120 | 120 | ||
| @@ -139,7 +139,7 @@ public: | |||
| 139 | * @param status_callback Callback for job status updates | 139 | * @param status_callback Callback for job status updates |
| 140 | * @param data_callback Called when calibration data is ready | 140 | * @param data_callback Called when calibration data is ready |
| 141 | */ | 141 | */ |
| 142 | explicit CalibrationConfigurationJob(const std::string& host, u16 port, u8 pad_index, | 142 | explicit CalibrationConfigurationJob(const std::string& host, u16 port, std::size_t pad_index, |
| 143 | u32 client_id, std::function<void(Status)> status_callback, | 143 | u32 client_id, std::function<void(Status)> status_callback, |
| 144 | std::function<void(u16, u16, u16, u16)> data_callback); | 144 | std::function<void(u16, u16, u16, u16)> data_callback); |
| 145 | ~CalibrationConfigurationJob(); | 145 | ~CalibrationConfigurationJob(); |
| @@ -149,7 +149,7 @@ private: | |||
| 149 | Common::Event complete_event; | 149 | Common::Event complete_event; |
| 150 | }; | 150 | }; |
| 151 | 151 | ||
| 152 | void TestCommunication(const std::string& host, u16 port, u8 pad_index, u32 client_id, | 152 | void TestCommunication(const std::string& host, u16 port, std::size_t pad_index, u32 client_id, |
| 153 | std::function<void()> success_callback, | 153 | std::function<void()> success_callback, |
| 154 | std::function<void()> failure_callback); | 154 | std::function<void()> failure_callback); |
| 155 | 155 | ||