diff --git a/Controllers/CorsairKeyboardController/CorsairKeyboardController.cpp b/Controllers/CorsairPeripheralController/CorsairPeripheralController.cpp similarity index 92% rename from Controllers/CorsairKeyboardController/CorsairKeyboardController.cpp rename to Controllers/CorsairPeripheralController/CorsairPeripheralController.cpp index ee05a8e5..9a5976b6 100644 --- a/Controllers/CorsairKeyboardController/CorsairKeyboardController.cpp +++ b/Controllers/CorsairPeripheralController/CorsairPeripheralController.cpp @@ -1,13 +1,13 @@ /*-----------------------------------------*\ -| CorsairKeyboardController.cpp | +| CorsairPeripheralController.cpp | | | -| Driver for Corsair RGB keyboard lighting | -| controller | +| Driver for Corsair RGB keyboard, mouse, | +| and mousemat lighting controller | | | | Adam Honse (CalcProgrammer1) 1/9/2020 | \*-----------------------------------------*/ -#include "CorsairKeyboardController.h" +#include "CorsairPeripheralController.h" #include @@ -44,7 +44,7 @@ static void get_usb_msg(hid_device* dev, char* data_pkt) bytes++; } -CorsairKeyboardController::CorsairKeyboardController(hid_device* dev_handle) +CorsairPeripheralController::CorsairPeripheralController(hid_device* dev_handle) { dev = dev_handle; @@ -56,22 +56,22 @@ CorsairKeyboardController::CorsairKeyboardController(hid_device* dev_handle) LightingControl(); } -CorsairKeyboardController::~CorsairKeyboardController() +CorsairPeripheralController::~CorsairPeripheralController() { } -device_type CorsairKeyboardController::GetDeviceType() +device_type CorsairPeripheralController::GetDeviceType() { return type; } -std::string CorsairKeyboardController::GetFirmwareString() +std::string CorsairPeripheralController::GetFirmwareString() { return firmware_version; } -void CorsairKeyboardController::SetLEDs(std::vectorcolors) +void CorsairPeripheralController::SetLEDs(std::vectorcolors) { switch(type) { @@ -88,12 +88,12 @@ void CorsairKeyboardController::SetLEDs(std::vectorcolors) } } -void CorsairKeyboardController::SetLEDsMouse(std::vector colors) +void CorsairPeripheralController::SetLEDsMouse(std::vector colors) { SubmitMouseColors(colors.size(), &colors[0]); } -void CorsairKeyboardController::SetLEDsLimited(std::vector colors) +void CorsairPeripheralController::SetLEDsLimited(std::vector colors) { unsigned char data_pkt[216]; unsigned char red_val[144]; @@ -164,7 +164,7 @@ void CorsairKeyboardController::SetLEDsLimited(std::vector colors) | Private packet sending functions. | \*-------------------------------------------------------------------------------------------------*/ -void CorsairKeyboardController::LightingControl() +void CorsairPeripheralController::LightingControl() { char usb_buf[64]; @@ -206,7 +206,7 @@ void CorsairKeyboardController::LightingControl() send_usb_msg(dev, usb_buf); } -void CorsairKeyboardController::SpecialFunctionControl() +void CorsairPeripheralController::SpecialFunctionControl() { char usb_buf[64]; @@ -228,7 +228,7 @@ void CorsairKeyboardController::SpecialFunctionControl() send_usb_msg(dev, usb_buf); } -void CorsairKeyboardController::ReadFirmwareInfo() +void CorsairPeripheralController::ReadFirmwareInfo() { char usb_buf[64]; @@ -283,7 +283,7 @@ void CorsairKeyboardController::ReadFirmwareInfo() } } -void CorsairKeyboardController::StreamPacket +void CorsairPeripheralController::StreamPacket ( unsigned char packet_id, unsigned char data_sz, @@ -315,7 +315,7 @@ void CorsairKeyboardController::StreamPacket send_usb_msg(dev, usb_buf); } -void CorsairKeyboardController::SubmitColors() +void CorsairPeripheralController::SubmitColors() { char usb_buf[64]; @@ -336,7 +336,7 @@ void CorsairKeyboardController::SubmitColors() send_usb_msg(dev, usb_buf); } -void CorsairKeyboardController::SubmitLimitedColors +void CorsairPeripheralController::SubmitLimitedColors ( unsigned char byte_count ) @@ -361,7 +361,7 @@ void CorsairKeyboardController::SubmitLimitedColors send_usb_msg(dev, usb_buf); } -void CorsairKeyboardController::SubmitMouseColors +void CorsairPeripheralController::SubmitMouseColors ( unsigned char num_zones, RGBColor * color_data @@ -397,4 +397,4 @@ void CorsairKeyboardController::SubmitMouseColors | Send packet | \*-----------------------------------------------------*/ send_usb_msg(dev, usb_buf); -} \ No newline at end of file +} diff --git a/Controllers/CorsairKeyboardController/CorsairKeyboardController.h b/Controllers/CorsairPeripheralController/CorsairPeripheralController.h similarity index 89% rename from Controllers/CorsairKeyboardController/CorsairKeyboardController.h rename to Controllers/CorsairPeripheralController/CorsairPeripheralController.h index c4b0c23a..6efe27c5 100644 --- a/Controllers/CorsairKeyboardController/CorsairKeyboardController.h +++ b/Controllers/CorsairPeripheralController/CorsairPeripheralController.h @@ -1,8 +1,9 @@ /*-----------------------------------------*\ -| CorsairKeyboardController.h | +| CorsairPeripheralController.h | | | | Definitions and types for Corsair RGB | -| keyboard lighting controller | +| keyboard, mouse, and mousemat lighting | +| controller | | | | Adam Honse (CalcProgrammer1) 1/9/2020 | \*-----------------------------------------*/ @@ -46,11 +47,11 @@ enum CORSAIR_COLOR_CHANNEL_BLUE = 0x03 }; -class CorsairKeyboardController +class CorsairPeripheralController { public: - CorsairKeyboardController(hid_device* dev_handle); - ~CorsairKeyboardController(); + CorsairPeripheralController(hid_device* dev_handle); + ~CorsairPeripheralController(); device_type GetDeviceType(); std::string GetFirmwareString(); diff --git a/Controllers/CorsairKeyboardController/CorsairKeyboardControllerDetect.cpp b/Controllers/CorsairPeripheralController/CorsairPeripheralControllerDetect.cpp similarity index 88% rename from Controllers/CorsairKeyboardController/CorsairKeyboardControllerDetect.cpp rename to Controllers/CorsairPeripheralController/CorsairPeripheralControllerDetect.cpp index 9d2bb852..b418edeb 100644 --- a/Controllers/CorsairKeyboardController/CorsairKeyboardControllerDetect.cpp +++ b/Controllers/CorsairPeripheralController/CorsairPeripheralControllerDetect.cpp @@ -1,6 +1,6 @@ -#include "CorsairKeyboardController.h" +#include "CorsairPeripheralController.h" #include "RGBController.h" -#include "RGBController_CorsairKeyboard.h" +#include "RGBController_CorsairPeripheral.h" #include #include @@ -63,13 +63,13 @@ static const corsair_node_device device_list[3] = /******************************************************************************************\ * * -* DetectCorsairKeyboardControllers * +* DetectCorsairPeripheralControllers * * * * Tests the USB address to see if a Corsair RGB Keyboard controller exists there. * * * \******************************************************************************************/ -void DetectCorsairKeyboardControllers(std::vector& rgb_controllers) +void DetectCorsairPeripheralControllers(std::vector& rgb_controllers) { hid_device_info* info; hid_device* dev; @@ -82,7 +82,7 @@ void DetectCorsairKeyboardControllers(std::vector& rgb_controlle info = hid_enumerate(device_list[device_idx].usb_vid, device_list[device_idx].usb_pid); - //Look for Corsair RGB Keyboard, interface 1 + //Look for Corsair RGB Peripheral while(info) { if((info->vendor_id == device_list[device_idx].usb_vid) @@ -100,11 +100,11 @@ void DetectCorsairKeyboardControllers(std::vector& rgb_controlle if( dev ) { - CorsairKeyboardController* controller = new CorsairKeyboardController(dev); + CorsairPeripheralController* controller = new CorsairPeripheralController(dev); if(controller->GetDeviceType() != DEVICE_TYPE_UNKNOWN) { - RGBController_CorsairKeyboard* rgb_controller = new RGBController_CorsairKeyboard(controller); + RGBController_CorsairPeripheral* rgb_controller = new RGBController_CorsairPeripheral(controller); rgb_controller->name = device_list[device_idx].name; diff --git a/OpenRGB.cpp b/OpenRGB.cpp index c2e56f23..970891b7 100644 --- a/OpenRGB.cpp +++ b/OpenRGB.cpp @@ -295,7 +295,7 @@ void DetectE131Controllers(std::vector &rgb_controllers); void DetectAMDWraithPrismControllers(std::vector& rgb_controllers); void DetectMSI3ZoneControllers(std::vector& rgb_controllers); void DetectPoseidonZRGBControllers(std::vector& rgb_controllers); -void DetectCorsairKeyboardControllers(std::vector& rgb_controllers); +void DetectCorsairPeripheralControllers(std::vector& rgb_controllers); void DetectCorsairLightingNodeControllers(std::vector &rgb_controllers); void DetectFaustusControllers(std::vector &rgb_controllers); void DetectHyperXKeyboardControllers(std::vector& rgb_controllers); @@ -335,7 +335,7 @@ void DetectRGBControllers(void) DetectMSI3ZoneControllers(rgb_controllers); DetectPoseidonZRGBControllers(rgb_controllers); DetectHyperXKeyboardControllers(rgb_controllers); - DetectCorsairKeyboardControllers(rgb_controllers); + DetectCorsairPeripheralControllers(rgb_controllers); DetectCorsairLightingNodeControllers(rgb_controllers); DetectThermaltakeRiingControllers(rgb_controllers); DetectRGBFusion2Controllers(rgb_controllers); diff --git a/OpenRGB.pro b/OpenRGB.pro index 962876c4..a6cd0e7d 100644 --- a/OpenRGB.pro +++ b/OpenRGB.pro @@ -33,7 +33,7 @@ INCLUDEPATH += \ Controllers/AuraController/ \ Controllers/AuraGPUController/ \ Controllers/CorsairController/ \ - Controllers/CorsairKeyboardController/ \ + Controllers/CorsairPeripheralController/ \ Controllers/CorsairLightingNodeController/ \ Controllers/CorsairProController/ \ Controllers/CrucialController/ \ @@ -83,10 +83,10 @@ SOURCES += \ Controllers/AuraGPUController/AuraGPUControllerDetect.cpp \ Controllers/CorsairController/CorsairController.cpp \ Controllers/CorsairController/CorsairControllerDetect.cpp \ - Controllers/CorsairKeyboardController/CorsairKeyboardController.cpp \ - Controllers/CorsairKeyboardController/CorsairKeyboardControllerDetect.cpp \ Controllers/CorsairLightingNodeController/CorsairLightingNodeController.cpp \ Controllers/CorsairLightingNodeController/CorsairLightingNodeControllerDetect.cpp \ + Controllers/CorsairPeripheralController/CorsairPeripheralController.cpp \ + Controllers/CorsairPeripheralController/CorsairPeripheralControllerDetect.cpp \ Controllers/CorsairProController/CorsairProController.cpp \ Controllers/CorsairProController/CorsairProControllerDetect.cpp \ Controllers/CrucialController/CrucialController.cpp \ @@ -125,8 +125,8 @@ SOURCES += \ RGBController/RGBController_Aura.cpp \ RGBController/RGBController_AuraGPU.cpp \ RGBController/RGBController_Corsair.cpp \ - RGBController/RGBController_CorsairKeyboard.cpp \ RGBController/RGBController_CorsairLightingNode.cpp \ + RGBController/RGBController_CorsairPeripheral.cpp \ RGBController/RGBController_CorsairPro.cpp \ RGBController/RGBController_Crucial.cpp \ RGBController/RGBController_Dummy.cpp \ @@ -166,8 +166,8 @@ HEADERS += \ Controllers/AuraController/AuraController.h \ Controllers/AuraGPUController/AuraGPUController.h \ Controllers/CorsairController/CorsairController.h \ - Controllers/CorsairKeyboardController/CorsairKeyboardController.h \ Controllers/CorsairLightingNodeController/CorsairLightingNodeController.h \ + Controllers/CorsairPeripheralController/CorsairPeripheralController.h \ Controllers/CorsairProController/CorsairProController.h \ Controllers/CrucialController/CrucialController.h \ Controllers/Hue2Controller/Hue2Controller.h \ @@ -190,6 +190,7 @@ HEADERS += \ RGBController/RGBController_AuraGPU.h \ RGBController/RGBController_Corsair.h \ RGBController/RGBController_CorsairLightingNode.h \ + RGBController/RGBController_CorsairPeripheral.h \ RGBController/RGBController_CorsairPro.h \ RGBController/RGBController_Crucial.h \ RGBController/RGBController_Dummy.h \ diff --git a/RGBController/RGBController_CorsairKeyboard.cpp b/RGBController/RGBController_CorsairPeripheral.cpp similarity index 90% rename from RGBController/RGBController_CorsairKeyboard.cpp rename to RGBController/RGBController_CorsairPeripheral.cpp index 3f2047d9..84e9b747 100644 --- a/RGBController/RGBController_CorsairKeyboard.cpp +++ b/RGBController/RGBController_CorsairPeripheral.cpp @@ -1,13 +1,13 @@ /*-----------------------------------------*\ -| RGBController_CorsairKeyboard.cpp | +| RGBController_CorsairPeripheral.cpp | | | | Generic RGB Interface for Corsair RGB | -| keyboards | +| keyboard, mouse, and mousemat devices | | | | Adam Honse (CalcProgrammer1) 1/9/2020 | \*-----------------------------------------*/ -#include "RGBController_CorsairKeyboard.h" +#include "RGBController_CorsairPeripheral.h" static const char* zone_names[] = { @@ -137,7 +137,7 @@ static const char* led_names[] = "Key: F12" }; -RGBController_CorsairKeyboard::RGBController_CorsairKeyboard(CorsairKeyboardController* corsair_ptr) +RGBController_CorsairPeripheral::RGBController_CorsairPeripheral(CorsairPeripheralController* corsair_ptr) { corsair = corsair_ptr; @@ -156,12 +156,12 @@ RGBController_CorsairKeyboard::RGBController_CorsairKeyboard(CorsairKeyboardCont SetupZones(); } -RGBController_CorsairKeyboard::~RGBController_CorsairKeyboard() +RGBController_CorsairPeripheral::~RGBController_CorsairPeripheral() { } -void RGBController_CorsairKeyboard::SetupZones() +void RGBController_CorsairPeripheral::SetupZones() { /*---------------------------------------------------------*\ | Determine number of zones | @@ -231,34 +231,34 @@ void RGBController_CorsairKeyboard::SetupZones() SetupColors(); } -void RGBController_CorsairKeyboard::ResizeZone(int /*zone*/, int /*new_size*/) +void RGBController_CorsairPeripheral::ResizeZone(int /*zone*/, int /*new_size*/) { /*---------------------------------------------------------*\ | This device does not support resizing zones | \*---------------------------------------------------------*/ } -void RGBController_CorsairKeyboard::UpdateLEDs() +void RGBController_CorsairPeripheral::UpdateLEDs() { corsair->SetLEDs(colors); } -void RGBController_CorsairKeyboard::UpdateZoneLEDs(int zone) +void RGBController_CorsairPeripheral::UpdateZoneLEDs(int zone) { corsair->SetLEDs(colors); } -void RGBController_CorsairKeyboard::UpdateSingleLED(int led) +void RGBController_CorsairPeripheral::UpdateSingleLED(int led) { corsair->SetLEDs(colors); } -void RGBController_CorsairKeyboard::SetCustomMode() +void RGBController_CorsairPeripheral::SetCustomMode() { active_mode = 0; } -void RGBController_CorsairKeyboard::UpdateMode() +void RGBController_CorsairPeripheral::UpdateMode() { } diff --git a/RGBController/RGBController_CorsairKeyboard.h b/RGBController/RGBController_CorsairPeripheral.h similarity index 63% rename from RGBController/RGBController_CorsairKeyboard.h rename to RGBController/RGBController_CorsairPeripheral.h index 1e07c530..e00407ea 100644 --- a/RGBController/RGBController_CorsairKeyboard.h +++ b/RGBController/RGBController_CorsairPeripheral.h @@ -1,21 +1,21 @@ /*-----------------------------------------*\ -| RGBController_CorsairKeyboard.h | +| RGBController_CorsairPeripheral.h | | | | Generic RGB Interface for Corsair RGB | -| keyboards | +| keyboard, mouse, and mousemat devices | | | | Adam Honse (CalcProgrammer1) 1/9/2020 | \*-----------------------------------------*/ #pragma once #include "RGBController.h" -#include "CorsairKeyboardController.h" +#include "CorsairPeripheralController.h" -class RGBController_CorsairKeyboard : public RGBController +class RGBController_CorsairPeripheral : public RGBController { public: - RGBController_CorsairKeyboard(CorsairKeyboardController* corsair_ptr); - ~RGBController_CorsairKeyboard(); + RGBController_CorsairPeripheral(CorsairPeripheralController* corsair_ptr); + ~RGBController_CorsairPeripheral(); void SetupZones(); @@ -29,5 +29,5 @@ public: void UpdateMode(); private: - CorsairKeyboardController* corsair; + CorsairPeripheralController* corsair; };