Fix Logitech G915 TKL: correct PID mapping and HID packet sizes

This commit is contained in:
Ace
2026-06-28 08:21:57 +00:00
committed by Adam Honse
parent d258065e36
commit 3582b96dd9
2 changed files with 112 additions and 12 deletions

View File

@@ -146,7 +146,7 @@ void LogitechG915Controller::SendCommit()
/*-----------------------------------------------------*\
| Send packet |
\*-----------------------------------------------------*/
hid_write(dev_handle, usb_buf, 4);
hid_write(dev_handle, usb_buf, MESSAGE_LEN);
hid_read_timeout(dev_handle, usb_buf, RESPONSE_LEN, LOGITECH_READ_TIMEOUT);
}
@@ -170,7 +170,7 @@ void LogitechG915Controller::BeginModeSet()
/*-----------------------------------------------------*\
| Send packet |
\*-----------------------------------------------------*/
hid_write(dev_handle, usb_buf, 4);
hid_write(dev_handle, usb_buf, MESSAGE_LEN);
hid_read(dev_handle, usb_buf, RESPONSE_LEN);
/*-----------------------------------------------------*\
@@ -189,7 +189,7 @@ void LogitechG915Controller::BeginModeSet()
/*-----------------------------------------------------*\
| Send packet |
\*-----------------------------------------------------*/
hid_write(dev_handle, usb_buf, 4);
hid_write(dev_handle, usb_buf, MESSAGE_LEN);
hid_read(dev_handle, usb_buf, RESPONSE_LEN);
}
@@ -216,7 +216,7 @@ void LogitechG915Controller::InitializeModeSet()
/*-----------------------------------------------------*\
| Send packet |
\*-----------------------------------------------------*/
hid_write(dev_handle, usb_buf, 7);
hid_write(dev_handle, usb_buf, MESSAGE_LEN);
hid_read(dev_handle, usb_buf, RESPONSE_LEN);
}
@@ -240,7 +240,7 @@ void LogitechG915Controller::InitializeDirect()
/*-----------------------------------------------------*\
| Send packet |
\*-----------------------------------------------------*/
hid_write(dev_handle, usb_buf, 4);
hid_write(dev_handle, usb_buf, MESSAGE_LEN);
hid_read(dev_handle, usb_buf, RESPONSE_LEN);
/*-----------------------------------------------------*\
@@ -259,7 +259,7 @@ void LogitechG915Controller::InitializeDirect()
/*-----------------------------------------------------*\
| Send packet |
\*-----------------------------------------------------*/
hid_write(dev_handle, usb_buf, 4);
hid_write(dev_handle, usb_buf, MESSAGE_LEN);
hid_read(dev_handle, usb_buf, RESPONSE_LEN);
/*-----------------------------------------------------*\
@@ -279,7 +279,7 @@ void LogitechG915Controller::InitializeDirect()
/*-----------------------------------------------------*\
| Send packet |
\*-----------------------------------------------------*/
hid_write(dev_handle, usb_buf, 17);
hid_write(dev_handle, usb_buf, MESSAGE_LEN);
hid_read(dev_handle, usb_buf, MESSAGE_LEN);
/*-----------------------------------------------------*\
@@ -300,7 +300,7 @@ void LogitechG915Controller::InitializeDirect()
/*-----------------------------------------------------*\
| Send packet |
\*-----------------------------------------------------*/
hid_write(dev_handle, usb_buf, 17);
hid_write(dev_handle, usb_buf, MESSAGE_LEN);
hid_read(dev_handle, usb_buf, RESPONSE_LEN);
}
@@ -355,7 +355,7 @@ void LogitechG915Controller::SendDirectFrame
/*-----------------------------------------------------*\
| Send packet |
\*-----------------------------------------------------*/
hid_write(dev_handle, usb_buf, HEADER_SIZE + length);
hid_write(dev_handle, usb_buf, MESSAGE_LEN);
hid_read_timeout(dev_handle, usb_buf, RESPONSE_LEN, LOGITECH_READ_TIMEOUT);
}
@@ -370,7 +370,7 @@ void LogitechG915Controller::SendMode
unsigned char blue
)
{
unsigned char usb_buf[HEADER_SIZE + 13];
unsigned char usb_buf[MESSAGE_LEN];
/*-----------------------------------------------------*\
| Zero out buffer |
@@ -433,6 +433,6 @@ void LogitechG915Controller::SendMode
/*-----------------------------------------------------*\
| Send packet |
\*-----------------------------------------------------*/
hid_write(dev_handle, usb_buf, HEADER_SIZE + 13);
hid_write(dev_handle, usb_buf, MESSAGE_LEN);
hid_read(dev_handle, usb_buf, RESPONSE_LEN);
}