Skip to content

uhk60: fix LED report filtering when report IDs aren't used #1565

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kareltucek merged 1 commit into from
Jun 2, 2026
+7 −3
Merged

uhk60: fix LED report filtering when report IDs aren't used #1565

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions right/src/hid/keyboard_app.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,8 @@ std::span<const uint8_t> keyboard_app::move_to_buffer(const hid_keyboard_report_
auto &keys_nkro = keys_[buf_idx].nkro;

::memcpy(&keys_nkro.modifiers, &report.modifiers, sizeof(report.modifiers));
::memcpy(static_cast<void *>(&keys_nkro.scancodes), &report.bitfield, sizeof(report.bitfield));
::memcpy(
static_cast<void *>(&keys_nkro.scancodes), &report.bitfield, sizeof(report.bitfield));

return std::span<const uint8_t>(
reinterpret_cast<const uint8_t *>(&keys_nkro), sizeof(keys_nkro));
Expand Down Expand Up @@ -157,8 +158,11 @@ keyboard_app::leds_boot_report keyboard_app::get_leds() const

void keyboard_app::set_report(hid::report::type type, const std::span<const uint8_t> &data)
{
if ((prot_ == hid::protocol::REPORT) &&
((type != hid::report::type::OUTPUT) || (data.front() != LEDS_REPORT_ID))) {
if (type != hid::report::type::OUTPUT) {
return;
}
if ((prot_ == hid::protocol::REPORT) && (LEDS_REPORT_ID != 0) &&
(data.front() != LEDS_REPORT_ID)) {
return;
}
// only one report is receivable, the LEDs
Expand Down
Loading