From 67def7465cc484053631888289c99d927401c9bf Mon Sep 17 00:00:00 2001 From: Chris Date: Mon, 2 Sep 2024 12:19:29 +1000 Subject: [PATCH] Initial commit for Corsair K70 Core keyboard * Added metadata to CorsairPeripheralV2Devices * Added detector in CorsairPeripheralV2ControllerDetect.cpp * Resolves #4103 --- .../CorsairPeripheralV2ControllerDetect.cpp | 1 + .../CorsairPeripheralV2Devices.cpp | 33 +++++++++++++++++++ .../CorsairPeripheralV2Devices.h | 1 + 3 files changed, 35 insertions(+) diff --git a/Controllers/CorsairPeripheralV2Controller/CorsairPeripheralV2ControllerDetect.cpp b/Controllers/CorsairPeripheralV2Controller/CorsairPeripheralV2ControllerDetect.cpp index 5bdaade8..680268cd 100644 --- a/Controllers/CorsairPeripheralV2Controller/CorsairPeripheralV2ControllerDetect.cpp +++ b/Controllers/CorsairPeripheralV2Controller/CorsairPeripheralV2ControllerDetect.cpp @@ -71,6 +71,7 @@ REGISTER_HID_DETECTOR_IP("Corsair K55 RGB PRO", DetectCorsai 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 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 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); diff --git a/Controllers/CorsairPeripheralV2Controller/CorsairPeripheralV2Devices.cpp b/Controllers/CorsairPeripheralV2Controller/CorsairPeripheralV2Devices.cpp index 49efc34d..f903de0b 100644 --- a/Controllers/CorsairPeripheralV2Controller/CorsairPeripheralV2Devices.cpp +++ b/Controllers/CorsairPeripheralV2Controller/CorsairPeripheralV2Devices.cpp @@ -764,6 +764,38 @@ static const corsair_v2_device k60_rgb_pro_tkl_device = &corsair_K60_tkl_layout }; +/*-------------------------------------------------------------*\ +| Corsair K70 Core RGB 1B1C:1BFD | +| | +| Zone "Keyboard" | +| Matrix | +| 6 Rows, 21 Columns | +\*-------------------------------------------------------------*/ +static const corsair_v2_zone k70_core_rgb_zone = +{ + ZONE_EN_KEYBOARD, + ZONE_TYPE_MATRIX, + 6, + 21 +}; + +static const corsair_v2_device k70_core_rgb_device = +{ + CORSAIR_K70_CORE_RGB_PID, + DEVICE_TYPE_KEYBOARD, + 6, + 21, + { + &k70_core_rgb_zone, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr + }, + &corsair_k70_layout +}; + /*-------------------------------------------------------------*\ | Corsair K70 RGB TKL 1B1C:1B73 | | | @@ -1153,6 +1185,7 @@ const corsair_v2_device* corsair_v2_device_list_data[] = &k60_rgb_pro_device, &k60_rgb_pro_lp_device, &k60_rgb_pro_tkl_device, + &k70_core_rgb_device, &k70_rgb_pro_device, &k70_rgb_tkl_device, &k70_rgb_tkl_cs_device, diff --git a/Controllers/CorsairPeripheralV2Controller/CorsairPeripheralV2Devices.h b/Controllers/CorsairPeripheralV2Controller/CorsairPeripheralV2Devices.h index c1e4ae2a..93a64737 100644 --- a/Controllers/CorsairPeripheralV2Controller/CorsairPeripheralV2Devices.h +++ b/Controllers/CorsairPeripheralV2Controller/CorsairPeripheralV2Devices.h @@ -72,6 +72,7 @@ typedef struct #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_K70_CORE_RGB_PID 0x1BFD #define CORSAIR_K70_RGB_PRO_PID 0x1BC4 #define CORSAIR_K70_RGB_TKL_PID 0x1B73 #define CORSAIR_K70_RGB_TKL_CS_PID 0x1BB9