mirrors/logiops
1
0
Fork 0
mirror of https://github.com/PixlOne/logiops.git synced 2025-07-13 21:02:43 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #414 from wprzytula/fix-uint8_t-cid

Browse Source 
fix bug: represent cid as `uint16_t`, not `uint8_t`
This commit is contained in:
pixl 2024-05-27 19:55:13 -07:00 committed by GitHub
commit 237fa5fbd3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/logid/backend/hidpp20/features/ReprogControls.cpp
View File

@ -129,7 +129,7 @@ ReprogControls::ControlInfo ReprogControls::getControlIdInfo(uint16_t cid) {
return report; return report;
} }
void ReprogControls::setControlReporting(uint8_t cid, ControlInfo info) { void ReprogControls::setControlReporting(uint16_t cid, ControlInfo info) {
// This function does not exist pre-v4 and cannot be emulated, ignore. // This function does not exist pre-v4 and cannot be emulated, ignore.
(void) cid; (void) cid;
(void) info; // Suppress unused warnings (void) info; // Suppress unused warnings
@ -173,7 +173,7 @@ ReprogControls::ControlInfo ReprogControlsV4::getControlReporting(uint16_t cid)
return info; return info;
} }
void ReprogControlsV4::setControlReporting(uint8_t cid, ControlInfo info) { void ReprogControlsV4::setControlReporting(uint16_t cid, ControlInfo info) {
std::vector<uint8_t> params(5); std::vector<uint8_t> params(5);
params[0] = (cid >> 8) & 0xff; params[0] = (cid >> 8) & 0xff;
params[1] = cid & 0xff; params[1] = cid & 0xff;

4
src/logid/backend/hidpp20/features/ReprogControls.h
View File

@ -100,7 +100,7 @@ namespace logid::backend::hidpp20 {
[[nodiscard]] virtual ControlInfo getControlReporting(uint16_t cid); [[nodiscard]] virtual ControlInfo getControlReporting(uint16_t cid);
// Only controlId (for remap) and flags will be read // Only controlId (for remap) and flags will be read
virtual void setControlReporting(uint8_t cid, ControlInfo info); virtual void setControlReporting(uint16_t cid, ControlInfo info);
[[nodiscard]] static std::set<uint16_t> divertedButtonEvent(const hidpp::Report& report); [[nodiscard]] static std::set<uint16_t> divertedButtonEvent(const hidpp::Report& report);
@ -162,7 +162,7 @@ namespace logid::backend::hidpp20 {
[[nodiscard]] ControlInfo getControlReporting(uint16_t cid) override; [[nodiscard]] ControlInfo getControlReporting(uint16_t cid) override;
void setControlReporting(uint8_t cid, ControlInfo info) override; void setControlReporting(uint16_t cid, ControlInfo info) override;
explicit ReprogControlsV4(Device* dev); explicit ReprogControlsV4(Device* dev);