Skip to content

Commit 3a71b76

Browse files
committed
Initial commit for the Corsair MM700 to resolve #1718
+ Adding CorsairPeripheralV2Controller base class + Adding CorsairPeripheralV2Devices.h metadata file + Renaming CorsairK55RGBPROController to CorsairPeripheralV2SWController + Adjusting CorsairPeripheralV2SWController to accomodate base class changes + Renaming RGBController_CorsairK55RGBPRO to RGBController_CorsairV2SW + Adjusting RGBController_CorsairV2SW to handle device set up from meta data + Adding PID `0x1B9B` and registering detector in CorsairPeripheralV2ControllerDetect.cpp
1 parent 9caf780 commit 3a71b76

14 files changed

+970
-350
lines changed

Controllers/CorsairPeripheralController/CorsairK55RGBPROController.cpp

Lines changed: 0 additions & 106 deletions
This file was deleted.

Controllers/CorsairPeripheralController/CorsairK55RGBPROController.h

Lines changed: 0 additions & 35 deletions
This file was deleted.

Controllers/CorsairPeripheralController/CorsairPeripheralControllerDetect.cpp

Lines changed: 11 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,18 @@
1+
/*-----------------------------------------------------*\
2+
| OpenRGB includes |
3+
\*-----------------------------------------------------*/
4+
#include <hidapi/hidapi.h>
15
#include "Detector.h"
2-
#include "CorsairPeripheralController.h"
3-
#include "CorsairK100Controller.h"
4-
#include "CorsairK55RGBPROController.h"
56
#include "LogManager.h"
67
#include "RGBController.h"
8+
9+
/*-----------------------------------------------------*\
10+
| Corsair Peripheral specific includes |
11+
\*-----------------------------------------------------*/
712
#include "RGBController_CorsairPeripheral.h"
813
#include "RGBController_CorsairK100.h"
9-
#include "RGBController_CorsairK55RGBPRO.h"
1014
#include "RGBController_CorsairK65Mini.h"
1115
#include "RGBController_CorsairK95PlatinumXT.h"
12-
#include <hidapi/hidapi.h>
1316

1417
#define CORSAIR_PERIPHERAL_CONTROLLER_NAME "Corsair peripheral"
1518

@@ -81,12 +84,6 @@
8184
\*-----------------------------------------------------*/
8285
#define CORSAIR_K100_PID 0x1B7C
8386

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-
9087
/*-----------------------------------------------------*\
9188
| Corsair K65 Mini Keyboard product ID |
9289
| This keyboard uses a separate driver |
@@ -120,19 +117,6 @@ void DetectCorsairK100Controllers(hid_device_info* info, const std::string& name
120117
}
121118
} /* DetectCorsairPeripheralControllers() */
122119

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-
136120
void DetectCorsairK65MiniControllers(hid_device_info* info, const std::string& name)
137121
{
138122
hid_device* dev = hid_open_path(info->path);
@@ -252,16 +236,12 @@ REGISTER_HID_DETECTOR_I("Corsair ST100 RGB", DetectCorsairPeriphe
252236
\*-----------------------------------------------------------------------------------------------------*/
253237
REGISTER_HID_DETECTOR_IP("Corsair K100", DetectCorsairK100Controllers, CORSAIR_VID, CORSAIR_K100_PID, 1, 0xFF42);
254238

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-
260239
/*-----------------------------------------------------------------------------------------------------*\
261240
| Corsair K65 Mini Keyboard |
262241
\*-----------------------------------------------------------------------------------------------------*/
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+
264244
/*-----------------------------------------------------------------------------------------------------*\
265245
| Corsair K95 Platinum XT Keyboard |
266246
\*-----------------------------------------------------------------------------------------------------*/
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);

Controllers/CorsairPeripheralController/RGBController_CorsairK55RGBPRO.cpp

Lines changed: 0 additions & 141 deletions
This file was deleted.

Controllers/CorsairPeripheralController/RGBController_CorsairK55RGBPRO.h

Lines changed: 0 additions & 33 deletions
This file was deleted.

0 commit comments

Comments
 (0)