mirror/OpenRGB
1
0
Fork 0
mirror of https://github.com/CalcProgrammer1/OpenRGB.git synced 2026-05-24 14:35:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove redundant K100 controller

Browse Source 
* Moved Existing K100 optical and K100 MX Red detectors to new V2 controller.
This commit is contained in:
Chris
2024-01-27 12:56:35 +11:00
committed by Adam Honse
parent 2dfde7e8cd
commit bfb3052255
9 changed files with 71 additions and 691 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Controllers/CorsairPeripheralV2Controller/CorsairPeripheralV2ControllerDetect.cpp
View File

@@ -65,7 +65,9 @@ REGISTER_HID_DETECTOR_IP("Corsair K60 RGB PRO TKL", DetectCorsai
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);
REGISTER_HID_DETECTOR_IP("Corsair K100 RGB Optical", DetectCorsairV2HardwareControllers, CORSAIR_VID, CORSAIR_K100_OPTICAL_PID, 1, 0xFF42);
REGISTER_HID_DETECTOR_IP("Corsair K100 RGB Optical", DetectCorsairV2HardwareControllers, CORSAIR_VID, CORSAIR_K100_OPTICAL_V1_PID, 1, 0xFF42);
REGISTER_HID_DETECTOR_IP("Corsair K100 RGB Optical", DetectCorsairV2HardwareControllers, CORSAIR_VID, CORSAIR_K100_OPTICAL_V2_PID, 1, 0xFF42);
REGISTER_HID_DETECTOR_IP("Corsair K100 MX Red", DetectCorsairV2HardwareControllers, CORSAIR_VID, CORSAIR_K100_MXRED_PID, 1, 0xFF42);
/*-----------------------------------------------------------------------------------------------------*\
| Mice |

70
Controllers/CorsairPeripheralV2Controller/CorsairPeripheralV2Devices.cpp
View File

@@ -820,7 +820,7 @@ static const corsair_v2_device k70_rgb_tkl_cs_device =
};
/*-------------------------------------------------------------*\
| Corsair k70 RGB Pro 1B1C:1BC4 |
| Corsair K70 RGB Pro 1B1C:1BC4 |
| |
| Zone "Keyboard" |
| Matrix |
@@ -852,7 +852,40 @@ static const corsair_v2_device k70_rgb_pro_device =
};
/*-------------------------------------------------------------*\
| Corsair k100 RGB Optical 1B1C:1BC5 |
| Corsair K100 MX Red 1B1C:1B7D |
| |
| Zone "Keyboard" |
| Matrix |
| 12 Rows, 24 Columns |
\*-------------------------------------------------------------*/
static const corsair_v2_zone k100_mx_red_zone =
{
ZONE_EN_KEYBOARD,
ZONE_TYPE_MATRIX,
12,
24
};
static const corsair_v2_device k100_mx_red_device =
{
CORSAIR_K100_MXRED_PID,
DEVICE_TYPE_KEYBOARD,
12,
24,
{
&k100_mx_red_zone,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr
},
&corsair_k100_layout
};
/*-------------------------------------------------------------*\
| Corsair K100 RGB Optical V1 1B1C:1B7C |
| |
| Zone "Keyboard" |
| Matrix |
@@ -867,9 +900,34 @@ static const corsair_v2_zone k100_rgb_opt_zone =
24
};
static const corsair_v2_device k100_rgb_opt_device =
static const corsair_v2_device k100_rgb_opt_v1_device =
{
CORSAIR_K100_OPTICAL_PID,
CORSAIR_K100_OPTICAL_V1_PID,
DEVICE_TYPE_KEYBOARD,
12,
24,
{
&k100_rgb_opt_zone,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr
},
&corsair_k100_layout
};
/*-------------------------------------------------------------*\
| Corsair K100 RGB Optical V2 1B1C:1BC5 |
| |
| Zone "Keyboard" |
| Matrix |
| 12 Rows, 24 Columns |
\*-------------------------------------------------------------*/
static const corsair_v2_device k100_rgb_opt_v2_device =
{
CORSAIR_K100_OPTICAL_V2_PID,
DEVICE_TYPE_KEYBOARD,
12,
24,
@@ -1035,7 +1093,9 @@ const corsair_v2_device* corsair_v2_device_list_data[] =
&k70_rgb_pro_device,
&k70_rgb_tkl_device,
&k70_rgb_tkl_cs_device,
&k100_rgb_opt_device,
&k100_mx_red_device,
&k100_rgb_opt_v1_device,
&k100_rgb_opt_v2_device,
/*-----------------------------------------------------------------*\
| MICE |

4
Controllers/CorsairPeripheralV2Controller/CorsairPeripheralV2Devices.h
View File

@@ -66,7 +66,9 @@ typedef struct
#define CORSAIR_K70_RGB_PRO_PID 0x1BC4
#define CORSAIR_K70_RGB_TKL_PID 0x1B73
#define CORSAIR_K70_RGB_TKL_CS_PID 0x1BB9
#define CORSAIR_K100_OPTICAL_PID 0x1BC5
#define CORSAIR_K100_OPTICAL_V1_PID 0x1B7C
#define CORSAIR_K100_OPTICAL_V2_PID 0x1BC5
#define CORSAIR_K100_MXRED_PID 0x1B7D
/*-----------------------------------------------------*\
| Corsair V2 Protocol Mice |