From fe6a84d6c912dc2fcc2bbeb673d04b3bf47f5f97 Mon Sep 17 00:00:00 2001 From: Adam Honse Date: Fri, 6 Mar 2020 12:11:53 -0600 Subject: [PATCH] Rename NodePro to LightingNode --- .../CorsairLightingNodeController.cpp} | 62 +++---- .../CorsairLightingNodeController.h | 168 +++++++++++++++++ .../CorsairLightingNodeControllerDetect.cpp} | 14 +- .../CorsairNodeProController.h | 175 ------------------ OpenRGB.cpp | 6 +- OpenRGB.pro | 12 +- ... => RGBController_CorsairLightingNode.cpp} | 100 +++++----- ....h => RGBController_CorsairLightingNode.h} | 10 +- 8 files changed, 269 insertions(+), 278 deletions(-) rename Controllers/{CorsairNodeProController/CorsairNodeProController.cpp => CorsairLightingNodeController/CorsairLightingNodeController.cpp} (87%) create mode 100644 Controllers/CorsairLightingNodeController/CorsairLightingNodeController.h rename Controllers/{CorsairNodeProController/CorsairNodeProControllerDetect.cpp => CorsairLightingNodeController/CorsairLightingNodeControllerDetect.cpp} (82%) delete mode 100644 Controllers/CorsairNodeProController/CorsairNodeProController.h rename RGBController/{RGBController_CorsairNodePro.cpp => RGBController_CorsairLightingNode.cpp} (71%) rename RGBController/{RGBController_CorsairNodePro.h => RGBController_CorsairLightingNode.h} (72%) diff --git a/Controllers/CorsairNodeProController/CorsairNodeProController.cpp b/Controllers/CorsairLightingNodeController/CorsairLightingNodeController.cpp similarity index 87% rename from Controllers/CorsairNodeProController/CorsairNodeProController.cpp rename to Controllers/CorsairLightingNodeController/CorsairLightingNodeController.cpp index 1ca87e01..d7cf307e 100644 --- a/Controllers/CorsairNodeProController/CorsairNodeProController.cpp +++ b/Controllers/CorsairLightingNodeController/CorsairLightingNodeController.cpp @@ -4,7 +4,7 @@ | Adam Honse (calcprogrammer1@gmail.com), 1/12/2020 | \*---------------------------------------------------------*/ -#include "CorsairNodeProController.h" +#include "CorsairLightingNodeController.h" #include #include @@ -41,12 +41,12 @@ static void Sleep(unsigned int milliseconds) THREAD keepalive_thread(void *param) { - CorsairNodeProController* corsair = static_cast(param); + CorsairLightingNodeController* corsair = static_cast(param); corsair->KeepaliveThread(); THREADRETURN } -CorsairNodeProController::CorsairNodeProController(libusb_device_handle* dev_handle, unsigned int dev_endpoint) +CorsairLightingNodeController::CorsairLightingNodeController(libusb_device_handle* dev_handle, unsigned int dev_endpoint) { dev = dev_handle; endpoint = dev_endpoint; @@ -68,11 +68,11 @@ CorsairNodeProController::CorsairNodeProController(libusb_device_handle* dev_han #endif } -CorsairNodeProController::~CorsairNodeProController() +CorsairLightingNodeController::~CorsairLightingNodeController() { } -void CorsairNodeProController::KeepaliveThread() +void CorsairLightingNodeController::KeepaliveThread() { while(1) { @@ -81,7 +81,7 @@ void CorsairNodeProController::KeepaliveThread() } } -void CorsairNodeProController::SetChannelEffect(unsigned char channel, +void CorsairLightingNodeController::SetChannelEffect(unsigned char channel, unsigned char num_leds, unsigned char mode, unsigned char speed, @@ -111,7 +111,7 @@ void CorsairNodeProController::SetChannelEffect(unsigned char channel, /*-----------------------------------------------------*\ | Set Port State packet | \*-----------------------------------------------------*/ - SendPortState(channel, CORSAIR_CMDR_PRO_PORT_STATE_HARDWARE); + SendPortState(channel, CORSAIR_LIGHTING_NODE_PORT_STATE_HARDWARE); /*-----------------------------------------------------*\ | Set Effect Configuration packet | @@ -145,7 +145,7 @@ void CorsairNodeProController::SetChannelEffect(unsigned char channel, SendCommit(); } -void CorsairNodeProController::SetChannelLEDs(unsigned char channel, RGBColor * colors, unsigned int num_colors) +void CorsairLightingNodeController::SetChannelLEDs(unsigned char channel, RGBColor * colors, unsigned int num_colors) { unsigned char color_data[50]; unsigned char pkt_max; @@ -153,7 +153,7 @@ void CorsairNodeProController::SetChannelLEDs(unsigned char channel, RGBColor * /*-----------------------------------------------------*\ | Send Port State packet | \*-----------------------------------------------------*/ - SendPortState(channel, CORSAIR_CMDR_PRO_PORT_STATE_SOFTWARE); + SendPortState(channel, CORSAIR_LIGHTING_NODE_PORT_STATE_SOFTWARE); /*-----------------------------------------------------*\ | Send red channel packet 1 | @@ -170,7 +170,7 @@ void CorsairNodeProController::SetChannelLEDs(unsigned char channel, RGBColor * color_data[idx] = RGBGetRValue(colors[idx]); } - SendDirect(channel, 0, pkt_max, CORSAIR_CMDR_PRO_DIRECT_CHANNEL_RED, color_data); + SendDirect(channel, 0, pkt_max, CORSAIR_LIGHTING_NODE_DIRECT_CHANNEL_RED, color_data); /*-----------------------------------------------------*\ | Send red channel packet 2 if necessary | @@ -189,7 +189,7 @@ void CorsairNodeProController::SetChannelLEDs(unsigned char channel, RGBColor * color_data[idx] = RGBGetRValue(colors[idx+50]); } - SendDirect(channel, 50, pkt_max, CORSAIR_CMDR_PRO_DIRECT_CHANNEL_RED, color_data); + SendDirect(channel, 50, pkt_max, CORSAIR_LIGHTING_NODE_DIRECT_CHANNEL_RED, color_data); } /*-----------------------------------------------------*\ @@ -207,7 +207,7 @@ void CorsairNodeProController::SetChannelLEDs(unsigned char channel, RGBColor * color_data[idx] = RGBGetGValue(colors[idx]); } - SendDirect(channel, 0, pkt_max, CORSAIR_CMDR_PRO_DIRECT_CHANNEL_GREEN, color_data); + SendDirect(channel, 0, pkt_max, CORSAIR_LIGHTING_NODE_DIRECT_CHANNEL_GREEN, color_data); /*-----------------------------------------------------*\ | Send green channel packet 2 if necessary | @@ -226,7 +226,7 @@ void CorsairNodeProController::SetChannelLEDs(unsigned char channel, RGBColor * color_data[idx] = RGBGetGValue(colors[idx+50]); } - SendDirect(channel, 50, pkt_max, CORSAIR_CMDR_PRO_DIRECT_CHANNEL_GREEN, color_data); + SendDirect(channel, 50, pkt_max, CORSAIR_LIGHTING_NODE_DIRECT_CHANNEL_GREEN, color_data); } /*-----------------------------------------------------*\ @@ -244,7 +244,7 @@ void CorsairNodeProController::SetChannelLEDs(unsigned char channel, RGBColor * color_data[idx] = RGBGetBValue(colors[idx]); } - SendDirect(channel, 0, pkt_max, CORSAIR_CMDR_PRO_DIRECT_CHANNEL_BLUE, color_data); + SendDirect(channel, 0, pkt_max, CORSAIR_LIGHTING_NODE_DIRECT_CHANNEL_BLUE, color_data); /*-----------------------------------------------------*\ | Send blue channel packet 2 if necessary | @@ -263,7 +263,7 @@ void CorsairNodeProController::SetChannelLEDs(unsigned char channel, RGBColor * color_data[idx] = RGBGetBValue(colors[idx+50]); } - SendDirect(channel, 50, pkt_max, CORSAIR_CMDR_PRO_DIRECT_CHANNEL_BLUE, color_data); + SendDirect(channel, 50, pkt_max, CORSAIR_LIGHTING_NODE_DIRECT_CHANNEL_BLUE, color_data); } /*-----------------------------------------------------*\ @@ -276,7 +276,7 @@ void CorsairNodeProController::SetChannelLEDs(unsigned char channel, RGBColor * | Private packet sending functions. | \*-------------------------------------------------------------------------------------------------*/ -void CorsairNodeProController::SendDirect +void CorsairLightingNodeController::SendDirect ( unsigned char channel, unsigned char start, @@ -296,7 +296,7 @@ void CorsairNodeProController::SendDirect /*-----------------------------------------------------*\ | Set up Direct packet | \*-----------------------------------------------------*/ - usb_buf[0x00] = CORSAIR_CMDR_PRO_PACKET_ID_DIRECT; + usb_buf[0x00] = CORSAIR_LIGHTING_NODE_PACKET_ID_DIRECT; usb_buf[0x01] = channel; usb_buf[0x02] = start; usb_buf[0x03] = count; @@ -313,7 +313,7 @@ void CorsairNodeProController::SendDirect libusb_interrupt_transfer(dev, endpoint, usb_buf, 64, &actual, 0); } -void CorsairNodeProController::SendCommit() +void CorsairLightingNodeController::SendCommit() { int actual; unsigned char usb_buf[64]; @@ -326,7 +326,7 @@ void CorsairNodeProController::SendCommit() /*-----------------------------------------------------*\ | Set up Commit packet | \*-----------------------------------------------------*/ - usb_buf[0x00] = CORSAIR_CMDR_PRO_PACKET_ID_COMMIT; + usb_buf[0x00] = CORSAIR_LIGHTING_NODE_PACKET_ID_COMMIT; usb_buf[0x01] = 0xFF; /*-----------------------------------------------------*\ @@ -335,7 +335,7 @@ void CorsairNodeProController::SendCommit() libusb_interrupt_transfer(dev, endpoint, usb_buf, 64, &actual, 0); } -void CorsairNodeProController::SendBegin +void CorsairLightingNodeController::SendBegin ( unsigned char channel ) @@ -351,7 +351,7 @@ void CorsairNodeProController::SendBegin /*-----------------------------------------------------*\ | Set up Begin packet | \*-----------------------------------------------------*/ - usb_buf[0x00] = CORSAIR_CMDR_PRO_PACKET_ID_BEGIN; + usb_buf[0x00] = CORSAIR_LIGHTING_NODE_PACKET_ID_BEGIN; usb_buf[0x01] = channel; /*-----------------------------------------------------*\ @@ -360,7 +360,7 @@ void CorsairNodeProController::SendBegin libusb_interrupt_transfer(dev, endpoint, usb_buf, 64, &actual, 0); } -void CorsairNodeProController::SendEffectConfig +void CorsairLightingNodeController::SendEffectConfig ( unsigned char channel, unsigned char count, @@ -394,7 +394,7 @@ void CorsairNodeProController::SendEffectConfig /*-----------------------------------------------------*\ | Set up Effect Config packet | \*-----------------------------------------------------*/ - usb_buf[0x00] = CORSAIR_CMDR_PRO_PACKET_ID_EFFECT_CONFIG; + usb_buf[0x00] = CORSAIR_LIGHTING_NODE_PACKET_ID_EFFECT_CONFIG; usb_buf[0x01] = channel; usb_buf[0x02] = count * 10; usb_buf[0x03] = led_type; @@ -437,12 +437,12 @@ void CorsairNodeProController::SendEffectConfig libusb_interrupt_transfer(dev, endpoint, usb_buf, 64, &actual, 0); } -void CorsairNodeProController::SendTemperature() +void CorsairLightingNodeController::SendTemperature() { } -void CorsairNodeProController::SendReset +void CorsairLightingNodeController::SendReset ( unsigned char channel ) @@ -458,7 +458,7 @@ void CorsairNodeProController::SendReset /*-----------------------------------------------------*\ | Set up Reset packet | \*-----------------------------------------------------*/ - usb_buf[0x00] = CORSAIR_CMDR_PRO_PACKET_ID_RESET; + usb_buf[0x00] = CORSAIR_LIGHTING_NODE_PACKET_ID_RESET; usb_buf[0x01] = channel; /*-----------------------------------------------------*\ @@ -467,7 +467,7 @@ void CorsairNodeProController::SendReset libusb_interrupt_transfer(dev, endpoint, usb_buf, 64, &actual, 0); } -void CorsairNodeProController::SendPortState +void CorsairLightingNodeController::SendPortState ( unsigned char channel, unsigned char state @@ -484,7 +484,7 @@ void CorsairNodeProController::SendPortState /*-----------------------------------------------------*\ | Set up Port State packet | \*-----------------------------------------------------*/ - usb_buf[0x00] = CORSAIR_CMDR_PRO_PACKET_ID_PORT_STATE; + usb_buf[0x00] = CORSAIR_LIGHTING_NODE_PACKET_ID_PORT_STATE; usb_buf[0x01] = channel; usb_buf[0x02] = state; @@ -494,17 +494,17 @@ void CorsairNodeProController::SendPortState libusb_interrupt_transfer(dev, endpoint, usb_buf, 64, &actual, 0); } -void CorsairNodeProController::SendBrightness() +void CorsairLightingNodeController::SendBrightness() { } -void CorsairNodeProController::SendLEDCount() +void CorsairLightingNodeController::SendLEDCount() { } -void CorsairNodeProController::SendProtocol() +void CorsairLightingNodeController::SendProtocol() { } diff --git a/Controllers/CorsairLightingNodeController/CorsairLightingNodeController.h b/Controllers/CorsairLightingNodeController/CorsairLightingNodeController.h new file mode 100644 index 00000000..38222fac --- /dev/null +++ b/Controllers/CorsairLightingNodeController/CorsairLightingNodeController.h @@ -0,0 +1,168 @@ +/*---------------------------------------------------------*\ +| Definitions for Corsair Lighting Node Pro | +| | +| Adam Honse (calcprogrammer1@gmail.com), 1/12/2020 | +\*---------------------------------------------------------*/ + +#include "RGBController.h" +#include +#include + +#pragma once + +enum +{ + CORSAIR_LIGHTING_NODE_PACKET_ID_DIRECT = 0x32, /* Direct mode LED update packet */ + CORSAIR_LIGHTING_NODE_PACKET_ID_COMMIT = 0x33, /* Commit changes packet */ + CORSAIR_LIGHTING_NODE_PACKET_ID_BEGIN = 0x34, /* Begin effect packet */ + CORSAIR_LIGHTING_NODE_PACKET_ID_EFFECT_CONFIG = 0x35, /* Effect mode configuration packet */ + CORSAIR_LIGHTING_NODE_PACKET_ID_TEMPERATURE = 0x36, /* Update temperature value packet */ + CORSAIR_LIGHTING_NODE_PACKET_ID_RESET = 0x37, /* Reset channel packet */ + CORSAIR_LIGHTING_NODE_PACKET_ID_PORT_STATE = 0x38, /* Set port state packet */ + CORSAIR_LIGHTING_NODE_PACKET_ID_BRIGHTNESS = 0x39, /* Set brightness packet */ + CORSAIR_LIGHTING_NODE_PACKET_ID_LED_COUNT = 0x3A, /* Set LED count packet */ + CORSAIR_LIGHTING_NODE_PACKET_ID_PROTOCOL = 0x3B, /* Set protocol packet */ +}; + +enum +{ + CORSAIR_LIGHTING_NODE_DIRECT_CHANNEL_RED = 0x00, /* Red channel for direct update */ + CORSAIR_LIGHTING_NODE_DIRECT_CHANNEL_GREEN = 0x01, /* Green channel for direct update */ + CORSAIR_LIGHTING_NODE_DIRECT_CHANNEL_BLUE = 0x02, /* Blue channel for direct update */ +}; + +enum +{ + CORSAIR_LIGHTING_NODE_PORT_STATE_HARDWARE = 0x01, /* Effect hardware control of channel */ + CORSAIR_LIGHTING_NODE_PORT_STATE_SOFTWARE = 0x02, /* Direct software control of channel */ +}; + +enum +{ + CORSAIR_LIGHTING_NODE_LED_TYPE_LED_STRIP = 0x0A, /* Corsair LED Strip Type */ + CORSAIR_LIGHTING_NODE_LED_TYPE_HD_FAN = 0x0C, /* Corsair HD-series Fan Type */ + CORSAIR_LIGHTING_NODE_LED_TYPE_SP_FAN = 0x01, /* Corsair SP-series Fan Type */ + CORSAIR_LIGHTING_NODE_LED_TYPE_ML_FAN = 0x02, /* Corsair ML-series Fan Type */ +}; + +enum +{ + CORSAIR_LIGHTING_NODE_CHANNEL_1 = 0x00, /* Channel 1 */ + CORSAIR_LIGHTING_NODE_CHANNEL_2 = 0x01, /* Channel 2 */ + CORSAIR_LIGHTING_NODE_NUM_CHANNELS = 0x02, /* Number of channels */ +}; + +enum +{ + CORSAIR_LIGHTING_NODE_SPEED_FAST = 0x00, /* Fast speed */ + CORSAIR_LIGHTING_NODE_SPEED_MEDIUM = 0x01, /* Medium speed */ + CORSAIR_LIGHTING_NODE_SPEED_SLOW = 0x02, /* Slow speed */ +}; + +enum +{ + CORSAIR_LIGHTING_NODE_MODE_RAINBOW_WAVE = 0x00, /* Rainbow Wave mode */ + CORSAIR_LIGHTING_NODE_MODE_COLOR_SHIFT = 0x01, /* Color Shift mode */ + CORSAIR_LIGHTING_NODE_MODE_COLOR_PULSE = 0x02, /* Color Pulse mode */ + CORSAIR_LIGHTING_NODE_MODE_COLOR_WAVE = 0x03, /* Color Wave mode */ + CORSAIR_LIGHTING_NODE_MODE_STATIC = 0x04, /* Static mode */ + CORSAIR_LIGHTING_NODE_MODE_TEMPERATURE = 0x05, /* Temperature mode */ + CORSAIR_LIGHTING_NODE_MODE_VISOR = 0x06, /* Visor mode */ + CORSAIR_LIGHTING_NODE_MODE_MARQUEE = 0x07, /* Marquee mode */ + CORSAIR_LIGHTING_NODE_MODE_BLINK = 0x08, /* Blink mode */ + CORSAIR_LIGHTING_NODE_MODE_SEQUENTIAL = 0x09, /* Sequential mode */ + CORSAIR_LIGHTING_NODE_MODE_RAINBOW = 0x0A, /* Rainbow mode */ +}; + +class CorsairLightingNodeController +{ +public: + CorsairLightingNodeController(libusb_device_handle* dev_handle, unsigned int dev_endpoint); + ~CorsairLightingNodeController(); + + unsigned int GetStripsOnChannel(unsigned int channel); + + void SetChannelEffect(unsigned char channel, + unsigned char num_leds, + unsigned char mode, + unsigned char speed, + unsigned char direction, + bool random, + unsigned char red1, + unsigned char grn1, + unsigned char blu1, + unsigned char red2, + unsigned char grn2, + unsigned char blu2, + unsigned char red3, + unsigned char grn3, + unsigned char blu3 + ); + + void SetChannelLEDs(unsigned char channel, RGBColor * colors, unsigned int num_colors); + unsigned int channel_leds[CORSAIR_LIGHTING_NODE_NUM_CHANNELS]; + + void KeepaliveThread(); + +private: + libusb_device_handle* dev; + unsigned int endpoint; + + void SendDirect + ( + unsigned char channel, + unsigned char start, + unsigned char count, + unsigned char color_channel, + unsigned char* color_data + ); + + void SendCommit(); + + void SendBegin + ( + unsigned char channel + ); + + void SendEffectConfig + ( + unsigned char channel, + unsigned char count, + unsigned char led_type, + unsigned char mode, + unsigned char speed, + unsigned char direction, + unsigned char change_style, + unsigned char color_0_red, + unsigned char color_0_green, + unsigned char color_0_blue, + unsigned char color_1_red, + unsigned char color_1_green, + unsigned char color_1_blue, + unsigned char color_2_red, + unsigned char color_2_green, + unsigned char color_2_blue, + unsigned short temperature_0, + unsigned short temperature_1, + unsigned short temperature_2 + ); + + void SendTemperature(); + + void SendReset + ( + unsigned char channel + ); + + void SendPortState + ( + unsigned char channel, + unsigned char state + ); + + void SendBrightness(); + + void SendLEDCount(); + + void SendProtocol(); +}; diff --git a/Controllers/CorsairNodeProController/CorsairNodeProControllerDetect.cpp b/Controllers/CorsairLightingNodeController/CorsairLightingNodeControllerDetect.cpp similarity index 82% rename from Controllers/CorsairNodeProController/CorsairNodeProControllerDetect.cpp rename to Controllers/CorsairLightingNodeController/CorsairLightingNodeControllerDetect.cpp index 2e267970..894e9643 100644 --- a/Controllers/CorsairNodeProController/CorsairNodeProControllerDetect.cpp +++ b/Controllers/CorsairLightingNodeController/CorsairLightingNodeControllerDetect.cpp @@ -1,6 +1,6 @@ -#include "CorsairNodeProController.h" +#include "CorsairLightingNodeController.h" #include "RGBController.h" -#include "RGBController_CorsairNodePro.h" +#include "RGBController_CorsairLightingNode.h" #include #include @@ -34,13 +34,13 @@ static const corsair_node_device device_list[6] = /******************************************************************************************\ * * -* DetectCorsairNodeProControllers * +* DetectCorsairLightingNodeControllers * * * * Detect devices supported by the Corsair Lighting Node Pro driver * * * * \******************************************************************************************/ -void DetectCorsairNodeProControllers(std::vector &rgb_controllers) +void DetectCorsairLightingNodeControllers(std::vector &rgb_controllers) { libusb_context * ctx; libusb_init(&ctx); @@ -55,13 +55,13 @@ void DetectCorsairNodeProControllers(std::vector &rgb_controller libusb_detach_kernel_driver(dev, 0); libusb_claim_interface(dev, 0); - CorsairNodeProController* controller = new CorsairNodeProController(dev, device_list[device_idx].usb_endpoint); + CorsairLightingNodeController* controller = new CorsairLightingNodeController(dev, device_list[device_idx].usb_endpoint); - RGBController_CorsairNodePro* rgb_controller = new RGBController_CorsairNodePro(controller); + RGBController_CorsairLightingNode* rgb_controller = new RGBController_CorsairLightingNode(controller); rgb_controller->name = device_list[device_idx].name; rgb_controllers.push_back(rgb_controller); } } -} /* DetectCorsairNodeProControllers() */ +} /* DetectCorsairLightingNodeControllers() */ diff --git a/Controllers/CorsairNodeProController/CorsairNodeProController.h b/Controllers/CorsairNodeProController/CorsairNodeProController.h deleted file mode 100644 index b5045d2a..00000000 --- a/Controllers/CorsairNodeProController/CorsairNodeProController.h +++ /dev/null @@ -1,175 +0,0 @@ -/*---------------------------------------------------------*\ -| Definitions for Corsair Lighting Node Pro | -| | -| Adam Honse (calcprogrammer1@gmail.com), 1/12/2020 | -\*---------------------------------------------------------*/ - -#include "RGBController.h" -#include -#include - -#pragma once - -enum -{ - CORSAIR_CMDR_PRO_PACKET_ID_DIRECT = 0x32, /* Direct mode LED update packet */ - CORSAIR_CMDR_PRO_PACKET_ID_COMMIT = 0x33, /* Commit changes packet */ - CORSAIR_CMDR_PRO_PACKET_ID_BEGIN = 0x34, /* Begin effect packet */ - CORSAIR_CMDR_PRO_PACKET_ID_EFFECT_CONFIG = 0x35, /* Effect mode configuration packet */ - CORSAIR_CMDR_PRO_PACKET_ID_TEMPERATURE = 0x36, /* Update temperature value packet */ - CORSAIR_CMDR_PRO_PACKET_ID_RESET = 0x37, /* Reset channel packet */ - CORSAIR_CMDR_PRO_PACKET_ID_PORT_STATE = 0x38, /* Set port state packet */ - CORSAIR_CMDR_PRO_PACKET_ID_BRIGHTNESS = 0x39, /* Set brightness packet */ - CORSAIR_CMDR_PRO_PACKET_ID_LED_COUNT = 0x3A, /* Set LED count packet */ - CORSAIR_CMDR_PRO_PACKET_ID_PROTOCOL = 0x3B, /* Set protocol packet */ -}; - -enum -{ - CORSAIR_CMDR_PRO_DIRECT_CHANNEL_RED = 0x00, /* Red channel for direct update */ - CORSAIR_CMDR_PRO_DIRECT_CHANNEL_GREEN = 0x01, /* Green channel for direct update */ - CORSAIR_CMDR_PRO_DIRECT_CHANNEL_BLUE = 0x02, /* Blue channel for direct update */ -}; - -enum -{ - CORSAIR_CMDR_PRO_PORT_STATE_HARDWARE = 0x01, /* Effect hardware control of channel */ - CORSAIR_CMDR_PRO_PORT_STATE_SOFTWARE = 0x02, /* Direct software control of channel */ -}; - -enum -{ - CORSAIR_CMDR_PRO_LED_TYPE_LED_STRIP = 0x0A, /* Corsair LED Strip Type */ - CORSAIR_CMDR_PRO_LED_TYPE_HD_FAN = 0x0C, /* Corsair HD-series Fan Type */ - CORSAIR_CMDR_PRO_LED_TYPE_SP_FAN = 0x01, /* Corsair SP-series Fan Type */ - CORSAIR_CMDR_PRO_LED_TYPE_ML_FAN = 0x02, /* Corsair ML-series Fan Type */ -}; - -enum -{ - CORSAIR_CMDR_PRO_CHANNEL_1 = 0x00, /* Channel 1 */ - CORSAIR_CMDR_PRO_CHANNEL_2 = 0x01, /* Channel 2 */ - CORSAIR_CMDR_PRO_NUM_CHANNELS = 0x02, /* Number of channels */ -}; - -enum -{ - CORSAIR_CMDR_PRO_SPEED_FAST = 0x00, /* Fast speed */ - CORSAIR_CMDR_PRO_SPEED_MEDIUM = 0x01, /* Medium speed */ - CORSAIR_CMDR_PRO_SPEED_SLOW = 0x02, /* Slow speed */ -}; - -enum -{ - CORSAIR_CMDR_PRO_MODE_RAINBOW_WAVE = 0x00, /* Rainbow Wave mode */ - CORSAIR_CMDR_PRO_MODE_COLOR_SHIFT = 0x01, /* Color Shift mode */ - CORSAIR_CMDR_PRO_MODE_COLOR_PULSE = 0x02, /* Color Pulse mode */ - CORSAIR_CMDR_PRO_MODE_COLOR_WAVE = 0x03, /* Color Wave mode */ - CORSAIR_CMDR_PRO_MODE_STATIC = 0x04, /* Static mode */ - CORSAIR_CMDR_PRO_MODE_TEMPERATURE = 0x05, /* Temperature mode */ - CORSAIR_CMDR_PRO_MODE_VISOR = 0x06, /* Visor mode */ - CORSAIR_CMDR_PRO_MODE_MARQUEE = 0x07, /* Marquee mode */ - CORSAIR_CMDR_PRO_MODE_BLINK = 0x08, /* Blink mode */ - CORSAIR_CMDR_PRO_MODE_SEQUENTIAL = 0x09, /* Sequential mode */ - CORSAIR_CMDR_PRO_MODE_RAINBOW = 0x0A, /* Rainbow mode */ -}; - -enum -{ - CORSAIR_NODE_PRO_CHANNEL_1 = 0x00, /* Channel 1 */ - CORSAIR_NODE_PRO_CHANNEL_2 = 0x01, /* Channel 2 */ - CORSAIR_NODE_PRO_NUM_CHANNELS = 0x02 /* Number of channels */ -}; - -class CorsairNodeProController -{ -public: - CorsairNodeProController(libusb_device_handle* dev_handle, unsigned int dev_endpoint); - ~CorsairNodeProController(); - - unsigned int GetStripsOnChannel(unsigned int channel); - - void SetChannelEffect(unsigned char channel, - unsigned char num_leds, - unsigned char mode, - unsigned char speed, - unsigned char direction, - bool random, - unsigned char red1, - unsigned char grn1, - unsigned char blu1, - unsigned char red2, - unsigned char grn2, - unsigned char blu2, - unsigned char red3, - unsigned char grn3, - unsigned char blu3 - ); - - void SetChannelLEDs(unsigned char channel, RGBColor * colors, unsigned int num_colors); - unsigned int channel_leds[CORSAIR_NODE_PRO_NUM_CHANNELS]; - - void KeepaliveThread(); - -private: - libusb_device_handle* dev; - unsigned int endpoint; - - void SendDirect - ( - unsigned char channel, - unsigned char start, - unsigned char count, - unsigned char color_channel, - unsigned char* color_data - ); - - void SendCommit(); - - void SendBegin - ( - unsigned char channel - ); - - void SendEffectConfig - ( - unsigned char channel, - unsigned char count, - unsigned char led_type, - unsigned char mode, - unsigned char speed, - unsigned char direction, - unsigned char change_style, - unsigned char color_0_red, - unsigned char color_0_green, - unsigned char color_0_blue, - unsigned char color_1_red, - unsigned char color_1_green, - unsigned char color_1_blue, - unsigned char color_2_red, - unsigned char color_2_green, - unsigned char color_2_blue, - unsigned short temperature_0, - unsigned short temperature_1, - unsigned short temperature_2 - ); - - void SendTemperature(); - - void SendReset - ( - unsigned char channel - ); - - void SendPortState - ( - unsigned char channel, - unsigned char state - ); - - void SendBrightness(); - - void SendLEDCount(); - - void SendProtocol(); -}; diff --git a/OpenRGB.cpp b/OpenRGB.cpp index 6fc850b6..1c7e613a 100644 --- a/OpenRGB.cpp +++ b/OpenRGB.cpp @@ -295,9 +295,8 @@ 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 DetectCorsairCmdrProControllers(std::vector &rgb_controllers); void DetectCorsairKeyboardControllers(std::vector& rgb_controllers); -void DetectCorsairNodeProControllers(std::vector &rgb_controllers); +void DetectCorsairLightingNodeControllers(std::vector &rgb_controllers); void DetectFaustusControllers(std::vector &rgb_controllers); void DetectHyperXKeyboardControllers(std::vector& rgb_controllers); void DetectThermaltakeRiingControllers(std::vector& rgb_controllers); @@ -336,9 +335,8 @@ void DetectRGBControllers(void) //DetectMSI3ZoneControllers(rgb_controllers); //DetectPoseidonZRGBControllers(rgb_controllers); //DetectHyperXKeyboardControllers(rgb_controllers); - //DetectCorsairCmdrProControllers(rgb_controllers); //DetectCorsairKeyboardControllers(rgb_controllers); - DetectCorsairNodeProControllers(rgb_controllers); + DetectCorsairLightingNodeControllers(rgb_controllers); DetectThermaltakeRiingControllers(rgb_controllers); //DetectRGBFusion2Controllers(rgb_controllers); diff --git a/OpenRGB.pro b/OpenRGB.pro index 0118c418..ba9cb8c1 100644 --- a/OpenRGB.pro +++ b/OpenRGB.pro @@ -34,7 +34,7 @@ INCLUDEPATH += \ # Controllers/AuraGPUController/ \ # Controllers/CorsairController/ \ # Controllers/CorsairKeyboardController/ \ - Controllers/CorsairNodeProController/ \ + Controllers/CorsairLightingNodeController/ \ # Controllers/CorsairProController/ \ # Controllers/CrucialController/ \ # Controllers/Hue2Controller/ \ @@ -85,8 +85,8 @@ SOURCES += \ # Controllers/CorsairController/CorsairControllerDetect.cpp \ # Controllers/CorsairKeyboardController/CorsairKeyboardController.cpp \ # Controllers/CorsairKeyboardController/CorsairKeyboardControllerDetect.cpp \ - Controllers/CorsairNodeProController/CorsairNodeProController.cpp \ - Controllers/CorsairNodeProController/CorsairNodeProControllerDetect.cpp \ + Controllers/CorsairLightingNodeController/CorsairLightingNodeController.cpp \ + Controllers/CorsairLightingNodeController/CorsairLightingNodeControllerDetect.cpp \ # Controllers/CorsairProController/CorsairProController.cpp \ # Controllers/CorsairProController/CorsairProControllerDetect.cpp \ # Controllers/CrucialController/CrucialController.cpp \ @@ -126,7 +126,7 @@ SOURCES += \ # RGBController/RGBController_AuraGPU.cpp \ # RGBController/RGBController_Corsair.cpp \ # RGBController/RGBController_CorsairKeyboard.cpp \ - RGBController/RGBController_CorsairNodePro.cpp \ + RGBController/RGBController_CorsairLightingNode.cpp \ # RGBController/RGBController_CorsairPro.cpp \ # RGBController/RGBController_Crucial.cpp \ RGBController/RGBController_Dummy.cpp \ @@ -167,7 +167,7 @@ HEADERS += \ Controllers/AuraGPUController/AuraGPUController.h \ Controllers/CorsairController/CorsairController.h \ Controllers/CorsairKeyboardController/CorsairKeyboardController.h \ - Controllers/CorsairNodeProController/CorsairNodeProController.h \ + Controllers/CorsairLightingNodeController/CorsairLightingNodeController.h \ Controllers/CorsairProController/CorsairProController.h \ Controllers/CrucialController/CrucialController.h \ Controllers/Hue2Controller/Hue2Controller.h \ @@ -189,7 +189,7 @@ HEADERS += \ RGBController/RGBController_Aura.h \ RGBController/RGBController_AuraGPU.h \ RGBController/RGBController_Corsair.h \ - RGBController/RGBController_CorsairNodePro.h \ + RGBController/RGBController_CorsairLightingNode.h \ RGBController/RGBController_CorsairPro.h \ RGBController/RGBController_Crucial.h \ RGBController/RGBController_Dummy.h \ diff --git a/RGBController/RGBController_CorsairNodePro.cpp b/RGBController/RGBController_CorsairLightingNode.cpp similarity index 71% rename from RGBController/RGBController_CorsairNodePro.cpp rename to RGBController/RGBController_CorsairLightingNode.cpp index 3e8987d7..d31bdb55 100644 --- a/RGBController/RGBController_CorsairNodePro.cpp +++ b/RGBController/RGBController_CorsairLightingNode.cpp @@ -1,5 +1,5 @@ /*-----------------------------------------*\ -| RGBController_CorsairNodePro.cpp | +| RGBController_CorsairLightingNode.cpp | | | | Generic RGB Interface for Corsair | | Lighting Node Pro | @@ -7,10 +7,10 @@ | Adam Honse (CalcProgrammer1) 1/12/2020 | \*-----------------------------------------*/ -#include "RGBController_CorsairNodePro.h" +#include "RGBController_CorsairLightingNode.h" -RGBController_CorsairNodePro::RGBController_CorsairNodePro(CorsairNodeProController* corsair_ptr) +RGBController_CorsairLightingNode::RGBController_CorsairLightingNode(CorsairLightingNodeController* corsair_ptr) { corsair = corsair_ptr; @@ -27,50 +27,50 @@ RGBController_CorsairNodePro::RGBController_CorsairNodePro(CorsairNodeProControl mode RainbowWave; RainbowWave.name = "Rainbow Wave"; - RainbowWave.value = CORSAIR_CMDR_PRO_MODE_RAINBOW_WAVE; + RainbowWave.value = CORSAIR_LIGHTING_NODE_MODE_RAINBOW_WAVE; RainbowWave.flags = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_DIRECTION_LR; - RainbowWave.speed_min = CORSAIR_CMDR_PRO_SPEED_SLOW; - RainbowWave.speed_max = CORSAIR_CMDR_PRO_SPEED_FAST; - RainbowWave.speed = CORSAIR_CMDR_PRO_SPEED_MEDIUM; + RainbowWave.speed_min = CORSAIR_LIGHTING_NODE_SPEED_SLOW; + RainbowWave.speed_max = CORSAIR_LIGHTING_NODE_SPEED_FAST; + RainbowWave.speed = CORSAIR_LIGHTING_NODE_SPEED_MEDIUM; RainbowWave.direction = MODE_DIRECTION_RIGHT; RainbowWave.color_mode = MODE_COLORS_NONE; modes.push_back(RainbowWave); mode ColorShift; ColorShift.name = "Color Shift"; - ColorShift.value = CORSAIR_CMDR_PRO_MODE_COLOR_SHIFT; + ColorShift.value = CORSAIR_LIGHTING_NODE_MODE_COLOR_SHIFT; ColorShift.flags = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_MODE_SPECIFIC_COLOR | MODE_FLAG_HAS_RANDOM_COLOR; ColorShift.colors_min = 2; ColorShift.colors_max = 2; - ColorShift.speed_min = CORSAIR_CMDR_PRO_SPEED_SLOW; - ColorShift.speed_max = CORSAIR_CMDR_PRO_SPEED_FAST; - ColorShift.speed = CORSAIR_CMDR_PRO_SPEED_MEDIUM; + ColorShift.speed_min = CORSAIR_LIGHTING_NODE_SPEED_SLOW; + ColorShift.speed_max = CORSAIR_LIGHTING_NODE_SPEED_FAST; + ColorShift.speed = CORSAIR_LIGHTING_NODE_SPEED_MEDIUM; ColorShift.color_mode = MODE_COLORS_MODE_SPECIFIC; ColorShift.colors.resize(2); modes.push_back(ColorShift); mode ColorPulse; ColorPulse.name = "Color Pulse"; - ColorPulse.value = CORSAIR_CMDR_PRO_MODE_COLOR_PULSE; + ColorPulse.value = CORSAIR_LIGHTING_NODE_MODE_COLOR_PULSE; ColorPulse.flags = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_MODE_SPECIFIC_COLOR | MODE_FLAG_HAS_RANDOM_COLOR; ColorPulse.colors_min = 2; ColorPulse.colors_max = 2; - ColorPulse.speed_min = CORSAIR_CMDR_PRO_SPEED_SLOW; - ColorPulse.speed_max = CORSAIR_CMDR_PRO_SPEED_FAST; - ColorPulse.speed = CORSAIR_CMDR_PRO_SPEED_MEDIUM; + ColorPulse.speed_min = CORSAIR_LIGHTING_NODE_SPEED_SLOW; + ColorPulse.speed_max = CORSAIR_LIGHTING_NODE_SPEED_FAST; + ColorPulse.speed = CORSAIR_LIGHTING_NODE_SPEED_MEDIUM; ColorPulse.color_mode = MODE_COLORS_MODE_SPECIFIC; ColorPulse.colors.resize(2); modes.push_back(ColorPulse); mode ColorWave; ColorWave.name = "Color Wave"; - ColorWave.value = CORSAIR_CMDR_PRO_MODE_COLOR_WAVE; + ColorWave.value = CORSAIR_LIGHTING_NODE_MODE_COLOR_WAVE; ColorWave.flags = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_DIRECTION_LR | MODE_FLAG_HAS_MODE_SPECIFIC_COLOR | MODE_FLAG_HAS_RANDOM_COLOR; ColorWave.colors_min = 2; ColorWave.colors_max = 2; - ColorWave.speed_min = CORSAIR_CMDR_PRO_SPEED_SLOW; - ColorWave.speed_max = CORSAIR_CMDR_PRO_SPEED_FAST; - ColorWave.speed = CORSAIR_CMDR_PRO_SPEED_MEDIUM; + ColorWave.speed_min = CORSAIR_LIGHTING_NODE_SPEED_SLOW; + ColorWave.speed_max = CORSAIR_LIGHTING_NODE_SPEED_FAST; + ColorWave.speed = CORSAIR_LIGHTING_NODE_SPEED_MEDIUM; ColorWave.direction = MODE_DIRECTION_RIGHT; ColorWave.color_mode = MODE_COLORS_MODE_SPECIFIC; ColorWave.colors.resize(2); @@ -78,7 +78,7 @@ RGBController_CorsairNodePro::RGBController_CorsairNodePro(CorsairNodeProControl mode Static; Static.name = "Static"; - Static.value = CORSAIR_CMDR_PRO_MODE_STATIC; + Static.value = CORSAIR_LIGHTING_NODE_MODE_STATIC; Static.flags = MODE_FLAG_HAS_MODE_SPECIFIC_COLOR; Static.colors_min = 1; Static.colors_max = 1; @@ -88,7 +88,7 @@ RGBController_CorsairNodePro::RGBController_CorsairNodePro(CorsairNodeProControl mode Temperature; Temperature.name = "Temperature"; - Temperature.value = CORSAIR_CMDR_PRO_MODE_TEMPERATURE; + Temperature.value = CORSAIR_LIGHTING_NODE_MODE_TEMPERATURE; Temperature.flags = MODE_FLAG_HAS_MODE_SPECIFIC_COLOR; Temperature.colors_min = 3; Temperature.colors_max = 3; @@ -98,26 +98,26 @@ RGBController_CorsairNodePro::RGBController_CorsairNodePro(CorsairNodeProControl mode Visor; Visor.name = "Visor"; - Visor.value = CORSAIR_CMDR_PRO_MODE_VISOR; + Visor.value = CORSAIR_LIGHTING_NODE_MODE_VISOR; Visor.flags = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_MODE_SPECIFIC_COLOR | MODE_FLAG_HAS_RANDOM_COLOR; Visor.colors_min = 2; Visor.colors_max = 2; - Visor.speed_min = CORSAIR_CMDR_PRO_SPEED_SLOW; - Visor.speed_max = CORSAIR_CMDR_PRO_SPEED_FAST; - Visor.speed = CORSAIR_CMDR_PRO_SPEED_MEDIUM; + Visor.speed_min = CORSAIR_LIGHTING_NODE_SPEED_SLOW; + Visor.speed_max = CORSAIR_LIGHTING_NODE_SPEED_FAST; + Visor.speed = CORSAIR_LIGHTING_NODE_SPEED_MEDIUM; Visor.color_mode = MODE_COLORS_MODE_SPECIFIC; Visor.colors.resize(2); modes.push_back(Visor); mode Marquee; Marquee.name = "Marquee"; - Marquee.value = CORSAIR_CMDR_PRO_MODE_MARQUEE; + Marquee.value = CORSAIR_LIGHTING_NODE_MODE_MARQUEE; Marquee.flags = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_DIRECTION_LR | MODE_FLAG_HAS_MODE_SPECIFIC_COLOR | MODE_FLAG_HAS_RANDOM_COLOR; Marquee.colors_min = 1; Marquee.colors_max = 1; - Marquee.speed_min = CORSAIR_CMDR_PRO_SPEED_SLOW; - Marquee.speed_max = CORSAIR_CMDR_PRO_SPEED_FAST; - Marquee.speed = CORSAIR_CMDR_PRO_SPEED_MEDIUM; + Marquee.speed_min = CORSAIR_LIGHTING_NODE_SPEED_SLOW; + Marquee.speed_max = CORSAIR_LIGHTING_NODE_SPEED_FAST; + Marquee.speed = CORSAIR_LIGHTING_NODE_SPEED_MEDIUM; Marquee.direction = MODE_DIRECTION_RIGHT; Marquee.color_mode = MODE_COLORS_MODE_SPECIFIC; Marquee.colors.resize(1); @@ -125,26 +125,26 @@ RGBController_CorsairNodePro::RGBController_CorsairNodePro(CorsairNodeProControl mode Blink; Blink.name = "Blink"; - Blink.value = CORSAIR_CMDR_PRO_MODE_BLINK; + Blink.value = CORSAIR_LIGHTING_NODE_MODE_BLINK; Blink.flags = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_MODE_SPECIFIC_COLOR | MODE_FLAG_HAS_RANDOM_COLOR; Blink.colors_min = 2; Blink.colors_max = 2; - Blink.speed_min = CORSAIR_CMDR_PRO_SPEED_SLOW; - Blink.speed_max = CORSAIR_CMDR_PRO_SPEED_FAST; - Blink.speed = CORSAIR_CMDR_PRO_SPEED_MEDIUM; + Blink.speed_min = CORSAIR_LIGHTING_NODE_SPEED_SLOW; + Blink.speed_max = CORSAIR_LIGHTING_NODE_SPEED_FAST; + Blink.speed = CORSAIR_LIGHTING_NODE_SPEED_MEDIUM; Blink.color_mode = MODE_COLORS_MODE_SPECIFIC; Blink.colors.resize(2); modes.push_back(Blink); mode Sequential; Sequential.name = "Sequential"; - Sequential.value = CORSAIR_CMDR_PRO_MODE_SEQUENTIAL; + Sequential.value = CORSAIR_LIGHTING_NODE_MODE_SEQUENTIAL; Sequential.flags = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_DIRECTION_LR | MODE_FLAG_HAS_MODE_SPECIFIC_COLOR | MODE_FLAG_HAS_RANDOM_COLOR; Sequential.colors_min = 1; Sequential.colors_max = 1; - Sequential.speed_min = CORSAIR_CMDR_PRO_SPEED_SLOW; - Sequential.speed_max = CORSAIR_CMDR_PRO_SPEED_FAST; - Sequential.speed = CORSAIR_CMDR_PRO_SPEED_MEDIUM; + Sequential.speed_min = CORSAIR_LIGHTING_NODE_SPEED_SLOW; + Sequential.speed_max = CORSAIR_LIGHTING_NODE_SPEED_FAST; + Sequential.speed = CORSAIR_LIGHTING_NODE_SPEED_MEDIUM; Sequential.direction = MODE_DIRECTION_RIGHT; Sequential.color_mode = MODE_COLORS_MODE_SPECIFIC; Sequential.colors.resize(1); @@ -152,18 +152,18 @@ RGBController_CorsairNodePro::RGBController_CorsairNodePro(CorsairNodeProControl mode Rainbow; Rainbow.name = "Rainbow"; - Rainbow.value = CORSAIR_CMDR_PRO_MODE_RAINBOW; + Rainbow.value = CORSAIR_LIGHTING_NODE_MODE_RAINBOW; Rainbow.flags = MODE_FLAG_HAS_SPEED; - Rainbow.speed_min = CORSAIR_CMDR_PRO_SPEED_SLOW; - Rainbow.speed_max = CORSAIR_CMDR_PRO_SPEED_FAST; - Rainbow.speed = CORSAIR_CMDR_PRO_SPEED_MEDIUM; + Rainbow.speed_min = CORSAIR_LIGHTING_NODE_SPEED_SLOW; + Rainbow.speed_max = CORSAIR_LIGHTING_NODE_SPEED_FAST; + Rainbow.speed = CORSAIR_LIGHTING_NODE_SPEED_MEDIUM; Rainbow.color_mode = MODE_COLORS_NONE; modes.push_back(Rainbow); SetupZones(); } -void RGBController_CorsairNodePro::SetupZones() +void RGBController_CorsairLightingNode::SetupZones() { /*-------------------------------------------------*\ | Clear any existing zone/LED configuration | @@ -174,7 +174,7 @@ void RGBController_CorsairNodePro::SetupZones() /*-------------------------------------------------*\ | Set zones and leds | \*-------------------------------------------------*/ - for (unsigned int channel_idx = 0; channel_idx < CORSAIR_NODE_PRO_NUM_CHANNELS; channel_idx++) + for (unsigned int channel_idx = 0; channel_idx < CORSAIR_LIGHTING_NODE_NUM_CHANNELS; channel_idx++) { if(corsair->channel_leds[channel_idx] > 0) { @@ -213,14 +213,14 @@ void RGBController_CorsairNodePro::SetupZones() SetupColors(); } -void RGBController_CorsairNodePro::ResizeZone(int zone, int new_size) +void RGBController_CorsairLightingNode::ResizeZone(int zone, int new_size) { corsair->channel_leds[zone] = new_size; SetupZones(); } -void RGBController_CorsairNodePro::UpdateLEDs() +void RGBController_CorsairLightingNode::UpdateLEDs() { for(std::size_t zone_idx = 0; zone_idx < zones.size(); zone_idx++) { @@ -228,24 +228,24 @@ void RGBController_CorsairNodePro::UpdateLEDs() } } -void RGBController_CorsairNodePro::UpdateZoneLEDs(int zone) +void RGBController_CorsairLightingNode::UpdateZoneLEDs(int zone) { corsair->SetChannelLEDs(zone, zones[zone].colors, zones[zone].leds_count); } -void RGBController_CorsairNodePro::UpdateSingleLED(int led) +void RGBController_CorsairLightingNode::UpdateSingleLED(int led) { unsigned int channel = leds_channel[led]; corsair->SetChannelLEDs(channel, zones[channel].colors, zones[channel].leds_count); } -void RGBController_CorsairNodePro::SetCustomMode() +void RGBController_CorsairLightingNode::SetCustomMode() { active_mode = 0; } -void RGBController_CorsairNodePro::UpdateMode() +void RGBController_CorsairLightingNode::UpdateMode() { if(modes[active_mode].value == 0xFFFF) { @@ -253,7 +253,7 @@ void RGBController_CorsairNodePro::UpdateMode() } else { - for(int channel = 0; channel < CORSAIR_CMDR_PRO_NUM_CHANNELS; channel++) + for(int channel = 0; channel < CORSAIR_LIGHTING_NODE_NUM_CHANNELS; channel++) { unsigned int direction = 0; bool random = (modes[active_mode].color_mode == MODE_COLORS_RANDOM); diff --git a/RGBController/RGBController_CorsairNodePro.h b/RGBController/RGBController_CorsairLightingNode.h similarity index 72% rename from RGBController/RGBController_CorsairNodePro.h rename to RGBController/RGBController_CorsairLightingNode.h index e9390855..721840b3 100644 --- a/RGBController/RGBController_CorsairNodePro.h +++ b/RGBController/RGBController_CorsairLightingNode.h @@ -1,5 +1,5 @@ /*-----------------------------------------*\ -| RGBController_CorsairNodePro.h | +| RGBController_CorsairLightingNode.h | | | | Generic RGB Interface for Corsair | | Lighting Node Pro | @@ -9,12 +9,12 @@ #pragma once #include "RGBController.h" -#include "CorsairNodeProController.h" +#include "CorsairLightingNodeController.h" -class RGBController_CorsairNodePro : public RGBController +class RGBController_CorsairLightingNode : public RGBController { public: - RGBController_CorsairNodePro(CorsairNodeProController* corsair_ptr); + RGBController_CorsairLightingNode(CorsairLightingNodeController* corsair_ptr); void SetupZones(); @@ -28,7 +28,7 @@ public: void UpdateMode(); private: - CorsairNodeProController* corsair; + CorsairLightingNodeController* corsair; std::vector leds_channel; std::vector zones_channel; };