From 4532f98a9452bf8bed22964f08a8321c25da7158 Mon Sep 17 00:00:00 2001 From: ToastKiste211 Date: Tue, 10 Jun 2025 23:04:48 +0000 Subject: [PATCH] Add corsair k60 rgb pro tkl white (v2) --- .../CorsairPeripheralV2ControllerDetect.cpp | 3 +- .../CorsairPeripheralV2Devices.cpp | 28 ++++++++++++++++--- .../CorsairPeripheralV2Devices.h | 3 +- 3 files changed, 28 insertions(+), 6 deletions(-) diff --git a/Controllers/CorsairPeripheralV2Controller/CorsairPeripheralV2ControllerDetect.cpp b/Controllers/CorsairPeripheralV2Controller/CorsairPeripheralV2ControllerDetect.cpp index b80d9a94..89985239 100644 --- a/Controllers/CorsairPeripheralV2Controller/CorsairPeripheralV2ControllerDetect.cpp +++ b/Controllers/CorsairPeripheralV2Controller/CorsairPeripheralV2ControllerDetect.cpp @@ -68,7 +68,8 @@ void DetectCorsairV2SoftwareControllers(hid_device_info* info, const std::string REGISTER_HID_DETECTOR_IP("Corsair K55 RGB PRO", DetectCorsairV2SoftwareControllers, CORSAIR_VID, CORSAIR_K55_RGB_PRO_PID, 1, 0xFF42); REGISTER_HID_DETECTOR_IP("Corsair K60 RGB PRO", DetectCorsairV2SoftwareControllers, CORSAIR_VID, CORSAIR_K60_RGB_PRO_PID, 1, 0xFF42); REGISTER_HID_DETECTOR_IP("Corsair K60 RGB PRO Low Profile", DetectCorsairV2SoftwareControllers, CORSAIR_VID, CORSAIR_K60_RGB_PRO_LP_PID, 1, 0xFF42); -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 K60 RGB PRO TKL Black", DetectCorsairV2HardwareControllers, CORSAIR_VID, CORSAIR_K60_RGB_PRO_TKL_B_PID, 1, 0xFF42); +REGISTER_HID_DETECTOR_IP("Corsair K60 RGB PRO TKL White", DetectCorsairV2HardwareControllers, CORSAIR_VID, CORSAIR_K60_RGB_PRO_TKL_W_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); diff --git a/Controllers/CorsairPeripheralV2Controller/CorsairPeripheralV2Devices.cpp b/Controllers/CorsairPeripheralV2Controller/CorsairPeripheralV2Devices.cpp index b98839a6..a2e3242e 100644 --- a/Controllers/CorsairPeripheralV2Controller/CorsairPeripheralV2Devices.cpp +++ b/Controllers/CorsairPeripheralV2Controller/CorsairPeripheralV2Devices.cpp @@ -759,7 +759,8 @@ static const corsair_v2_device k60_rgb_pro_lp_device = }; /*-------------------------------------------------------------*\ -| Corsair K60 RGB Pro TKL 1B1C:1BC7 | +| Corsair K60 RGB Pro TKL 1B1C:1BC7 (black) | +| Corsair K60 RGB Pro TKL 1B1C:1BED (white) | | | | Zone "Keyboard" | | Matrix | @@ -773,9 +774,9 @@ static const corsair_v2_zone k60_rgb_pro_tkl_zone = 21 }; -static const corsair_v2_device k60_rgb_pro_tkl_device = +static const corsair_v2_device k60_rgb_pro_tkl_device_b = { - CORSAIR_K60_RGB_PRO_TKL_PID, + CORSAIR_K60_RGB_PRO_TKL_B_PID, DEVICE_TYPE_KEYBOARD, 6, 21, @@ -790,6 +791,24 @@ static const corsair_v2_device k60_rgb_pro_tkl_device = &corsair_K60_tkl_layout }; +static const corsair_v2_device k60_rgb_pro_tkl_device_w = +{ + CORSAIR_K60_RGB_PRO_TKL_W_PID, + DEVICE_TYPE_KEYBOARD, + 6, + 21, + { + &k60_rgb_pro_lp_zone, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr + }, + &corsair_K60_tkl_layout +}; + + /*-------------------------------------------------------------*\ | Corsair K70 Core RGB 1B1C:1BFD | | | @@ -1234,7 +1253,8 @@ const corsair_v2_device* corsair_v2_device_list_data[] = &k55_rgb_pro_device, &k60_rgb_pro_device, &k60_rgb_pro_lp_device, - &k60_rgb_pro_tkl_device, + &k60_rgb_pro_tkl_device_b, + &k60_rgb_pro_tkl_device_w, &k70_core_rgb_device, &k70_rgb_pro_device, &k70_rgb_pro_v2_device, diff --git a/Controllers/CorsairPeripheralV2Controller/CorsairPeripheralV2Devices.h b/Controllers/CorsairPeripheralV2Controller/CorsairPeripheralV2Devices.h index 17ddd2cc..6e0098f7 100644 --- a/Controllers/CorsairPeripheralV2Controller/CorsairPeripheralV2Devices.h +++ b/Controllers/CorsairPeripheralV2Controller/CorsairPeripheralV2Devices.h @@ -71,7 +71,8 @@ typedef struct #define CORSAIR_K55_RGB_PRO_PID 0x1BA4 #define CORSAIR_K60_RGB_PRO_PID 0x1BA0 #define CORSAIR_K60_RGB_PRO_LP_PID 0x1BAD -#define CORSAIR_K60_RGB_PRO_TKL_PID 0x1BC7 +#define CORSAIR_K60_RGB_PRO_TKL_B_PID 0x1BC7 +#define CORSAIR_K60_RGB_PRO_TKL_W_PID 0x1BED #define CORSAIR_K70_CORE_RGB_PID 0x1BFD #define CORSAIR_K70_RGB_PRO_PID 0x1BC4 #define CORSAIR_K70_RGB_PRO_V2_PID 0x1BB3