Conversation
Adds `ButtonId::KeyCalculator` and `(0x000a, ButtonId::KeyCalculator)` to `KEYBOARD_KEY_CIDS`, so the Calculator hotkey can be bound like the existing keyboard keys. Closes AprilNEA#1147. Unlike the F-row keys the table was built for, this control sits in the hotkey cluster beside the numpad (ERGO K860, MX Keys S) and is absent from the Signature series. Diversion is the only way to reach it on macOS: with the keyboard in its macOS mode the firmware emits no HID usage at all for this key, so nothing above the HID layer has an event to intercept. In Windows mode the same key natively sends consumer usage 0x0192 (`AL Calculator`). CID and firmware task (`CALCULATOR`) cross-checked against Solaar's `special_keys.py`, the same catalog the existing nine entries cite, and against the Logi asset metadata slot `SLOT_NAME_CALCULATOR`. As for every entry in the table, an unbound key is never diverted, so stock firmware behavior is unchanged unless the user binds it.
|
|
Thanks for the rebase. Will be great to have the button working on Mac |
Contributor
Author
|
Thanks for the original work and for confirming — hope it lands soon. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Rebase/adoption of #1247 (thorstent) onto current master — original PR went stale (CONFLICTING). Author preserved via git commit.
Adds
ButtonId::KeyCalculatorand(0x000a, ButtonId::KeyCalculator)toKEYBOARD_KEY_CIDS, making the Calculator hotkey bindable like the existing nine keyboard keys.With the keyboard in macOS mode, the firmware emits no HID usage at all for this key (verified at the HID/evdev/libinput level on a real ERGO K860 — see #1247 for the full verification writeup), so diversion is the only way to reach it. In Windows mode it natively sends consumer usage
AL Calculator(0x0192); binding it suppresses that native usage the same way the other divertable keys behave.As for every entry in the table, an unbound key is never diverted — stock firmware behavior is unchanged unless the user explicitly binds it.
Changes
openlogi-core: appendButtonId::KeyCalculator(append-only perbutton.rs's own convention), growKEYBOARD_KEYSto 10, add the display name + locale key across all 23 catalogs, default toAction::None.openlogi-device: add(0x000a, ButtonId::KeyCalculator)toKEYBOARD_KEY_CIDS.Testing
cargo fmt --all -- --checkRUSTFLAGS="-D warnings" cargo clippy --workspace --all-targets -- -D warningscargo test --workspaceFixes #1147
Closes #1247