|
| 1 | +/*-----------------------------------------------------*\ |
| 2 | +| OpenRGB includes | |
| 3 | +\*-----------------------------------------------------*/ |
| 4 | +#include <hidapi/hidapi.h> |
1 | 5 | #include "Detector.h"
|
2 |
| -#include "CorsairPeripheralController.h" |
3 |
| -#include "CorsairK100Controller.h" |
4 |
| -#include "CorsairK55RGBPROController.h" |
5 | 6 | #include "LogManager.h"
|
6 | 7 | #include "RGBController.h"
|
| 8 | + |
| 9 | +/*-----------------------------------------------------*\ |
| 10 | +| Corsair Peripheral specific includes | |
| 11 | +\*-----------------------------------------------------*/ |
7 | 12 | #include "RGBController_CorsairPeripheral.h"
|
8 | 13 | #include "RGBController_CorsairK100.h"
|
9 |
| -#include "RGBController_CorsairK55RGBPRO.h" |
10 | 14 | #include "RGBController_CorsairK65Mini.h"
|
11 | 15 | #include "RGBController_CorsairK95PlatinumXT.h"
|
12 |
| -#include <hidapi/hidapi.h> |
13 | 16 |
|
14 | 17 | #define CORSAIR_PERIPHERAL_CONTROLLER_NAME "Corsair peripheral"
|
15 | 18 |
|
|
81 | 84 | \*-----------------------------------------------------*/
|
82 | 85 | #define CORSAIR_K100_PID 0x1B7C
|
83 | 86 |
|
84 |
| -/*-----------------------------------------------------*\ |
85 |
| -| Corsair K55 RGB PRO Keyboard product ID | |
86 |
| -| This keyboard uses a separate driver | |
87 |
| -\*-----------------------------------------------------*/ |
88 |
| -#define CORSAIR_K55_RGB_PRO_PID 0x1BA4 |
89 |
| - |
90 | 87 | /*-----------------------------------------------------*\
|
91 | 88 | | Corsair K65 Mini Keyboard product ID |
|
92 | 89 | | This keyboard uses a separate driver |
|
@@ -120,19 +117,6 @@ void DetectCorsairK100Controllers(hid_device_info* info, const std::string& name
|
120 | 117 | }
|
121 | 118 | } /* DetectCorsairPeripheralControllers() */
|
122 | 119 |
|
123 |
| -void DetectCorsairK55RGBPROControllers(hid_device_info* info, const std::string& name) |
124 |
| -{ |
125 |
| - hid_device* dev = hid_open_path(info->path); |
126 |
| - |
127 |
| - if(dev) |
128 |
| - { |
129 |
| - CorsairK55RGBPROController* controller = new CorsairK55RGBPROController(dev, info->path); |
130 |
| - controller->SetName(name); |
131 |
| - RGBController_CorsairK55RGBPRO* rgb_controller = new RGBController_CorsairK55RGBPRO(controller); |
132 |
| - ResourceManager::get()->RegisterRGBController(rgb_controller); |
133 |
| - } |
134 |
| -} /* DetectCorsairK55RGBPROControllers() */ |
135 |
| - |
136 | 120 | void DetectCorsairK65MiniControllers(hid_device_info* info, const std::string& name)
|
137 | 121 | {
|
138 | 122 | hid_device* dev = hid_open_path(info->path);
|
@@ -252,16 +236,12 @@ REGISTER_HID_DETECTOR_I("Corsair ST100 RGB", DetectCorsairPeriphe
|
252 | 236 | \*-----------------------------------------------------------------------------------------------------*/
|
253 | 237 | REGISTER_HID_DETECTOR_IP("Corsair K100", DetectCorsairK100Controllers, CORSAIR_VID, CORSAIR_K100_PID, 1, 0xFF42);
|
254 | 238 |
|
255 |
| -/*-----------------------------------------------------------------------------------------------------*\ |
256 |
| -| Corsair K55 RGB PRO Keyboard | |
257 |
| -\*-----------------------------------------------------------------------------------------------------*/ |
258 |
| -REGISTER_HID_DETECTOR_IP("Corsair K55 RGB PRO", DetectCorsairK55RGBPROControllers, CORSAIR_VID, CORSAIR_K55_RGB_PRO_PID, 1, 0xFF42); |
259 |
| - |
260 | 239 | /*-----------------------------------------------------------------------------------------------------*\
|
261 | 240 | | Corsair K65 Mini Keyboard |
|
262 | 241 | \*-----------------------------------------------------------------------------------------------------*/
|
263 |
| -REGISTER_HID_DETECTOR_I("Corsair K65 Mini", DetectCorsairK65MiniControllers, CORSAIR_VID, CORSAIR_K65_MINI_PID, 1); |
| 242 | +REGISTER_HID_DETECTOR_I("Corsair K65 Mini", DetectCorsairK65MiniControllers, CORSAIR_VID, CORSAIR_K65_MINI_PID, 1); |
| 243 | + |
264 | 244 | /*-----------------------------------------------------------------------------------------------------*\
|
265 | 245 | | Corsair K95 Platinum XT Keyboard |
|
266 | 246 | \*-----------------------------------------------------------------------------------------------------*/
|
267 |
| -REGISTER_HID_DETECTOR_IP("Corsair K95 RGB PLATINUM XT", DetectCorsairK95PlatinumXTControllers, CORSAIR_VID, CORSAIR_K95_PLATINUM_XT_PID, 1, 0xFF42); |
| 247 | +REGISTER_HID_DETECTOR_IP("Corsair K95 RGB PLATINUM XT", DetectCorsairK95PlatinumXTControllers, CORSAIR_VID, CORSAIR_K95_PLATINUM_XT_PID, 1, 0xFF42); |
0 commit comments