From 42542b6b676738c793bb2a84258498c6fe96e8ac Mon Sep 17 00:00:00 2001 From: Barry H Date: Mon, 22 Apr 2024 03:40:36 +0000 Subject: [PATCH] Add Corsair M65 RGB Ultra Wired --- .../CorsairPeripheralV2ControllerDetect.cpp | 3 +- .../CorsairPeripheralV2Devices.cpp | 59 ++++++++++++++++++- .../CorsairPeripheralV2Devices.h | 3 +- 3 files changed, 61 insertions(+), 4 deletions(-) diff --git a/Controllers/CorsairPeripheralV2Controller/CorsairPeripheralV2ControllerDetect.cpp b/Controllers/CorsairPeripheralV2Controller/CorsairPeripheralV2ControllerDetect.cpp index 0b67c4c9..099b79d4 100644 --- a/Controllers/CorsairPeripheralV2Controller/CorsairPeripheralV2ControllerDetect.cpp +++ b/Controllers/CorsairPeripheralV2Controller/CorsairPeripheralV2ControllerDetect.cpp @@ -80,7 +80,8 @@ REGISTER_HID_DETECTOR_IP("Corsair Katar Pro", DetectCorsai REGISTER_HID_DETECTOR_IP("Corsair Katar Pro V2", DetectCorsairV2HardwareControllers, CORSAIR_VID, CORSAIR_KATAR_PRO_V2_PID, 1, 0xFF42); REGISTER_HID_DETECTOR_IP("Corsair Katar Pro XT", DetectCorsairV2HardwareControllers, CORSAIR_VID, CORSAIR_KATAR_PRO_XT_PID, 1, 0xFF42); REGISTER_HID_DETECTOR_IP("Corsair M55 RGB PRO", DetectCorsairV2SoftwareControllers, CORSAIR_VID, CORSAIR_M55_RGB_PRO_PID, 1, 0xFF42); -REGISTER_HID_DETECTOR_IP("Corsair M65 Ultra RGB (Wired)", DetectCorsairV2HardwareControllers, CORSAIR_VID, CORSAIR_M65_ULTRA_RGB_PID, 1, 0xFF42); +REGISTER_HID_DETECTOR_IP("Corsair M65 RGB Ultra Wired", DetectCorsairV2SoftwareControllers, CORSAIR_VID, CORSAIR_M65_RGB_ULTRA_WIRED_PID, 1, 0xFF42); +REGISTER_HID_DETECTOR_IP("Corsair M65 RGB Ultra Wireless (Wired)", DetectCorsairV2HardwareControllers, CORSAIR_VID, CORSAIR_M65_RGB_ULTRA_WIRELESS_PID, 1, 0xFF42); REGISTER_HID_DETECTOR_IP("Corsair Slipstream Wireless Receiver HW", DetectCorsairV2HardwareControllers, CORSAIR_VID, CORSAIR_SLIPSTREAM_WIRELESS_PID1, 1, 0xFF42); REGISTER_HID_DETECTOR_IP("Corsair Slipstream Wireless Receiver SW", DetectCorsairV2SoftwareControllers, CORSAIR_VID, CORSAIR_SLIPSTREAM_WIRELESS_PID2, 1, 0xFF42); /*-----------------------------------------------------------------------------------------------------*\ diff --git a/Controllers/CorsairPeripheralV2Controller/CorsairPeripheralV2Devices.cpp b/Controllers/CorsairPeripheralV2Controller/CorsairPeripheralV2Devices.cpp index 54213bc5..5ccc2fdc 100644 --- a/Controllers/CorsairPeripheralV2Controller/CorsairPeripheralV2Devices.cpp +++ b/Controllers/CorsairPeripheralV2Controller/CorsairPeripheralV2Devices.cpp @@ -986,7 +986,61 @@ static const corsair_v2_device m55_device = }; /*-------------------------------------------------------------*\ -| Corsair M65 Ultra RGB 1B1C:1BB5 | +| Corsair M65 RGB Ultra Wired 1B1C:1B9E | +| | +| Zone "Scroll Wheel" | +| Single | +| | +| Zone "Logo" | +| Single | +| | +| Zone "Indicator" | +| Single | +| | +\*-------------------------------------------------------------*/ +static const corsair_v2_zone m65_rgb_ultra_wired_scroll_zone = +{ + "Scroll Wheel", + ZONE_TYPE_SINGLE, + 1, + 1 +}; + +static const corsair_v2_zone m65_rgb_ultra_wired_logo_zone = +{ + "Logo", + ZONE_TYPE_SINGLE, + 1, + 1 +}; + +static const corsair_v2_zone m65_rgb_ultra_wired_indicator_zone = +{ + "Indicator", + ZONE_TYPE_SINGLE, + 1, + 1 +}; + +static const corsair_v2_device m65_rgb_ultra_wired_device = +{ + CORSAIR_M65_RGB_ULTRA_WIRED_PID, + DEVICE_TYPE_MOUSE, + 1, + 3, + { + &m65_rgb_ultra_wired_logo_zone, + &m65_rgb_ultra_wired_scroll_zone, + &m65_rgb_ultra_wired_indicator_zone, + nullptr, + nullptr, + nullptr + }, + nullptr +}; + +/*-------------------------------------------------------------*\ +| Corsair M65 RGB Ultra Wireless 1B1C:1BB5 | | | | Zone "Logo" | | Single | @@ -1012,7 +1066,7 @@ static const corsair_v2_zone m65_ultra_rgb_dpi_zone = static const corsair_v2_device m65_ultra_rgb_device = { - CORSAIR_M65_ULTRA_RGB_PID, + CORSAIR_M65_RGB_ULTRA_WIRELESS_PID, DEVICE_TYPE_MOUSE, 1, 2, @@ -1108,6 +1162,7 @@ const corsair_v2_device* corsair_v2_device_list_data[] = &katar_pro_v2_device, &katar_pro_xt_device, &m55_device, + &m65_rgb_ultra_wired_device, &m65_ultra_rgb_device, /*-----------------------------------------------------------------*\ diff --git a/Controllers/CorsairPeripheralV2Controller/CorsairPeripheralV2Devices.h b/Controllers/CorsairPeripheralV2Controller/CorsairPeripheralV2Devices.h index 4ea29d8f..3fc191ad 100644 --- a/Controllers/CorsairPeripheralV2Controller/CorsairPeripheralV2Devices.h +++ b/Controllers/CorsairPeripheralV2Controller/CorsairPeripheralV2Devices.h @@ -81,7 +81,8 @@ typedef struct #define CORSAIR_KATAR_PRO_V2_PID 0x1BBA #define CORSAIR_KATAR_PRO_XT_PID 0x1BAC #define CORSAIR_M55_RGB_PRO_PID 0x1B70 -#define CORSAIR_M65_ULTRA_RGB_PID 0x1BB5 +#define CORSAIR_M65_RGB_ULTRA_WIRED_PID 0x1B9E +#define CORSAIR_M65_RGB_ULTRA_WIRELESS_PID 0x1BB5 #define CORSAIR_SLIPSTREAM_WIRELESS_PID1 0x1BA6 #define CORSAIR_SLIPSTREAM_WIRELESS_PID2 0x1B65