Skip to content

Fix G19 macro key handling on newer Linux systems #45

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

Open
MiQ71 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix G19 macro key handling on newer Linux systems #45

Show file tree
Hide file tree
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
16 changes: 11 additions & 5 deletions src/g19device.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,14 +62,20 @@ extern "C" void LIBUSB_CALL GKeysCallback(libusb_transfer *transfer) {
}

if (status == LIBUSB_TRANSFER_COMPLETED) {
if (transfer->length < 3)
if (transfer->actual_length < 3) {
libusb_submit_transfer(transfer);
return;
}

if (transfer->buffer[0] < 1)
if (transfer->buffer[0] != 0x02) {
libusb_submit_transfer(transfer);
return;
}

if ((transfer->buffer[1] & 0x00) && (transfer->buffer[2] & 0x00))
if ((transfer->buffer[1] == 0x00) && (transfer->buffer[2] == 0x00)) {
cthis->gKeyCallback(0);
return;
}

if (transfer->buffer[1] & 0x01)
keys |= G19_KEY_G1;
Expand Down Expand Up @@ -281,8 +287,8 @@ void G19Device::openDevice(libusb_device_handle *handle) {
if (type.flags.contains(G19_HAS_G_KEYS)) {
gKeysTransfer = libusb_alloc_transfer(0);
libusb_fill_interrupt_transfer(gKeysTransfer, handle,
LIBUSB_ENDPOINT_IN | LIBUSB_RECIPIENT_OTHER,
gKeysBuffer, 4, GKeysCallback, this, 0);
0x83,
gKeysBuffer, 7, GKeysCallback, this, 0);
libusb_submit_transfer(gKeysTransfer);
}

Expand Down
2 changes: 1 addition & 1 deletion src/g19device.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ Q_OBJECT
libusb_transfer *lKeysTransfer;
libusb_transfer *dataTransfer{};

unsigned char gKeysBuffer[4]{};
unsigned char gKeysBuffer[7]{};
unsigned char lKeysBuffer[2]{};

libusb_context *context;
Expand Down