From a6758252249f72ea785182e5b2cd1075c904d81b Mon Sep 17 00:00:00 2001 From: Chris M Date: Tue, 3 Sep 2024 11:42:13 +1000 Subject: [PATCH] Initial commit for Corsair K70 PRO V2 keyboard * Added metadata to CorsairPeripheralV2Devices * Added detector in CorsairPeripheralV2ControllerDetect.cpp * Resolves #3912 --- .../CorsairPeripheralV2ControllerDetect.cpp | 1 + .../CorsairPeripheralV2Devices.cpp | 25 +++++++++++++++++++ .../CorsairPeripheralV2Devices.h | 1 + 3 files changed, 27 insertions(+) diff --git a/Controllers/CorsairPeripheralV2Controller/CorsairPeripheralV2ControllerDetect.cpp b/Controllers/CorsairPeripheralV2Controller/CorsairPeripheralV2ControllerDetect.cpp index 680268cd..f1403f44 100644 --- a/Controllers/CorsairPeripheralV2Controller/CorsairPeripheralV2ControllerDetect.cpp +++ b/Controllers/CorsairPeripheralV2Controller/CorsairPeripheralV2ControllerDetect.cpp @@ -73,6 +73,7 @@ REGISTER_HID_DETECTOR_IP("Corsair K60 RGB PRO Low Profile", DetectCorsai REGISTER_HID_DETECTOR_IP("Corsair K60 RGB PRO TKL", DetectCorsairV2HardwareControllers, CORSAIR_VID, CORSAIR_K60_RGB_PRO_TKL_PID, 1, 0xFF42); REGISTER_HID_DETECTOR_IP("Corsair K70 Core RGB", DetectCorsairV2HardwareControllers, CORSAIR_VID, CORSAIR_K70_CORE_RGB_PID, 1, 0xFF42); REGISTER_HID_DETECTOR_IP("Corsair K70 RGB PRO", DetectCorsairV2HardwareControllers, CORSAIR_VID, CORSAIR_K70_RGB_PRO_PID, 1, 0xFF42); +REGISTER_HID_DETECTOR_IP("Corsair K70 RGB PRO V2", DetectCorsairV2HardwareControllers, CORSAIR_VID, CORSAIR_K70_RGB_PRO_V2_PID, 1, 0xFF42); REGISTER_HID_DETECTOR_IP("Corsair K70 RGB TKL", DetectCorsairV2HardwareControllers, CORSAIR_VID, CORSAIR_K70_RGB_TKL_PID, 1, 0xFF42); REGISTER_HID_DETECTOR_IP("Corsair K70 RGB TKL Champion Series", DetectCorsairV2HardwareControllers, CORSAIR_VID, CORSAIR_K70_RGB_TKL_CS_PID, 1, 0xFF42); REGISTER_HID_DETECTOR_IP("Corsair K100 RGB Optical", DetectCorsairV2HardwareControllers, CORSAIR_VID, CORSAIR_K100_OPTICAL_V1_PID, 1, 0xFF42); diff --git a/Controllers/CorsairPeripheralV2Controller/CorsairPeripheralV2Devices.cpp b/Controllers/CorsairPeripheralV2Controller/CorsairPeripheralV2Devices.cpp index 80129a69..7a9da607 100644 --- a/Controllers/CorsairPeripheralV2Controller/CorsairPeripheralV2Devices.cpp +++ b/Controllers/CorsairPeripheralV2Controller/CorsairPeripheralV2Devices.cpp @@ -918,6 +918,30 @@ static const corsair_v2_device k70_rgb_pro_device = &corsair_k70_pro_layout }; +/*-------------------------------------------------------------*\ +| Corsair K70 RGB Pro V2 1B1C:1BB3 | +| | +| Zone "Keyboard" | +| Matrix | +| 6 Rows, 21 Columns | +\*-------------------------------------------------------------*/ +static const corsair_v2_device k70_rgb_pro_v2_device = + { + CORSAIR_K70_RGB_PRO_V2_PID, + DEVICE_TYPE_KEYBOARD, + 7, + 21, + { + &k70_rgb_pro_zone, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr + }, + &corsair_k70_pro_layout +}; + /*-------------------------------------------------------------*\ | Corsair K100 MX Red 1B1C:1B7D | | | @@ -1213,6 +1237,7 @@ const corsair_v2_device* corsair_v2_device_list_data[] = &k60_rgb_pro_tkl_device, &k70_core_rgb_device, &k70_rgb_pro_device, + &k70_rgb_pro_v2_device, &k70_rgb_tkl_device, &k70_rgb_tkl_cs_device, &k100_mx_red_device, diff --git a/Controllers/CorsairPeripheralV2Controller/CorsairPeripheralV2Devices.h b/Controllers/CorsairPeripheralV2Controller/CorsairPeripheralV2Devices.h index 93a64737..17ddd2cc 100644 --- a/Controllers/CorsairPeripheralV2Controller/CorsairPeripheralV2Devices.h +++ b/Controllers/CorsairPeripheralV2Controller/CorsairPeripheralV2Devices.h @@ -74,6 +74,7 @@ typedef struct #define CORSAIR_K60_RGB_PRO_TKL_PID 0x1BC7 #define CORSAIR_K70_CORE_RGB_PID 0x1BFD #define CORSAIR_K70_RGB_PRO_PID 0x1BC4 +#define CORSAIR_K70_RGB_PRO_V2_PID 0x1BB3 #define CORSAIR_K70_RGB_TKL_PID 0x1B73 #define CORSAIR_K70_RGB_TKL_CS_PID 0x1BB9 #define CORSAIR_K100_OPTICAL_V1_PID 0x1B7C