Commit 9d1bd934 authored by Mavroudis Chatzilazaridis's avatar Mavroudis Chatzilazaridis Committed by Jiri Kosina
Browse files

HID: logitech-dj: Add support for a new lightspeed receiver iteration 

The lightspeed receiver for the Pro X Superlight uses 13 byte mouse reports
without a report id. The workaround for such cases has been adjusted to
handle these larger packets.

The device now reports the status of its battery in wireless mode and
libratbag now recognizes the device and it can be configured with Piper.

https://github.com/libratbag/libratbag/pull/1122



Co-developed-by: default avatarFilipe Laíns <lains@riseup.net>
Signed-off-by: default avatarFilipe Laíns <lains@riseup.net>
Signed-off-by: default avatarMavroudis Chatzilazaridis <mavchatz@protonmail.com>
Reviewed-by: default avatarBastien Nocera <hadess@hadess.net>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent c05b8a93

drivers/hid/hid-ids.h

+1 −0
Original line number Diff line number Diff line
@@ -866,6 +866,7 @@ 
#define USB_DEVICE_ID_LOGITECH_NANO_RECEIVER_2		0xc534

#define USB_DEVICE_ID_LOGITECH_NANO_RECEIVER_LIGHTSPEED_1	0xc539

#define USB_DEVICE_ID_LOGITECH_NANO_RECEIVER_LIGHTSPEED_1_1	0xc53f

#define USB_DEVICE_ID_LOGITECH_NANO_RECEIVER_LIGHTSPEED_1_2	0xc547

#define USB_DEVICE_ID_LOGITECH_NANO_RECEIVER_POWERPLAY	0xc53a

#define USB_DEVICE_ID_SPACETRAVELLER	0xc623

#define USB_DEVICE_ID_SPACENAVIGATOR	0xc626

drivers/hid/hid-logitech-dj.c

+8 −3
Original line number Diff line number Diff line
@@ -1692,11 +1692,12 @@ static int logi_dj_raw_event(struct hid_device *hdev, 
		}

		/*

		 * Mouse-only receivers send unnumbered mouse data. The 27 MHz

		 * receiver uses 6 byte packets, the nano receiver 8 bytes.

		 * receiver uses 6 byte packets, the nano receiver 8 bytes,

		 * the lightspeed receiver (Pro X Superlight) 13 bytes.

		 */

		if (djrcv_dev->unnumbered_application == HID_GD_MOUSE &&

		    size <= 8) {

			u8 mouse_report[9];

		    size <= 13){

			u8 mouse_report[14];



			/* Prepend report id */

			mouse_report[0] = REPORT_TYPE_MOUSE;
@@ -1980,6 +1981,10 @@ static const struct hid_device_id logi_dj_receivers[] = { 
	  HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH,

		USB_DEVICE_ID_LOGITECH_NANO_RECEIVER_LIGHTSPEED_1_1),

	 .driver_data = recvr_type_gaming_hidpp},

	{ /* Logitech lightspeed receiver (0xc547) */

	  HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH,

		USB_DEVICE_ID_LOGITECH_NANO_RECEIVER_LIGHTSPEED_1_2),

	 .driver_data = recvr_type_gaming_hidpp},



	{ /* Logitech 27 MHz HID++ 1.0 receiver (0xc513) */

	  HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_MX3000_RECEIVER),