OpenRGB version 0.1

Not confirmed working as of yet, but at least it builds and
--list-devices works.

Code originally taken from Sam Lewis (@sam-masaki on gitlab.com), see:
https://gitlab.com/CalcProgrammer1/OpenRGB/-/merge_requests/9

.gitignore

@@ -0,0 +1 @@
+*.pro.user*

.gitmodules

@@ -1,3 +1,6 @@
 [submodule "dependencies/libe131"]
 	path = dependencies/libe131
 	url = https://github.com/CalcProgrammer1/libe131
+[submodule "razer-drivers-win32"]
+	path = razer-drivers-win32
+	url = https://github.com/rsandoz/razer-drivers-win32

Controllers/AuraGPUController/AuraGPUController.cpp

@@ -0,0 +1,84 @@
+/*-----------------------------------------*\
+|  AuraGPUController.cpp                    |
+|                                           |
+|  Driver for ASUS Aura RGB on GPUs         |
+|                                           |
+|  Jan Rettig (Klapstuhl) 14.02.2020        |
+\*-----------------------------------------*/
+
+#include "AuraGPUController.h"
+#include <cstring>
+
+AuraGPUController::AuraGPUController(i2c_smbus_interface* bus, aura_gpu_dev_id dev)
+{
+    this->bus = bus;
+    this->dev = dev;
+
+    strcpy(device_name, "ASUS Aura GPU");                                               // Would be nice to get the actual GPU name. Using this as a placeholder.
+}
+
+AuraGPUController::~AuraGPUController()
+{
+
+}
+
+std::string AuraGPUController::GetDeviceName()
+{
+    return(device_name);
+}
+
+std::string AuraGPUController::GetDeviceLocation()
+{
+    std::string return_string(bus->device_name);
+    char addr[5];
+    snprintf(addr, 5, "0x%02X", dev);
+    return_string.append(", address ");
+    return_string.append(addr);
+    return(return_string);
+}
+
+unsigned char AuraGPUController::GetLEDRed()
+{
+    return(AuraGPURegisterRead(AURA_GPU_REG_RED));
+}
+
+unsigned char AuraGPUController::GetLEDGreen()
+{
+    return(AuraGPURegisterRead(AURA_GPU_REG_GREEN));
+}
+
+unsigned char AuraGPUController::GetLEDBlue()
+{
+    return(AuraGPURegisterRead(AURA_GPU_REG_BLUE));
+}
+
+void AuraGPUController::SetLEDColorsDirect(unsigned char red, unsigned char green, unsigned char blue)                  // Direct Mode is just Static Mode without applying color changes
+{
+    AuraGPURegisterWrite(AURA_GPU_REG_RED, red);
+    AuraGPURegisterWrite(AURA_GPU_REG_GREEN, green);
+    AuraGPURegisterWrite(AURA_GPU_REG_BLUE, blue);
+}
+
+void AuraGPUController::SetLEDColorsEffect(unsigned char red, unsigned char green, unsigned char blue)
+{
+    AuraGPURegisterWrite(AURA_GPU_REG_RED, red);
+    AuraGPURegisterWrite(AURA_GPU_REG_GREEN, green);
+    AuraGPURegisterWrite(AURA_GPU_REG_BLUE, blue);
+    AuraGPURegisterWrite(AURA_GPU_REG_APPLY, AURA_GPU_APPLY_VAL);
+}
+
+void AuraGPUController::SetMode(unsigned char mode)
+{
+    AuraGPURegisterWrite(AURA_GPU_REG_MODE, mode);
+    AuraGPURegisterWrite(AURA_GPU_REG_APPLY, AURA_GPU_APPLY_VAL);
+}
+
+unsigned char AuraGPUController::AuraGPURegisterRead(unsigned char reg)
+{
+    return(bus->i2c_smbus_read_byte_data(dev, reg));
+}
+
+void AuraGPUController::AuraGPURegisterWrite(unsigned char reg, unsigned char val)
+{
+    bus->i2c_smbus_write_byte_data(dev, reg, val);
+}

Controllers/AuraGPUController/AuraGPUController.h

@@ -0,0 +1,64 @@
+/*-----------------------------------------*\
+|  AuraGPUController.h                      |
+|                                           |
+|  Definitions for ASUS Aura RGB on GPUs    |
+|                                           |
+|  Jan Rettig (Klapstuhl) 14.02.2020        |
+\*-----------------------------------------*/
+
+#include <string>
+#include "i2c_smbus.h"
+
+#pragma once
+
+typedef unsigned char aura_gpu_dev_id;
+
+#define AURA_GPU_MAGIC_VAL 0x1589                   /* This magic value is present in all Aura GPU controllers */
+#define AURA_GPU_APPLY_VAL 0x01                     /* Value for Apply Changes Register     */
+
+enum
+{
+    AURA_GPU_REG_RED                        = 0x04,    /* AURA GPU RED Register            */
+    AURA_GPU_REG_GREEN                      = 0x05,    /* AURA GPU GREEN Register          */
+    AURA_GPU_REG_BLUE                       = 0x06,    /* AURA GPU BLUE Register           */
+    AURA_GPU_REG_MODE                       = 0x07,    /* AURA GPU Mode Selection Register */
+    AURA_GPU_REG_SYNC                       = 0x0C,    /* AURA GPU "Sync" Register         */
+    AURA_GPU_REG_APPLY                      = 0x0E,    /* AURA GPU Apply Chnages Register  */
+};
+
+enum
+{
+    AURA_GPU_MODE_OFF                       = 0,        /* OFF mode (not a real Mode! Doesn't do anything!)    */
+    AURA_GPU_MODE_STATIC                    = 1,        /* Static color mode                                   */
+    AURA_GPU_MODE_BREATHING                 = 2,        /* Breathing effect mode                               */
+    AURA_GPU_MODE_FLASHING                  = 3,        /* Flashing effect mode                                */
+    AURA_GPU_MODE_SPECTRUM_CYCLE            = 4,        /* Spectrum Cycle mode                                 */
+    AURA_GPU_MODE_DIRECT                    = 5,        /* Direct mode (not a real Mode! Doesn't do anything!) */
+    AURA_GPU_NUMBER_MODES
+};
+
+class AuraGPUController
+{
+public:
+    AuraGPUController(i2c_smbus_interface* bus, aura_gpu_dev_id);
+    ~AuraGPUController();
+
+    std::string   GetDeviceName();
+    std::string   GetDeviceLocation();
+    unsigned char GetLEDRed();
+    unsigned char GetLEDGreen();
+    unsigned char GetLEDBlue();
+    void          SetLEDColorsDirect(unsigned char red, unsigned char green, unsigned char blue);
+    void          SetLEDColorsEffect(unsigned char red, unsigned char green, unsigned char blue);
+    void          SetMode(unsigned char mode);
+
+    unsigned char AuraGPURegisterRead(unsigned char reg);
+    void          AuraGPURegisterWrite(unsigned char reg, unsigned char val);
+
+    bool          direct = false;                                                // Temporary solution to check if we are in "Direct" mode
+
+private:
+    char                    device_name[16];
+    i2c_smbus_interface *   bus;
+    aura_gpu_dev_id         dev;
+};

Controllers/AuraGPUController/AuraGPUControllerDetect.cpp

@@ -0,0 +1,94 @@
+/*-----------------------------------------*\
+|  AuraGPUControllerDetect.cpp              |
+|                                           |
+|  Driver for ASUS Aura RGB on GPUs         |
+|                                           |
+|  Jan Rettig (Klapstuhl) 14.02.2020        |
+\*-----------------------------------------*/
+
+#include "AuraGPUController.h"
+#include "RGBController.h"
+#include "RGBController_AuraGPU.h"
+#include "i2c_smbus.h"
+#include <vector>
+#include <stdio.h>
+#include <stdlib.h>
+
+#ifdef WIN32
+#include <Windows.h>
+#else
+#include <unistd.h>
+
+static void Sleep(unsigned int milliseconds)
+{
+    usleep(1000 * milliseconds);
+}
+#endif
+
+/*-------------------------------------------------------------*\
+| This list contains the available I2C addresses for Aura GPUs  |
+\*-------------------------------------------------------------*/
+#define AURA_GPU_ADDRESS_COUNT 3
+
+static const unsigned char aura_gpu_addresses[] =
+{
+    0x29,
+    0x2A,
+    0x60
+};
+
+
+/******************************************************************************************\
+*                                                                                          *
+*   TestForAuraGPUController                                                               *
+*                                                                                          *
+*       Tests the given address to see if an Aura GPU controller exists there.             *
+*                                                                                          *
+\******************************************************************************************/
+
+bool TestForAuraGPUController(i2c_smbus_interface* bus, unsigned char address)
+{
+    bool pass = false;
+
+    unsigned char aura_gpu_magic_high = bus->i2c_smbus_read_byte_data(address, 0x20);                        // High Byte of magic (0x15)                        
+    unsigned char aura_gpu_magic_low = bus->i2c_smbus_read_byte_data(address, 0x21);                         // Low Byte of magic (0x89)
+
+    if((aura_gpu_magic_high << 8) + aura_gpu_magic_low == AURA_GPU_MAGIC_VAL)
+    {
+        pass = true;
+    }
+
+    return(pass);
+
+}   /* TestForAuraGPUController() */
+
+
+/******************************************************************************************\
+*                                                                                          *
+*   DetectAuraGPUControllers                                                               *
+*                                                                                          *
+*       Detect Aura GPU controllers on the enumerated I2C busses.                          *
+*                                                                                          *
+\******************************************************************************************/
+
+void DetectAuraGPUControllers(std::vector<i2c_smbus_interface*> &busses, std::vector<RGBController*> &rgb_controllers)
+{
+    AuraGPUController* new_aura_gpu;
+    RGBController_AuraGPU* new_controller;
+
+    for (unsigned int bus = 0; bus < busses.size(); bus++)
+    {
+        // Add Aura-enabled GPU controllers
+        for (unsigned int address_list_idx = 0; address_list_idx < AURA_GPU_ADDRESS_COUNT; address_list_idx++)
+        {
+            if (TestForAuraGPUController(busses[bus], aura_gpu_addresses[address_list_idx]))
+            {
+                new_aura_gpu = new AuraGPUController(busses[bus], aura_gpu_addresses[address_list_idx]);
+                new_controller = new RGBController_AuraGPU(new_aura_gpu);
+                rgb_controllers.push_back(new_controller);
+            }
+
+            Sleep(1);
+        }
+    }
+} /* DetectAuraGPUControllers() */

Controllers/AuraSMBusController/AuraSMBusController.cpp

@@ -1,5 +1,5 @@
 /*-----------------------------------------*\
-|  AuraController.cpp                       |
+|  AuraSMBusController.cpp                  |
 |                                           |
 |  Driver for ASUS Aura RGB lighting        |
 |  controller                               |
@@ -7,10 +7,10 @@
 |  Adam Honse (CalcProgrammer1) 8/19/2018   |
 \*-----------------------------------------*/
 
-#include "AuraController.h"
+#include "AuraSMBusController.h"
 #include <cstring>
 
-AuraController::AuraController(i2c_smbus_interface* bus, aura_dev_id dev)
+AuraSMBusController::AuraSMBusController(i2c_smbus_interface* bus, aura_dev_id dev)
 {
     this->bus = bus;
     this->dev = dev;
@@ -77,17 +77,17 @@ AuraController::AuraController(i2c_smbus_interface* bus, aura_dev_id dev)
     }
 }
 
-AuraController::~AuraController()
+AuraSMBusController::~AuraSMBusController()
 {
 
 }
 
-std::string AuraController::GetDeviceName()
+std::string AuraSMBusController::GetDeviceName()
 {
     return(device_name);
 }
 
-std::string AuraController::GetDeviceLocation()
+std::string AuraSMBusController::GetDeviceLocation()
 {
     std::string return_string(bus->device_name);
     char addr[5];
@@ -97,12 +97,12 @@ std::string AuraController::GetDeviceLocation()
     return(return_string);
 }
 
-unsigned char AuraController::GetChannel(unsigned int led)
+unsigned char AuraSMBusController::GetChannel(unsigned int led)
 {
     return(config_table[channel_cfg + led]);
 }
 
-const char * AuraController::GetChannelName(unsigned int led)
+const char * AuraSMBusController::GetChannelName(unsigned int led)
 {
     switch (config_table[channel_cfg + led])
     {
@@ -152,27 +152,27 @@ const char * AuraController::GetChannelName(unsigned int led)
     }
 }
 
-unsigned int AuraController::GetLEDCount()
+unsigned int AuraSMBusController::GetLEDCount()
 {
     return(led_count);
 }
 
-unsigned char AuraController::GetLEDRed(unsigned int led)
+unsigned char AuraSMBusController::GetLEDRed(unsigned int led)
 {
     return(AuraRegisterRead(direct_reg + ( 3 * led )));
 }
 
-unsigned char AuraController::GetLEDGreen(unsigned int led)
+unsigned char AuraSMBusController::GetLEDGreen(unsigned int led)
 {
     return(AuraRegisterRead(direct_reg + ( 3 * led ) + 2));
 }
 
-unsigned char AuraController::GetLEDBlue(unsigned int led)
+unsigned char AuraSMBusController::GetLEDBlue(unsigned int led)
 {
     return(AuraRegisterRead(direct_reg + ( 3 * led ) + 1));
 }
 
-void AuraController::SetAllColorsDirect(unsigned char red, unsigned char green, unsigned char blue)
+void AuraSMBusController::SetAllColorsDirect(unsigned char red, unsigned char green, unsigned char blue)
 {
     unsigned char* colors = new unsigned char[led_count * 3];
 
@@ -188,7 +188,7 @@ void AuraController::SetAllColorsDirect(unsigned char red, unsigned char green,
     delete colors;
 }
 
-void AuraController::SetAllColorsEffect(unsigned char red, unsigned char green, unsigned char blue)
+void AuraSMBusController::SetAllColorsEffect(unsigned char red, unsigned char green, unsigned char blue)
 {
     unsigned char* colors = new unsigned char[led_count * 3];
 
@@ -206,20 +206,20 @@ void AuraController::SetAllColorsEffect(unsigned char red, unsigned char green,
     delete[] colors;
 }
 
-void AuraController::SetDirect(unsigned char direct)
+void AuraSMBusController::SetDirect(unsigned char direct)
 {
     AuraRegisterWrite(AURA_REG_DIRECT, direct);
     AuraRegisterWrite(AURA_REG_APPLY, AURA_APPLY_VAL);
 }
 
-void AuraController::SetLEDColorDirect(unsigned int led, unsigned char red, unsigned char green, unsigned char blue)
+void AuraSMBusController::SetLEDColorDirect(unsigned int led, unsigned char red, unsigned char green, unsigned char blue)
 {
     unsigned char colors[3] = { red, blue, green };
 
     AuraRegisterWriteBlock(direct_reg + ( 3 * led ), colors, 3);
 }
 
-void AuraController::SetLEDColorEffect(unsigned int led, unsigned char red, unsigned char green, unsigned char blue)
+void AuraSMBusController::SetLEDColorEffect(unsigned int led, unsigned char red, unsigned char green, unsigned char blue)
 {
     unsigned char colors[3] = { red, blue, green };
 
@@ -228,13 +228,13 @@ void AuraController::SetLEDColorEffect(unsigned int led, unsigned char red, unsi
     AuraRegisterWrite(AURA_REG_APPLY, AURA_APPLY_VAL);
 }
 
-void AuraController::SetMode(unsigned char mode)
+void AuraSMBusController::SetMode(unsigned char mode)
 {
     AuraRegisterWrite(AURA_REG_MODE, mode);
     AuraRegisterWrite(AURA_REG_APPLY, AURA_APPLY_VAL);
 }
 
-void AuraController::AuraUpdateDeviceName()
+void AuraSMBusController::AuraUpdateDeviceName()
 {
     for (int i = 0; i < 16; i++)
     {
@@ -242,7 +242,7 @@ void AuraController::AuraUpdateDeviceName()
     }
 }
 
-unsigned char AuraController::AuraRegisterRead(aura_register reg)
+unsigned char AuraSMBusController::AuraRegisterRead(aura_register reg)
 {
     //Write Aura register
     bus->i2c_smbus_write_word_data(dev, 0x00, ((reg << 8) & 0xFF00) | ((reg >> 8) & 0x00FF));
@@ -252,7 +252,7 @@ unsigned char AuraController::AuraRegisterRead(aura_register reg)
 
 }
 
-void AuraController::AuraRegisterWrite(aura_register reg, unsigned char val)
+void AuraSMBusController::AuraRegisterWrite(aura_register reg, unsigned char val)
 {
     //Write Aura register
     bus->i2c_smbus_write_word_data(dev, 0x00, ((reg << 8) & 0xFF00) | ((reg >> 8) & 0x00FF));
@@ -262,7 +262,7 @@ void AuraController::AuraRegisterWrite(aura_register reg, unsigned char val)
 
 }
 
-void AuraController::AuraRegisterWriteBlock(aura_register reg, unsigned char * data, unsigned char sz)
+void AuraSMBusController::AuraRegisterWriteBlock(aura_register reg, unsigned char * data, unsigned char sz)
 {
     //Write Aura register
     bus->i2c_smbus_write_word_data(dev, 0x00, ((reg << 8) & 0xFF00) | ((reg >> 8) & 0x00FF));

Controllers/AuraSMBusController/AuraSMBusController.h

@@ -1,5 +1,5 @@
 /*-----------------------------------------*\
-|  AuraController.h                         |
+|  AuraSMBusController.h                    |
 |                                           |
 |  Definitions and types for ASUS Aura RGB  |
 |  lighting controller                      |
@@ -88,11 +88,11 @@ enum
     AURA_CONFIG_CHANNEL_V2              = 0x1B,     /* LED Channel V2 configuration offset  */
 };
 
-class AuraController
+class AuraSMBusController
 {
 public:
-    AuraController(i2c_smbus_interface* bus, aura_dev_id dev);
-    ~AuraController();
+    AuraSMBusController(i2c_smbus_interface* bus, aura_dev_id dev);
+    ~AuraSMBusController();
 
     std::string   GetDeviceName();
     std::string   GetDeviceLocation();

Controllers/AuraSMBusController/AuraSMBusControllerDetect.cpp

@@ -1,6 +1,6 @@
-#include "AuraController.h"
+#include "AuraSMBusController.h"
 #include "RGBController.h"
-#include "RGBController_Aura.h"
+#include "RGBController_AuraSMBus.h"
 #include "i2c_smbus.h"
 #include <vector>
 #include <stdio.h>
@@ -20,12 +20,13 @@ static void Sleep(unsigned int milliseconds)
 /*----------------------------------------------------------------------*\
 | This list contains the available SMBus addresses for mapping Aura RAM  |
 \*----------------------------------------------------------------------*/
-#define AURA_RAM_ADDRESS_COUNT  17
+#define AURA_RAM_ADDRESS_COUNT  22
 
 static const unsigned char aura_ram_addresses[] =
 {
     0x70,
     0x71,
+    0x72,
     0x73,
     0x74,
     0x75,
@@ -40,7 +41,11 @@ static const unsigned char aura_ram_addresses[] =
     0x7F,
     0x4F,
     0x66,
-    0x67
+    0x67,
+    0x39,
+    0x3B,
+    0x3C,
+    0x3D
 };
 
 /*---------------------------------------------------------------------------------*\
@@ -60,9 +65,9 @@ static const unsigned char aura_mobo_addresses[] =
 *                                                                                          *
 *   AuraRegisterWrite                                                                      *
 *                                                                                          *
-*       A standalone version of the AuraController::AuraRegisterWrite function for access  *
-*       to Aura devices without instancing the AuraController class or reading the config  *
-*       table from the device.                                                             *
+*       A standalone version of the AuraSMBusController::AuraRegisterWrite function for    *
+*       access to Aura devices without instancing the AuraSMBusController class or reading *
+*       the config table from the device.                                                  *
 *                                                                                          *
 \******************************************************************************************/
 
@@ -77,7 +82,7 @@ void AuraRegisterWrite(i2c_smbus_interface* bus, aura_dev_id dev, aura_register
 
 /******************************************************************************************\
 *                                                                                          *
-*   TestForAuraController                                                                  *
+*   TestForAuraSMBusController                                                                  *
 *                                                                                          *
 *       Tests the given address to see if an Aura controller exists there.  First does a   *
 *       quick write to test for a response, and if so does a simple read at 0xA0 to test   *
@@ -85,7 +90,7 @@ void AuraRegisterWrite(i2c_smbus_interface* bus, aura_dev_id dev, aura_register
 *                                                                                          *
 \******************************************************************************************/
 
-bool TestForAuraController(i2c_smbus_interface* bus, unsigned char address)
+bool TestForAuraSMBusController(i2c_smbus_interface* bus, unsigned char address)
 {
     bool pass = false;
 
@@ -108,11 +113,11 @@ bool TestForAuraController(i2c_smbus_interface* bus, unsigned char address)
 
     return(pass);
 
-}   /* TestForAuraController() */
+}   /* TestForAuraSMBusController() */
 
 /******************************************************************************************\
 *                                                                                          *
-*   DetectAuraControllers                                                                  *
+*   DetectAuraSMBusControllers                                                                  *
 *                                                                                          *
 *       Detect Aura controllers on the enumerated I2C busses.  Searches for Aura-enabled   *
 *       RAM at 0x77 and tries to initialize their slot addresses, then searches for them   *
@@ -124,14 +129,14 @@ bool TestForAuraController(i2c_smbus_interface* bus, unsigned char address)
 *                                                                                          *
 \******************************************************************************************/
 
-void DetectAuraControllers(std::vector<i2c_smbus_interface*> &busses, std::vector<RGBController*> &rgb_controllers)
+void DetectAuraSMBusControllers(std::vector<i2c_smbus_interface*> &busses, std::vector<RGBController*> &rgb_controllers)
 {
-    AuraController* new_aura;
-    RGBController_Aura* new_controller;
+    AuraSMBusController* new_aura;
+    RGBController_AuraSMBus* new_controller;
 
     for (unsigned int bus = 0; bus < busses.size(); bus++)
     {
-        int address_list_idx = 0;
+        int address_list_idx = -1;
 
         // Remap Aura-enabled RAM modules on 0x77
         for (unsigned int slot = 0; slot < 8; slot++)
@@ -145,10 +150,11 @@ void DetectAuraControllers(std::vector<i2c_smbus_interface*> &busses, std::vecto
 
             do
             {
+                address_list_idx++;
+
                 if(address_list_idx < AURA_RAM_ADDRESS_COUNT)
                 {
                     res = busses[bus]->i2c_smbus_write_quick(aura_ram_addresses[address_list_idx], I2C_SMBUS_WRITE);
-                    address_list_idx++;
                 }
                 else
                 {
@@ -156,17 +162,20 @@ void DetectAuraControllers(std::vector<i2c_smbus_interface*> &busses, std::vecto
                 }
             } while (res >= 0);
 
-            AuraRegisterWrite(busses[bus], 0x77, AURA_REG_SLOT_INDEX, slot);
-            AuraRegisterWrite(busses[bus], 0x77, AURA_REG_I2C_ADDRESS, (aura_ram_addresses[address_list_idx] << 1));
+            if(address_list_idx < AURA_RAM_ADDRESS_COUNT)
+            {
+                AuraRegisterWrite(busses[bus], 0x77, AURA_REG_SLOT_INDEX, slot);
+                AuraRegisterWrite(busses[bus], 0x77, AURA_REG_I2C_ADDRESS, (aura_ram_addresses[address_list_idx] << 1));
+            }
         }
 
         // Add Aura-enabled controllers at their remapped addresses
         for (unsigned int address_list_idx = 0; address_list_idx < AURA_RAM_ADDRESS_COUNT; address_list_idx++)
         {
-            if (TestForAuraController(busses[bus], aura_ram_addresses[address_list_idx]))
+            if (TestForAuraSMBusController(busses[bus], aura_ram_addresses[address_list_idx]))
             {
-                new_aura = new AuraController(busses[bus], aura_ram_addresses[address_list_idx]);
-                new_controller = new RGBController_Aura(new_aura);
+                new_aura = new AuraSMBusController(busses[bus], aura_ram_addresses[address_list_idx]);
+                new_controller = new RGBController_AuraSMBus(new_aura);
                 rgb_controllers.push_back(new_controller);
             }
 
@@ -176,10 +185,10 @@ void DetectAuraControllers(std::vector<i2c_smbus_interface*> &busses, std::vecto
         // Add Aura-enabled motherboard controllers
         for (unsigned int address_list_idx = 0; address_list_idx < AURA_MOBO_ADDRESS_COUNT; address_list_idx++)
         {
-            if (TestForAuraController(busses[bus], aura_mobo_addresses[address_list_idx]))
+            if (TestForAuraSMBusController(busses[bus], aura_mobo_addresses[address_list_idx]))
             {
-                new_aura = new AuraController(busses[bus], aura_mobo_addresses[address_list_idx]);
-                new_controller = new RGBController_Aura(new_aura);
+                new_aura = new AuraSMBusController(busses[bus], aura_mobo_addresses[address_list_idx]);
+                new_controller = new RGBController_AuraSMBus(new_aura);
                 rgb_controllers.push_back(new_controller);
             }
 
@@ -187,4 +196,4 @@ void DetectAuraControllers(std::vector<i2c_smbus_interface*> &busses, std::vecto
         }
     }
 
-}   /* DetectAuraControllers() */
+}   /* DetectAuraSMBusControllers() */

Controllers/CorsairCmdrProController/CorsairCmdrProController.cpp

@@ -1,504 +0,0 @@
-/*---------------------------------------------------------*\
-|  Processing Code for Corsair Commander Pro                |
-|                                                           |
-|  Adam Honse ([email protected]), 1/16/2020        |
-\*---------------------------------------------------------*/
-
-#include "CorsairCmdrProController.h"
-
-#include <fstream>
-#include <iostream>
-#include <string>
-#include <cstring>
-
-//Include thread libraries for Windows or Linux
-#ifdef WIN32
-#include <process.h>
-#else
-#include "pthread.h"
-#include "unistd.h"
-#endif
-
-//Thread functions have different types in Windows and Linux
-#ifdef WIN32
-#define THREAD static void
-#define THREADRETURN
-#else
-#define THREAD static void*
-#define THREADRETURN return(NULL);
-#endif
-
-#ifdef WIN32
-#include <Windows.h>
-#else
-#include <unistd.h>
-
-static void Sleep(unsigned int milliseconds)
-{
-    usleep(1000 * milliseconds);
-}
-#endif
-
-THREAD keepalive_thread(void *param)
-{
-    CorsairCmdrProController* corsair = static_cast<CorsairCmdrProController*>(param);
-    corsair->KeepaliveThread();
-    THREADRETURN
-}
-
-CorsairCmdrProController::CorsairCmdrProController(libusb_device_handle* dev_handle)
-{
-    dev = dev_handle;
-    channel_leds[0] = 60;
-    channel_leds[1] = 60;
-
-    /*-----------------------------------------------------*\
-    | The Corsair Lighting Node Pro requires a packet within|
-    | 20 seconds of sending the lighting change in order    |
-    | to not revert back into rainbow mode.  Start a thread |
-    | to continuously send a keepalive packet every 5s      |
-    \*-----------------------------------------------------*/
-#ifdef WIN32
-    _beginthread(keepalive_thread, 0, this);
-#else
-    pthread_t thread;
-    pthread_create(&thread, NULL, &keepalive_thread, this);
-#endif
-}
-
-CorsairCmdrProController::~CorsairCmdrProController()
-{
-}
-
-void CorsairCmdrProController::KeepaliveThread()
-{
-    while(1)
-    {
-        SendCommit();
-        Sleep(5000);
-    }
-}
-
-void CorsairCmdrProController::SetChannelEffect(unsigned char channel,
-                                                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
-                                               )
-{
-    /*-----------------------------------------------------*\
-    | Send Reset packet                                     |
-    \*-----------------------------------------------------*/
-    SendReset(channel);
-
-    /*-----------------------------------------------------*\
-    | Send Begin packet                                     |
-    \*-----------------------------------------------------*/
-    SendBegin(channel);
-
-    /*-----------------------------------------------------*\
-    | Set Port State packet                                 |
-    \*-----------------------------------------------------*/
-    SendPortState(channel, CORSAIR_CMDR_PRO_PORT_STATE_HARDWARE);
-
-    /*-----------------------------------------------------*\
-    | Set Effect Configuration packet                       |
-    \*-----------------------------------------------------*/
-    SendEffectConfig
-    (
-        channel,
-        0,
-        CORSAIR_CMDR_PRO_LED_TYPE_LED_STRIP,
-        mode,
-        speed,
-        direction,
-        random,
-        red1,
-        grn1,
-        blu1,
-        red2,
-        grn2,
-        blu2,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0
-    );
-
-    /*-----------------------------------------------------*\
-    | Send Commit packet                                    |
-    \*-----------------------------------------------------*/
-    SendCommit();
-}
-
-void CorsairCmdrProController::SetChannelLEDs(unsigned char channel, std::vector<RGBColor> colors)
-{
-    unsigned char   color_data[50];
-    unsigned char   pkt_max;
-
-    /*-----------------------------------------------------*\
-    | Send Port State packet                                |
-    \*-----------------------------------------------------*/
-    SendPortState(channel, CORSAIR_CMDR_PRO_PORT_STATE_SOFTWARE);
-
-    /*-----------------------------------------------------*\
-    | Send red channel packet 1                             |
-    \*-----------------------------------------------------*/
-    pkt_max = 50;
-
-    if(pkt_max > colors.size())
-    {
-        pkt_max = (unsigned char)colors.size();
-    }
-
-    for(int idx = 0; idx < pkt_max; idx++)
-    {
-        color_data[idx] = RGBGetRValue(colors[idx]);
-    }
-
-    SendDirect(channel, 0, pkt_max, CORSAIR_CMDR_PRO_DIRECT_CHANNEL_RED, color_data);
-
-    /*-----------------------------------------------------*\
-    | Send red channel packet 2 if necessary                |
-    \*-----------------------------------------------------*/
-    pkt_max = 0;
-
-    if (colors.size() > 50)
-    {
-        pkt_max = (unsigned char)(colors.size() - 50);
-    }
-
-    if(pkt_max > 0)
-    {
-        for (std::size_t idx = 0; idx < pkt_max; idx++)
-        {
-            color_data[idx] = RGBGetRValue(colors[idx+50]);
-        }
-
-        SendDirect(channel, 50, pkt_max, CORSAIR_CMDR_PRO_DIRECT_CHANNEL_RED, color_data);
-    }
-
-    /*-----------------------------------------------------*\
-    | Send green channel packet 1                           |
-    \*-----------------------------------------------------*/
-    pkt_max = 50;
-
-    if(pkt_max > colors.size())
-    {
-        pkt_max = (unsigned char)colors.size();
-    }
-
-    for(int idx = 0; idx < pkt_max; idx++)
-    {
-        color_data[idx] = RGBGetGValue(colors[idx]);
-    }
-
-    SendDirect(channel, 0, pkt_max, CORSAIR_CMDR_PRO_DIRECT_CHANNEL_GREEN, color_data);
-
-    /*-----------------------------------------------------*\
-    | Send green channel packet 2 if necessary              |
-    \*-----------------------------------------------------*/
-    pkt_max = 0;
-
-    if (colors.size() > 50)
-    {
-        pkt_max = (unsigned char)(colors.size() - 50);
-    }
-
-    if(pkt_max > 0)
-    {
-        for (std::size_t idx = 0; idx < pkt_max; idx++)
-        {
-            color_data[idx] = RGBGetGValue(colors[idx+50]);
-        }
-
-        SendDirect(channel, 50, pkt_max, CORSAIR_CMDR_PRO_DIRECT_CHANNEL_GREEN, color_data);
-    }
-
-    /*-----------------------------------------------------*\
-    | Send blue channel packet 1                            |
-    \*-----------------------------------------------------*/
-    pkt_max = 50;
-
-    if(pkt_max > colors.size())
-    {
-        pkt_max = (unsigned char)colors.size();
-    }
-
-    for(int idx = 0; idx < pkt_max; idx++)
-    {
-        color_data[idx] = RGBGetBValue(colors[idx]);
-    }
-
-    SendDirect(channel, 0, pkt_max, CORSAIR_CMDR_PRO_DIRECT_CHANNEL_BLUE, color_data);
-
-    /*-----------------------------------------------------*\
-    | Send blue channel packet 2 if necessary               |
-    \*-----------------------------------------------------*/
-    pkt_max = 0;
-
-    if (colors.size() > 50)
-    {
-        pkt_max = (unsigned char)(colors.size() - 50);
-    }
-
-    if(pkt_max > 0)
-    {
-        for (std::size_t idx = 0; idx < pkt_max; idx++)
-        {
-            color_data[idx] = RGBGetBValue(colors[idx+50]);
-        }
-
-        SendDirect(channel, 50, pkt_max, CORSAIR_CMDR_PRO_DIRECT_CHANNEL_BLUE, color_data);
-    }
-
-    /*-----------------------------------------------------*\
-    | Send Commit packet                                    |
-    \*-----------------------------------------------------*/
-    SendCommit();
-}
-
-/*-------------------------------------------------------------------------------------------------*\
-| Private packet sending functions.                                                                 |
-\*-------------------------------------------------------------------------------------------------*/
-
-void CorsairCmdrProController::SendDirect
-    (
-    unsigned char   channel,
-    unsigned char   start,
-    unsigned char   count,
-    unsigned char   color_channel,
-    unsigned char*  color_data
-    )
-{
-    int             actual;
-    unsigned char   usb_buf[64];
-
-    /*-----------------------------------------------------*\
-    | Zero out buffer                                       |
-    \*-----------------------------------------------------*/
-    memset(usb_buf, 0x00, sizeof(usb_buf));
-
-    /*-----------------------------------------------------*\
-    | Set up Direct packet                                  |
-    \*-----------------------------------------------------*/
-    usb_buf[0x00]   = CORSAIR_CMDR_PRO_PACKET_ID_DIRECT;
-    usb_buf[0x01]   = channel;
-    usb_buf[0x02]   = start;
-    usb_buf[0x03]   = count;
-    usb_buf[0x04]   = color_channel;
-
-    /*-----------------------------------------------------*\
-    | Copy in color data bytes                              |
-    \*-----------------------------------------------------*/
-    memcpy(&usb_buf[0x05], color_data, count);
-
-    /*-----------------------------------------------------*\
-    | Send packet                                           |
-    \*-----------------------------------------------------*/
-    libusb_interrupt_transfer(dev, 0x02, usb_buf, 64, &actual, 0);
-}
-
-void CorsairCmdrProController::SendCommit()
-{
-    int             actual;
-    unsigned char   usb_buf[64];
-
-    /*-----------------------------------------------------*\
-    | Zero out buffer                                       |
-    \*-----------------------------------------------------*/
-    memset(usb_buf, 0x00, sizeof(usb_buf));
-
-    /*-----------------------------------------------------*\
-    | Set up Commit packet                                  |
-    \*-----------------------------------------------------*/
-    usb_buf[0x00]   = CORSAIR_CMDR_PRO_PACKET_ID_COMMIT;
-    usb_buf[0x01]   = 0xFF;
-
-    /*-----------------------------------------------------*\
-    | Send packet                                           |
-    \*-----------------------------------------------------*/
-    libusb_interrupt_transfer(dev, 0x02, usb_buf, 64, &actual, 0);
-}
-
-void CorsairCmdrProController::SendBegin
-    (
-    unsigned char   channel
-    )
-{
-    int             actual;
-    unsigned char   usb_buf[64];
-
-    /*-----------------------------------------------------*\
-    | Zero out buffer                                       |
-    \*-----------------------------------------------------*/
-    memset(usb_buf, 0x00, sizeof(usb_buf));
-
-    /*-----------------------------------------------------*\
-    | Set up Begin packet                                   |
-    \*-----------------------------------------------------*/
-    usb_buf[0x00]   = CORSAIR_CMDR_PRO_PACKET_ID_BEGIN;
-    usb_buf[0x01]   = channel;
-
-    /*-----------------------------------------------------*\
-    | Send packet                                           |
-    \*-----------------------------------------------------*/
-    libusb_interrupt_transfer(dev, 0x02, usb_buf, 64, &actual, 0);
-}
-
-void CorsairCmdrProController::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
-    )
-{
-    int             actual;
-    unsigned char   usb_buf[64];
-
-    /*-----------------------------------------------------*\
-    | Zero out buffer                                       |
-    \*-----------------------------------------------------*/
-    memset(usb_buf, 0x00, sizeof(usb_buf));
-
-    /*-----------------------------------------------------*\
-    | Set up Effect Config packet                           |
-    \*-----------------------------------------------------*/
-    usb_buf[0x00]   = CORSAIR_CMDR_PRO_PACKET_ID_EFFECT_CONFIG;
-    usb_buf[0x01]   = channel;
-    usb_buf[0x02]   = count * 10;
-    usb_buf[0x03]   = led_type;
-
-    /*-----------------------------------------------------*\
-    | Set up mode parameters                                |
-    \*-----------------------------------------------------*/
-    usb_buf[0x04]   = mode;
-    usb_buf[0x05]   = speed;
-    usb_buf[0x06]   = direction;
-    usb_buf[0x07]   = change_style;
-    usb_buf[0x08]   = 0;
-
-    /*-----------------------------------------------------*\
-    | Set up mode colors                                    |
-    \*-----------------------------------------------------*/
-    usb_buf[0x09]   = color_0_red;
-    usb_buf[0x10]   = color_0_green;
-    usb_buf[0x11]   = color_0_blue;
-    usb_buf[0x12]   = color_1_red;
-    usb_buf[0x13]   = color_1_green;
-    usb_buf[0x14]   = color_1_blue;
-    usb_buf[0x15]   = color_2_red;
-    usb_buf[0x16]   = color_2_green;
-    usb_buf[0x17]   = color_2_blue;
-
-    /*-----------------------------------------------------*\
-    | Set up temperatures                                   |
-    \*-----------------------------------------------------*/
-    usb_buf[0x12]   = (temperature_0 >> 8);
-    usb_buf[0x13]   = (temperature_0 & 0xFF);
-    usb_buf[0x14]   = (temperature_1 >> 8);
-    usb_buf[0x15]   = (temperature_1 & 0xFF);
-    usb_buf[0x16]   = (temperature_2 >> 8);
-    usb_buf[0x17]   = (temperature_2 & 0xFF);
-
-    /*-----------------------------------------------------*\
-    | Send packet                                           |
-    \*-----------------------------------------------------*/
-    libusb_interrupt_transfer(dev, 0x02, usb_buf, 64, &actual, 0);
-}
-
-void CorsairCmdrProController::SendTemperature()
-{
-
-}
-
-void CorsairCmdrProController::SendReset
-    (
-    unsigned char   channel
-    )
-{
-    int             actual;
-    unsigned char   usb_buf[64];
-
-    /*-----------------------------------------------------*\
-    | Zero out buffer                                       |
-    \*-----------------------------------------------------*/
-    memset(usb_buf, 0x00, sizeof(usb_buf));
-
-    /*-----------------------------------------------------*\
-    | Set up Reset packet                                   |
-    \*-----------------------------------------------------*/
-    usb_buf[0x00]   = CORSAIR_CMDR_PRO_PACKET_ID_RESET;
-    usb_buf[0x01]   = channel;
-
-    /*-----------------------------------------------------*\
-    | Send packet                                           |
-    \*-----------------------------------------------------*/
-    libusb_interrupt_transfer(dev, 0x02, usb_buf, 64, &actual, 0);
-}
-
-void CorsairCmdrProController::SendPortState
-    (
-    unsigned char   channel,
-    unsigned char   state
-    )
-{
-    int             actual;
-    unsigned char   usb_buf[64];
-
-    /*-----------------------------------------------------*\
-    | Zero out buffer                                       |
-    \*-----------------------------------------------------*/
-    memset(usb_buf, 0x00, sizeof(usb_buf));
-
-    /*-----------------------------------------------------*\
-    | Set up Port State packet                              |
-    \*-----------------------------------------------------*/
-    usb_buf[0x00]   = CORSAIR_CMDR_PRO_PACKET_ID_PORT_STATE;
-    usb_buf[0x01]   = channel;
-    usb_buf[0x02]   = state;
-
-    /*-----------------------------------------------------*\
-    | Send packet                                           |
-    \*-----------------------------------------------------*/
-    libusb_interrupt_transfer(dev, 0x02, usb_buf, 64, &actual, 0);
-}
-
-void CorsairCmdrProController::SendBrightness()
-{
-
-}
-
-void CorsairCmdrProController::SendLEDCount()
-{
-
-}
-
-void CorsairCmdrProController::SendProtocol()
-{
-
-}

Controllers/CorsairCmdrProController/CorsairCmdrProController.h

@@ -1,164 +0,0 @@
-/*---------------------------------------------------------*\
-|  Definitions for Corsair Commander Pro                    |
-|                                                           |
-|  Adam Honse ([email protected]), 1/16/2020        |
-\*---------------------------------------------------------*/
-
-#include "RGBController.h"
-#include <vector>
-#include <libusb-1.0/libusb.h>
-
-#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                         */
-};
-
-class CorsairCmdrProController
-{
-public:
-    CorsairCmdrProController(libusb_device_handle* dev_handle);
-    ~CorsairCmdrProController();
-    
-    char*           GetLEDString();
-    unsigned int    GetStripsOnChannel(unsigned int channel);
-
-    void            SetChannelEffect(unsigned char channel,
-                                     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
-                                    );
-
-    void            SetChannelLEDs(unsigned char channel, std::vector<RGBColor> colors);
-    unsigned int    channel_leds[CORSAIR_CMDR_PRO_NUM_CHANNELS];
-
-    void            KeepaliveThread();
-
-private:
-    libusb_device_handle*   dev;
-
-    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();
-};

Controllers/CorsairCmdrProController/CorsairCmdrProControllerDetect.cpp

@@ -1,37 +0,0 @@
-#include "CorsairCmdrProController.h"
-#include "RGBController.h"
-#include "RGBController_CorsairCmdrPro.h"
-#include <vector>
-#include <libusb-1.0/libusb.h>
-
-#define CORSAIR_COMMANDER_PRO_VID 0x1B1C
-#define CORSAIR_COMMANDER_PRO_PID 0x0C10
-
-/******************************************************************************************\
-*                                                                                          *
-*   DetectCorsairCmdrProControllers                                                        *
-*                                                                                          *
-*       Detect devices supported by the Corsair Commander Pro driver                       *
-*                                                                                          *                                                                                          *
-\******************************************************************************************/
-
-void DetectCorsairCmdrProControllers(std::vector<RGBController*> &rgb_controllers)
-{
-    libusb_context * ctx;
-    libusb_init(&ctx);
-
-    //Look for Corsair Commander Pro
-    libusb_device_handle * dev = libusb_open_device_with_vid_pid(ctx, CORSAIR_COMMANDER_PRO_VID, CORSAIR_COMMANDER_PRO_PID);
-
-    if( dev )
-    {
-        libusb_detach_kernel_driver(dev, 0);
-        libusb_claim_interface(dev, 0);
-
-        CorsairCmdrProController* controller = new CorsairCmdrProController(dev);
-
-        RGBController_CorsairCmdrPro* rgb_controller = new RGBController_CorsairCmdrPro(controller);
-
-        rgb_controllers.push_back(rgb_controller);
-    }
-}   /* DetectCorsairCmdrProControllers() */

Controllers/CorsairLightingNodeController/CorsairLightingNodeController.cpp

@@ -4,7 +4,7 @@
 |  Adam Honse (calcprogrammer1@gmail.com), 1/12/2020        |
 \*---------------------------------------------------------*/
 
-#include "CorsairNodeProController.h"
+#include "CorsairLightingNodeController.h"
 
 #include <fstream>
 #include <iostream>
@@ -41,16 +41,17 @@ static void Sleep(unsigned int milliseconds)
 
 THREAD keepalive_thread(void *param)
 {
-    CorsairNodeProController* corsair = static_cast<CorsairNodeProController*>(param);
+    CorsairLightingNodeController* corsair = static_cast<CorsairLightingNodeController*>(param);
     corsair->KeepaliveThread();
     THREADRETURN
 }
 
-CorsairNodeProController::CorsairNodeProController(libusb_device_handle* dev_handle)
+CorsairLightingNodeController::CorsairLightingNodeController(libusb_device_handle* dev_handle, unsigned int dev_endpoint)
 {
     dev = dev_handle;
-    channel_leds[0] = 60;
-    channel_leds[1] = 60;
+    endpoint = dev_endpoint;
+
+    SendFirmwareRequest();
 
     /*-----------------------------------------------------*\
     | The Corsair Lighting Node Pro requires a packet within|
@@ -66,11 +67,11 @@ CorsairNodeProController::CorsairNodeProController(libusb_device_handle* dev_han
 #endif
 }
 
-CorsairNodeProController::~CorsairNodeProController()
+CorsairLightingNodeController::~CorsairLightingNodeController()
 {
 }
 
-void CorsairNodeProController::KeepaliveThread()
+void CorsairLightingNodeController::KeepaliveThread()
 {
     while(1)
     {
@@ -79,7 +80,13 @@ void CorsairNodeProController::KeepaliveThread()
     }
 }
 
-void CorsairNodeProController::SetChannelEffect(unsigned char channel,
+std::string CorsairLightingNodeController::GetFirmwareString()
+{
+    return(firmware_version);
+}
+
+void CorsairLightingNodeController::SetChannelEffect(unsigned char channel,
+                                                unsigned char num_leds,
                                                 unsigned char mode,
                                                 unsigned char speed,
                                                 unsigned char direction,
@@ -89,7 +96,10 @@ void CorsairNodeProController::SetChannelEffect(unsigned char channel,
                                                 unsigned char blu1,
                                                 unsigned char red2,
                                                 unsigned char grn2,
-                                                unsigned char blu2
+                                                unsigned char blu2,
+                                                unsigned char red3,
+                                                unsigned char grn3,
+                                                unsigned char blu3
                                                )
 {
     /*-----------------------------------------------------*\
@@ -105,7 +115,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                       |
@@ -114,7 +124,7 @@ void CorsairNodeProController::SetChannelEffect(unsigned char channel,
     (
         channel,
         0,
-        CORSAIR_CMDR_PRO_LED_TYPE_LED_STRIP,
+        num_leds,
         mode,
         speed,
         direction,
@@ -125,9 +135,9 @@ void CorsairNodeProController::SetChannelEffect(unsigned char channel,
         red2,
         grn2,
         blu2,
-        0,
-        0,
-        0,
+        red3,
+        grn3,
+        blu3,
         0,
         0,
         0
@@ -139,7 +149,7 @@ void CorsairNodeProController::SetChannelEffect(unsigned char channel,
     SendCommit();
 }
 
-void CorsairNodeProController::SetChannelLEDs(unsigned char channel, std::vector<RGBColor> colors)
+void CorsairLightingNodeController::SetChannelLEDs(unsigned char channel, RGBColor * colors, unsigned int num_colors)
 {
     unsigned char   color_data[50];
     unsigned char   pkt_max;
@@ -147,16 +157,16 @@ void CorsairNodeProController::SetChannelLEDs(unsigned char channel, std::vector
     /*-----------------------------------------------------*\
     | 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                             |
     \*-----------------------------------------------------*/
     pkt_max = 50;
 
-    if(pkt_max > colors.size())
+    if(pkt_max > num_colors)
     {
-        pkt_max = (unsigned char)colors.size();
+        pkt_max = (unsigned char)num_colors;
     }
 
     for(int idx = 0; idx < pkt_max; idx++)
@@ -164,16 +174,16 @@ void CorsairNodeProController::SetChannelLEDs(unsigned char channel, std::vector
         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                |
     \*-----------------------------------------------------*/
     pkt_max = 0;
 
-    if (colors.size() > 50)
+    if (num_colors > 50)
     {
-        pkt_max = (unsigned char)(colors.size() - 50);
+        pkt_max = (unsigned char)(num_colors - 50);
     }
 
     if(pkt_max > 0)
@@ -183,7 +193,7 @@ void CorsairNodeProController::SetChannelLEDs(unsigned char channel, std::vector
             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);
     }
 
     /*-----------------------------------------------------*\
@@ -191,9 +201,9 @@ void CorsairNodeProController::SetChannelLEDs(unsigned char channel, std::vector
     \*-----------------------------------------------------*/
     pkt_max = 50;
 
-    if(pkt_max > colors.size())
+    if(pkt_max > num_colors)
     {
-        pkt_max = (unsigned char)colors.size();
+        pkt_max = (unsigned char)num_colors;
     }
 
     for(int idx = 0; idx < pkt_max; idx++)
@@ -201,16 +211,16 @@ void CorsairNodeProController::SetChannelLEDs(unsigned char channel, std::vector
         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              |
     \*-----------------------------------------------------*/
     pkt_max = 0;
 
-    if (colors.size() > 50)
+    if (num_colors > 50)
     {
-        pkt_max = (unsigned char)(colors.size() - 50);
+        pkt_max = (unsigned char)(num_colors - 50);
     }
 
     if(pkt_max > 0)
@@ -220,7 +230,7 @@ void CorsairNodeProController::SetChannelLEDs(unsigned char channel, std::vector
             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);
     }
 
     /*-----------------------------------------------------*\
@@ -228,9 +238,9 @@ void CorsairNodeProController::SetChannelLEDs(unsigned char channel, std::vector
     \*-----------------------------------------------------*/
     pkt_max = 50;
 
-    if(pkt_max > colors.size())
+    if(pkt_max > num_colors)
     {
-        pkt_max = (unsigned char)colors.size();
+        pkt_max = (unsigned char)num_colors;
     }
 
     for(int idx = 0; idx < pkt_max; idx++)
@@ -238,16 +248,16 @@ void CorsairNodeProController::SetChannelLEDs(unsigned char channel, std::vector
         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               |
     \*-----------------------------------------------------*/
     pkt_max = 0;
 
-    if (colors.size() > 50)
+    if (num_colors > 50)
     {
-        pkt_max = (unsigned char)(colors.size() - 50);
+        pkt_max = (unsigned char)(num_colors - 50);
     }
 
     if(pkt_max > 0)
@@ -257,7 +267,7 @@ void CorsairNodeProController::SetChannelLEDs(unsigned char channel, std::vector
             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);
     }
 
     /*-----------------------------------------------------*\
@@ -270,7 +280,34 @@ void CorsairNodeProController::SetChannelLEDs(unsigned char channel, std::vector
 | Private packet sending functions.                                                                 |
 \*-------------------------------------------------------------------------------------------------*/
 
-void CorsairNodeProController::SendDirect
+void CorsairLightingNodeController::SendFirmwareRequest()
+{
+    int             actual;
+    unsigned char   usb_buf[64];
+
+    /*-----------------------------------------------------*\
+    | Zero out buffer                                       |
+    \*-----------------------------------------------------*/
+    memset(usb_buf, 0x00, sizeof(usb_buf));
+
+    /*-----------------------------------------------------*\
+    | Set up Firmware Version Request packet                |
+    \*-----------------------------------------------------*/
+    usb_buf[0x00]   = CORSAIR_LIGHTING_NODE_PACKET_ID_FIRMWARE;
+
+    /*-----------------------------------------------------*\
+    | Send packet                                           |
+    \*-----------------------------------------------------*/
+    libusb_interrupt_transfer(dev, endpoint, usb_buf, 64, &actual, 0);
+    libusb_interrupt_transfer(dev, 0x80 + endpoint, usb_buf, 64, &actual, 0);
+
+    if(actual > 0)
+    {
+        firmware_version = std::to_string(usb_buf[0x01]) + "." + std::to_string(usb_buf[0x02]) + "." + std::to_string(usb_buf[0x03]);
+    }
+}
+
+void CorsairLightingNodeController::SendDirect
     (
     unsigned char   channel,
     unsigned char   start,
@@ -290,7 +327,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;
@@ -304,10 +341,10 @@ void CorsairNodeProController::SendDirect
     /*-----------------------------------------------------*\
     | Send packet                                           |
     \*-----------------------------------------------------*/
-    libusb_interrupt_transfer(dev, 0x01, usb_buf, 64, &actual, 0);
+    libusb_interrupt_transfer(dev, endpoint, usb_buf, 64, &actual, 0);
 }
 
-void CorsairNodeProController::SendCommit()
+void CorsairLightingNodeController::SendCommit()
 {
     int             actual;
     unsigned char   usb_buf[64];
@@ -320,16 +357,16 @@ 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;
 
     /*-----------------------------------------------------*\
     | Send packet                                           |
     \*-----------------------------------------------------*/
-    libusb_interrupt_transfer(dev, 0x01, usb_buf, 64, &actual, 0);
+    libusb_interrupt_transfer(dev, endpoint, usb_buf, 64, &actual, 0);
 }
 
-void CorsairNodeProController::SendBegin
+void CorsairLightingNodeController::SendBegin
     (
     unsigned char   channel
     )
@@ -345,16 +382,16 @@ 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;
 
     /*-----------------------------------------------------*\
     | Send packet                                           |
     \*-----------------------------------------------------*/
-    libusb_interrupt_transfer(dev, 0x01, usb_buf, 64, &actual, 0);
+    libusb_interrupt_transfer(dev, endpoint, usb_buf, 64, &actual, 0);
 }
 
-void CorsairNodeProController::SendEffectConfig
+void CorsairLightingNodeController::SendEffectConfig
     (
     unsigned char   channel,
     unsigned char   count,
@@ -388,7 +425,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;
@@ -428,15 +465,15 @@ void CorsairNodeProController::SendEffectConfig
     /*-----------------------------------------------------*\
     | Send packet                                           |
     \*-----------------------------------------------------*/
-    libusb_interrupt_transfer(dev, 0x01, usb_buf, 64, &actual, 0);
+    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
     )
@@ -452,16 +489,16 @@ 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;
 
     /*-----------------------------------------------------*\
     | Send packet                                           |
     \*-----------------------------------------------------*/
-    libusb_interrupt_transfer(dev, 0x01, usb_buf, 64, &actual, 0);
+    libusb_interrupt_transfer(dev, endpoint, usb_buf, 64, &actual, 0);
 }
 
-void CorsairNodeProController::SendPortState
+void CorsairLightingNodeController::SendPortState
     (
     unsigned char   channel,
     unsigned char   state
@@ -478,27 +515,27 @@ 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;
 
     /*-----------------------------------------------------*\
     | Send packet                                           |
     \*-----------------------------------------------------*/
-    libusb_interrupt_transfer(dev, 0x01, usb_buf, 64, &actual, 0);
+    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()
 {
 
 }

Controllers/CorsairLightingNodeController/CorsairLightingNodeController.h

@@ -0,0 +1,173 @@
+/*---------------------------------------------------------*\
+|  Definitions for Corsair Lighting Node Pro                |
+|                                                           |
+|  Adam Honse ([email protected]), 1/12/2020        |
+\*---------------------------------------------------------*/
+
+#include "RGBController.h"
+#include <vector>
+#include <libusb-1.0/libusb.h>
+
+#pragma once
+
+enum
+{
+    CORSAIR_LIGHTING_NODE_PACKET_ID_FIRMWARE         = 0x02,     /* Get firmware version                 */
+    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();
+
+    std::string     GetFirmwareString();
+
+    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);
+
+    void            KeepaliveThread();
+
+private:
+    libusb_device_handle*   dev;
+    unsigned int            endpoint;
+    std::string             firmware_version;
+
+    void            SendFirmwareRequest();
+
+    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();
+};

Controllers/CorsairLightingNodeController/CorsairLightingNodeControllerDetect.cpp

@@ -0,0 +1,67 @@
+#include "CorsairLightingNodeController.h"
+#include "RGBController.h"
+#include "RGBController_CorsairLightingNode.h"
+#include <vector>
+#include <libusb-1.0/libusb.h>
+
+#define CORSAIR_VID                     0x1B1C
+#define CORSAIR_LIGHTING_NODE_CORE_PID  0x0C1A
+#define CORSAIR_LIGHTING_NODE_PRO_PID   0x0C0B
+#define CORSAIR_COMMANDER_PRO_PID       0x0C10
+#define CORSAIR_LS100_PID               0x0C1E
+#define CORSAIR_1000D_OBSIDIAN_PID      0x1D00
+#define CORSAIR_SPEC_OMEGA_RGB_PID      0x1D04
+
+typedef struct
+{
+    unsigned short  usb_vid;
+    unsigned short  usb_pid;
+    unsigned char   usb_endpoint;
+    unsigned char   channel_count;
+    const char *    name;
+} corsair_node_device;
+
+static const corsair_node_device device_list[6] =
+{
+    { CORSAIR_VID,          CORSAIR_LIGHTING_NODE_CORE_PID,     1,      1,      "Corsair Lighting Node Core"    },
+    { CORSAIR_VID,          CORSAIR_LIGHTING_NODE_PRO_PID,      1,      2,      "Corsair Lighting Node Pro"     },
+    { CORSAIR_VID,          CORSAIR_COMMANDER_PRO_PID,          2,      2,      "Corsair Commander Pro"         },
+    { CORSAIR_VID,          CORSAIR_LS100_PID,                  1,      1,      "Corsair LS100 Lighting Kit"    },
+    { CORSAIR_VID,          CORSAIR_1000D_OBSIDIAN_PID,         2,      2,      "Corsair 1000D Obsidian"        },
+    { CORSAIR_VID,          CORSAIR_SPEC_OMEGA_RGB_PID,         1,      2,      "Corsair SPEC OMEGA RGB"        }
+
+};
+
+/******************************************************************************************\
+*                                                                                          *
+*   DetectCorsairLightingNodeControllers                                                   *
+*                                                                                          *
+*       Detect devices supported by the Corsair Lighting Node Pro driver                   *
+*                                                                                          *                                                                                          *
+\******************************************************************************************/
+
+void DetectCorsairLightingNodeControllers(std::vector<RGBController*> &rgb_controllers)
+{
+    libusb_context * ctx;
+    libusb_init(&ctx);
+
+    for(int device_idx = 0; device_idx < 6; device_idx++)
+    {
+        //Look for Corsair Lighting Node Device
+        libusb_device_handle * dev = libusb_open_device_with_vid_pid(ctx, device_list[device_idx].usb_vid, device_list[device_idx].usb_pid);
+
+        if( dev )
+        {
+            libusb_detach_kernel_driver(dev, 0);
+            libusb_claim_interface(dev, 0);
+
+            CorsairLightingNodeController* controller = new CorsairLightingNodeController(dev, device_list[device_idx].usb_endpoint);
+
+            RGBController_CorsairLightingNode* rgb_controller = new RGBController_CorsairLightingNode(controller);
+
+            rgb_controller->name = device_list[device_idx].name;
+
+            rgb_controllers.push_back(rgb_controller);
+        }
+    }
+}   /* DetectCorsairLightingNodeControllers() */

Controllers/CorsairNodeProController/CorsairNodeProController.h

@@ -1,171 +0,0 @@
-/*---------------------------------------------------------*\
-|  Definitions for Corsair Lighting Node Pro                |
-|                                                           |
-|  Adam Honse ([email protected]), 1/12/2020        |
-\*---------------------------------------------------------*/
-
-#include "RGBController.h"
-#include <vector>
-#include <libusb-1.0/libusb.h>
-
-#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);
-    ~CorsairNodeProController();
-    
-    char*           GetLEDString();
-    unsigned int    GetStripsOnChannel(unsigned int channel);
-
-    void            SetChannelEffect(unsigned char channel,
-                                     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
-                                    );
-
-    void            SetChannelLEDs(unsigned char channel, std::vector<RGBColor> colors);
-    unsigned int    channel_leds[CORSAIR_NODE_PRO_NUM_CHANNELS];
-
-    void            KeepaliveThread();
-
-private:
-    libusb_device_handle*   dev;
-
-    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();
-};

Controllers/CorsairNodeProController/CorsairNodeProControllerDetect.cpp

@@ -1,37 +0,0 @@
-#include "CorsairNodeProController.h"
-#include "RGBController.h"
-#include "RGBController_CorsairNodePro.h"
-#include <vector>
-#include <libusb-1.0/libusb.h>
-
-#define CORSAIR_LIGHTING_NODE_PRO_VID 0x1B1C
-#define CORSAIR_LIGHTING_NODE_PRO_PID 0x0C0B
-
-/******************************************************************************************\
-*                                                                                          *
-*   DetectCorsairNodeProControllers                                                        *
-*                                                                                          *
-*       Detect devices supported by the Corsair Lighting Node Pro driver                   *
-*                                                                                          *                                                                                          *
-\******************************************************************************************/
-
-void DetectCorsairNodeProControllers(std::vector<RGBController*> &rgb_controllers)
-{
-    libusb_context * ctx;
-    libusb_init(&ctx);
-
-    //Look for Corsair Lighting Node Pro
-    libusb_device_handle * dev = libusb_open_device_with_vid_pid(ctx, CORSAIR_LIGHTING_NODE_PRO_VID, CORSAIR_LIGHTING_NODE_PRO_PID);
-
-    if( dev )
-    {
-        libusb_detach_kernel_driver(dev, 0);
-        libusb_claim_interface(dev, 0);
-
-        CorsairNodeProController* controller = new CorsairNodeProController(dev);
-
-        RGBController_CorsairNodePro* rgb_controller = new RGBController_CorsairNodePro(controller);
-
-        rgb_controllers.push_back(rgb_controller);
-    }
-}   /* DetectCorsairNodeProControllers() */

Controllers/CorsairPeripheralController/CorsairPeripheralController.cpp

@@ -0,0 +1,487 @@
+/*-----------------------------------------*\
+|  CorsairPeripheralController.cpp          |
+|                                           |
+|  Driver for Corsair RGB keyboard, mouse,  |
+|  and mousemat lighting controller         |
+|                                           |
+|  Adam Honse (CalcProgrammer1) 1/9/2020    |
+\*-----------------------------------------*/
+
+#include "CorsairPeripheralController.h"
+
+#include <cstring>
+
+static unsigned int keys[] = {0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0C, 0x0D, 0x0E, 0x0F, 0x11, 0x12,
+                              0x14, 0x15, 0x18, 0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F, 0x20, 0x21, 0x24, 0x25, 0x26,
+                              0x27, 0x28, 0x2A, 0x2B, 0x2C, 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39,
+                              0x3C, 0x3D, 0x3E, 0x3F, 0x40, 0x42, 0x43, 0x44, 0x45, 0x48, 73,   74,   75,   76,   78,
+                              79,   80,   81,   84,   85,   86,   87,   88,   89,   90,   91,   92,   93,   96,   97,
+                              98,   99,   100,  101,  102,  103,  104,  105,  108,  109,  110,  111,  112,  113,  115,
+                              116,  117,  120,  121,  122,  123,  124,  126,  127,  128,  129,  132,  133,  134,  135,
+                              136,  137,  139,  140,  141};
+
+static void send_usb_msg(hid_device* dev, char * data_pkt)
+{
+    char usb_pkt[65];
+    usb_pkt[0] = 0x00;
+    for(int i = 1; i < 65; i++)
+    {
+        usb_pkt[i] = data_pkt[i-1];
+    }
+    int bytes = hid_send_feature_report(dev, (unsigned char *)usb_pkt, 65);
+    bytes++;
+}
+
+CorsairPeripheralController::CorsairPeripheralController(hid_device* dev_handle)
+{
+    dev = dev_handle;
+
+    ReadFirmwareInfo();
+
+    SpecialFunctionControl();
+    LightingControl();
+}
+
+CorsairPeripheralController::~CorsairPeripheralController()
+{
+
+}
+
+device_type CorsairPeripheralController::GetDeviceType()
+{
+    return type;
+}
+
+std::string CorsairPeripheralController::GetFirmwareString()
+{
+    return firmware_version;
+}
+
+void CorsairPeripheralController::SetLEDs(std::vector<RGBColor>colors)
+{
+    switch(type)
+    {
+        case DEVICE_TYPE_KEYBOARD:
+            SetLEDsKeyboardFull(colors);
+            break;
+
+        case DEVICE_TYPE_MOUSE:
+            SetLEDsMouse(colors);
+            break;
+
+        case DEVICE_TYPE_MOUSEMAT:
+            SetLEDsMousemat(colors);
+            break;
+    }
+}
+
+void CorsairPeripheralController::SetLEDsKeyboardFull(std::vector<RGBColor> colors)
+{
+    unsigned char red_val[144];
+    unsigned char grn_val[144];
+    unsigned char blu_val[144];
+
+    /*-----------------------------------------------------*\
+    | Zero out buffers                                      |
+    \*-----------------------------------------------------*/
+    memset(red_val, 0x00, sizeof( red_val ));
+    memset(grn_val, 0x00, sizeof( grn_val ));
+    memset(blu_val, 0x00, sizeof( blu_val ));
+
+    /*-----------------------------------------------------*\
+    | Copy red, green, and blue components into buffers     |
+    \*-----------------------------------------------------*/
+    for(std::size_t color_idx = 0; color_idx < colors.size(); color_idx++)
+    {
+        RGBColor           color = colors[color_idx];
+        red_val[keys[color_idx]] = RGBGetRValue(color);
+        grn_val[keys[color_idx]] = RGBGetGValue(color);
+        blu_val[keys[color_idx]] = RGBGetBValue(color);
+    }
+
+    /*-----------------------------------------------------*\
+    | Send red bytes                                        |
+    \*-----------------------------------------------------*/
+    StreamPacket(1, 60, &red_val[0]);
+    StreamPacket(2, 60, &red_val[60]);
+    StreamPacket(3, 24, &red_val[120]);
+    SubmitKeyboardFullColors(1, 3, 1);
+
+    /*-----------------------------------------------------*\
+    | Send green bytes                                      |
+    \*-----------------------------------------------------*/
+    StreamPacket(1, 60, &grn_val[0]);
+    StreamPacket(2, 60, &grn_val[60]);
+    StreamPacket(3, 24, &grn_val[120]);
+    SubmitKeyboardFullColors(2, 3, 1);
+
+    /*-----------------------------------------------------*\
+    | Send blue bytes                                       |
+    \*-----------------------------------------------------*/
+    StreamPacket(1, 60, &blu_val[0]);
+    StreamPacket(2, 60, &blu_val[60]);
+    StreamPacket(3, 24, &blu_val[120]);
+    SubmitKeyboardFullColors(3, 3, 2);
+}
+
+void CorsairPeripheralController::SetLEDsMouse(std::vector<RGBColor> colors)
+{
+    SubmitMouseColors(colors.size(), &colors[0]);
+}
+
+void CorsairPeripheralController::SetLEDsMousemat(std::vector<RGBColor> colors)
+{
+    SubmitMousematColors(colors.size(), &colors[0]);
+}
+
+void CorsairPeripheralController::SetLEDsKeyboardLimited(std::vector<RGBColor> colors)
+{
+    unsigned char data_pkt[216];
+    unsigned char red_val[144];
+    unsigned char grn_val[144];
+    unsigned char blu_val[144];
+
+    /*-----------------------------------------------------*\
+    | Zero out buffers                                      |
+    \*-----------------------------------------------------*/
+    memset(data_pkt, 0x00, sizeof( data_pkt ));
+    memset(red_val, 0x00, sizeof( red_val ));
+    memset(grn_val, 0x00, sizeof( grn_val ));
+    memset(blu_val, 0x00, sizeof( blu_val ));
+
+    /*-----------------------------------------------------*\
+    | Scale color values to 9-bit                           |
+    \*-----------------------------------------------------*/
+    for(std::size_t color_idx = 0; color_idx < colors.size(); color_idx++)
+    {
+        RGBColor      color = colors[color_idx];
+        unsigned char red   = RGBGetRValue(color);
+        unsigned char grn   = RGBGetGValue(color);
+        unsigned char blu   = RGBGetBValue(color);
+
+        if( red > 7 ) red = 7;
+        if( grn > 7 ) grn = 7;
+        if( blu > 7 ) blu = 7;
+
+        red = 7 - red;
+        grn = 7 - grn;
+        blu = 7 - blu;
+
+        red_val[keys[color_idx]] = red;
+        grn_val[keys[color_idx]] = grn;
+        blu_val[keys[color_idx]] = blu;
+    }
+
+    /*-----------------------------------------------------*\
+    | Pack the color values, 2 values per byte              |
+    \*-----------------------------------------------------*/
+    for(int red_idx = 0; red_idx < 72; red_idx++)
+    {
+        data_pkt[red_idx] = red_val[(red_idx * 2) + 1] << 4 | red_val[red_idx * 2];
+    }
+
+    for(int grn_idx = 0; grn_idx < 72; grn_idx++)
+    {
+        data_pkt[grn_idx + 72] = grn_val[(grn_idx * 2) + 1] << 4 | grn_val[grn_idx * 2];
+    }
+
+    for(int blu_idx = 0; blu_idx < 72; blu_idx++)
+    {
+        data_pkt[blu_idx + 144] = blu_val[(blu_idx * 2) + 1] << 4 | blu_val[blu_idx * 2];
+    }
+
+    /*-----------------------------------------------------*\
+    | Send the packets                                      |
+    \*-----------------------------------------------------*/
+    StreamPacket(1, 60, &data_pkt[0]);
+    StreamPacket(2, 60, &data_pkt[60]);
+    StreamPacket(3, 60, &data_pkt[120]);
+    StreamPacket(4, 36, &data_pkt[180]);
+    
+    SubmitKeyboardLimitedColors(216);
+}
+
+/*-------------------------------------------------------------------------------------------------*\
+| Private packet sending functions.                                                                 |
+\*-------------------------------------------------------------------------------------------------*/
+
+void CorsairPeripheralController::LightingControl()
+{
+    char usb_buf[64];
+
+    /*-----------------------------------------------------*\
+    | Zero out buffer                                       |
+    \*-----------------------------------------------------*/
+    memset(usb_buf, 0x00, sizeof(usb_buf));
+
+    /*-----------------------------------------------------*\
+    | Set up Lighting Control packet                        |
+    \*-----------------------------------------------------*/
+    usb_buf[0x00]           = CORSAIR_COMMAND_WRITE;
+    usb_buf[0x01]           = CORSAIR_PROPERTY_LIGHTING_CONTROL;
+    usb_buf[0x02]           = CORSAIR_LIGHTING_CONTROL_SOFTWARE;
+
+    /*-----------------------------------------------------*\
+    | Lighting control byte needs to be 3 for keyboards, 1  |
+    | for mice and mousepads                                |
+    \*-----------------------------------------------------*/
+    switch(type)
+    {
+        default:
+        case DEVICE_TYPE_KEYBOARD:
+            usb_buf[0x04]   = 0x03;
+            break;
+
+        case DEVICE_TYPE_MOUSE:
+            usb_buf[0x04]   = 0x01;
+            break;
+
+        case DEVICE_TYPE_MOUSEMAT:
+            usb_buf[0x04]   = 0x04;
+            break;
+    }
+    
+    /*-----------------------------------------------------*\
+    | Send packet                                           |
+    \*-----------------------------------------------------*/
+    send_usb_msg(dev, usb_buf);
+}
+
+void CorsairPeripheralController::SpecialFunctionControl()
+{
+    char usb_buf[64];
+
+    /*-----------------------------------------------------*\
+    | Zero out buffer                                       |
+    \*-----------------------------------------------------*/
+    memset(usb_buf, 0x00, sizeof(usb_buf));
+
+    /*-----------------------------------------------------*\
+    | Set up Lighting Control packet                        |
+    \*-----------------------------------------------------*/
+    usb_buf[0x00]           = CORSAIR_COMMAND_WRITE;
+    usb_buf[0x01]           = CORSAIR_PROPERTY_SPECIAL_FUNCTION;
+    usb_buf[0x02]           = CORSAIR_LIGHTING_CONTROL_SOFTWARE;
+    
+    /*-----------------------------------------------------*\
+    | Send packet                                           |
+    \*-----------------------------------------------------*/
+    send_usb_msg(dev, usb_buf);
+}
+
+void CorsairPeripheralController::ReadFirmwareInfo()
+{
+    char usb_buf[64];
+
+    /*-----------------------------------------------------*\
+    | Zero out buffer                                       |
+    \*-----------------------------------------------------*/
+    memset(usb_buf, 0x00, sizeof(usb_buf));
+
+    /*-----------------------------------------------------*\
+    | Set up Read Firmware Info packet                      |
+    \*-----------------------------------------------------*/
+    usb_buf[0x00]   = CORSAIR_COMMAND_READ;
+    usb_buf[0x01]   = CORSAIR_PROPERTY_FIRMWARE_INFO;
+
+    /*-----------------------------------------------------*\
+    | Send packet                                           |
+    \*-----------------------------------------------------*/
+    send_usb_msg(dev, usb_buf);
+    hid_get_feature_report(dev, (unsigned char*)usb_buf, 64);
+
+    /*-----------------------------------------------------*\
+    | Get device type                                       |
+    |   0xC0    Device is a keyboard                        |
+    |   0xC1    Device is a mouse                           |
+    |   0xC2    Device is a mousepad                        |
+    \*-----------------------------------------------------*/
+    switch((unsigned char)usb_buf[0x14])
+    {
+        case 0xC0:
+            type = DEVICE_TYPE_KEYBOARD;
+            break;
+
+        case 0xC1:
+            type = DEVICE_TYPE_MOUSE;
+            break;
+
+        case 0xC2:
+            type = DEVICE_TYPE_MOUSEMAT;
+            break;
+
+        default:
+            type = DEVICE_TYPE_UNKNOWN;
+            break;
+    }
+
+    /*-----------------------------------------------------*\
+    | Format firmware version string if device type is valid|
+    \*-----------------------------------------------------*/
+    if(type != DEVICE_TYPE_UNKNOWN)
+    {
+        firmware_version = std::to_string(usb_buf[0x09]) + "." + std::to_string(usb_buf[0x08]);
+    }
+}
+
+void CorsairPeripheralController::StreamPacket
+    (
+    unsigned char   packet_id,
+    unsigned char   data_sz,
+    unsigned char*  data_ptr
+    )
+{
+    char usb_buf[64];
+
+    /*-----------------------------------------------------*\
+    | Zero out buffer                                       |
+    \*-----------------------------------------------------*/
+    memset(usb_buf, 0x00, sizeof(usb_buf));
+
+    /*-----------------------------------------------------*\
+    | Set up Stream packet                                  |
+    \*-----------------------------------------------------*/
+    usb_buf[0x00]   = CORSAIR_COMMAND_STREAM;
+    usb_buf[0x01]   = packet_id;
+    usb_buf[0x02]   = data_sz;
+
+    /*-----------------------------------------------------*\
+    | Copy in data bytes                                    |
+    \*-----------------------------------------------------*/
+    memcpy(&usb_buf[0x04], data_ptr, data_sz);
+
+    /*-----------------------------------------------------*\
+    | Send packet                                           |
+    \*-----------------------------------------------------*/
+    send_usb_msg(dev, usb_buf);
+}
+
+void CorsairPeripheralController::SubmitKeyboardFullColors
+    (
+    unsigned char   color_channel,
+    unsigned char   packet_count,
+    unsigned char   finish_val
+    )
+{
+    char usb_buf[64];
+
+    /*-----------------------------------------------------*\
+    | Zero out buffer                                       |
+    \*-----------------------------------------------------*/
+    memset(usb_buf, 0x00, sizeof(usb_buf));
+
+    /*-----------------------------------------------------*\
+    | Set up Submit Keyboard 24-Bit Colors packet           |
+    \*-----------------------------------------------------*/
+    usb_buf[0x00]   = CORSAIR_COMMAND_WRITE;
+    usb_buf[0x01]   = CORSAIR_PROPERTY_SUBMIT_KEYBOARD_COLOR_24;
+    usb_buf[0x02]   = color_channel;
+    usb_buf[0x03]   = packet_count;
+    usb_buf[0x04]   = finish_val;
+
+    /*-----------------------------------------------------*\
+    | Send packet                                           |
+    \*-----------------------------------------------------*/
+    send_usb_msg(dev, usb_buf);
+}
+
+void CorsairPeripheralController::SubmitKeyboardLimitedColors
+    (
+    unsigned char   byte_count
+    )
+{
+    char usb_buf[64];
+
+    /*-----------------------------------------------------*\
+    | Zero out buffer                                       |
+    \*-----------------------------------------------------*/
+    memset(usb_buf, 0x00, sizeof(usb_buf));
+
+    /*-----------------------------------------------------*\
+    | Set up Submit Keyboard 9-Bit Colors packet            |
+    \*-----------------------------------------------------*/
+    usb_buf[0x00]   = CORSAIR_COMMAND_WRITE;
+    usb_buf[0x01]   = CORSAIR_PROPERTY_SUBMIT_KEYBOARD_COLOR_9;
+    usb_buf[0x04]   = byte_count;
+
+    /*-----------------------------------------------------*\
+    | Send packet                                           |
+    \*-----------------------------------------------------*/
+    send_usb_msg(dev, usb_buf);
+}
+
+void CorsairPeripheralController::SubmitMouseColors
+    (
+    unsigned char   num_zones,
+    RGBColor *      color_data
+    )
+{
+    char usb_buf[64];
+
+    /*-----------------------------------------------------*\
+    | Zero out buffer                                       |
+    \*-----------------------------------------------------*/
+    memset(usb_buf, 0x00, sizeof(usb_buf));
+
+    /*-----------------------------------------------------*\
+    | Set up Submit Mouse Colors packet                     |
+    \*-----------------------------------------------------*/
+    usb_buf[0x00]   = CORSAIR_COMMAND_WRITE;
+    usb_buf[0x01]   = CORSAIR_PROPERTY_SUBMIT_MOUSE_COLOR;
+    usb_buf[0x02]   = num_zones;
+    usb_buf[0x03]   = 0x00;
+
+    /*-----------------------------------------------------*\
+    | Copy in colors in <ZONE> <RED> <GREEN> <BLUE> order   |
+    \*-----------------------------------------------------*/
+    for(unsigned int zone_idx = 0; zone_idx < num_zones; zone_idx++)
+    {
+        usb_buf[(zone_idx * 4) + 4] = zone_idx;
+        usb_buf[(zone_idx * 4) + 5] = RGBGetRValue(color_data[zone_idx]);
+        usb_buf[(zone_idx * 4) + 6] = RGBGetGValue(color_data[zone_idx]);
+        usb_buf[(zone_idx * 4) + 7] = RGBGetBValue(color_data[zone_idx]);
+    }
+
+    /*-----------------------------------------------------*\
+    | Send packet                                           |
+    \*-----------------------------------------------------*/
+    send_usb_msg(dev, usb_buf);
+}
+
+void CorsairPeripheralController::SubmitMousematColors
+    (
+    unsigned char   num_zones,
+    RGBColor *      color_data
+    )
+{
+    char usb_buf[64];
+
+    /*-----------------------------------------------------*\
+    | Zero out buffer                                       |
+    \*-----------------------------------------------------*/
+    memset(usb_buf, 0x00, sizeof(usb_buf));
+
+    /*-----------------------------------------------------*\
+    | Set up Submit Mouse Colors packet                     |
+    \*-----------------------------------------------------*/
+    usb_buf[0x00]   = CORSAIR_COMMAND_WRITE;
+    usb_buf[0x01]   = CORSAIR_PROPERTY_SUBMIT_MOUSE_COLOR;
+    usb_buf[0x02]   = num_zones;
+    usb_buf[0x03]   = 0x00;
+
+    /*-----------------------------------------------------*\
+    | Copy in colors in <ZONE> <RED> <GREEN> <BLUE> order   |
+    \*-----------------------------------------------------*/
+    for(unsigned int zone_idx = 0; zone_idx < num_zones; zone_idx++)
+    {
+        //usb_buf[(zone_idx * 4) + 4] = zone_idx;
+        usb_buf[(zone_idx * 3) + 4] = RGBGetRValue(color_data[zone_idx]);
+        usb_buf[(zone_idx * 3) + 5] = RGBGetGValue(color_data[zone_idx]);
+        usb_buf[(zone_idx * 3) + 6] = RGBGetBValue(color_data[zone_idx]);
+    }
+
+    /*-----------------------------------------------------*\
+    | Send packet                                           |
+    \*-----------------------------------------------------*/
+    send_usb_msg(dev, usb_buf);
+}

Controllers/CorsairPeripheralController/CorsairPeripheralController.h

@@ -0,0 +1,106 @@
+/*-----------------------------------------*\
+|  CorsairPeripheralController.h            |
+|                                           |
+|  Definitions and types for Corsair RGB    |
+|  keyboard, mouse, and mousemat lighting   |
+|  controller                               |
+|                                           |
+|  Adam Honse (CalcProgrammer1) 1/9/2020    |
+\*-----------------------------------------*/
+
+#include "RGBController.h"
+
+#include <string>
+#include <hidapi/hidapi.h>
+
+#pragma once
+
+enum
+{
+    CORSAIR_COMMAND_WRITE       = 0x07,
+    CORSAIR_COMMAND_READ        = 0x0E,
+    CORSAIR_COMMAND_STREAM      = 0x7F
+};
+
+enum
+{
+    CORSAIR_PROPERTY_FIRMWARE_INFO              = 0x01,
+    CORSAIR_PROPERTY_RESET                      = 0x02,
+    CORSAIR_PROPERTY_SPECIAL_FUNCTION           = 0x04,
+    CORSAIR_PROPERTY_LIGHTING_CONTROL           = 0x05,
+    CORSAIR_PROPERTY_HARDWARE_PROFILE           = 0x13,
+    CORSAIR_PROPERTY_SUBMIT_MOUSE_COLOR         = 0x22,
+    CORSAIR_PROPERTY_SUBMIT_KEYBOARD_COLOR_9    = 0x27,
+    CORSAIR_PROPERTY_SUBMIT_KEYBOARD_COLOR_24   = 0x28,
+};
+
+enum
+{
+    CORSAIR_LIGHTING_CONTROL_HARDWARE           = 0x01,
+    CORSAIR_LIGHTING_CONTROL_SOFTWARE           = 0x02
+};
+
+enum
+{
+    CORSAIR_COLOR_CHANNEL_RED       = 0x01,
+    CORSAIR_COLOR_CHANNEL_GREEN     = 0x02,
+    CORSAIR_COLOR_CHANNEL_BLUE      = 0x03
+};
+
+class CorsairPeripheralController
+{
+public:
+    CorsairPeripheralController(hid_device* dev_handle);
+    ~CorsairPeripheralController();
+
+    device_type     GetDeviceType();
+    std::string     GetFirmwareString();
+
+    void            SetLEDs(std::vector<RGBColor> colors);
+    void            SetLEDsKeyboardFull(std::vector<RGBColor> colors);
+    void            SetLEDsKeyboardLimited(std::vector<RGBColor> colors);
+    void            SetLEDsMouse(std::vector<RGBColor> colors);
+    void            SetLEDsMousemat(std::vector<RGBColor> colors);
+
+private:
+    hid_device*             dev;
+
+    std::string             firmware_version;
+    device_type             type;
+
+    void    LightingControl();
+    void    SpecialFunctionControl();
+
+    void    ReadFirmwareInfo();
+    
+    void    StreamPacket
+                (
+                unsigned char   packet_id,
+                unsigned char   data_sz,
+                unsigned char*  data_ptr
+                );
+
+    void    SubmitKeyboardFullColors
+                (
+                unsigned char   color_channel,
+                unsigned char   packet_count,
+                unsigned char   finish_val
+                );
+
+    void    SubmitKeyboardLimitedColors
+                (
+                unsigned char   byte_count
+                );
+
+    void    SubmitMouseColors
+                (
+                unsigned char   num_zones,
+                RGBColor *      color_data
+                );
+
+    void    SubmitMousematColors
+            (
+            unsigned char   num_zones,
+            RGBColor *      color_data
+            );
+};

Controllers/CorsairPeripheralController/CorsairPeripheralControllerDetect.cpp

@@ -0,0 +1,137 @@
+#include "CorsairPeripheralController.h"
+#include "RGBController.h"
+#include "RGBController_CorsairPeripheral.h"
+#include <vector>
+#include <hidapi/hidapi.h>
+
+/*-----------------------------------------------------*\
+| Corsair vendor ID                                     |
+\*-----------------------------------------------------*/
+#define CORSAIR_VID                     0x1B1C
+
+/*-----------------------------------------------------*\
+| Keyboard product IDs                                  |
+|   List taken from ckb-next                            |
+|   Non-RGB keyboards were omitted from this list       |
+\*-----------------------------------------------------*/
+#define CORSAIR_K55_RGB_PID             0x1B3D
+
+#define CORSAIR_K65_RGB_PID             0x1B17
+#define CORSAIR_K65_LUX_RGB_PID         0x1B37
+#define CORSAIR_K65_RGB_RAPIDFIRE_PID   0x1B39
+
+#define CORSAIR_K68_RGB                 0x1B4F
+
+#define CORSAIR_K70_RGB_PID             0x1B13
+#define CORSAIR_K70_LUX_RGB_PID         0x1B33
+#define CORSAIR_K70_RGB_RAPIDFIRE_PID   0x1B38
+#define CORSAIR_K70_RGB_MK2_PID         0x1B38
+#define CORSAIR_K70_RGB_MK2_SE_PID      0x1B6B
+#define CORSAIR_K70_RGB_MK2_LP_PID      0x1B55
+
+#define CORSAIR_K95_RGB_PID             0x1B11
+#define CORSAIR_K95_PLATINUM_PID        0x1B2D
+
+#define CORSAIR_STRAFE_PID              0x1B20
+#define CORSAIR_STRAFE_MK2_PID          0x1B48
+
+/*-----------------------------------------------------*\
+| Mouse product IDs                                     |
+|   List taken from ckb-next                            |
+\*-----------------------------------------------------*/
+#define CORSAIR_M65_PRO_PID             0x1B2E
+#define CORSAIR_M65_RGB_ELITE_PID       0x1B5A
+
+/*-----------------------------------------------------*\
+| Mousepad product IDs                                  |
+|   List taken from ckb-next                            |
+\*-----------------------------------------------------*/
+#define CORSAIR_MM800_RGB_POLARIS_PID   0x1B3B
+
+typedef struct
+{
+    unsigned short  usb_vid;
+    unsigned short  usb_pid;
+    unsigned char   usb_interface;
+    const char *    name;
+} corsair_node_device;
+
+#define CORSAIR_NUM_DEVICES (sizeof(device_list) / sizeof(device_list[ 0 ]))
+
+static const corsair_node_device device_list[] =
+{
+    /*-----------------------------------------------------------------------------------------------------*\
+    | Keyboards                                                                                             |
+    \*-----------------------------------------------------------------------------------------------------*/
+    { CORSAIR_VID,          CORSAIR_K68_RGB,                    1,      "Corsair K68 RGB"                   },
+    { CORSAIR_VID,          CORSAIR_K70_RGB_PID,                1,      "Corsair K70 RGB"                   },
+    { CORSAIR_VID,          CORSAIR_K70_LUX_RGB_PID,            1,      "Corsair K70 LUX RGB"               },
+    { CORSAIR_VID,          CORSAIR_K70_RGB_RAPIDFIRE_PID,      1,      "Corsair K70 RGB RAPIDFIRE"         },
+    { CORSAIR_VID,          CORSAIR_K70_RGB_MK2_PID,            1,      "Corsair K70 RGB MK.2"              },
+    { CORSAIR_VID,          CORSAIR_K70_RGB_MK2_SE_PID,         1,      "Corsair K70 RGB MK.2 SE"           },
+    { CORSAIR_VID,          CORSAIR_K70_RGB_MK2_LP_PID,         1,      "Corsair K70 RGB MK.2 Low Profile"  },
+    { CORSAIR_VID,          CORSAIR_K95_RGB_PID,                1,      "Corsair K95 RGB"                   },
+    { CORSAIR_VID,          CORSAIR_K95_PLATINUM_PID,           1,      "Corsair K95 RGB PLATINUM"          },
+    /*-----------------------------------------------------------------------------------------------------*\
+    | Mice                                                                                                  |
+    \*-----------------------------------------------------------------------------------------------------*/
+    { CORSAIR_VID,          CORSAIR_M65_PRO_PID,                1,      "Corsair M65 PRO"                   },
+    { CORSAIR_VID,          CORSAIR_M65_RGB_ELITE_PID,          1,      "Corsair M65 RGB Elite"             },
+    /*-----------------------------------------------------------------------------------------------------*\
+    | Mousemats                                                                                             |
+    \*-----------------------------------------------------------------------------------------------------*/
+    { CORSAIR_VID,          CORSAIR_MM800_RGB_POLARIS_PID,      0,      "Corsair MM800 RGB Polaris"         }
+};
+
+/******************************************************************************************\
+*                                                                                          *
+*   DetectCorsairPeripheralControllers                                                     *
+*                                                                                          *
+*       Tests the USB address to see if a Corsair RGB Keyboard controller exists there.    *
+*                                                                                          *
+\******************************************************************************************/
+
+void DetectCorsairPeripheralControllers(std::vector<RGBController*>& rgb_controllers)
+{
+    hid_device_info* info;
+    hid_device* dev;
+
+    hid_init();
+
+    for(std::size_t device_idx = 0; device_idx < CORSAIR_NUM_DEVICES; device_idx++)
+    {
+        dev = NULL;
+
+        info = hid_enumerate(device_list[device_idx].usb_vid, device_list[device_idx].usb_pid);
+
+        //Look for Corsair RGB Peripheral
+        while(info)
+        {
+            if((info->vendor_id == device_list[device_idx].usb_vid)
+            &&(info->product_id == device_list[device_idx].usb_pid)
+            &&(info->interface_number == device_list[device_idx].usb_interface))
+            {
+                dev = hid_open_path(info->path);
+                break;
+            }
+            else
+            {
+                info = info->next;
+            }
+        }
+
+        if( dev )
+        {
+            CorsairPeripheralController* controller = new CorsairPeripheralController(dev);
+
+            if(controller->GetDeviceType() != DEVICE_TYPE_UNKNOWN)
+            {
+                RGBController_CorsairPeripheral* rgb_controller = new RGBController_CorsairPeripheral(controller);
+
+                rgb_controller->name = device_list[device_idx].name;
+                
+                rgb_controllers.push_back(rgb_controller);
+            }
+        }
+    }
+}

Controllers/CorsairProController/CorsairProControllerDetect.cpp

@@ -1,126 +0,0 @@
-#include "CorsairProController.h"
-#include "RGBController.h"
-#include "RGBController_CorsairPro.h"
-#include "i2c_smbus.h"
-#include <vector>
-#include <stdio.h>
-#include <stdlib.h>
-
-#ifdef WIN32
-#include <Windows.h>
-#else
-#include <unistd.h>
-
-static void Sleep(unsigned int milliseconds)
-{
-    usleep(1000 * milliseconds);
-}
-#endif
-
-/******************************************************************************************\
-*                                                                                          *
-*   TestForCorsairProController                                                            *
-*                                                                                          *
-*       Tests the given address to see if a Corsair Pro controller exists there.           *
-*                                                                                          *
-\******************************************************************************************/
-
-bool TestForCorsairProController(i2c_smbus_interface* bus, unsigned char address)
-{
-    bool pass = false;
-
-    int res = bus->i2c_smbus_write_quick(address, I2C_SMBUS_WRITE);
-
-    if (res >= 0)
-    {
-        pass = true;
-
-        res = bus->i2c_smbus_read_byte_data(address, 0x43);
-
-        if (res != 0x1C)
-        {
-            pass = false;
-        }
-
-        res = bus->i2c_smbus_read_byte_data(address, 0x44);
-
-        if (res != 0x03)
-        {
-            pass = false;
-        }
-    }
-
-    Sleep(10);
-    
-    return(pass);
-
-}   /* TestForCorsairProController() */
-
-/******************************************************************************************\
-*                                                                                          *
-*   DetectCorsairProControllers                                                            *
-*                                                                                          *
-*       Detect Corsair Pro controllers on the enumerated I2C busses.                       *
-*                                                                                          *
-*           bus - pointer to i2c_smbus_interface where Aura device is connected            *
-*           dev - I2C address of Aura device                                               *
-*                                                                                          *
-\******************************************************************************************/
-
-void DetectCorsairProControllers(std::vector<i2c_smbus_interface*> &busses, std::vector<RGBController*> &rgb_controllers)
-{
-    CorsairProController* new_corsair_pro;
-    RGBController_CorsairPro* new_controller;
-
-    for (unsigned int bus = 0; bus < busses.size(); bus++)
-    {
-        // Check for Corsair controller at 0x58
-        if (TestForCorsairProController(busses[bus], 0x58))
-        {
-            new_corsair_pro = new CorsairProController(busses[bus], 0x58);
-            new_controller = new RGBController_CorsairPro(new_corsair_pro);
-            rgb_controllers.push_back(new_controller);
-        }
-
-        // Check for Corsair controller at 0x59
-        if (TestForCorsairProController(busses[bus], 0x59))
-        {
-            new_corsair_pro = new CorsairProController(busses[bus], 0x59);
-            new_controller = new RGBController_CorsairPro(new_corsair_pro);
-            rgb_controllers.push_back(new_controller);
-        }
-
-        // Check for Corsair controller at 0x5A
-        if (TestForCorsairProController(busses[bus], 0x5A))
-        {
-            new_corsair_pro = new CorsairProController(busses[bus], 0x5A);
-            new_controller = new RGBController_CorsairPro(new_corsair_pro);
-            rgb_controllers.push_back(new_controller);
-        }
-
-        // Check for Corsair controller at 0x5B
-        if (TestForCorsairProController(busses[bus], 0x5B))
-        {
-            new_corsair_pro = new CorsairProController(busses[bus], 0x5B);
-            new_controller = new RGBController_CorsairPro(new_corsair_pro);
-            rgb_controllers.push_back(new_controller);
-        }
-
-        // Check for Corsair controller at 0x5C
-        if (TestForCorsairProController(busses[bus], 0x5C))
-        {
-            new_corsair_pro = new CorsairProController(busses[bus], 0x5C);
-            new_controller = new RGBController_CorsairPro(new_corsair_pro);
-            rgb_controllers.push_back(new_controller);
-        }
-
-        // Check for Corsair controller at 0x5D
-        if (TestForCorsairProController(busses[bus], 0x5D))
-        {
-            new_corsair_pro = new CorsairProController(busses[bus], 0x5D);
-            new_controller = new RGBController_CorsairPro(new_corsair_pro);
-            rgb_controllers.push_back(new_controller);
-        }
-    }
-
-}   /* DetectCorsairProControllers() */

Controllers/CorsairVengeanceController/CorsairVengeanceController.cpp

@@ -1,5 +1,5 @@
 /*-----------------------------------------*\
-|  CorsairController.h                      |
+|  CorsairVengeanceController.h             |
 |                                           |
 |  Driver for Corsair Vengeance RGB RAM     |
 |  lighting controller                      |
@@ -7,10 +7,10 @@
 |  Adam Honse (CalcProgrammer1) 3/8/2019    |
 \*-----------------------------------------*/
 
-#include "CorsairController.h"
+#include "CorsairVengeanceController.h"
 #include <cstring>
 
-CorsairController::CorsairController(i2c_smbus_interface* bus, corsair_dev_id dev)
+CorsairVengeanceController::CorsairVengeanceController(i2c_smbus_interface* bus, corsair_dev_id dev)
 {
     this->bus = bus;
     this->dev = dev;
@@ -19,17 +19,17 @@ CorsairController::CorsairController(i2c_smbus_interface* bus, corsair_dev_id de
     led_count = 1;
 }
 
-CorsairController::~CorsairController()
+CorsairVengeanceController::~CorsairVengeanceController()
 {
 
 }
 
-std::string CorsairController::GetDeviceName()
+std::string CorsairVengeanceController::GetDeviceName()
 {
     return(device_name);
 }
 
-std::string CorsairController::GetDeviceLocation()
+std::string CorsairVengeanceController::GetDeviceLocation()
 {
     std::string return_string(bus->device_name);
     char addr[5];
@@ -39,12 +39,12 @@ std::string CorsairController::GetDeviceLocation()
     return(return_string);
 }
 
-unsigned int CorsairController::GetLEDCount()
+unsigned int CorsairVengeanceController::GetLEDCount()
 {
     return(led_count);
 }
 
-void CorsairController::SetLEDColor(unsigned char red, unsigned char green, unsigned char blue)
+void CorsairVengeanceController::SetLEDColor(unsigned char red, unsigned char green, unsigned char blue)
 {
     bus->i2c_smbus_write_byte_data(dev, CORSAIR_VENGEANCE_RGB_CMD_FADE_TIME, 0x00);
     bus->i2c_smbus_write_byte_data(dev, CORSAIR_VENGEANCE_RGB_CMD_RED_VAL, red);
@@ -53,7 +53,7 @@ void CorsairController::SetLEDColor(unsigned char red, unsigned char green, unsi
     bus->i2c_smbus_write_byte_data(dev, CORSAIR_VENGEANCE_RGB_CMD_MODE, CORSAIR_VENGEANCE_RGB_MODE_SINGLE);
 }
 
-void CorsairController::SetMode(unsigned char /*mode*/)
+void CorsairVengeanceController::SetMode(unsigned char /*mode*/)
 {
     bus->i2c_smbus_write_byte_data(dev, CORSAIR_VENGEANCE_RGB_CMD_MODE, CORSAIR_VENGEANCE_RGB_MODE_SINGLE);
 }

Controllers/CorsairVengeanceController/CorsairVengeanceController.h

@@ -1,5 +1,5 @@
 /*-----------------------------------------*\
-|  CorsairController.h                      |
+|  CorsairVengeanceController.h             |
 |                                           |
 |  Definitions and types for Corsair        |
 |  Vengeance RGB RAM lighting controller    |
@@ -33,11 +33,11 @@ enum
     CORSAIR_NUMBER_MODES                            /* Number of Corsair modes              */
 };
 
-class CorsairController
+class CorsairVengeanceController
 {
 public:
-    CorsairController(i2c_smbus_interface* bus, corsair_dev_id dev);
-    ~CorsairController();
+    CorsairVengeanceController(i2c_smbus_interface* bus, corsair_dev_id dev);
+    ~CorsairVengeanceController();
 
     std::string     GetDeviceName();
     std::string     GetDeviceLocation();

Controllers/CorsairVengeanceController/CorsairVengeanceControllerDetect.cpp

@@ -1,6 +1,6 @@
-#include "CorsairController.h"
+#include "CorsairVengeanceController.h"
 #include "RGBController.h"
-#include "RGBController_Corsair.h"
+#include "RGBController_CorsairVengeance.h"
 #include "i2c_smbus.h"
 #include <vector>
 #include <stdio.h>
@@ -8,13 +8,13 @@
 
 /******************************************************************************************\
 *                                                                                          *
-*   TestForCorsairController                                                               *
+*   TestForCorsairVengeanceController                                                      *
 *                                                                                          *
 *       Tests the given address to see if a Corsair controller exists there.               *
 *                                                                                          *
 \******************************************************************************************/
 
-bool TestForCorsairController(i2c_smbus_interface* bus, unsigned char address)
+bool TestForCorsairVengeanceController(i2c_smbus_interface* bus, unsigned char address)
 {
     bool pass = false;
 
@@ -37,11 +37,11 @@ bool TestForCorsairController(i2c_smbus_interface* bus, unsigned char address)
 
     return(pass);
 
-}   /* TestForCorsairController() */
+}   /* TestForCorsairVengeanceController() */
 
 /******************************************************************************************\
 *                                                                                          *
-*   DetectCorsairControllers                                                               *
+*   DetectCorsairVengeanceControllers                                                      *
 *                                                                                          *
 *       Detect Corsair controllers on the enumerated I2C busses.                           *
 *                                                                                          *
@@ -50,60 +50,76 @@ bool TestForCorsairController(i2c_smbus_interface* bus, unsigned char address)
 *                                                                                          *
 \******************************************************************************************/
 
-void DetectCorsairControllers(std::vector<i2c_smbus_interface*> &busses, std::vector<RGBController*> &rgb_controllers)
+void DetectCorsairVengeanceControllers(std::vector<i2c_smbus_interface*> &busses, std::vector<RGBController*> &rgb_controllers)
 {
-    CorsairController* new_corsair;
-    RGBController_Corsair* new_controller;
+    CorsairVengeanceController* new_corsair;
+    RGBController_CorsairVengeance* new_controller;
 
     for (unsigned int bus = 0; bus < busses.size(); bus++)
     {
         // Check for Corsair controller at 0x58
-        if (TestForCorsairController(busses[bus], 0x58))
+        if (TestForCorsairVengeanceController(busses[bus], 0x58))
         {
-            new_corsair = new CorsairController(busses[bus], 0x58);
-            new_controller = new RGBController_Corsair(new_corsair);
+            new_corsair = new CorsairVengeanceController(busses[bus], 0x58);
+            new_controller = new RGBController_CorsairVengeance(new_corsair);
             rgb_controllers.push_back(new_controller);
         }
 
         // Check for Corsair controller at 0x59
-        if (TestForCorsairController(busses[bus], 0x59))
+        if (TestForCorsairVengeanceController(busses[bus], 0x59))
         {
-            new_corsair = new CorsairController(busses[bus], 0x59);
-            new_controller = new RGBController_Corsair(new_corsair);
+            new_corsair = new CorsairVengeanceController(busses[bus], 0x59);
+            new_controller = new RGBController_CorsairVengeance(new_corsair);
             rgb_controllers.push_back(new_controller);
         }
 
         // Check for Corsair controller at 0x5A
-        if (TestForCorsairController(busses[bus], 0x5A))
+        if (TestForCorsairVengeanceController(busses[bus], 0x5A))
         {
-            new_corsair = new CorsairController(busses[bus], 0x5A);
-            new_controller = new RGBController_Corsair(new_corsair);
+            new_corsair = new CorsairVengeanceController(busses[bus], 0x5A);
+            new_controller = new RGBController_CorsairVengeance(new_corsair);
             rgb_controllers.push_back(new_controller);
         }
 
         // Check for Corsair controller at 0x5B
-        if (TestForCorsairController(busses[bus], 0x5B))
+        if (TestForCorsairVengeanceController(busses[bus], 0x5B))
         {
-            new_corsair = new CorsairController(busses[bus], 0x5B);
-            new_controller = new RGBController_Corsair(new_corsair);
+            new_corsair = new CorsairVengeanceController(busses[bus], 0x5B);
+            new_controller = new RGBController_CorsairVengeance(new_corsair);
             rgb_controllers.push_back(new_controller);
         }
 
         // Check for Corsair controller at 0x5C
-        if (TestForCorsairController(busses[bus], 0x5C))
+        if (TestForCorsairVengeanceController(busses[bus], 0x5C))
         {
-            new_corsair = new CorsairController(busses[bus], 0x5C);
-            new_controller = new RGBController_Corsair(new_corsair);
+            new_corsair = new CorsairVengeanceController(busses[bus], 0x5C);
+            new_controller = new RGBController_CorsairVengeance(new_corsair);
             rgb_controllers.push_back(new_controller);
         }
 
         // Check for Corsair controller at 0x5D
-        if (TestForCorsairController(busses[bus], 0x5D))
+        if (TestForCorsairVengeanceController(busses[bus], 0x5D))
         {
-            new_corsair = new CorsairController(busses[bus], 0x5D);
-            new_controller = new RGBController_Corsair(new_corsair);
+            new_corsair = new CorsairVengeanceController(busses[bus], 0x5D);
+            new_controller = new RGBController_CorsairVengeance(new_corsair);
+            rgb_controllers.push_back(new_controller);
+        }
+
+        // Check for Corsair controller at 0x5E
+        if (TestForCorsairVengeanceController(busses[bus], 0x5E))
+        {
+            new_corsair = new CorsairVengeanceController(busses[bus], 0x5E);
+            new_controller = new RGBController_CorsairVengeance(new_corsair);
+            rgb_controllers.push_back(new_controller);
+        }
+
+        // Check for Corsair controller at 0x5F
+        if (TestForCorsairVengeanceController(busses[bus], 0x5F))
+        {
+            new_corsair = new CorsairVengeanceController(busses[bus], 0x5F);
+            new_controller = new RGBController_CorsairVengeance(new_corsair);
             rgb_controllers.push_back(new_controller);
         }
     }
 
-}   /* DetectCorsairControllers() */
+}   /* DetectCorsairVengeanceControllers() */

Controllers/CorsairVengeanceProController/CorsairVengeanceProController.cpp

@@ -1,5 +1,5 @@
 /*-----------------------------------------*\
-|  CorsairProController.cpp                 |
+|  CorsairVengeanceProController.cpp        |
 |                                           |
 |  Definitions and types for Corsair        |
 |  Vengeance Pro RGB RAM lighting controller|
@@ -7,7 +7,7 @@
 |  Adam Honse (CalcProgrammer1) 6/30/2019   |
 \*-----------------------------------------*/
 
-#include "CorsairProController.h"
+#include "CorsairVengeanceProController.h"
 #include <cstring>
 
 #ifdef WIN32
@@ -21,7 +21,7 @@ static void Sleep(unsigned int milliseconds)
 }
 #endif
 
-CorsairProController::CorsairProController(i2c_smbus_interface* bus, corsair_dev_id dev)
+CorsairVengeanceProController::CorsairVengeanceProController(i2c_smbus_interface* bus, corsair_dev_id dev)
 {
     this->bus = bus;
     this->dev = dev;
@@ -39,17 +39,17 @@ CorsairProController::CorsairProController(i2c_smbus_interface* bus, corsair_dev
     }
 }
 
-CorsairProController::~CorsairProController()
+CorsairVengeanceProController::~CorsairVengeanceProController()
 {
 
 }
 
-std::string CorsairProController::GetDeviceName()
+std::string CorsairVengeanceProController::GetDeviceName()
 {
     return(device_name);
 }
 
-std::string CorsairProController::GetDeviceLocation()
+std::string CorsairVengeanceProController::GetDeviceLocation()
 {
     std::string return_string(bus->device_name);
     char addr[5];
@@ -59,17 +59,17 @@ std::string CorsairProController::GetDeviceLocation()
     return(return_string);
 }
 
-unsigned int CorsairProController::GetLEDCount()
+unsigned int CorsairVengeanceProController::GetLEDCount()
 {
     return(led_count);
 }
 
-unsigned char CorsairProController::GetEffect()
+unsigned char CorsairVengeanceProController::GetEffect()
 {
     return(effect_mode);
 }
 
-void CorsairProController::SetAllColors(unsigned char red, unsigned char green, unsigned char blue)
+void CorsairVengeanceProController::SetAllColors(unsigned char red, unsigned char green, unsigned char blue)
 {
     for (unsigned int i = 0; i < led_count; i++)
     {
@@ -79,14 +79,14 @@ void CorsairProController::SetAllColors(unsigned char red, unsigned char green,
     }
 }
 
-void CorsairProController::SetLEDColor(unsigned int led, unsigned char red, unsigned char green, unsigned char blue)
+void CorsairVengeanceProController::SetLEDColor(unsigned int led, unsigned char red, unsigned char green, unsigned char blue)
 {
     led_red[led]    = red;
     led_green[led]  = green;
     led_blue[led]   = blue;
 }
 
-void CorsairProController::ApplyColors()
+void CorsairVengeanceProController::ApplyColors()
 {
     bus->i2c_smbus_write_byte_data(dev, 0x26, 0x02);
     Sleep(1);
@@ -104,7 +104,7 @@ void CorsairProController::ApplyColors()
     bus->i2c_smbus_write_byte_data(dev, 0x82, 0x02);
 }
 
-void CorsairProController::SetEffect(unsigned char mode,
+void CorsairVengeanceProController::SetEffect(unsigned char mode,
                                      unsigned char speed,
                                      unsigned char direction,
                                      bool          random,
@@ -159,7 +159,7 @@ void CorsairProController::SetEffect(unsigned char mode,
     WaitReady();
 }
 
-bool CorsairProController::WaitReady()
+bool CorsairVengeanceProController::WaitReady()
 {
     int i = 0;
     while (bus->i2c_smbus_read_byte_data(dev, 0x41) != 0x00)

Controllers/CorsairVengeanceProController/CorsairVengeanceProController.h

@@ -1,5 +1,5 @@
 /*-----------------------------------------*\
-|  CorsairProController.h                   |
+|  CorsairVengeanceProController.h          |
 |                                           |
 |  Definitions and types for Corsair        |
 |  Vengeance Pro RGB RAM lighting controller|
@@ -60,11 +60,11 @@ enum
     CORSAIR_PRO_DIRECTION_HORIZONTAL    = 0x03,     /* Horizontal direction                 */
 };
 
-class CorsairProController
+class CorsairVengeanceProController
 {
 public:
-    CorsairProController(i2c_smbus_interface* bus, corsair_dev_id dev);
-    ~CorsairProController();
+    CorsairVengeanceProController(i2c_smbus_interface* bus, corsair_dev_id dev);
+    ~CorsairVengeanceProController();
 
     std::string     GetDeviceName();
     std::string     GetDeviceLocation();

Controllers/CorsairVengeanceProController/CorsairVengeanceProControllerDetect.cpp

@@ -0,0 +1,142 @@
+#include "CorsairVengeanceProController.h"
+#include "RGBController.h"
+#include "RGBController_CorsairVengeancePro.h"
+#include "i2c_smbus.h"
+#include <vector>
+#include <stdio.h>
+#include <stdlib.h>
+
+#ifdef WIN32
+#include <Windows.h>
+#else
+#include <unistd.h>
+
+static void Sleep(unsigned int milliseconds)
+{
+    usleep(1000 * milliseconds);
+}
+#endif
+
+/******************************************************************************************\
+*                                                                                          *
+*   TestForCorsairVengeanceProController                                                   *
+*                                                                                          *
+*       Tests the given address to see if a Corsair Pro controller exists there.           *
+*                                                                                          *
+\******************************************************************************************/
+
+bool TestForCorsairVengeanceProController(i2c_smbus_interface* bus, unsigned char address)
+{
+    bool pass = false;
+
+    int res = bus->i2c_smbus_write_quick(address, I2C_SMBUS_WRITE);
+
+    if (res >= 0)
+    {
+        pass = true;
+
+        res = bus->i2c_smbus_read_byte_data(address, 0x43);
+
+        if (res != 0x1C)
+        {
+            pass = false;
+        }
+
+        res = bus->i2c_smbus_read_byte_data(address, 0x44);
+
+        if (!((res == 0x03) || (res == 0x04)))
+        {
+            pass = false;
+        }
+    }
+
+    Sleep(10);
+    
+    return(pass);
+
+}   /* TestForCorsairVengeanceProController() */
+
+/******************************************************************************************\
+*                                                                                          *
+*   DetectCorsairVengeanceProControllers                                                   *
+*                                                                                          *
+*       Detect Corsair Vengeance Pro controllers on the enumerated I2C busses.             *
+*                                                                                          *
+*           bus - pointer to i2c_smbus_interface where Aura device is connected            *
+*           dev - I2C address of Aura device                                               *
+*                                                                                          *
+\******************************************************************************************/
+
+void DetectCorsairVengeanceProControllers(std::vector<i2c_smbus_interface*> &busses, std::vector<RGBController*> &rgb_controllers)
+{
+    CorsairVengeanceProController* new_corsair_pro;
+    RGBController_CorsairVengeancePro* new_controller;
+
+    for (unsigned int bus = 0; bus < busses.size(); bus++)
+    {
+        // Check for Corsair controller at 0x58
+        if (TestForCorsairVengeanceProController(busses[bus], 0x58))
+        {
+            new_corsair_pro = new CorsairVengeanceProController(busses[bus], 0x58);
+            new_controller = new RGBController_CorsairVengeancePro(new_corsair_pro);
+            rgb_controllers.push_back(new_controller);
+        }
+
+        // Check for Corsair controller at 0x59
+        if (TestForCorsairVengeanceProController(busses[bus], 0x59))
+        {
+            new_corsair_pro = new CorsairVengeanceProController(busses[bus], 0x59);
+            new_controller = new RGBController_CorsairVengeancePro(new_corsair_pro);
+            rgb_controllers.push_back(new_controller);
+        }
+
+        // Check for Corsair controller at 0x5A
+        if (TestForCorsairVengeanceProController(busses[bus], 0x5A))
+        {
+            new_corsair_pro = new CorsairVengeanceProController(busses[bus], 0x5A);
+            new_controller = new RGBController_CorsairVengeancePro(new_corsair_pro);
+            rgb_controllers.push_back(new_controller);
+        }
+
+        // Check for Corsair controller at 0x5B
+        if (TestForCorsairVengeanceProController(busses[bus], 0x5B))
+        {
+            new_corsair_pro = new CorsairVengeanceProController(busses[bus], 0x5B);
+            new_controller = new RGBController_CorsairVengeancePro(new_corsair_pro);
+            rgb_controllers.push_back(new_controller);
+        }
+
+        // Check for Corsair controller at 0x5C
+        if (TestForCorsairVengeanceProController(busses[bus], 0x5C))
+        {
+            new_corsair_pro = new CorsairVengeanceProController(busses[bus], 0x5C);
+            new_controller = new RGBController_CorsairVengeancePro(new_corsair_pro);
+            rgb_controllers.push_back(new_controller);
+        }
+
+        // Check for Corsair controller at 0x5D
+        if (TestForCorsairVengeanceProController(busses[bus], 0x5D))
+        {
+            new_corsair_pro = new CorsairVengeanceProController(busses[bus], 0x5D);
+            new_controller = new RGBController_CorsairVengeancePro(new_corsair_pro);
+            rgb_controllers.push_back(new_controller);
+        }
+
+        // Check for Corsair controller at 0x5E
+        if (TestForCorsairVengeanceProController(busses[bus], 0x5E))
+        {
+            new_corsair_pro = new CorsairVengeanceProController(busses[bus], 0x5E);
+            new_controller = new RGBController_CorsairVengeancePro(new_corsair_pro);
+            rgb_controllers.push_back(new_controller);
+        }
+
+        // Check for Corsair controller at 0x5F
+        if (TestForCorsairVengeanceProController(busses[bus], 0x5F))
+        {
+            new_corsair_pro = new CorsairVengeanceProController(busses[bus], 0x5F);
+            new_controller = new RGBController_CorsairVengeancePro(new_corsair_pro);
+            rgb_controllers.push_back(new_controller);
+        }
+    }
+
+}   /* DetectCorsairVengeanceProControllers() */

Controllers/CrucialController/CrucialController.cpp

@@ -0,0 +1,150 @@
+/*-----------------------------------------*\
+|  CrucialController.cpp                    |
+|                                           |
+|  Driver for Crucial Ballistix RGB lighting|
+|  controller                               |
+|                                           |
+|  Adam Honse (CalcProgrammer1) 1/19/2020   |
+\*-----------------------------------------*/
+
+#include "RGBController.h"
+#include "CrucialController.h"
+#include <cstring>
+
+CrucialController::CrucialController(i2c_smbus_interface* bus, crucial_dev_id dev)
+{
+    this->bus = bus;
+    this->dev = dev;
+}
+
+CrucialController::~CrucialController()
+{
+
+}
+
+std::string CrucialController::GetDeviceName()
+{
+    return(device_name);
+}
+
+std::string CrucialController::GetDeviceLocation()
+{
+    std::string return_string(bus->device_name);
+    char addr[5];
+    snprintf(addr, 5, "0x%02X", dev);
+    return_string.append(", address ");
+    return_string.append(addr);
+    return(return_string);
+}
+
+unsigned int CrucialController::GetLEDCount()
+{
+    return(led_count);
+}
+
+void CrucialController::SetMode(unsigned char mode)
+{
+    SendEffectMode(mode, 0x10);
+}
+
+void CrucialController::SetAllColorsDirect(RGBColor* colors)
+{
+    SendDirectColors(colors);
+}
+
+void CrucialController::SetAllColorsEffect(RGBColor* colors)
+{
+    for(int led_idx = 0; led_idx < 8; led_idx++)
+    {
+        unsigned char red = RGBGetRValue(colors[led_idx]);
+        unsigned char grn = RGBGetGValue(colors[led_idx]);
+        unsigned char blu = RGBGetBValue(colors[led_idx]);
+        SendEffectColor(led_idx, red, grn, blu);
+    }
+}
+
+void CrucialController::SendBrightness(unsigned char brightness)
+{
+    CrucialRegisterWrite(0x82EE, 0xFF);
+    CrucialRegisterWrite(0x82EF, brightness);
+    CrucialRegisterWrite(0x82F0, 0x83);
+}
+
+void CrucialController::SendEffectMode(unsigned char mode, unsigned char speed)
+{
+    CrucialRegisterWrite(0x820F, mode);
+    CrucialRegisterWrite(0x82EE, 0x00);
+    CrucialRegisterWrite(0x82EF, speed);
+    CrucialRegisterWrite(0x82F0, 0x84);
+}
+
+void CrucialController::SendDirectColors(RGBColor* color_buf)
+{
+    //Red Channels
+    CrucialRegisterWrite(0x8300, RGBGetRValue(color_buf[0]));
+    CrucialRegisterWrite(0x8301, RGBGetRValue(color_buf[1]));
+    CrucialRegisterWrite(0x8302, RGBGetRValue(color_buf[2]));
+    CrucialRegisterWrite(0x8303, RGBGetRValue(color_buf[3]));
+    CrucialRegisterWrite(0x8304, RGBGetRValue(color_buf[4]));
+    CrucialRegisterWrite(0x8305, RGBGetRValue(color_buf[5]));
+    CrucialRegisterWrite(0x8306, RGBGetRValue(color_buf[6]));
+    CrucialRegisterWrite(0x8307, RGBGetRValue(color_buf[7]));
+
+    //Green Channels
+    CrucialRegisterWrite(0x8340, RGBGetGValue(color_buf[0]));
+    CrucialRegisterWrite(0x8341, RGBGetGValue(color_buf[1]));
+    CrucialRegisterWrite(0x8342, RGBGetGValue(color_buf[2]));
+    CrucialRegisterWrite(0x8343, RGBGetGValue(color_buf[3]));
+    CrucialRegisterWrite(0x8344, RGBGetGValue(color_buf[4]));
+    CrucialRegisterWrite(0x8345, RGBGetGValue(color_buf[5]));
+    CrucialRegisterWrite(0x8346, RGBGetGValue(color_buf[6]));
+    CrucialRegisterWrite(0x8347, RGBGetGValue(color_buf[7]));
+
+    //Blue Channels
+    CrucialRegisterWrite(0x8380, RGBGetBValue(color_buf[0]));
+    CrucialRegisterWrite(0x8381, RGBGetBValue(color_buf[1]));
+    CrucialRegisterWrite(0x8382, RGBGetBValue(color_buf[2]));
+    CrucialRegisterWrite(0x8383, RGBGetBValue(color_buf[3]));
+    CrucialRegisterWrite(0x8384, RGBGetBValue(color_buf[4]));
+    CrucialRegisterWrite(0x8385, RGBGetBValue(color_buf[5]));
+    CrucialRegisterWrite(0x8386, RGBGetBValue(color_buf[6]));
+    CrucialRegisterWrite(0x8387, RGBGetBValue(color_buf[7]));
+}
+
+unsigned char CrucialController::CrucialRegisterRead(crucial_register reg)
+{
+    //Write Crucial register
+    bus->i2c_smbus_write_word_data(dev, 0x00, ((reg << 8) & 0xFF00) | ((reg >> 8) & 0x00FF));
+
+    //Read Crucial value
+    return(bus->i2c_smbus_read_byte_data(dev, 0x81));
+
+}
+
+void CrucialController::CrucialRegisterWrite(crucial_register reg, unsigned char val)
+{
+    //Write Crucial register
+    bus->i2c_smbus_write_word_data(dev, 0x00, ((reg << 8) & 0xFF00) | ((reg >> 8) & 0x00FF));
+
+    //Write Crucial value
+    bus->i2c_smbus_write_byte_data(dev, 0x01, val);
+
+}
+
+void CrucialController::SendEffectColor
+    (
+    unsigned int    led_idx,
+    unsigned int    red,
+    unsigned int    green,
+    unsigned int    blue
+    )
+{
+    CrucialRegisterWrite(0x82E9, (1 << led_idx));
+    CrucialRegisterWrite(0x82EA, 0x00);
+    CrucialRegisterWrite(0x82EB, 0x00);
+    CrucialRegisterWrite(0x82EC, 0x00);
+    CrucialRegisterWrite(0x82ED, red);
+    CrucialRegisterWrite(0x82EE, green);
+    CrucialRegisterWrite(0x82EF, blue);
+    CrucialRegisterWrite(0x82F0, 0x01);
+}

Controllers/CrucialController/CrucialController.h

@@ -0,0 +1,70 @@
+/*-----------------------------------------*\
+|  CrucialController.h                      |
+|                                           |
+|  Definitions and types for Crucial        |
+|  Ballistix RGB lighting controller        |
+|                                           |
+|  Adam Honse (CalcProgrammer1) 1/19/2020   |
+\*-----------------------------------------*/
+
+#include "RGBController.h"
+#include <string>
+#include "i2c_smbus.h"
+
+#pragma once
+
+typedef unsigned char	crucial_dev_id;
+typedef unsigned short	crucial_register;
+
+enum
+{
+    CRUCIAL_MODE_SHIFT              = 0x1F,     /* Shift effect mode                */
+    CRUCIAL_MODE_GRADIENT_SHIFT     = 0x2F,     /* Gradient shift mode              */
+    CRUCIAL_MODE_FILL               = 0x3F,     /* Fill effect mode                 */
+    CRUCIAL_MODE_STACK              = 0x4F,     /* Stack effect mode                */
+    CRUCIAL_MODE_DOUBLE_STACK       = 0x5F,     /* Double stack effect mode         */
+    CRUCIAL_MODE_BREATHING          = 0x6F,     /* Breathing effect mode            */
+    CRUCIAL_MODE_MOTION_POINT       = 0x7F,     /* Motion point effect mode         */
+    CRUCIAL_MODE_INSIDE_OUT         = 0x8F,     /* Inside out effect mode           */
+    CRUCIAL_MODE_COLOR_STEP         = 0x9F,     /* Color step effect mode           */
+    CRUCIAL_MODE_WATER_WAVE         = 0xAF,     /* Water wave effect mode           */
+    CRUCIAL_MODE_FLASHING           = 0xBF,     /* Flashing effect mode             */
+    CRUCIAL_MODE_STATIC             = 0xCF,     /* Static effect mode               */
+};
+
+class CrucialController
+{
+public:
+    CrucialController(i2c_smbus_interface* bus, crucial_dev_id dev);
+    ~CrucialController();
+
+    std::string   GetDeviceName();
+    std::string   GetDeviceLocation();
+    unsigned int  GetLEDCount();
+    void          SetAllColorsDirect(RGBColor* colors);
+    void          SetAllColorsEffect(RGBColor* colors);
+    void          SetMode(unsigned char mode);
+
+    unsigned char CrucialRegisterRead(crucial_register reg);
+    void          CrucialRegisterWrite(crucial_register reg, unsigned char val);
+
+private:
+    char                    device_name[16];
+    unsigned char           config_table[64];
+    unsigned int            led_count;
+    unsigned char           channel_cfg;
+    i2c_smbus_interface *   bus;
+    crucial_dev_id          dev;
+
+    void            SendEffectColor
+                        (
+                        unsigned int    led_idx,
+                        unsigned int    red,
+                        unsigned int    green,
+                        unsigned int    blue
+                        );
+    
+    void            SendDirectColors(RGBColor* color_buf);
+    void            SendBrightness(unsigned char brightness);
+    void            SendEffectMode(unsigned char mode, unsigned char speed);
+};

Controllers/CrucialController/CrucialControllerDetect.cpp

@@ -0,0 +1,88 @@
+#include "CrucialController.h"
+#include "RGBController.h"
+#include "RGBController_Crucial.h"
+#include "i2c_smbus.h"
+#include <vector>
+#include <stdio.h>
+#include <stdlib.h>
+
+/*----------------------------------------------------------------------*\
+| This list contains the available SMBus addresses for Crucial RAM       |
+\*----------------------------------------------------------------------*/
+#define CRUCIAL_ADDRESS_COUNT  4
+
+static const unsigned char crucial_addresses[] =
+{
+    0x20,
+    0x21,
+    0x22,
+    0x23
+};
+
+
+/******************************************************************************************\
+*                                                                                          *
+*   TestForCrucialController                                                               *
+*                                                                                          *
+*       Tests the given address to see if an Crucial controller exists there.  First does a*
+*       quick write to test for a response, and if so does a simple read at 0xA0 to test   *
+*       for incrementing values 0...F which was observed at this location during data dump *
+*                                                                                          *
+\******************************************************************************************/
+
+bool TestForCrucialController(i2c_smbus_interface* bus, unsigned char address)
+{
+    bool pass = false;
+
+    int res = bus->i2c_smbus_write_quick(address, I2C_SMBUS_WRITE);
+
+    if (res >= 0)
+    {
+        pass = true;
+
+        for (int i = 0xA0; i < 0xB0; i++)
+        {
+            res = bus->i2c_smbus_read_byte_data(address, i);
+
+            if (res != (i - 0xA0))
+            {
+                pass = false;
+            }
+        }
+    }
+
+    return(pass);
+
+}   /* TestForCrucialController() */
+
+/******************************************************************************************\
+*                                                                                          *
+*   DetectCrucialControllers                                                               *
+*                                                                                          *
+*       Detect Crucial controllers on the enumerated I2C busses.                           *
+*                                                                                          *
+*           bus - pointer to i2c_smbus_interface where Aura device is connected            *
+*           dev - I2C address of Aura device                                               *
+*                                                                                          *
+\******************************************************************************************/
+
+void DetectCrucialControllers(std::vector<i2c_smbus_interface*> &busses, std::vector<RGBController*> &rgb_controllers)
+{
+    CrucialController* new_crucial;
+    RGBController_Crucial* new_controller;
+
+    for (unsigned int bus = 0; bus < busses.size(); bus++)
+    {
+        // Add Crucial controllers
+        for (unsigned int address_list_idx = 0; address_list_idx < CRUCIAL_ADDRESS_COUNT; address_list_idx++)
+        {
+            if (TestForCrucialController(busses[bus], crucial_addresses[address_list_idx]))
+            {
+                new_crucial = new CrucialController(busses[bus], crucial_addresses[address_list_idx]);
+                new_controller = new RGBController_Crucial(new_crucial);
+                rgb_controllers.push_back(new_controller);
+            }
+        }
+    }
+
+}   /* DetectCrucialControllers() */

Controllers/Hue2Controller/Hue2Controller.cpp

@@ -9,6 +9,7 @@
 #include <fstream>
 #include <iostream>
 #include <string>
+#include <cstring>
 
 Hue2Controller::Hue2Controller(libusb_device_handle* dev_handle)
 {
@@ -19,9 +20,7 @@ Hue2Controller::Hue2Controller(libusb_device_handle* dev_handle)
 
 Hue2Controller::~Hue2Controller()
 {
-    current_mode        = HUE_2_MODE_FIXED;
-    current_speed       = HUE_2_SPEED_NORMAL;
-    current_direction   = false;
+
 }
 
 unsigned int Hue2Controller::GetStripsOnChannel(unsigned int /*channel*/)
@@ -72,7 +71,11 @@ unsigned int Hue2Controller::GetStripsOnChannel(unsigned int /*channel*/)
                 num_leds_on_channel += 10;
                 break;
             
-            case 0x0B: //Aer 2 fan
+            case 0x0B: //Aer 2 fan (120mm)
+                num_leds_on_channel += 8;
+                break;
+
+            case 0x0C: //Aer 2 fan (140mm)
                 num_leds_on_channel += 8;
                 break;
 
@@ -85,73 +88,199 @@ unsigned int Hue2Controller::GetStripsOnChannel(unsigned int /*channel*/)
     return(ret_val);
 }
 
-void Hue2Controller::SetMode(unsigned char mode, unsigned char speed, bool direction)
+void Hue2Controller::SetChannelEffect
+    (
+    unsigned char   channel,
+    unsigned char   mode,
+    unsigned char   speed,
+    bool            direction,
+    RGBColor *      colors,
+    unsigned int    num_colors
+    )
 {
-    current_mode        = mode;
-    current_speed       = speed;
-    current_direction   = direction;
-}
-
-void Hue2Controller::SetChannelLEDs(unsigned char channel, std::vector<RGBColor> colors)
-{
-    unsigned char usb_buf[] =
-    {
-        0x28, 0x03, 0x00, 0x28,
-        0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00
-    };
-    int             actual = 0;
+    unsigned char color_data[24];
 
     /*-----------------------------------------------------*\
-    | Set channel in USB packet                             |
+    | Fill in color data (up to 8 colors)                  |
     \*-----------------------------------------------------*/
-    usb_buf[0x02]   = 1 << channel;
+    for (std::size_t idx = 0; idx < num_colors; idx++)
+    {
+        int pixel_idx = idx * 3;
+        RGBColor color = colors[idx];
+        color_data[pixel_idx + 0x00] = RGBGetGValue(color);
+        color_data[pixel_idx + 0x01] = RGBGetRValue(color);
+        color_data[pixel_idx + 0x02] = RGBGetBValue(color);
+    }
+
+    /*-----------------------------------------------------*\
+    | Send effect packet                                    |
+    \*-----------------------------------------------------*/
+    SendEffect(channel, mode, speed, direction, num_colors, &color_data[0]);
+}
+
+void Hue2Controller::SetChannelLEDs
+    (
+    unsigned char   channel,
+    RGBColor *      colors,
+    unsigned int    num_colors
+    )
+{
+    unsigned char color_data[120];
+
+    /*-----------------------------------------------------*\
+    | Fill in color data (up to 40 colors)                  |
+    \*-----------------------------------------------------*/
+    for (std::size_t idx = 0; idx < num_colors; idx++)
+    {
+        int pixel_idx = idx * 3;
+        RGBColor color = colors[idx];
+        color_data[pixel_idx + 0x00] = RGBGetGValue(color);
+        color_data[pixel_idx + 0x01] = RGBGetRValue(color);
+        color_data[pixel_idx + 0x02] = RGBGetBValue(color);
+    }
+
+    /*-----------------------------------------------------*\
+    | Send first group of color data                        |
+    \*-----------------------------------------------------*/
+    SendDirect(channel, 0, 20, &color_data[0]);
+
+    /*-----------------------------------------------------*\
+    | Send second group of color data if necessary          |
+    \*-----------------------------------------------------*/
+    if(num_colors > 20)
+    {
+        SendDirect(channel, 1, 20, &color_data[60]);
+    }
+
+    /*-----------------------------------------------------*\
+    | Send apply packet                                     |
+    \*-----------------------------------------------------*/
+    SendApply(channel);
+}
+
+/*-------------------------------------------------------------------------------------------------*\
+| Private packet sending functions.                                                                 |
+\*-------------------------------------------------------------------------------------------------*/
+
+void Hue2Controller::SendApply
+    (
+    unsigned char   channel
+    )
+{
+    int             actual;
+    unsigned char   usb_buf[64];
+
+    /*-----------------------------------------------------*\
+    | Zero out buffer                                       |
+    \*-----------------------------------------------------*/
+    memset(usb_buf, 0x00, sizeof(usb_buf));
+
+    /*-----------------------------------------------------*\
+    | Set up Apply packet                                   |
+    \*-----------------------------------------------------*/
+    usb_buf[0x00]   = 0x22;
+    usb_buf[0x01]   = 0xA0;
+    usb_buf[0x02]   = (unsigned char)(1 << channel);
+    usb_buf[0x04]   = 0x01;
+    usb_buf[0x07]   = 0x28;
+    usb_buf[0x0A]   = 0x80;
+    usb_buf[0x0C]   = 0x32;
+    usb_buf[0x0F]   = 0x01;
+
+    /*-----------------------------------------------------*\
+    | Send packet                                           |
+    \*-----------------------------------------------------*/
+    libusb_interrupt_transfer(dev, 0x01, usb_buf, 64, &actual, 0);
+    libusb_interrupt_transfer(dev, 0x81, usb_buf, 64, &actual, 0);
+}
+
+void Hue2Controller::SendDirect
+    (
+    unsigned char   channel,
+    unsigned char   group,
+    unsigned char   color_count,
+    unsigned char*  color_data
+    )
+{
+    int             actual;
+    unsigned char   usb_buf[64];
+
+    /*-----------------------------------------------------*\
+    | Zero out buffer                                       |
+    \*-----------------------------------------------------*/
+    memset(usb_buf, 0x00, sizeof(usb_buf));
+
+    /*-----------------------------------------------------*\
+    | Set up Direct packet                                  |
+    \*-----------------------------------------------------*/
+    usb_buf[0x00]   = 0x22;
+    usb_buf[0x01]   = 0x10 | group;
+    usb_buf[0x02]   = (unsigned char)(1 << channel);
+    usb_buf[0x03]   = 0x00;
+
+    /*-----------------------------------------------------*\
+    | Copy in color data bytes                              |
+    \*-----------------------------------------------------*/
+    memcpy(&usb_buf[0x04], color_data, color_count * 3);
+
+    /*-----------------------------------------------------*\
+    | Send packet                                           |
+    \*-----------------------------------------------------*/
+    libusb_interrupt_transfer(dev, 0x01, usb_buf, 64, &actual, 0);
+    libusb_interrupt_transfer(dev, 0x81, usb_buf, 64, &actual, 0);
+}
+
+void Hue2Controller::SendEffect
+    (
+    unsigned char   channel,
+    unsigned char   mode,
+    unsigned char   speed,
+    bool            direction,
+    unsigned char   color_count,
+    unsigned char*  color_data
+    )
+{
+    int             actual;
+    unsigned char   usb_buf[64];
+
+    /*-----------------------------------------------------*\
+    | Zero out buffer                                       |
+    \*-----------------------------------------------------*/
+    memset(usb_buf, 0x00, sizeof(usb_buf));
+
+    /*-----------------------------------------------------*\
+    | Set up Effect packet                                  |
+    \*-----------------------------------------------------*/
+    usb_buf[0x00]   = 0x28;
+    usb_buf[0x01]   = 0x03;
+    usb_buf[0x02]   = (unsigned char)(1 << channel);
+    usb_buf[0x03]   = 0x28;
 
     /*-----------------------------------------------------*\
     | Set mode in USB packet                                |
     \*-----------------------------------------------------*/
-    usb_buf[0x04]   = current_mode;
+    usb_buf[0x04]   = mode;
 
     /*-----------------------------------------------------*\
     | Set speed in USB packet                               |
     \*-----------------------------------------------------*/
-    usb_buf[0x05]   = current_speed;
+    usb_buf[0x05]   = speed;
 
     /*-----------------------------------------------------*\
     | Set direction in USB packet                           |
     \*-----------------------------------------------------*/
-    usb_buf[0x06]   = current_direction ? 0x01 : 0x00;
-    
+    usb_buf[0x06]   = direction ? 0x01 : 0x00;
+
     /*-----------------------------------------------------*\
     | Set color count in USB packet                         |
     \*-----------------------------------------------------*/
-    usb_buf[0x08]   = colors.size();
+    usb_buf[0x08]   = color_count;
 
     /*-----------------------------------------------------*\
-    | Fill in color data                                    |
+    | Copy in color data bytes                              |
     \*-----------------------------------------------------*/
-    for (std::size_t idx = 0; idx < colors.size(); idx++)
-    {
-        int pixel_idx = idx * 3;
-        RGBColor color = colors[idx];
-        usb_buf[pixel_idx + 0x0A] = RGBGetGValue(color);
-        usb_buf[pixel_idx + 0x0B] = RGBGetRValue(color);
-        usb_buf[pixel_idx + 0x0C] = RGBGetBValue(color);
-    }
+    memcpy(&usb_buf[0x0A], color_data, color_count * 3);
 
     libusb_interrupt_transfer(dev, 0x01, usb_buf, 64, &actual, 0);
     libusb_interrupt_transfer(dev, 0x81, usb_buf, 64, &actual, 0);
-}
+}

Controllers/Hue2Controller/Hue2Controller.h

@@ -55,18 +55,54 @@ class Hue2Controller
 public:
     Hue2Controller(libusb_device_handle* dev_handle);
     ~Hue2Controller();
-    
-    char*           GetLEDString();
-    unsigned int    GetStripsOnChannel(unsigned int channel);
-    void            SetChannelLEDs(unsigned char channel, std::vector<RGBColor> colors);
-    void            SetMode(unsigned char mode, unsigned char speed, bool direction);
+
+    unsigned int    GetStripsOnChannel
+                        (
+                        unsigned int    channel
+                        );
+
+    void            SetChannelEffect
+                        (
+                        unsigned char   channel,
+                        unsigned char   mode,
+                        unsigned char   speed,
+                        bool            direction,
+                        RGBColor *      colors,
+                        unsigned int    num_colors
+                        );
+
+    void            SetChannelLEDs
+                        (
+                        unsigned char   channel,
+                        RGBColor *      colors,
+                        unsigned int    num_colors
+                        );
     
     unsigned int    channel_leds[HUE_2_NUM_CHANNELS];
 
 private:
     libusb_device_handle*   dev;
 
-    unsigned char   current_mode;
-    unsigned char   current_speed;
-    bool            current_direction;
+    void            SendApply
+                        (
+                        unsigned char   channel
+                        );
+
+    void            SendDirect
+                        (
+                        unsigned char   channel,
+                        unsigned char   group,
+                        unsigned char   color_count,
+                        unsigned char*  color_data
+                        );
+
+    void            SendEffect
+                        (
+                        unsigned char   channel,
+                        unsigned char   mode,
+                        unsigned char   speed,
+                        bool            direction,
+                        unsigned char   color_count,
+                        unsigned char*  color_data
+                        );
 };

Controllers/Hue2Controller/Hue2ControllerDetect.cpp

@@ -6,6 +6,7 @@
 
 #define NZXT_HUE_2_VID 0x1E71
 #define NZXT_HUE_2_PID 0x2001
+#define NZXT_SMART_DEVICE_V2_PID 0x2006
 
 /******************************************************************************************\
 *                                                                                          *
@@ -21,14 +22,29 @@ void DetectHue2Controllers(std::vector<RGBController*> &rgb_controllers)
     libusb_init(&ctx);
 
     //Look for NZXT Hue 2
-    libusb_device_handle * dev = libusb_open_device_with_vid_pid(ctx, NZXT_HUE_2_VID, NZXT_HUE_2_PID);
+    libusb_device_handle * hue_2_dev = libusb_open_device_with_vid_pid(ctx, NZXT_HUE_2_VID, NZXT_HUE_2_PID);
 
-    if( dev )
+    if( hue_2_dev )
     {
-        libusb_detach_kernel_driver(dev, 0);
-        libusb_claim_interface(dev, 0);
+        libusb_detach_kernel_driver(hue_2_dev, 0);
+        libusb_claim_interface(hue_2_dev, 0);
 
-        Hue2Controller* controller = new Hue2Controller(dev);
+        Hue2Controller* controller = new Hue2Controller(hue_2_dev);
+
+        RGBController_Hue2* rgb_controller = new RGBController_Hue2(controller);
+
+        rgb_controllers.push_back(rgb_controller);
+    }
+
+    //Look for NZXT Smart Device V2
+    libusb_device_handle * smart_dev_2_dev = libusb_open_device_with_vid_pid(ctx, NZXT_HUE_2_VID, NZXT_SMART_DEVICE_V2_PID);
+
+    if( smart_dev_2_dev )
+    {
+        libusb_detach_kernel_driver(smart_dev_2_dev, 0);
+        libusb_claim_interface(smart_dev_2_dev, 0);
+
+        Hue2Controller* controller = new Hue2Controller(smart_dev_2_dev);
 
         RGBController_Hue2* rgb_controller = new RGBController_Hue2(controller);
 

Controllers/HuePlusController/HuePlusController.cpp

@@ -9,7 +9,7 @@
 #include <fstream>
 #include <iostream>
 #include <string>
-
+#include <cstring>
 
 #ifdef WIN32
 #include <Windows.h>
@@ -24,9 +24,7 @@ static void Sleep(unsigned int milliseconds)
 
 HuePlusController::HuePlusController()
 {
-    current_mode        = HUE_PLUS_MODE_FIXED;
-    current_speed       = HUE_PLUS_SPEED_NORMAL;
-    current_direction   = false;
+
 }
 
 HuePlusController::~HuePlusController()
@@ -85,86 +83,166 @@ unsigned int HuePlusController::GetLEDsOnChannel(unsigned int channel)
     return(ret_val);
 }
 
-void HuePlusController::SetMode(unsigned char mode, unsigned char speed, bool direction)
+void HuePlusController::SetChannelEffect
+    (
+    unsigned char   channel,
+    unsigned char   mode,
+    unsigned char   speed,
+    bool            direction,
+    RGBColor *      colors,
+    unsigned int    num_colors
+    )
 {
-    current_mode        = mode;
-    current_speed       = speed;
-    current_direction   = direction;
+    unsigned char color_data[120];
+
+    /*-----------------------------------------------------*\
+    | If mode requires no colors, send packet               |
+    \*-----------------------------------------------------*/
+    if(num_colors == 0)
+    {
+        /*-----------------------------------------------------*\
+        | Send mode without color data                          |
+        \*-----------------------------------------------------*/
+        SendPacket(channel, mode, direction, 0, speed, 0, NULL);
+    }
+    /*-----------------------------------------------------*\
+    | If mode requires indexed colors, send color index     |
+    | packets for each mode color                           |
+    \*-----------------------------------------------------*/
+    else if(num_colors <= 8)
+    {
+        for(std::size_t color_idx = 0; color_idx < num_colors; color_idx++)
+        {
+            /*-----------------------------------------------------*\
+            | Fill in color data (40 entries per color)             |
+            \*-----------------------------------------------------*/
+            for (std::size_t idx = 0; idx < 40; idx++)
+            {
+                int pixel_idx = idx * 3;
+                RGBColor color = colors[color_idx];
+                color_data[pixel_idx + 0x00] = RGBGetGValue(color);
+                color_data[pixel_idx + 0x01] = RGBGetRValue(color);
+                color_data[pixel_idx + 0x02] = RGBGetBValue(color);
+            }
+
+            /*-----------------------------------------------------*\
+            | Send mode and color data                              |
+            \*-----------------------------------------------------*/
+            SendPacket(channel, mode, direction, color_idx, speed, 40, &color_data[0]);
+        }
+    }
+    /*-----------------------------------------------------*\
+    | If mode requires per-LED colors, fill colors array    |
+    \*-----------------------------------------------------*/
+    else
+    {
+        /*-----------------------------------------------------*\
+        | Fill in color data (up to 40 colors)                  |
+        \*-----------------------------------------------------*/
+        for (std::size_t idx = 0; idx < num_colors; idx++)
+        {
+            int pixel_idx = idx * 3;
+            RGBColor color = colors[idx];
+            color_data[pixel_idx + 0x00] = RGBGetGValue(color);
+            color_data[pixel_idx + 0x01] = RGBGetRValue(color);
+            color_data[pixel_idx + 0x02] = RGBGetBValue(color);
+        }
+
+        /*-----------------------------------------------------*\
+        | Send mode and color data                              |
+        \*-----------------------------------------------------*/
+        SendPacket(channel, mode, direction, 0, speed, num_colors, &color_data[0]);
+    }
 }
 
-void HuePlusController::SetChannelLEDs(unsigned char channel, std::vector<RGBColor> colors)
+void HuePlusController::SetChannelLEDs
+    (
+    unsigned char   channel,
+    RGBColor *      colors,
+    unsigned int    num_colors
+    )
 {
-    unsigned char serial_buf[] =
+    unsigned char color_data[120];
+
+    /*-----------------------------------------------------*\
+    | Fill in color data (up to 40 colors)                  |
+    \*-----------------------------------------------------*/
+    for (std::size_t idx = 0; idx < num_colors; idx++)
     {
-        0x4B, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00,
-        0x00
-    };
+        int pixel_idx = idx * 3;
+        RGBColor color = colors[idx];
+        color_data[pixel_idx + 0x00] = RGBGetGValue(color);
+        color_data[pixel_idx + 0x01] = RGBGetRValue(color);
+        color_data[pixel_idx + 0x02] = RGBGetBValue(color);
+    }
+
+    /*-----------------------------------------------------*\
+    | Send color data                                       |
+    \*-----------------------------------------------------*/
+    SendPacket(channel, HUE_PLUS_MODE_FIXED, false, 0, 0, num_colors, &color_data[0]);
+}
+
+/*-------------------------------------------------------------------------------------------------*\
+| Private packet sending functions.                                                                 |
+\*-------------------------------------------------------------------------------------------------*/
+
+void HuePlusController::SendPacket
+    (
+    unsigned char   channel,
+    unsigned char   mode,
+    bool            direction,
+    unsigned char   color_idx,
+    unsigned char   speed,
+    unsigned char   color_count,
+    unsigned char*  color_data
+    )
+{
+    unsigned char serial_buf[125];
+
+    /*-----------------------------------------------------*\
+    | Zero out buffer                                       |
+    \*-----------------------------------------------------*/
+    memset(serial_buf, 0x00, sizeof(serial_buf));
+
+    /*-----------------------------------------------------*\
+    | Set up Direct packet                                  |
+    \*-----------------------------------------------------*/
+    serial_buf[0x00]    = 0x4B;
 
     /*-----------------------------------------------------*\
     | Set channel in serial packet                          |
     \*-----------------------------------------------------*/
-    serial_buf[0x01]   = channel;
+    serial_buf[0x01]   = channel + 1;
 
     /*-----------------------------------------------------*\
     | Set mode in serial packet                             |
     \*-----------------------------------------------------*/
-    serial_buf[0x02]   = current_mode;
+    serial_buf[0x02]   = mode;
 
     /*-----------------------------------------------------*\
     | Set options bitfield in serial packet                 |
     \*-----------------------------------------------------*/
     serial_buf[0x03]   = 0;
-    serial_buf[0x03]   |= current_direction ? ( 1 << 4 ) : 0;
+    serial_buf[0x03]   |= direction ? ( 1 << 4 ) : 0;
 
     /*-----------------------------------------------------*\
-    | Set speed in serial packet                            |
+    | Set color index and speed in serial packet            |
     \*-----------------------------------------------------*/
-    serial_buf[0x04]   = current_speed;
+    serial_buf[0x04]   = ( color_idx << 5 ) | speed;
 
     /*-----------------------------------------------------*\
-    | Fill in color data                                    |
+    | Copy in color data bytes                              |
     \*-----------------------------------------------------*/
-    for (std::size_t idx = 0; idx < colors.size(); idx++)
-    {
-        int pixel_idx = idx * 3;
-        RGBColor color = colors[idx];
-        serial_buf[pixel_idx + 0x05] = RGBGetGValue(color);
-        serial_buf[pixel_idx + 0x06] = RGBGetRValue(color);
-        serial_buf[pixel_idx + 0x07] = RGBGetBValue(color);
-    }
+    memcpy(&serial_buf[0x05], color_data, color_count * 3);
 
+    /*-----------------------------------------------------*\
+    | Send packet                                           |
+    \*-----------------------------------------------------*/
     serialport->serial_write((char *)serial_buf, HUE_PLUS_PACKET_SIZE);
     serialport->serial_flush_tx();
 
-    Sleep(10);
-}
+    /*-----------------------------------------------------*\
+    | Delay to allow Hue+ device to ready for next packet   |
+    \*-----------------------------------------------------*/
+    Sleep(20);
+}

Controllers/HuePlusController/HuePlusController.h

@@ -73,8 +73,23 @@ public:
     void            Initialize(char* port);
     char*           GetLocation();
     unsigned int    GetLEDsOnChannel(unsigned int channel);
-    void            SetChannelLEDs(unsigned char channel, std::vector<RGBColor> colors);
-    void            SetMode(unsigned char mode, unsigned char speed, bool direction);
+
+    void            SetChannelEffect
+                        (
+                        unsigned char   channel,
+                        unsigned char   mode,
+                        unsigned char   speed,
+                        bool            direction,
+                        RGBColor *      colors,
+                        unsigned int    num_colors
+                        );
+
+    void            SetChannelLEDs
+                        (
+                        unsigned char   channel,
+                        RGBColor *      colors,
+                        unsigned int    num_colors
+                        );
 
     unsigned int    channel_leds[HUE_PLUS_NUM_CHANNELS];
 
@@ -82,9 +97,16 @@ private:
     char            port_name[128];
     serial_port     *serialport;
 
-    unsigned char   current_mode;
-    unsigned char   current_speed;
-    bool            current_direction;
+    void            SendPacket
+                        (
+                        unsigned char   channel,
+                        unsigned char   mode,
+                        bool            direction,
+                        unsigned char   color_idx,
+                        unsigned char   speed,
+                        unsigned char   color_count,
+                        unsigned char*  color_data
+                        );
 };
 
 #endif

Controllers/HyperXDRAMController/HyperXDRAMController.cpp

@@ -1,16 +1,16 @@
 /*-----------------------------------------*\
-|  HyperXController.cpp                     |
+|  HyperXDRAMController.cpp                 |
 |                                           |
 |  Definitions and types for HyperX Predator|
-|  RGB RAM lighting controller              |
+|  and Fury RGB RAM lighting controller     |
 |                                           |
 |  Adam Honse (CalcProgrammer1) 6/29/2019   |
 \*-----------------------------------------*/
 
-#include "HyperXController.h"
+#include "HyperXDRAMController.h"
 #include <cstring>
 
-HyperXController::HyperXController(i2c_smbus_interface* bus, hyperx_dev_id dev, unsigned char slots)
+HyperXDRAMController::HyperXDRAMController(i2c_smbus_interface* bus, hyperx_dev_id dev, unsigned char slots)
 {
     this->bus   = bus;
     this->dev   = dev;
@@ -31,17 +31,17 @@ HyperXController::HyperXController(i2c_smbus_interface* bus, hyperx_dev_id dev,
     mode = HYPERX_MODE_DIRECT;
 }
 
-HyperXController::~HyperXController()
+HyperXDRAMController::~HyperXDRAMController()
 {
 
 }
 
-std::string HyperXController::GetDeviceName()
+std::string HyperXDRAMController::GetDeviceName()
 {
     return(device_name);
 }
 
-std::string HyperXController::GetDeviceLocation()
+std::string HyperXDRAMController::GetDeviceLocation()
 {
     std::string return_string(bus->device_name);
     char addr[5];
@@ -51,12 +51,12 @@ std::string HyperXController::GetDeviceLocation()
     return(return_string);
 }
 
-unsigned int HyperXController::GetLEDCount()
+unsigned int HyperXDRAMController::GetLEDCount()
 {
     return(led_count);
 }
 
-unsigned int HyperXController::GetSlotCount()
+unsigned int HyperXDRAMController::GetSlotCount()
 {
     unsigned int slot_count = 0;
 
@@ -71,12 +71,12 @@ unsigned int HyperXController::GetSlotCount()
     return(slot_count);
 }
 
-unsigned int HyperXController::GetMode()
+unsigned int HyperXDRAMController::GetMode()
 {
     return(mode);
 }
 
-void HyperXController::SetEffectColor(unsigned char red, unsigned char green, unsigned char blue)
+void HyperXDRAMController::SetEffectColor(unsigned char red, unsigned char green, unsigned char blue)
 {
     bus->i2c_smbus_write_byte_data(dev, HYPERX_REG_APPLY, 0x01);
 
@@ -89,7 +89,7 @@ void HyperXController::SetEffectColor(unsigned char red, unsigned char green, un
     bus->i2c_smbus_write_byte_data(dev, HYPERX_REG_APPLY, 0x03);
 }
 
-void HyperXController::SetAllColors(unsigned char red, unsigned char green, unsigned char blue)
+void HyperXDRAMController::SetAllColors(unsigned char red, unsigned char green, unsigned char blue)
 {
     bus->i2c_smbus_write_byte_data(dev, HYPERX_REG_APPLY, 0x01);
 
@@ -126,7 +126,7 @@ void HyperXController::SetAllColors(unsigned char red, unsigned char green, unsi
     bus->i2c_smbus_write_byte_data(dev, HYPERX_REG_APPLY, 0x03);
 }
 
-void HyperXController::SetLEDColor(unsigned int led, unsigned char red, unsigned char green, unsigned char blue)
+void HyperXDRAMController::SetLEDColor(unsigned int led, unsigned char red, unsigned char green, unsigned char blue)
 {
     /*-----------------------------------------------------*\
     | led_slot - the unmapped slot ID for the given LED     |
@@ -175,7 +175,7 @@ void HyperXController::SetLEDColor(unsigned int led, unsigned char red, unsigned
 }
 
 
-void HyperXController::SetLEDColor(unsigned int slot, unsigned int led, unsigned char red, unsigned char green, unsigned char blue)
+void HyperXDRAMController::SetLEDColor(unsigned int slot, unsigned int led, unsigned char red, unsigned char green, unsigned char blue)
 {
     unsigned char base        = slot_base[slot];
     unsigned char red_base    = base + 0x00;
@@ -194,7 +194,7 @@ void HyperXController::SetLEDColor(unsigned int slot, unsigned int led, unsigned
     bus->i2c_smbus_write_byte_data(dev, HYPERX_REG_APPLY, 0x03);
 }
 
-void HyperXController::SetMode(unsigned char new_mode, bool random, unsigned short new_speed)
+void HyperXDRAMController::SetMode(unsigned char new_mode, bool random, unsigned short new_speed)
 {
     mode  = new_mode;
     speed = new_speed;

Controllers/HyperXDRAMController/HyperXDRAMController.h

@@ -1,8 +1,8 @@
 /*-----------------------------------------*\
-|  HyperXController.h                       |
+|  HyperXDRAMController.h                   |
 |                                           |
 |  Definitions and types for HyperX Predator|
-|  RGB RAM lighting controller              |
+|  and Fury RGB RAM lighting controller     |
 |                                           |
 |  Adam Honse (CalcProgrammer1) 6/29/2019   |
 \*-----------------------------------------*/
@@ -193,11 +193,11 @@ static const unsigned char slot_base[4] =
     HYPERX_REG_SLOT3_LED0_RED                       /* SPD 0x53 maps to slot 3              */
 };
 
-class HyperXController
+class HyperXDRAMController
 {
 public:
-    HyperXController(i2c_smbus_interface* bus, hyperx_dev_id dev, unsigned char slots);
-    ~HyperXController();
+    HyperXDRAMController(i2c_smbus_interface* bus, hyperx_dev_id dev, unsigned char slots);
+    ~HyperXDRAMController();
 
     std::string     GetDeviceName();
     std::string     GetDeviceLocation();

Controllers/HyperXDRAMController/HyperXDRAMControllerDetect.cpp

@@ -1,6 +1,6 @@
-#include "HyperXController.h"
+#include "HyperXDRAMController.h"
 #include "RGBController.h"
-#include "RGBController_HyperX.h"
+#include "RGBController_HyperXDRAM.h"
 #include "i2c_smbus.h"
 #include <vector>
 #include <stdio.h>
@@ -19,13 +19,13 @@ static void Sleep(unsigned int milliseconds)
 
 /******************************************************************************************\
 *                                                                                          *
-*   TestForHyperXController                                                               *
+*   TestForHyperXDRAMController                                                            *
 *                                                                                          *
-*       Tests the given address to see if a HyperX controller exists there.               *
+*       Tests the given address to see if a HyperX controller exists there.                *
 *                                                                                          *
 \******************************************************************************************/
 
-bool TestForHyperXController(i2c_smbus_interface* bus, unsigned char address)
+bool TestForHyperXDRAMController(i2c_smbus_interface* bus, unsigned char address)
 {
     bool pass = false;
 
@@ -48,31 +48,31 @@ bool TestForHyperXController(i2c_smbus_interface* bus, unsigned char address)
 
     return(pass);
 
-}   /* TestForHyperXController() */
+}   /* TestForHyperXDRAMController() */
 
 
 /******************************************************************************************\
 *                                                                                          *
-*   DetectHyperXControllers                                                                *
+*   DetectHyperXDRAMControllers                                                            *
 *                                                                                          *
-*       Detect HyperX controllers on the enumerated I2C busses.                            *
+*       Detect HyperX DRAM controllers on the enumerated I2C busses.                       *
 *                                                                                          *
 *           bus - pointer to i2c_smbus_interface where Aura device is connected            *
 *           dev - I2C address of Aura device                                               *
 *                                                                                          *
 \******************************************************************************************/
 
-void DetectHyperXControllers(std::vector<i2c_smbus_interface*> &busses, std::vector<RGBController*> &rgb_controllers)
+void DetectHyperXDRAMControllers(std::vector<i2c_smbus_interface*> &busses, std::vector<RGBController*> &rgb_controllers)
 {
-    HyperXController* new_hyperx;
-    RGBController_HyperX* new_controller;
+    HyperXDRAMController* new_hyperx;
+    RGBController_HyperXDRAM* new_controller;
 
     for (unsigned int bus = 0; bus < busses.size(); bus++)
     {
         unsigned char slots_valid = 0x00;
 
         // Check for HyperX controller at 0x27
-        if (TestForHyperXController(busses[bus], 0x27))
+        if (TestForHyperXDRAMController(busses[bus], 0x27))
         {
             busses[bus]->i2c_smbus_write_byte_data(0x37, 0x00, 0xFF);
 
@@ -94,11 +94,11 @@ void DetectHyperXControllers(std::vector<i2c_smbus_interface*> &busses, std::vec
 
             if(slots_valid != 0)
             {
-                new_hyperx = new HyperXController(busses[bus], 0x27, slots_valid);
-                new_controller = new RGBController_HyperX(new_hyperx);
+                new_hyperx = new HyperXDRAMController(busses[bus], 0x27, slots_valid);
+                new_controller = new RGBController_HyperXDRAM(new_hyperx);
                 rgb_controllers.push_back(new_controller);
             }
         }
     }
 
-}   /* DetectHyperXControllers() */
+}   /* DetectHyperXDRAMControllers() */

Controllers/HyperXKeyboardController/HyperXKeyboardController.cpp

@@ -0,0 +1,489 @@
+/*-----------------------------------------*\
+|  HyperXKeyboardController.cpp             |
+|                                           |
+|  Driver for HyperX RGB Keyboard lighting  |
+|  controller                               |
+|                                           |
+|  Adam Honse (CalcProgrammer1) 1/30/2020   |
+\*-----------------------------------------*/
+
+#include "HyperXKeyboardController.h"
+
+#include <cstring>
+
+#ifdef WIN32
+#include <Windows.h>
+#else
+#include <unistd.h>
+
+static void Sleep(unsigned int milliseconds)
+{
+    usleep(1000 * milliseconds);
+}
+#endif
+
+
+static unsigned int keys[] = {0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F, 0x10, 0x11, 0x12, 0x13, 0x14,
+                              0x15, 0x17, 0x18, 0x19, 0x1A, 0x1B, 0x1D, 0x1E, 0x20, 0x21, 0x22, 0x23, 0x24,
+                              0x26, 0x27, 0x28, 0x29, 0x2A, 0x2B, 0x2C, 0x2D, 0x2E, 0x2F, 0x30, 0x31, 0x32,
+                              0x33, 0x34, 0x37, 0x38, 0x39, 0x3A, 0x3B, 0x3C, 0x3E, 0x3F, 0x41, 0x44, 0x45,
+                              0x48, 0x49, 0x4A, 0x4B, 0x4C, 0x4D, 0x4E, 0x4F, 0x51, 0x54, 0x55, 0x58, 0x59,
+                              0x5A, 0x5B, 0x5C, 0x5E, 0x5F, 0x61, 0x64, 0x65, 0x68, 0x69, 0x6A, 0x6B, 0x6C,
+                              0x6E, 0x6F, 0x74, 0x75, 0x78, 0x79, 0x7A, 0x7B, 0x7C, 0x7D, 0x7E, 0x7F, 0x81,
+                              0x84, 0x85, 0x88, 0x89, 0x8A, 0x8B, 0x8C, 0x8D, 0x8E, 0x8F, 0x91, 0x94, 0x95 };
+
+static unsigned int extended_red[] = {0x08, 0x48, 0x88, 0x09, 0x89, 0x0A, 0x8A, 0x0B, 0x8B, 0x0C, 0x8C, 0x0D, 0x8D, 0x0E, 0x8F, 0x8E, 0x0F, 0x4F, 0x92, 0x13, 0x93, 0x12 };
+static unsigned int extended_grn[] = {0x29, 0x28, 0x78, 0x19, 0x79, 0x1A, 0x7A, 0x1B, 0x7B, 0x1C, 0x7C, 0x1D, 0x7D, 0x1E, 0x6E, 0x7E, 0x1F, 0x6F, 0x82, 0x23, 0x83, 0x22 };
+static unsigned int extended_blu[] = {0x39, 0x38, 0x68, 0x3A, 0x69, 0x2A, 0x6A, 0x2B, 0x6B, 0x2C, 0x6C, 0x2D, 0x6D, 0x2E, 0x5E, 0x5D, 0x2F, 0x5F, 0x72, 0x33, 0x73, 0x32 };
+
+HyperXKeyboardController::HyperXKeyboardController(hid_device* dev_handle)
+{
+    dev = dev_handle;
+}
+
+HyperXKeyboardController::~HyperXKeyboardController()
+{
+
+}
+
+void HyperXKeyboardController::SetMode
+    (
+    unsigned char mode,
+    unsigned char direction,
+    unsigned char speed,
+    std::vector<RGBColor> colors
+    )
+{
+    unsigned char color_mode;
+    unsigned char mode_colors[9];
+
+    active_mode = mode;
+    active_direction = direction;
+    active_speed = speed;
+
+    memset(mode_colors, 0x00, sizeof(mode_colors));
+
+    switch(colors.size())
+    {
+        default:
+        case 0:
+            color_mode = HYPERX_COLOR_MODE_SPECTRUM;
+            break;
+
+        case 1:
+            color_mode = HYPERX_COLOR_MODE_SINGLE;
+            mode_colors[0] = RGBGetRValue(colors[0]);
+            mode_colors[1] = RGBGetGValue(colors[0]);
+            mode_colors[2] = RGBGetBValue(colors[0]);
+            break;
+
+        case 2:
+            color_mode = HYPERX_COLOR_MODE_DUAL;
+            mode_colors[3] = RGBGetRValue(colors[0]);
+            mode_colors[4] = RGBGetGValue(colors[0]);
+            mode_colors[5] = RGBGetBValue(colors[0]);
+            mode_colors[6] = RGBGetRValue(colors[1]);
+            mode_colors[7] = RGBGetGValue(colors[1]);
+            mode_colors[8] = RGBGetBValue(colors[1]);
+            break;
+    }
+
+    SendEffect
+        (
+        0x01,
+        active_mode,
+        active_direction,
+        HYPERX_REACTIVE_MODE_NONE,
+        active_speed,
+        color_mode,
+        mode_colors[0],
+        mode_colors[1],
+        mode_colors[2],
+        mode_colors[3],
+        mode_colors[4],
+        mode_colors[5],
+        mode_colors[6],
+        mode_colors[7],
+        mode_colors[8]
+        );
+
+    Sleep(100);
+}
+
+void HyperXKeyboardController::SetLEDsDirect(std::vector<RGBColor> colors)
+{
+    unsigned char red_color_data[104];
+    unsigned char grn_color_data[104];
+    unsigned char blu_color_data[104];
+    unsigned char ext_color_data[150];
+
+    for(std::size_t i = 0; i < 104; i++)
+    {
+        red_color_data[i] = RGBGetRValue(colors[i]);
+        grn_color_data[i] = RGBGetGValue(colors[i]);
+        blu_color_data[i] = RGBGetBValue(colors[i]);
+    }
+
+    for(std::size_t i = 0; i < 22; i++)
+    {
+        ext_color_data[extended_red[i]] = RGBGetRValue(colors[i + 104]);
+        ext_color_data[extended_grn[i]] = RGBGetGValue(colors[i + 104]);
+        ext_color_data[extended_blu[i]] = RGBGetBValue(colors[i + 104]);
+    }
+
+    SendDirect
+        (
+        HYPERX_COLOR_CHANNEL_RED,
+        red_color_data
+        );
+
+    Sleep(5);
+
+    SendDirect
+        (
+        HYPERX_COLOR_CHANNEL_GREEN,
+        grn_color_data
+        );
+
+    Sleep(5);
+
+    SendDirect
+        (
+        HYPERX_COLOR_CHANNEL_BLUE,
+        blu_color_data
+        );
+
+    Sleep(5);
+
+    SendDirectExtended
+        (
+        ext_color_data
+        );
+}
+
+void HyperXKeyboardController::SetLEDs(std::vector<RGBColor> colors)
+{
+    unsigned char red_color_data[104];
+    unsigned char grn_color_data[104];
+    unsigned char blu_color_data[104];
+    unsigned char ext_color_data[150];
+
+    for(std::size_t i = 0; i < 104; i++)
+    {
+        red_color_data[i] = RGBGetRValue(colors[i]);
+        grn_color_data[i] = RGBGetGValue(colors[i]);
+        blu_color_data[i] = RGBGetBValue(colors[i]);
+    }
+
+    for(std::size_t i = 0; i < 22; i++)
+    {
+        ext_color_data[extended_red[i]] = RGBGetRValue(colors[i + 104]);
+        ext_color_data[extended_grn[i]] = RGBGetGValue(colors[i + 104]);
+        ext_color_data[extended_blu[i]] = RGBGetBValue(colors[i + 104]);
+    }
+
+    SendColor
+        (
+        0x01,
+        HYPERX_COLOR_CHANNEL_RED,
+        red_color_data
+        );
+
+    Sleep(5);
+
+    SendColor
+        (
+        0x01,
+        HYPERX_COLOR_CHANNEL_GREEN,
+        grn_color_data
+        );
+
+    Sleep(5);
+
+    SendColor
+        (
+        0x01,
+        HYPERX_COLOR_CHANNEL_BLUE,
+        blu_color_data
+        );
+
+    Sleep(5);
+    
+    SendExtendedColor
+        (
+        0x01,
+        ext_color_data
+        );
+}
+
+/*-------------------------------------------------------------------------------------------------*\
+| Private packet sending functions.                                                                 |
+\*-------------------------------------------------------------------------------------------------*/
+
+void HyperXKeyboardController::SelectProfile
+    (
+    unsigned char   profile
+    )
+{
+    unsigned char buf[264];
+
+    /*-----------------------------------------------------*\
+    | Zero out buffer                                       |
+    \*-----------------------------------------------------*/
+    memset(buf, 0x00, sizeof(buf));
+
+    /*-----------------------------------------------------*\
+    | Set up Select Profile packet                          |
+    \*-----------------------------------------------------*/
+    buf[0x00]   = 0x07;
+    buf[0x01]   = 0x01;
+    buf[0x02]   = profile;
+
+    buf[0x06]   = 0x03;
+    buf[0x07]   = 0x01;
+
+    /*-----------------------------------------------------*\
+    | Send packet                                           |
+    \*-----------------------------------------------------*/
+    hid_send_feature_report(dev, buf, 264);
+}
+
+void HyperXKeyboardController::SendEffect
+    (
+    unsigned char   profile,
+    unsigned char   mode,
+    unsigned char   direction,
+    unsigned char   reactive_mode,
+    unsigned char   speed,
+    unsigned char   color_mode,
+    unsigned char   red_single,
+    unsigned char   grn_single,
+    unsigned char   blu_single,
+    unsigned char   red_dual_1,
+    unsigned char   grn_dual_1,
+    unsigned char   blu_dual_1,
+    unsigned char   red_dual_2,
+    unsigned char   grn_dual_2,
+    unsigned char   blu_dual_2
+    )
+{
+    unsigned char buf[264];
+
+    /*-----------------------------------------------------*\
+    | Zero out buffer                                       |
+    \*-----------------------------------------------------*/
+    memset(buf, 0x00, sizeof(buf));
+
+    /*-----------------------------------------------------*\
+    | Set up Effect packet                                  |
+    \*-----------------------------------------------------*/
+    buf[0x00]   = 0x07;
+    buf[0x01]   = HYPERX_PACKET_ID_SET_EFFECT;
+    buf[0x02]   = profile;
+
+    /*-----------------------------------------------------*\
+    | Set mode                                              |
+    \*-----------------------------------------------------*/
+    buf[0x09]   = 0x01;
+    buf[0x0A]   = mode;
+
+    /*-----------------------------------------------------*\
+    | Set direction                                         |
+    \*-----------------------------------------------------*/
+    buf[0x0D]   = direction;
+    buf[0x0E]   = direction;
+
+    /*-----------------------------------------------------*\
+    | Set reactive mode                                     |
+    \*-----------------------------------------------------*/
+    buf[0x1B]   = reactive_mode;
+    buf[0x1C]   = reactive_mode;
+    buf[0x1D]   = reactive_mode;
+    buf[0x1E]   = reactive_mode;
+    buf[0x1F]   = reactive_mode;
+    buf[0x20]   = reactive_mode;
+    buf[0x21]   = reactive_mode;
+    buf[0x22]   = reactive_mode;
+
+    /*-----------------------------------------------------*\
+    | Set mode-specific colors                              |
+    \*-----------------------------------------------------*/
+    buf[0x29]   = red_single;
+    buf[0x41]   = grn_single;
+    buf[0x59]   = blu_single;
+    buf[0x2A]   = red_dual_1;
+    buf[0x42]   = grn_dual_1;
+    buf[0x5A]   = blu_dual_1;
+    buf[0x2B]   = red_dual_2;
+    buf[0x43]   = grn_dual_2;
+    buf[0x5B]   = blu_dual_2;
+
+    buf[0x6B]   = 0x09;
+    buf[0x6C]   = 0x09;
+    buf[0x6D]   = 0x05;
+    buf[0x6E]   = 0x05;
+    buf[0x6F]   = 0x06;
+    buf[0x70]   = 0x05;
+
+    /*-----------------------------------------------------*\
+    | Set speed                                             |
+    \*-----------------------------------------------------*/
+    buf[0x71]   = speed;
+
+    buf[0x72]   = 0x09;
+
+    /*-----------------------------------------------------*\
+    | Set color mode                                        |
+    \*-----------------------------------------------------*/
+    buf[0x73]   = color_mode;
+    buf[0x74]   = color_mode;
+    buf[0x75]   = color_mode;
+    buf[0x76]   = color_mode;
+    buf[0x77]   = color_mode;
+    buf[0x78]   = color_mode;
+    buf[0x79]   = color_mode;
+    buf[0x7A]   = color_mode;
+
+    /*-----------------------------------------------------*\
+    | Send packet                                           |
+    \*-----------------------------------------------------*/
+    hid_send_feature_report(dev, buf, 264);
+}
+
+void HyperXKeyboardController::SendColor
+    (
+    unsigned char   profile,
+    unsigned char   color_channel,
+    unsigned char*  color_data
+    )
+{
+    unsigned char buf[264];
+
+    /*-----------------------------------------------------*\
+    | Zero out buffer                                       |
+    \*-----------------------------------------------------*/
+    memset(buf, 0x00, sizeof(buf));
+
+    /*-----------------------------------------------------*\
+    | Set up Color packet                                   |
+    \*-----------------------------------------------------*/
+    buf[0x00]   = 0x07;
+    buf[0x01]   = HYPERX_PACKET_ID_SET_COLOR;
+    buf[0x02]   = profile;
+    buf[0x03]   = color_channel;
+
+    /*-----------------------------------------------------*\
+    | Fill in color data                                    |
+    \*-----------------------------------------------------*/
+    for(int i = 0; i < 104; i++)
+    {
+        buf[keys[i]] = color_data[i];
+    }
+
+    /*-----------------------------------------------------*\
+    | Send packet                                           |
+    \*-----------------------------------------------------*/
+    hid_send_feature_report(dev, buf, 264);
+}
+
+void HyperXKeyboardController::SendExtendedColor
+    (
+    unsigned char   profile,
+    unsigned char*  color_data
+    )
+{
+    unsigned char buf[264];
+
+    /*-----------------------------------------------------*\
+    | Zero out buffer                                       |
+    \*-----------------------------------------------------*/
+    memset(buf, 0x00, sizeof(buf));
+
+    /*-----------------------------------------------------*\
+    | Set up Color packet                                   |
+    \*-----------------------------------------------------*/
+    buf[0x00]   = 0x07;
+    buf[0x01]   = HYPERX_PACKET_ID_SET_COLOR;
+    buf[0x02]   = profile;
+    buf[0x03]   = HYPERX_COLOR_CHANNEL_EXTENDED;
+
+    /*-----------------------------------------------------*\
+    | Fill in color data                                    |
+    \*-----------------------------------------------------*/
+    for(int i = 0x08; i <= 0x93; i++)
+    {
+        buf[i] = color_data[i];
+    }
+
+    /*-----------------------------------------------------*\
+    | Send packet                                           |
+    \*-----------------------------------------------------*/
+    hid_send_feature_report(dev, buf, 264);
+}
+
+void HyperXKeyboardController::SendDirect
+    (
+    unsigned char   color_channel,
+    unsigned char*  color_data
+    )
+{
+    unsigned char buf[264];
+
+    /*-----------------------------------------------------*\
+    | Zero out buffer                                       |
+    \*-----------------------------------------------------*/
+    memset(buf, 0x00, sizeof(buf));
+
+    /*-----------------------------------------------------*\
+    | Set up Direct packet                                  |
+    \*-----------------------------------------------------*/
+    buf[0x00]   = 0x07;
+    buf[0x01]   = HYPERX_PACKET_ID_DIRECT;
+    buf[0x02]   = color_channel;
+
+    /*-----------------------------------------------------*\
+    | Fill in color data                                    |
+    \*-----------------------------------------------------*/
+    for(int i = 0; i < 104; i++)
+    {
+        buf[keys[i]] = color_data[i];
+    }
+
+    /*-----------------------------------------------------*\
+    | Send packet                                           |
+    \*-----------------------------------------------------*/
+    hid_send_feature_report(dev, buf, 264);
+}
+
+void HyperXKeyboardController::SendDirectExtended
+    (
+    unsigned char*  color_data
+    )
+{
+    unsigned char buf[264];
+
+    /*-----------------------------------------------------*\
+    | Zero out buffer                                       |
+    \*-----------------------------------------------------*/
+    memset(buf, 0x00, sizeof(buf));
+
+    /*-----------------------------------------------------*\
+    | Set up Direct packet                                  |
+    \*-----------------------------------------------------*/
+    buf[0x00]   = 0x07;
+    buf[0x01]   = HYPERX_PACKET_ID_DIRECT;
+    buf[0x02]   = HYPERX_COLOR_CHANNEL_EXTENDED;
+
+    /*-----------------------------------------------------*\
+    | Fill in color data                                    |
+    \*-----------------------------------------------------*/
+    for(int i = 0x08; i <= 0x93; i++)
+    {
+        buf[i] = color_data[i];
+    }
+
+    /*-----------------------------------------------------*\
+    | Send packet                                           |
+    \*-----------------------------------------------------*/
+    hid_send_feature_report(dev, buf, 264);
+}

Controllers/HyperXKeyboardController/HyperXKeyboardController.h

@@ -0,0 +1,135 @@
+/*-----------------------------------------*\
+|  HyperXKeyboardController.h               |
+|                                           |
+|  Definitions and types for HyperX RGB     |
+|  Keyboard lighting controller             |
+|                                           |
+|  Adam Honse (CalcProgrammer1) 1/30/2020   |
+\*-----------------------------------------*/
+
+#include "RGBController.h"
+
+#include <string>
+#include <hidapi/hidapi.h>
+
+#pragma once
+
+enum
+{
+    HYPERX_PACKET_ID_SET_EFFECT                 = 0x02,     /* Set profile effect packet            */
+    HYPERX_PACKET_ID_SET_COLOR                  = 0x06,     /* Set profile color packet             */
+    HYPERX_PACKET_ID_DIRECT                     = 0x16,     /* Direct control packet                */
+};
+
+
+enum
+{
+    HYPERX_DIRECTION_RIGHT  = 0x00,
+    HYPERX_DIRECTION_LEFT   = 0x01,
+    HYPERX_DIRECTION_UP     = 0x02,
+    HYPERX_DIRECTION_DOWN   = 0x03,
+    HYPERX_DIRECTION_IN     = 0x04,
+    HYPERX_DIRECTION_OUT    = 0x05
+};
+
+enum
+{
+    HYPERX_MODE_WAVE                    = 0x00,
+    HYPERX_MODE_STATIC                  = 0x01,
+    HYPERX_MODE_BREATHING               = 0x02,
+};
+
+enum
+{
+    HYPERX_REACTIVE_MODE_TRIGGER        = 0x03,
+    HYPERX_REACTIVE_MODE_EXPLOSION      = 0x04,
+    HYPERX_REACTIVE_MODE_HYPERX_FLAME   = 0x05,
+    HYPERX_REACTIVE_MODE_NONE           = 0xFF
+};
+
+enum
+{
+    HYPERX_COLOR_MODE_SINGLE            = 0x00,
+    HYPERX_COLOR_MODE_DUAL              = 0x01,
+    HYPERX_COLOR_MODE_SPECTRUM          = 0x02
+};
+
+enum
+{
+    HYPERX_COLOR_CHANNEL_RED                = 0x01,
+    HYPERX_COLOR_CHANNEL_GREEN              = 0x02,
+    HYPERX_COLOR_CHANNEL_BLUE               = 0x03,
+    HYPERX_COLOR_CHANNEL_EXTENDED           = 0x04
+};
+
+class HyperXKeyboardController
+{
+public:
+    HyperXKeyboardController(hid_device* dev_handle);
+    ~HyperXKeyboardController();
+
+    void SetMode
+        (
+        unsigned char mode,
+        unsigned char direction,
+        unsigned char speed,
+        std::vector<RGBColor> colors
+        );
+
+    void SetLEDsDirect(std::vector<RGBColor> colors);
+    void SetLEDs(std::vector<RGBColor> colors);
+
+private:
+    hid_device*             dev;
+    unsigned char           active_mode;
+    unsigned char           active_direction;
+    unsigned char           active_speed;
+
+    void    SelectProfile
+                (
+                unsigned char   profile
+                );
+
+    void    SendEffect
+                (
+                unsigned char   profile,
+                unsigned char   mode,
+                unsigned char   direction,
+                unsigned char   reactive_mode,
+                unsigned char   speed,
+                unsigned char   color_mode,
+                unsigned char   red_single,
+                unsigned char   grn_single,
+                unsigned char   blu_single,
+                unsigned char   red_dual_1,
+                unsigned char   grn_dual_1,
+                unsigned char   blu_dual_1,
+                unsigned char   red_dual_2,
+                unsigned char   grn_dual_2,
+                unsigned char   blu_dual_2
+                );
+
+    void    SendColor
+                (
+                unsigned char   profile,
+                unsigned char   color_channel,
+                unsigned char*  color_data
+                );
+
+    void    SendExtendedColor
+                (
+                unsigned char   profile,
+                unsigned char*  color_data
+                );
+
+    void    SendDirect
+                (
+                unsigned char   color_channel,
+                unsigned char*  color_data
+                );
+
+    void    SendDirectExtended
+                (
+                unsigned char*  color_data
+                );
+};

Controllers/HyperXKeyboardController/HyperXKeyboardControllerDetect.cpp

@@ -0,0 +1,51 @@
+#include "HyperXKeyboardController.h"
+#include "RGBController.h"
+#include "RGBController_HyperXKeyboard.h"
+#include <vector>
+#include <hidapi/hidapi.h>
+
+#define HYPERX_KEYBOARD_VID         0x0951
+#define HYPERX_ALLOY_ELITE_PID      0x16BE
+
+/******************************************************************************************\
+*                                                                                          *
+*   DetectHyperXKeyboardControllers                                                        *
+*                                                                                          *
+*       Tests the USB address to see if a HyperX Keyboard controller exists there.         *
+*                                                                                          *
+\******************************************************************************************/
+
+void DetectHyperXKeyboardControllers(std::vector<RGBController*>& rgb_controllers)
+{
+    hid_device_info* info;
+    hid_device* dev = NULL;
+
+    hid_init();
+
+    info = hid_enumerate(HYPERX_KEYBOARD_VID, HYPERX_ALLOY_ELITE_PID);
+
+    //Look for HyperX Keyboard, Interface 2
+    while(info)
+    {
+        if((info->vendor_id == HYPERX_KEYBOARD_VID)
+         &&(info->product_id == HYPERX_ALLOY_ELITE_PID)
+         &&(info->interface_number == 2))
+        {
+            dev = hid_open_path(info->path);
+            break;
+        }
+        else
+        {
+            info = info->next;
+        }
+    }
+
+    if( dev )
+    {
+        HyperXKeyboardController* controller = new HyperXKeyboardController(dev);
+
+        RGBController_HyperXKeyboard* rgb_controller = new RGBController_HyperXKeyboard(controller);
+
+        rgb_controllers.push_back(rgb_controller);
+    }
+}

Controllers/MSIRGBController/MSIRGBController.cpp

@@ -0,0 +1,99 @@
+/*-----------------------------------------*\
+|  MSIRGBController.cpp                     |
+|                                           |
+|  Driver for MSI-RGB lighting controller   |
+|                                           |
+|  Logic adapted from:                      |
+|     https://github.com/nagisa/msi-rgb     |
+|                                           |
+|  Adam Honse (CalcProgrammer1) 2/11/2020   |
+\*-----------------------------------------*/
+
+#include "MSIRGBController.h"
+#include "super_io.h"
+
+MSIRGBController::MSIRGBController(int sioaddr)
+{
+    msi_sioaddr = sioaddr;
+
+    /*-----------------------------------------------------*\
+    | This setup step isn't well documented                 |
+    | Without this, pulsing does not work                   |
+    \*-----------------------------------------------------*/
+    superio_outb(msi_sioaddr, SIO_REG_LOGDEV, 0x09);
+
+    int val_at_2c = superio_inb(msi_sioaddr, 0x2C);
+
+    val_at_2c &= 0b11110111;
+    val_at_2c |= 0b00010000;
+
+    superio_outb(msi_sioaddr, 0x2C, val_at_2c);
+    
+
+    /*-----------------------------------------------------*\
+    | Set logical device register to RGB controller         |
+    \*-----------------------------------------------------*/
+    superio_outb(msi_sioaddr, SIO_REG_LOGDEV, MSI_SIO_LOGDEV_RGB);
+
+    /*-----------------------------------------------------*\
+    | Test if RGB is enabled.  If it is not, enable it.     |
+    \*-----------------------------------------------------*/
+    int enable = superio_inb(msi_sioaddr, MSI_SIO_RGB_REG_ENABLE);
+
+    if((enable & MSI_SIO_RGB_ENABLE_MASK) != MSI_SIO_RGB_ENABLE_MASK)
+    {
+        superio_outb(msi_sioaddr, MSI_SIO_RGB_REG_ENABLE, MSI_SIO_RGB_ENABLE_MASK & (enable & !MSI_SIO_RGB_ENABLE_MASK));
+    }
+
+    /*-----------------------------------------------------*\
+    | Lighting enabled, no pulsing or blinking              |
+    \*-----------------------------------------------------*/
+    superio_outb(msi_sioaddr, MSI_SIO_RGB_REG_CFG_1, 0x00);
+
+    /*-----------------------------------------------------*\
+    | Lighting enabled, RGB non-inverted, header on         |
+    \*-----------------------------------------------------*/
+    superio_outb(msi_sioaddr, MSI_SIO_RGB_REG_CFG_3, 0xE2);
+}
+
+MSIRGBController::~MSIRGBController()
+{
+
+}
+
+void MSIRGBController::SetColor(unsigned char red, unsigned char green, unsigned char blue)
+{
+    /*-----------------------------------------------------*\
+    | The MSI RGB controller uses 4 bits per color rather   |
+    | than 8.  Shift the values by 4 so that the 4 most     |
+    | significant bits of each color are the new color value|
+    \*-----------------------------------------------------*/
+    red     = red >> 4;
+    green   = green >> 4;
+    blue    = blue >> 4;
+
+    /*-----------------------------------------------------*\
+    | Set logical device register to RGB controller         |
+    \*-----------------------------------------------------*/
+    superio_outb(msi_sioaddr, SIO_REG_LOGDEV, MSI_SIO_LOGDEV_RGB);
+
+    /*-----------------------------------------------------*\
+    | Write the colors to the color sequence registers      |
+    | Only static mode is supported right now - all colors  |
+    | are the same.                                         |
+    \*-----------------------------------------------------*/
+    superio_outb(msi_sioaddr, MSI_SIO_RGB_REG_RED_1_0, (red | (red << 4)));
+    superio_outb(msi_sioaddr, MSI_SIO_RGB_REG_RED_3_2, (red | (red << 4)));
+    superio_outb(msi_sioaddr, MSI_SIO_RGB_REG_RED_5_4, (red | (red << 4)));
+    superio_outb(msi_sioaddr, MSI_SIO_RGB_REG_RED_7_6, (red | (red << 4)));
+
+    superio_outb(msi_sioaddr, MSI_SIO_RGB_REG_GREEN_1_0, (green | (green << 4)));
+    superio_outb(msi_sioaddr, MSI_SIO_RGB_REG_GREEN_3_2, (green | (green << 4)));
+    superio_outb(msi_sioaddr, MSI_SIO_RGB_REG_GREEN_5_4, (green | (green << 4)));
+    superio_outb(msi_sioaddr, MSI_SIO_RGB_REG_GREEN_7_6, (green | (green << 4)));
+
+    superio_outb(msi_sioaddr, MSI_SIO_RGB_REG_BLUE_1_0, (blue | (blue << 4)));
+    superio_outb(msi_sioaddr, MSI_SIO_RGB_REG_BLUE_3_2, (blue | (blue << 4)));
+    superio_outb(msi_sioaddr, MSI_SIO_RGB_REG_BLUE_5_4, (blue | (blue << 4)));
+    superio_outb(msi_sioaddr, MSI_SIO_RGB_REG_BLUE_7_6, (blue | (blue << 4)));
+}

Controllers/MSIRGBController/MSIRGBController.h

@@ -0,0 +1,56 @@
+/*-----------------------------------------*\
+|  MSIRGBController.h                       |
+|                                           |
+|  Definitions and types for MSI-RGB        |
+|  lighting controller                      |
+|                                           |
+|  Logic adapted from:                      |
+|     https://github.com/nagisa/msi-rgb     |
+|                                           |
+|  Adam Honse (CalcProgrammer1) 2/11/2020   |
+\*-----------------------------------------*/
+
+#include <string>
+
+#pragma once
+
+#define MSI_SIO_LOGDEV_RGB      0x12
+
+enum
+{
+    MSI_SIO_RGB_REG_ENABLE      = 0xE0,
+    MSI_SIO_RGB_REG_CFG_1       = 0xE4,
+    MSI_SIO_RGB_REG_RED_1_0     = 0xF0,
+    MSI_SIO_RGB_REG_RED_3_2     = 0xF1,
+    MSI_SIO_RGB_REG_RED_5_4     = 0xF2,
+    MSI_SIO_RGB_REG_RED_7_6     = 0xF3,
+    MSI_SIO_RGB_REG_GREEN_1_0   = 0xF4,
+    MSI_SIO_RGB_REG_GREEN_3_2   = 0xF5,
+    MSI_SIO_RGB_REG_GREEN_5_4   = 0xF6,
+    MSI_SIO_RGB_REG_GREEN_7_6   = 0xF7,
+    MSI_SIO_RGB_REG_BLUE_1_0    = 0xF8,
+    MSI_SIO_RGB_REG_BLUE_3_2    = 0xF9,
+    MSI_SIO_RGB_REG_BLUE_5_4    = 0xFA,
+    MSI_SIO_RGB_REG_BLUE_7_6    = 0xFB,
+    MSI_SIO_RGB_REG_CFG_2       = 0xFE,
+    MSI_SIO_RGB_REG_CFG_3       = 0xFF,
+};
+
+#define MSI_SIO_RGB_ENABLE_MASK 0xE0
+
+class MSIRGBController
+{
+public:
+    MSIRGBController(int sioaddr);
+    ~MSIRGBController();
+
+    std::string     GetDeviceName();
+    std::string     GetDeviceLocation();
+
+    unsigned int    GetMode();
+    void            SetMode(unsigned char new_mode, unsigned char new_speed);
+
+    void            SetColor(unsigned char red, unsigned char green, unsigned char blue);
+private:
+    int     msi_sioaddr;
+};

Controllers/MSIRGBController/MSIRGBControllerDetect.cpp

@@ -0,0 +1,40 @@
+#include "MSIRGBController.h"
+#include "RGBController.h"
+#include "RGBController_MSIRGB.h"
+#include "super_io.h"
+#include <vector>
+#include <stdio.h>
+#include <stdlib.h>
+
+/******************************************************************************************\
+*                                                                                          *
+*   DetectMSIRGBControllers                                                                *
+*                                                                                          *
+*       Detect MSI-RGB compatible Super-IO chips.                                          *
+*                                                                                          *
+\******************************************************************************************/
+
+void DetectMSIRGBControllers(std::vector<RGBController*> &rgb_controllers)
+{
+    int sio_addrs[2] = {0x2E, 0x4E};
+
+    for(int sioaddr_idx = 0; sioaddr_idx < 2; sioaddr_idx++)
+    {
+        int sioaddr = sio_addrs[sioaddr_idx];
+
+        superio_enter(sioaddr);
+
+        int val = (superio_inb(sioaddr, SIO_REG_DEVID) << 8) | superio_inb(sioaddr, SIO_REG_DEVID + 1);
+
+        switch (val & SIO_ID_MASK)
+        {
+        case SIO_NCT6795_ID:
+        case SIO_NCT6797_ID:
+            MSIRGBController* new_msi = new MSIRGBController(sioaddr);
+            RGBController_MSIRGB* new_rgb = new RGBController_MSIRGB(new_msi);
+
+            rgb_controllers.push_back(new_rgb);
+            break;
+        }
+    }
+}   /* DetectMSIRGBControllers() */

Controllers/PatriotViperController/PatriotViperController.cpp

@@ -126,7 +126,7 @@ void PatriotViperController::SetLEDEffectColor(unsigned int led, unsigned char r
     ViperRegisterWrite(VIPER_REG_MODE, 0xFA, 0x00, 0x00);
 }
 
-void PatriotViperController::SetLEDColor(unsigned int slot, unsigned int led, unsigned char red, unsigned char green, unsigned char blue)
+void PatriotViperController::SetLEDColor(unsigned int /*slot*/, unsigned int led, unsigned char red, unsigned char green, unsigned char blue)
 {
     ViperRegisterWrite(VIPER_REG_START, 0xFF, 0xFF, 0xFF);
     ViperRegisterWrite(VIPER_REG_STATIC, 0x04, 0x00, 0x00);
@@ -136,7 +136,7 @@ void PatriotViperController::SetLEDColor(unsigned int slot, unsigned int led, un
     ViperRegisterWrite(VIPER_REG_APPLY, 0x01, 0x00, 0x00);
 }
 
-void PatriotViperController::SetLEDEffectColor(unsigned int slot, unsigned int led, unsigned char red, unsigned char green, unsigned char blue)
+void PatriotViperController::SetLEDEffectColor(unsigned int /*slot*/, unsigned int led, unsigned char red, unsigned char green, unsigned char blue)
 {
     ViperRegisterWrite(VIPER_REG_START, 0xFF, 0xFF, 0xFF);
     ViperRegisterWrite(VIPER_REG_STATIC, 0x04, 0x00, 0x00);

Controllers/PolychromeController/PolychromeController.cpp

@@ -25,8 +25,20 @@ PolychromeController::PolychromeController(i2c_smbus_interface* bus, polychrome_
 
     case FIRMWARE_VER_2_PT_00:
         led_count = 1;
-        asr_led = false;
-        strcpy(device_name, "ASRock Polychrome FW 2.00");
+        asr_led = true;
+        strcpy(device_name, "ASRock ASR LED FW 2.00");
+        break;
+
+    case FIRMWARE_VER_2_PT_08:
+        led_count = 1;
+        asr_led = true;
+        strcpy(device_name, "ASRock ASR LED FW 2.08");
+        break;
+
+    case FIRMWARE_VER_2_PT_10:
+        led_count = 1;
+        asr_led = true;
+        strcpy(device_name, "ASRock ASR LED FW 2.10");
         break;
 
     case FIRMWARE_VER_3_PT_00:
@@ -35,6 +47,12 @@ PolychromeController::PolychromeController(i2c_smbus_interface* bus, polychrome_
         strcpy(device_name, "ASRock Polychrome FW 3.00");
         break;
 
+    case FIRMWARE_VER_3_PT_04:
+        led_count = 1;
+        asr_led = false;
+        strcpy(device_name, "ASRock Polychrome FW 3.04");
+        break;
+
     default:
         led_count = 0;
         strcpy(device_name, "");
@@ -76,45 +94,38 @@ unsigned int PolychromeController::GetLEDCount()
 
 unsigned int PolychromeController::GetMode()
 {
-    return(0);
+    return(active_mode);
 }
 
-void PolychromeController::SetAllColors(unsigned char red, unsigned char green, unsigned char blue)
+bool PolychromeController::IsAsrLed()
 {
+    return(asr_led);
+}
+
+void PolychromeController::SetColor(unsigned char red, unsigned char green, unsigned char blue)
+{
+    unsigned char colors[3] = { red, green, blue };
+
     if (asr_led)
     {
-
+        bus->i2c_smbus_write_block_data(dev, active_mode, 3, colors);
     }
     else
     {
-        unsigned char colors[3] = { red, green, blue };
-
-        bus->i2c_smbus_write_block_data(dev, POLYCHROME_REG_COLOR, 3, colors);
-    }
-}
-
-void PolychromeController::SetLEDColor(unsigned int /*led*/, unsigned char red, unsigned char green, unsigned char blue)
-{
-    if (asr_led)
-    {
-
-    }
-    else
-    {
-        unsigned char colors[3] = { red, green, blue };
-
         bus->i2c_smbus_write_block_data(dev, POLYCHROME_REG_COLOR, 3, colors);
     }
 }
 
 void PolychromeController::SetMode(unsigned char mode)
 {
+    active_mode = mode;
+
     if (asr_led)
     {
-
+        bus->i2c_smbus_write_block_data(dev, ASRLED_REG_MODE, 1, &active_mode);
     }
     else
     {
-        bus->i2c_smbus_write_byte_data(dev, POLYCHROME_REG_MODE, mode);
+        bus->i2c_smbus_write_block_data(dev, POLYCHROME_REG_MODE, 1, &active_mode);
     }    
 }

Controllers/PolychromeController/PolychromeController.h

@@ -18,7 +18,10 @@ enum
 {
     FIRMWARE_VER_1_PT_10            = 0x010A,   /* Firmware nu51_1.10                   */
     FIRMWARE_VER_2_PT_00            = 0x0200,   /* Firmware nu51_2.00                   */
+    FIRMWARE_VER_2_PT_08            = 0x0208,   /* Firmware nu51_2.08                   */
+    FIRMWARE_VER_2_PT_10            = 0x020A,   /* Firmware nu51_2.10                   */
     FIRMWARE_VER_3_PT_00            = 0x0300,   /* Firmware nu51_3.00                   */
+    FIRMWARE_VER_3_PT_04            = 0x0304,   /* Firmware nu51_3.04                   */
 };
 
 enum
@@ -77,8 +80,8 @@ public:
     char*           GetDeviceName();
     unsigned int    GetLEDCount();
     unsigned int    GetMode();
-    void            SetAllColors(unsigned char red, unsigned char green, unsigned char blue);
-    void            SetLEDColor(unsigned int led, unsigned char red, unsigned char green, unsigned char blue);
+    bool            IsAsrLed();
+    void            SetColor(unsigned char red, unsigned char green, unsigned char blue);
     void            SetMode(unsigned char mode);
     unsigned short  GetFirmwareVersion();
 
@@ -86,7 +89,8 @@ private:
     bool                    asr_led;
     char                    device_name[32];
     unsigned int            led_count;
+    unsigned char           active_mode;
     i2c_smbus_interface*    bus;
     polychrome_dev_id       dev;
 
-};
+};

Controllers/PoseidonZRGBController/PoseidonZRGBController.cpp

@@ -9,6 +9,8 @@
 
 #include "PoseidonZRGBController.h"
 
+#include <cstring>
+
 #ifdef WIN32
 #include <Windows.h>
 #else
@@ -20,15 +22,14 @@ static void Sleep(unsigned int milliseconds)
 }
 #endif
 
-static unsigned int keys[] = {8,  9,  10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 21,
-                              22, 23, 24, 25, 26, 27, 29, 30, 31, 32, 33, 34, 35,
-                              36, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49,
-                              50, 51, 52, 54, 55, 56, 57, 58, 59, 60, 62, 63, 64,
-                              65, 66, 67, 68, 70, 71, 72, 73, 74, 75, 76, 78, 79,
-                              80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92,
-                              93, 94, 95, 96, 97, 98, 99, 100, 102, 103, 104, 105,
-                              106, 108, 109, 111, 112, 114, 115, 117, 118, 119, 120,
-                              124, 128, 129 };
+static unsigned int keys[] = {0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F, 0x10, 0x11, 0x12, 0x13, 0x15,
+                              0x16, 0x17, 0x18, 0x19, 0x1A, 0x1B, 0x1D, 0x1E, 0x1F, 0x20, 0x21, 0x22, 0x23,
+                              0x24, 0x26, 0x27, 0x28, 0x29, 0x2A, 0x2B, 0x2C, 0x2D, 0x2E, 0x2F, 0x30, 0x31,
+                              0x32, 0x33, 0x34, 0x36, 0x37, 0x38, 0x39, 0x3A, 0x3B, 0x3C, 0x3E, 0x3F, 0x40,
+                              0x41, 0x42, 0x43, 0x44, 0x46, 0x47, 0x48, 0x49, 0x4A, 0x4B, 0x4C, 0x4E, 0x4F,
+                              0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59, 0x5A, 0x5B, 0x5C,
+                              0x5D, 0x5E, 0x5F, 0x60, 0x61, 0x62, 0x63, 0x64, 0x66, 0x67, 0x68, 0x69, 0x6A,
+                              0x6C, 0x6D, 0x6F, 0x70, 0x72, 0x73, 0x75, 0x76, 0x77, 0x78, 0x7C, 0x80, 0x81 };
 
 PoseidonZRGBController::PoseidonZRGBController(hid_device* dev_handle)
 {
@@ -40,9 +41,23 @@ PoseidonZRGBController::~PoseidonZRGBController()
 
 }
 
-char* PoseidonZRGBController::GetDeviceName()
+void PoseidonZRGBController::SetMode(unsigned char mode, unsigned char direction, unsigned char speed)
 {
-    return device_name;
+    active_mode = mode;
+    active_direction = direction;
+    active_speed = speed;
+
+    SendControl
+        (
+        POSEIDONZ_PROFILE_P1,
+        POSEIDONZ_PROFILE_P1,
+        active_direction,
+        active_mode,
+        POSEIDONZ_BRIGHTNESS_MAX,
+        active_speed
+        );
+
+    Sleep(200);
 }
 
 void PoseidonZRGBController::SetLEDsDirect(std::vector<RGBColor> colors)
@@ -50,124 +65,177 @@ void PoseidonZRGBController::SetLEDsDirect(std::vector<RGBColor> colors)
     unsigned char red_grn_buf[264];
     unsigned char blu_buf[264];
 
-    for(int i = 0; i < 264; i++)
-    {
-        red_grn_buf[i] = 0x00;
-        blu_buf[i]     = 0x00;
-    }
+    /*-----------------------------------------------------*\
+    | Zero out buffers                                      |
+    \*-----------------------------------------------------*/
+    memset(red_grn_buf, 0x00, sizeof(red_grn_buf));
+    memset(blu_buf, 0x00, sizeof(blu_buf));
 
-    red_grn_buf[0] = POSEIDONZ_START;
-    red_grn_buf[1] = POSEIDONZ_LED_CMD;
-    red_grn_buf[2] = POSEIDONZ_PROFILE;
-    red_grn_buf[3] = POSEIDONZ_RED_GRN_CH;
+    /*-----------------------------------------------------*\
+    | Set up Direct packets                                 |
+    \*-----------------------------------------------------*/
+    red_grn_buf[0] = 0x07;
+    red_grn_buf[1] = POSEIDONZ_PACKET_ID_SET_DIRECT;
+    red_grn_buf[2] = POSEIDONZ_PROFILE_P1;
+    red_grn_buf[3] = POSEIDONZ_DIRECT_RED_GREEN;
     red_grn_buf[4] = 0x00;
     red_grn_buf[5] = 0x00;
     red_grn_buf[6] = 0x00;
     red_grn_buf[7] = 0x00;
 
-    blu_buf[0] = POSEIDONZ_START;
-    blu_buf[1] = POSEIDONZ_LED_CMD;
-    blu_buf[2] = POSEIDONZ_PROFILE;
-    blu_buf[3] = POSEIDONZ_BLU_CH;
+    blu_buf[0] = 0x07;
+    blu_buf[1] = POSEIDONZ_PACKET_ID_SET_DIRECT;
+    blu_buf[2] = POSEIDONZ_PROFILE_P1;
+    blu_buf[3] = POSEIDONZ_DIRECT_BLUE;
     blu_buf[4] = 0x00;
     blu_buf[5] = 0x00;
     blu_buf[6] = 0x00;
     blu_buf[7] = 0x00;
 
-    for(int i = 0; i < 104; i++)
+    /*-----------------------------------------------------*\
+    | Fill in color data                                    |
+    \*-----------------------------------------------------*/
+    for(std::size_t i = 0; i < 104; i++)
     {
         red_grn_buf[keys[i]      ] = RGBGetRValue(colors[i]);
         red_grn_buf[keys[i] + 128] = RGBGetGValue(colors[i]);
         blu_buf[    keys[i]      ] = RGBGetBValue(colors[i]);
     }
 
+    /*-----------------------------------------------------*\
+    | Send packets                                          |
+    \*-----------------------------------------------------*/
     hid_send_feature_report(dev, red_grn_buf, 264);
-    
-    Sleep(1);
 
+    Sleep(5);
+     
     hid_send_feature_report(dev, blu_buf, 264);
-
 }
 
 void PoseidonZRGBController::SetLEDs(std::vector<RGBColor> colors)
 {
-    unsigned char buf[264] = {0};
+    unsigned char red_color_data[104];
+    unsigned char grn_color_data[104];
+    unsigned char blu_color_data[104];
 
-    //Send Red Packet
-    for(int i = 0; i < 264; i++)
+    for(std::size_t i = 0; i < 104; i++)
     {
-        buf[i] = 0xFF;
+        red_color_data[i] = RGBGetRValue(colors[i]);
+        grn_color_data[i] = RGBGetGValue(colors[i]);
+        blu_color_data[i] = RGBGetBValue(colors[i]);
     }
 
-    buf[0] = 0x07;
-    buf[1] = 0x09;
-    buf[2] = 0x01;
-    buf[3] = 0x01;
-
-    for(int i = 0; i < 104; i++)
-    {
-        buf[keys[i]] = RGBGetRValue(colors[i]);
-    }
-
-    hid_send_feature_report(dev, buf, 264);
+    SendColor
+        (
+        POSEIDONZ_PROFILE_P1,
+        POSEIDONZ_COLOR_RED,
+        red_color_data
+        );
 
     Sleep(10);
-    
-    //Send Green Packet
-    for(int i = 0; i < 264; i++)
-    {
-        buf[i] = 0x00;
-    }
 
-    buf[0] = 0x07;
-    buf[1] = 0x09;
-    buf[2] = 0x01;
-    buf[3] = 0x02;
-
-    buf[8] = 0xFF;
-
-    for(int i = 0; i < 104; i++)
-    {
-        buf[keys[i]] = RGBGetGValue(colors[i]);
-    }
-
-    hid_send_feature_report(dev, buf, 264);
+    SendColor
+        (
+        POSEIDONZ_PROFILE_P1,
+        POSEIDONZ_COLOR_GREEN,
+        grn_color_data
+        );
 
     Sleep(10);
-    
-    //Send Blue Packet
-    for(int i = 0; i < 264; i++)
-    {
-        buf[i] = 0x11;
-    }
 
-    buf[0] = 0x07;
-    buf[1] = 0x09;
-    buf[2] = 0x01;
-    buf[3] = 0x03;
-
-    for(int i = 0; i < 104; i++)
-    {
-       buf[keys[i]] = RGBGetBValue(colors[i]);
-    }
-
-    hid_send_feature_report(dev, buf, 264);
+    SendColor
+        (
+        POSEIDONZ_PROFILE_P1,
+        POSEIDONZ_COLOR_BLUE,
+        blu_color_data
+        );
 
     Sleep(10);
-    
-    //Send Update Packet
-    for(int i = 0; i < 264; i++)
+
+    SendControl
+        (
+        POSEIDONZ_PROFILE_P1,
+        POSEIDONZ_PROFILE_P1,
+        active_direction,
+        active_mode,
+        POSEIDONZ_BRIGHTNESS_MAX,
+        active_speed
+        );
+}
+
+/*-------------------------------------------------------------------------------------------------*\
+| Private packet sending functions.                                                                 |
+\*-------------------------------------------------------------------------------------------------*/
+
+void PoseidonZRGBController::SendColor
+    (
+    unsigned char   profile_to_edit,
+    unsigned char   color_channel,
+    unsigned char*  color_data
+    )
+{
+    unsigned char buf[264];
+
+    /*-----------------------------------------------------*\
+    | Zero out buffer                                       |
+    \*-----------------------------------------------------*/
+    memset(buf, 0x00, sizeof(buf));
+
+    /*-----------------------------------------------------*\
+    | Set up Color packet                                   |
+    \*-----------------------------------------------------*/
+    buf[0x00]   = 0x07;
+    buf[0x01]   = POSEIDONZ_PACKET_ID_SET_COLOR;
+    buf[0x02]   = profile_to_edit;
+    buf[0x03]   = color_channel;
+
+    /*-----------------------------------------------------*\
+    | Fill in color data                                    |
+    \*-----------------------------------------------------*/
+    for(int i = 0; i < 104; i++)
     {
-        buf[i] = 0x00;
+        buf[keys[i]] = color_data[i];
     }
 
-    buf[0] = 0x07;
-    buf[1] = 0x02;
-    buf[2] = 0x01;
-    buf[8] = 0x01;  //Preset to save
-    buf[13] = 0x04; //Brightness?
-    buf[16] = 0x08;
-    buf[22] = 0x03;
+    /*-----------------------------------------------------*\
+    | Send packet                                           |
+    \*-----------------------------------------------------*/
+    hid_send_feature_report(dev, buf, 264);
+}
 
+void PoseidonZRGBController::SendControl
+    (
+    unsigned char   profile_to_activate,
+    unsigned char   profile_to_edit,
+    unsigned char   direction,
+    unsigned char   mode,
+    unsigned char   brightness,
+    unsigned char   speed
+    )
+{
+    unsigned char buf[264];
+
+    /*-----------------------------------------------------*\
+    | Zero out buffer                                       |
+    \*-----------------------------------------------------*/
+    memset(buf, 0x00, sizeof(buf));
+
+    /*-----------------------------------------------------*\
+    | Set up Effect packet                                  |
+    \*-----------------------------------------------------*/
+    buf[0x00]   = 0x07;
+    buf[0x01]   = POSEIDONZ_PACKET_ID_SET_EFFECT;
+    buf[0x02]   = profile_to_activate;
+    buf[0x08]   = profile_to_edit;
+    buf[0x0A]   = direction;
+    buf[0x0C]   = mode;
+    buf[0x0D]   = brightness;
+    buf[0x10]   = 0x08;
+    buf[0x12]   = speed;
+    buf[0x13]   = 0x50;
+
+    /*-----------------------------------------------------*\
+    | Send packet                                           |
+    \*-----------------------------------------------------*/
     hid_send_feature_report(dev, buf, 264);
 }

Controllers/PoseidonZRGBController/PoseidonZRGBController.h

@@ -21,18 +21,86 @@
 #define POSEIDONZ_RED_GRN_CH  0x01
 #define POSEIDONZ_BLU_CH      0x02
 
+enum
+{
+    POSEIDONZ_PACKET_ID_SET_EFFECT      = 0x02,     /* Set profile effect packet            */
+    POSEIDONZ_PACKET_ID_SET_COLOR       = 0x09,     /* Set profile color packet             */
+    POSEIDONZ_PACKET_ID_SET_DIRECT      = 0x0E,     /* Set direct color packet              */
+};
+
+enum
+{
+    POSEIDONZ_MODE_STATIC       = 0x00,
+    POSEIDONZ_MODE_REACTIVE     = 0x01,
+    POSEIDONZ_MODE_ARROW_FLOW   = 0x02,
+    POSEIDONZ_MODE_WAVE         = 0x03,
+    POSEIDONZ_MODE_RIPPLE       = 0x04
+};
+
+enum
+{
+    POSEIDONZ_PROFILE_P1        = 0x01,
+    POSEIDONZ_PROFILE_P2        = 0x02,
+    POSEIDONZ_PROFILE_P3        = 0x03,
+    POSEIDONZ_PROFILE_P4        = 0x04,
+    POSEIDONZ_PROFILE_P5        = 0x05
+};
+
+enum
+{
+    POSEIDONZ_BRIGHTNESS_MIN    = 0x00,
+    POSEIDONZ_BRIGHTNESS_MAX    = 0x04
+};
+
+enum
+{
+    POSEIDONZ_COLOR_RED         = 0x01,
+    POSEIDONZ_COLOR_GREEN       = 0x02,
+    POSEIDONZ_COLOR_BLUE        = 0x03
+};
+
+enum
+{
+    POSEIDONZ_DIRECT_RED_GREEN  = 0x01,
+    POSEIDONZ_DIRECT_BLUE       = 0x02
+};
+
+enum
+{
+    POSEIDONZ_SPEED_SLOW        = 0x10,
+    POSEIDONZ_SPEED_FAST        = 0x05
+};
+
 class PoseidonZRGBController
 {
 public:
     PoseidonZRGBController(hid_device* dev_handle);
     ~PoseidonZRGBController();
 
-    char* GetDeviceName();
-
+    void SetMode(unsigned char mode, unsigned char direction, unsigned char speed);
     void SetLEDsDirect(std::vector<RGBColor> colors);
     void SetLEDs(std::vector<RGBColor> colors);
     
 private:
-    char                    device_name[32];
     hid_device*             dev;
+    unsigned char           active_mode;
+    unsigned char           active_direction;
+    unsigned char           active_speed;
+
+    void SendControl
+        (
+        unsigned char   profile_to_activate,
+        unsigned char   profile_to_edit,
+        unsigned char   direction,
+        unsigned char   mode,
+        unsigned char   brightness,
+        unsigned char   speed
+        );
+    
+    void SendColor
+        (
+        unsigned char   profile_to_edit,
+        unsigned char   color_channel,
+        unsigned char*  color_data
+        );
 };

Controllers/PoseidonZRGBController/PoseidonZRGBControllerDetect.cpp

@@ -18,12 +18,28 @@
 
 void DetectPoseidonZRGBControllers(std::vector<RGBController*>& rgb_controllers)
 {
-    hid_device* dev;
+    hid_device_info* info;
+    hid_device* dev = NULL;
 
-    //Look for Thermaltake Poseidon Z RGB Keyboard
     hid_init();
 
-    dev = hid_open(TT_POSEIDON_Z_RGB_VID, TT_POSEIDON_Z_RGB_PID, 0);
+    info = hid_enumerate(TT_POSEIDON_Z_RGB_VID, TT_POSEIDON_Z_RGB_PID);
+
+    //Look for Thermaltake Poseidon Z RGB, Interface 2
+    while(info)
+    {
+        if((info->vendor_id == TT_POSEIDON_Z_RGB_VID)
+         &&(info->product_id == TT_POSEIDON_Z_RGB_PID)
+         &&(info->interface_number == 2))
+        {
+            dev = hid_open_path(info->path);
+            break;
+        }
+        else
+        {
+            info = info->next;
+        }
+    }
 
     if( dev )
     {

Controllers/RGBFusion2USBController/RGBFusion2USBController.cpp

@@ -0,0 +1,291 @@
+/*-----------------------------------------*\
+|  RGBFusion2USBController.cpp              |
+|                                           |
+|  Driver for Gigabyte Aorus RGB Fusion 2.0 |
+|  USB lighting controller                  |
+|                                           |
+|  jackun 1/8/2020                          |
+\*-----------------------------------------*/
+
+#include "RGBFusion2USBController.h"
+#include <algorithm>
+#include <array>
+#include <thread>
+#include <chrono>
+
+static LEDCount LedCountToEnum(unsigned int c)
+{
+    if (c <= 32)
+        return(LEDS_32);
+    if (c <= 64)
+        return(LEDS_64);
+    if (c <= 256)
+        return(LEDS_256);
+    if (c <= 512)
+        return(LEDS_512);
+
+    return(LEDS_1024);
+}
+
+RGBFusion2USBController::RGBFusion2USBController(hid_device* handle, const char *path) : dev(handle)
+{
+    int res = 0;
+    char text[64] {};
+    unsigned char buffer[64] {};
+
+    if( dev ) {
+
+        SetCalibration();
+
+        // hid report read needs 0x60 packet or it gives IO error
+        SendPacket(0x60, 0x00);
+
+        buffer[0] = report_id;
+        res = hid_get_feature_report(dev, buffer, 64);
+        if( res > 0 )
+        {
+            report = *reinterpret_cast<IT8297Report*>(buffer);
+
+            name = std::string(report.str_product, 32);
+            name.erase(std::find(name.begin(), name.end(), '\0'), name.end());
+
+            snprintf(text, 11, "0x%08X", report.fw_ver);
+            version = text;
+
+            snprintf(text, 11, "0x%08X", report.chip_id);
+            chip_id = text;
+        }
+
+        loc = path;
+
+        EnableBeat(false);
+    }
+}
+
+RGBFusion2USBController::~RGBFusion2USBController()
+{
+    if( dev ) {
+        hid_close(dev);
+    }
+}
+
+void RGBFusion2USBController::SetMode(int m)
+{
+    mode = m;
+}
+
+// Sets RGB color mapping to LED pins.
+// "Custom" RGB packets don't seem to get remapped so use report.byteorderN and do it manually.
+// Of course it all depends how we send data to the controller, but bios/rgb fusion 2 itself
+// set it up like this.
+void RGBFusion2USBController::SetCalibration()
+{
+    uint8_t buffer[64] {};
+    buffer[0] = report_id;
+    buffer[1] = 0x33;
+
+     // D_LED1 WS2812 GRB, 0x00RRGGBB to 0x00GGRRBB
+    buffer[2] = 0x02; // B
+    buffer[3] = 0x00; // G
+    buffer[4] = 0x01; // R
+    buffer[5] = 0x00;
+
+     // D_LED2 WS2812 GRB
+    buffer[6] = 0x02;
+    buffer[7] = 0x00;
+    buffer[8] = 0x01;
+    buffer[9] = 0x00;
+
+    // LED C1/C2 12vGRB, seems pins already connect to LEDs correctly
+    buffer[10] = 0x00;
+    buffer[11] = 0x01;
+    buffer[12] = 0x02;
+    buffer[13] = 0x00;
+
+    SendPacket(buffer);
+}
+
+void RGBFusion2USBController::SetLedCount(unsigned int count)
+{
+    led_count = count;
+    LEDCount s0 = LedCountToEnum(count);
+    SendPacket(0x34, s0 | (s0 << 4)); // D_LED1 | D_LED2
+}
+
+bool RGBFusion2USBController::DisableBuiltinEffect(int enable_bit, int mask)
+{
+    if(effect_disabled & enable_bit)
+        return(true);
+
+    effect_disabled &= ~mask;
+    effect_disabled |= enable_bit;
+
+    int res = SendPacket(0x32, effect_disabled);
+    // Sometimes effect doesn't apply at first, delay a little and let MCU to react, if this packet is the cause
+    std::this_thread::sleep_for(std::chrono::milliseconds(50));
+    return res;
+}
+
+bool RGBFusion2USBController::EnableBeat(bool e)
+{
+    return SendPacket(0x31, e ? 1 : 0);
+}
+
+std::string RGBFusion2USBController::GetDeviceName()
+{
+    return(name);
+}
+
+std::string RGBFusion2USBController::GetFWVersion()
+{
+    return(version);
+}
+
+std::string RGBFusion2USBController::GetDeviceLocation()
+{
+    return(loc);
+}
+
+std::string RGBFusion2USBController::GetSerial()
+{
+    return(chip_id);
+}
+
+void RGBFusion2USBController::SetStripColors
+    (
+    unsigned int    hdr,
+    RGBColor *      colors,
+    unsigned int    num_colors,
+    int             single_led
+    )
+{
+    PktRGB pkt;
+    pkt.Init(hdr, report_id);
+
+     // FIXME assuming that LED strips ports are 0x58/0x59 for all boards
+    uint32_t byteorder = hdr == HDR_D_LED1_RGB ? report.byteorder0 : report.byteorder1;
+
+    unsigned char bo_r = byteorder >> 16;
+    unsigned char bo_g = byteorder >> 8;
+    unsigned char bo_b = byteorder & 0xFF;
+
+    int res;
+    int leds_left = num_colors;
+    int sent_data = 0;
+    int k = 0;
+    int leds_in_pkt = sizeof(pkt.s.leds) / sizeof(*pkt.s.leds); /* 19 */
+
+    // other leds stay at whatever the builtin effect was doing at that moment
+    // if breathing/pulse effect faded out then they stay dark
+    if(single_led > -1)
+    {
+        leds_left = 1;
+        k = single_led;
+        sent_data = k * 3;
+        leds_in_pkt = 1;
+    }
+
+    while(leds_left > 0)
+    {
+        leds_in_pkt = (std::min)(leds_in_pkt, leds_left);
+        leds_left -= leds_in_pkt;
+
+        pkt.s.bcount = leds_in_pkt * 3;
+        pkt.s.boffset = sent_data;
+        sent_data += pkt.s.bcount;
+
+        for(int i = 0; i < leds_in_pkt; i++)
+        {
+            RGBColor      color = colors[k];
+            unsigned char red   = RGBGetRValue(color);
+            unsigned char grn   = RGBGetGValue(color);
+            unsigned char blu   = RGBGetBValue(color);
+
+            pkt.buffer[5 + i * 3 + bo_r] = red;
+            pkt.buffer[5 + i * 3 + bo_g] = grn;
+            pkt.buffer[5 + i * 3 + bo_b] = blu;
+            k++;
+        }
+
+        res = SendPacket(pkt.buffer);
+        if(res < 0)
+            return;
+    }
+
+    if (hdr == HDR_D_LED1_RGB)
+        DisableBuiltinEffect(0x01, 0x01);
+    else
+        DisableBuiltinEffect(0x02, 0x02);
+}
+
+static const std::array< std::array<int, 3>, 5> speeds = {
+    {
+        {1600, 1600, 200},
+        {1200, 1200, 200},
+        {800, 800, 200},
+        {400, 400, 200},
+        {200, 200, 200},
+    },
+};
+
+void RGBFusion2USBController::SetLEDEffect(unsigned int led, int mode, unsigned int speed, bool random, unsigned char r, unsigned char g, unsigned char b)
+{
+    PktEffect pkt;
+    pkt.Init(led, report_id);
+    pkt.e.effect_type = mode;
+    pkt.e.color0 = r << 16 | g << 8 | b;
+
+    if (speed < speeds.size()) {
+        const auto& s = speeds[speed];
+        pkt.e.period0 = s[0];
+        pkt.e.period1 = s[1];
+        pkt.e.period2 = s[2];
+    }
+
+    switch(mode)
+    {
+    case 0: break;
+    case 1: break; // static
+    case 2: // breathing
+    case 3: // blink
+        if (random)
+            pkt.e.effect_param0 = 7; // cycle through up to 7 (max?) colors
+        break;
+    case 4: // color cycle
+        pkt.e.effect_param0 = 7; // cycle through up to 7 (max?) colors
+        break;
+
+    // "fake" effects
+    case 10: // flashing, flashing color cycle
+        pkt.e.period0 = 200;
+        pkt.e.period1 = 200;
+        pkt.e.period2 = 5000 - 1000 * speed; // time between flashing, doesn't seem to be affected by period0/period1
+        pkt.e.effect_type = 3;
+        pkt.e.effect_param2 = 2; // flash twice
+        if (random)
+            pkt.e.effect_param0 = 7;
+        break;
+    }
+
+    SendPacket(pkt.buffer);
+}
+
+bool RGBFusion2USBController::ApplyEffect()
+{
+    return SendPacket(0x28, 0xFF);
+}
+
+bool RGBFusion2USBController::SendPacket(uint8_t a, uint8_t b, uint8_t c)
+{
+    unsigned char buffer[64] {};
+    buffer[0] = report_id;
+    buffer[1] = a;
+    buffer[2] = b;
+    buffer[3] = c;
+    return (SendPacket(buffer) == 64);
+}
+
+int RGBFusion2USBController::SendPacket(unsigned char* packet)
+{
+    return hid_send_feature_report(dev, packet, 64);
+}

Controllers/RGBFusion2USBController/RGBFusion2USBController.h

@@ -0,0 +1,197 @@
+/*-----------------------------------------*\
+|  RGBFusion2USBController.h                |
+|                                           |
+|  Definitions and types for Gigabyte Aorus |
+|  RGB Fusion 2.0 USB lighting controller   |
+|                                           |
+|  jackun 1/8/2020                          |
+\*-----------------------------------------*/
+
+#include "RGBController.h"
+#include <cstring>
+#include <hidapi/hidapi.h>
+
+#pragma once
+
+// LED "headers" 0x20..0x27, As seen on Gigabyte X570 Elite board
+const uint8_t HDR_BACK_IO  = 0x20;
+const uint8_t HDR_CPU      = 0x21;
+const uint8_t HDR_LED_2    = 0x22;
+const uint8_t HDR_PCIE     = 0x23;
+const uint8_t HDR_LED_C1C2 = 0x24;
+const uint8_t HDR_D_LED1   = 0x25;
+const uint8_t HDR_D_LED2   = 0x26;
+const uint8_t HDR_LED_7    = 0x27;
+
+const uint8_t HDR_D_LED1_RGB = 0x58; // FIXME assuming that it is 0x58 for all boards
+const uint8_t HDR_D_LED2_RGB = 0x59;
+
+enum EffectType
+{
+    EFFECT_NONE = 0,
+    EFFECT_STATIC = 1,
+    EFFECT_PULSE = 2,
+    EFFECT_BLINKING = 3,
+    EFFECT_COLORCYCLE = 4,
+    // to be continued...
+};
+
+enum LEDCount
+{
+    LEDS_32 = 0,
+    LEDS_64,
+    LEDS_256,
+    LEDS_512,
+    LEDS_1024,
+};
+
+struct LEDs
+{
+    uint8_t r;
+    uint8_t g;
+    uint8_t b;
+};
+
+#pragma pack(push, 1)
+
+union PktRGB
+{
+    unsigned char buffer[64];
+    struct RGBData
+    {
+        uint8_t     report_id;
+        uint8_t     header;
+        uint16_t    boffset; // in bytes, absolute
+        uint8_t     bcount;
+        LEDs        leds[19];
+        uint16_t    padding0;
+    } s;
+
+    PktRGB() : s {}
+    {
+    }
+
+    void Init(uint8_t header, uint8_t report_id)
+    {
+        s.report_id = report_id;
+        s.header    = header;
+        s.boffset   = 0;
+        s.bcount    = 0;
+        memset(s.leds, 0, sizeof(s.leds));
+    }
+};
+
+union PktEffect
+{
+    unsigned char buffer[64];
+    struct Effect
+    {
+        uint8_t report_id;
+        uint8_t header;
+        uint32_t zone0; // rgb fusion seems to set it to pow(2, header - 0x20)
+        uint32_t zone1;
+        uint8_t reserved0;
+        uint8_t effect_type;
+        uint8_t max_brightness;
+        uint8_t min_brightness;
+        uint32_t color0;
+        uint32_t color1;
+        uint16_t period0; // fade in
+        uint16_t period1; // fade out
+        uint16_t period2; // hold
+        uint16_t period3;
+        uint8_t effect_param0;
+        uint8_t effect_param1;
+        uint8_t effect_param2;
+        uint8_t effect_param3;
+        uint8_t padding0[30];
+    } e;
+
+    PktEffect() : e {}
+    {
+    }
+
+    void Init(int header, uint8_t report_id)
+    {
+        memset(buffer, 0, sizeof(buffer));
+        e.report_id = report_id;
+        if (header < 8)
+            e.header = 32 + header; // set as default
+        else
+            e.header = header;
+        e.zone0 = (uint32_t)(1 << (e.header - 32));
+        e.effect_type = EFFECT_STATIC;
+        e.max_brightness = 100;
+        e.min_brightness = 0;
+        e.color0 = 0x00FF2100; //orange
+        e.period0 = 1200;
+        e.period1 = 1200;
+        e.period2 = 200;
+        e.period3 = 200;
+        e.effect_param0 = 0; // ex color count to cycle through (max seems to be 7)
+        e.effect_param1 = 0;
+        e.effect_param2 = 1; // ex flash repeat count
+        e.effect_param3 = 0;
+    }
+};
+
+struct IT8297Report
+{
+    uint8_t report_id;
+    uint8_t product;
+    uint8_t device_num;
+    uint8_t total_leds;
+    uint32_t fw_ver;
+    uint16_t curr_led_count;
+    uint16_t reserved0;
+    char str_product[32]; // might be 28 and an extra byteorder3
+    uint32_t byteorder0; // is little-endian 0x00RRGGBB ?
+    uint32_t byteorder1;
+    uint32_t byteorder2;
+    uint32_t chip_id;
+    uint32_t reserved1;
+};
+
+#pragma pack(pop)
+
+class RGBFusion2USBController
+{
+public:
+    RGBFusion2USBController(hid_device* handle, const char *path);
+    ~RGBFusion2USBController();
+
+    void            SetStripColors
+                        (
+                        unsigned int    hdr,
+                        RGBColor *      colors,
+                        unsigned int    num_colors,
+                        int             single_led      = -1
+                        );
+
+    void            SetLEDEffect(unsigned int led, int mode, unsigned int speed, bool random, unsigned char red, unsigned char green, unsigned char blue);
+    void            SetLedCount(unsigned int count);
+    void            SetMode(int mode);
+    bool            ApplyEffect();
+    bool            DisableBuiltinEffect(int enable_bit, int mask);
+    void            SetCalibration();
+    std::string     GetDeviceName();
+    std::string     GetDeviceLocation();
+    std::string     GetFWVersion();
+    std::string     GetSerial();
+
+private:
+    bool            EnableBeat(bool enable);
+    bool            SendPacket(uint8_t a, uint8_t b, uint8_t c = 0);
+    int             SendPacket(unsigned char* packet);
+
+    hid_device*             dev;
+    int                     mode;
+    unsigned int            led_count;
+    IT8297Report            report;
+    std::string             name;
+    std::string             loc;
+    std::string             version;
+    std::string             chip_id;
+    int                     effect_disabled = 0;
+    int                     report_id = 0xCC;
+};

Controllers/RGBFusion2USBController/RGBFusion2USBControllerDetect.cpp

@@ -0,0 +1,37 @@
+#include "RGBFusion2USBController.h"
+#include "RGBController_RGBFusion2USB.h"
+
+#define IT8297_VID 0x048D
+#define IT8297_PID 0x8297
+
+/******************************************************************************************\
+*                                                                                          *
+*   DetectRGBFusion2USBControllers                                                         *
+*                                                                                          *
+*       Detect RGB Fusion 2 devices that use IT8297 RGB controller                         *
+*                                                                                          *
+\******************************************************************************************/
+
+void DetectRGBFusion2USBControllers(std::vector<RGBController*> &rgb_controllers)
+{
+    if (hid_init() < 0)
+        return;
+
+    hid_device_info * device_list = hid_enumerate(IT8297_VID, IT8297_PID);
+    if (!device_list)
+        return;
+
+    hid_device_info * device = device_list;
+    while (device)
+    {
+        hid_device * dev = hid_open_path(device->path);
+        if (dev) {
+            RGBFusion2USBController * controller = new RGBFusion2USBController(dev, device_list->path);
+            RGBController_RGBFusion2USB * rgb_controller = new RGBController_RGBFusion2USB(controller);
+            rgb_controllers.push_back(rgb_controller);
+        }
+        device = device->next;
+    }
+
+    hid_free_enumeration(device_list);
+}

Controllers/RGBFusionGPUController/RGBFusionGPUController.cpp

@@ -0,0 +1,47 @@
+/*-----------------------------------------*\
+|  RGBFusionGPUController.cpp               |
+|                                           |
+|  Driver for Gigabyte Aorus RGB Fusion GPU |
+|  lighting controller                      |
+|                                           |
+|  Adam Honse (CalcProgrammer1) 2/20/2020   |
+\*-----------------------------------------*/
+
+#include "RGBFusionGPUController.h"
+
+RGBFusionGPUController::RGBFusionGPUController(i2c_smbus_interface* bus, rgb_fusion_dev_id dev)
+{
+    this->bus = bus;
+    this->dev = dev;
+}
+
+RGBFusionGPUController::~RGBFusionGPUController()
+{
+
+}
+
+std::string RGBFusionGPUController::GetDeviceLocation()
+{
+    std::string return_string(bus->device_name);
+    char addr[5];
+    snprintf(addr, 5, "0x%02X", dev);
+    return_string.append(", address ");
+    return_string.append(addr);
+    return(return_string);
+}
+
+void RGBFusionGPUController::SetColor(unsigned char red, unsigned char green, unsigned char blue)
+{
+    bus->i2c_smbus_write_byte(dev, RGB_FUSION_GPU_REG_COLOR);
+    bus->i2c_smbus_write_byte(dev, red);
+    bus->i2c_smbus_write_byte(dev, green);
+    bus->i2c_smbus_write_byte(dev, blue);
+}
+
+void RGBFusionGPUController::SetMode(unsigned char mode, unsigned char speed)
+{
+    bus->i2c_smbus_write_byte(dev, RGB_FUSION_GPU_REG_MODE);
+    bus->i2c_smbus_write_byte(dev, mode);
+    bus->i2c_smbus_write_byte(dev, speed);
+    bus->i2c_smbus_write_byte(dev, 0x63);
+}

Controllers/RGBFusionGPUController/RGBFusionGPUController.h

@@ -0,0 +1,54 @@
+/*-----------------------------------------*\
+|  RGBFusionGPUController.h                 |
+|                                           |
+|  Definitions and types for Gigabyte Aorus |
+|  RGB Fusion GPU lighting controller       |
+|                                           |
+|  Adam Honse (CalcProgrammer1) 2/20/2020   |
+\*-----------------------------------------*/
+
+#include <string>
+#include "i2c_smbus.h"
+
+#pragma once
+
+typedef unsigned char	rgb_fusion_dev_id;
+
+enum
+{
+    RGB_FUSION_GPU_REG_COLOR            = 0x40,
+    RGB_FUSION_GPU_REG_MODE             = 0x88
+};
+
+enum
+{
+    RGB_FUSION_GPU_MODE_STATIC          = 0x01,
+    RGB_FUSION_GPU_MODE_BREATHING       = 0x02,
+    RGB_FUSION_GPU_MODE_FLASHING        = 0x04,
+    RGB_FUSION_GPU_MODE_DUAL_FLASHING   = 0x08,
+    RGB_FUSION_GPU_MODE_SPECTRUM_CYCLE  = 0x11
+};
+
+enum
+{
+    RGB_FUSION_GPU_SPEED_SLOWEST        = 0x00,
+    RGB_FUSION_GPU_SPEED_NORMAL         = 0x05,
+    RGB_FUSION_GPU_SPEED_FASTEST        = 0x09
+};
+
+class RGBFusionGPUController
+{
+public:
+    RGBFusionGPUController(i2c_smbus_interface* bus, rgb_fusion_dev_id dev);
+    ~RGBFusionGPUController();
+
+    std::string     GetDeviceLocation();
+
+    void            SetColor(unsigned char red, unsigned char green, unsigned char blue);
+    void            SetMode(unsigned char mode, unsigned char speed);
+
+private:
+    i2c_smbus_interface*    bus;
+    rgb_fusion_dev_id       dev;
+
+};

Controllers/RGBFusionGPUController/RGBFusionGPUControllerDetect.cpp

@@ -0,0 +1,83 @@
+#include "RGBFusionGPUController.h"
+#include "RGBController.h"
+#include "RGBController_RGBFusionGPU.h"
+#include "i2c_smbus.h"
+#include <vector>
+#include <stdio.h>
+#include <stdlib.h>
+
+/******************************************************************************************\
+*                                                                                          *
+*   TestForRGBFusionGPUController                                                          *
+*                                                                                          *
+*       Tests the given address to see if an RGB Fusion controller exists there.  First    *
+*       does a quick write to test for a response                                          *
+*                                                                                          *
+\******************************************************************************************/
+
+bool TestForRGBFusionGPUController(i2c_smbus_interface* bus, unsigned char address)
+{
+    bool pass = false;
+    int res;
+
+    //Write out 0xAB 0x00 0x00 0x00 sequence
+    res = bus->i2c_smbus_write_byte(address, 0xAB);
+
+    if (res >= 0)
+    {
+        bus->i2c_smbus_write_byte(address, 0x00);
+        bus->i2c_smbus_write_byte(address, 0x00);
+        bus->i2c_smbus_write_byte(address, 0x00);
+
+        pass = true;
+
+        res = bus->i2c_smbus_read_byte(address);
+
+        if (res != 0xAB)
+        {
+            pass = false;
+        }
+
+        res = bus->i2c_smbus_read_byte(address);
+
+        if(res != 0x14)
+        {
+            pass = false;
+        }
+
+        bus->i2c_smbus_read_byte(address);
+        bus->i2c_smbus_read_byte(address);
+    }
+
+    return(pass);
+
+}   /* TestForRGBFusionGPUController() */
+
+/******************************************************************************************\
+*                                                                                          *
+*   DetectRGBFusionGPUControllers                                                          *
+*                                                                                          *
+*       Detect RGB Fusion controllers on the enumerated I2C busses at address 0x47.        *
+*                                                                                          *
+*           bus - pointer to i2c_smbus_interface where RGB Fusion device is connected      *
+*           dev - I2C address of RGB Fusion device                                         *
+*                                                                                          *
+\******************************************************************************************/
+
+void DetectRGBFusionGPUControllers(std::vector<i2c_smbus_interface*>& busses, std::vector<RGBController*>& rgb_controllers)
+{
+    RGBFusionGPUController* new_rgb_fusion;
+    RGBController_RGBFusionGPU* new_controller;
+
+    for (unsigned int bus = 0; bus < busses.size(); bus++)
+    {
+        // Check for RGB Fusion controller at 0x47
+        if (TestForRGBFusionGPUController(busses[bus], 0x47))
+        {
+            new_rgb_fusion = new RGBFusionGPUController(busses[bus], 0x47);
+            new_controller = new RGBController_RGBFusionGPU(new_rgb_fusion);
+            rgb_controllers.push_back(new_controller);
+        }
+    }
+
+}   /* DetectRGBFusionGPUControllers() */

Controllers/RedragonController/RedragonControllerDetect.cpp

@@ -0,0 +1,108 @@
+#include "RedragonK556Controller.h"
+#include "RedragonM711Controller.h"
+#include "RGBController.h"
+#include "RGBController_RedragonK556.h"
+#include "RGBController_RedragonM711.h"
+#include <vector>
+#include <hidapi/hidapi.h>
+
+/*-----------------------------------------------------*\
+| Keyboard product IDs                                  |
+\*-----------------------------------------------------*/
+#define REDRAGON_K556_VID               0x0C45
+#define REDRAGON_K556_PID               0x5004
+
+/*-----------------------------------------------------*\
+| Mouse product IDs                                     |
+\*-----------------------------------------------------*/
+#define REDRAGON_M711_VID               0x04D9
+#define REDRAGON_M711_PID               0xFC30
+
+typedef struct
+{
+    unsigned short  usb_vid;
+    unsigned short  usb_pid;
+    unsigned char   usb_interface;
+    device_type     type;
+    const char *    name;
+} redragon_device;
+
+#define REDRAGON_NUM_DEVICES (sizeof(device_list) / sizeof(device_list[ 0 ]))
+
+static const redragon_device device_list[] =
+{
+    /*-----------------------------------------------------------------------------------------------------*\
+    | Keyboards                                                                                             |
+    \*-----------------------------------------------------------------------------------------------------*/
+    { REDRAGON_K556_VID,    REDRAGON_K556_PID,  1,  DEVICE_TYPE_KEYBOARD,   "Redragon K556 Devarajas"       },
+    /*-----------------------------------------------------------------------------------------------------*\
+    | Mice                                                                                                  |
+    \*-----------------------------------------------------------------------------------------------------*/
+    { REDRAGON_M711_VID,    REDRAGON_M711_PID,  2,  DEVICE_TYPE_MOUSE,      "Redragon M711 Cobra"           },
+    /*-----------------------------------------------------------------------------------------------------*\
+    | Mousemats                                                                                             |
+    \*-----------------------------------------------------------------------------------------------------*/
+};
+
+/******************************************************************************************\
+*                                                                                          *
+*   DetectRedragonControllers                                                              *
+*                                                                                          *
+*       Tests the USB address to see if a Redragon RGB Keyboard controller exists there.   *
+*                                                                                          *
+\******************************************************************************************/
+
+void DetectRedragonControllers(std::vector<RGBController*>& rgb_controllers)
+{
+    hid_device_info* info;
+    hid_device* dev;
+
+    hid_init();
+
+    for(int device_idx = 0; device_idx < REDRAGON_NUM_DEVICES; device_idx++)
+    {
+        dev = NULL;
+
+        info = hid_enumerate(device_list[device_idx].usb_vid, device_list[device_idx].usb_pid);
+
+        //Look for Redragon RGB Peripheral
+        while(info)
+        {
+            if((info->vendor_id == device_list[device_idx].usb_vid)
+            &&(info->product_id == device_list[device_idx].usb_pid)
+            &&(info->interface_number == device_list[device_idx].usb_interface))
+            {
+                dev = hid_open_path(info->path);
+                break;
+            }
+            else
+            {
+                info = info->next;
+            }
+        }
+
+        if( dev )
+        {
+            switch(device_list[device_idx].type)
+            {
+                case DEVICE_TYPE_KEYBOARD:
+                    {
+                    RedragonK556Controller* controller = new RedragonK556Controller(dev);
+
+                    RGBController_RedragonK556* rgb_controller = new RGBController_RedragonK556(controller);
+                    rgb_controllers.push_back(rgb_controller);
+                    }
+                    break;
+
+                case DEVICE_TYPE_MOUSE:
+                    {
+                    RedragonM711Controller* controller = new RedragonM711Controller(dev);
+
+                    RGBController_RedragonM711* rgb_controller = new RGBController_RedragonM711(controller);
+                    rgb_controllers.push_back(rgb_controller);
+                    }
+                    break;
+            }
+        }
+    }
+}

Controllers/RedragonController/RedragonK556Controller.cpp

@@ -0,0 +1,159 @@
+#include "RedragonK556Controller.h"
+
+#include <cstring>
+
+RedragonK556Controller::RedragonK556Controller(hid_device* dev_handle)
+{
+    dev = dev_handle;
+}
+
+void RedragonK556Controller::SetKeyboardColors
+    (
+    unsigned char *     color_data,
+    unsigned int        size
+    )
+{
+    unsigned int    packet_size = 0;
+    unsigned int    packet_offset = 0;
+
+    while(size > 0)
+    {
+        if(size >= REDRAGON_K556_MAX_PACKET_SIZE)
+        {
+            packet_size     = REDRAGON_K556_MAX_PACKET_SIZE;
+        }
+        else
+        {
+            packet_size     = size;
+        }
+        
+        SendKeyboardData
+            (
+            &color_data[packet_offset],
+            packet_size,
+            packet_offset
+            );
+
+        size           -= packet_size;
+        packet_offset  += packet_size;
+    }
+}
+
+/*-------------------------------------------------------------------------------------------------*\
+| Private packet sending functions.                                                                 |
+\*-------------------------------------------------------------------------------------------------*/
+
+void RedragonK556Controller::SendKeyboardBegin()
+{
+    char usb_buf[64];
+
+    /*-----------------------------------------------------*\
+    | Zero out buffer                                       |
+    \*-----------------------------------------------------*/
+    memset(usb_buf, 0x00, sizeof(usb_buf));
+
+    /*-----------------------------------------------------*\
+    | Set up Keyboard Begin packet                          |
+    \*-----------------------------------------------------*/
+    usb_buf[0x00]           = 0x04;
+    usb_buf[0x01]           = 0x01;
+    usb_buf[0x02]           = 0x00;
+    usb_buf[0x03]           = 0x01;
+    
+    /*-----------------------------------------------------*\
+    | Send packet                                           |
+    \*-----------------------------------------------------*/
+    hid_write(dev, (unsigned char *)usb_buf, 64);
+    hid_read(dev, (unsigned char *)usb_buf, 64);
+}
+
+void RedragonK556Controller::SendKeyboardData
+    (
+    unsigned char *     data,
+    unsigned char       data_size,
+    unsigned short      data_offset
+    )
+{
+    char usb_buf[64];
+
+    /*-----------------------------------------------------*\
+    | Zero out buffer                                       |
+    \*-----------------------------------------------------*/
+    memset(usb_buf, 0x00, sizeof(usb_buf));
+
+    /*-----------------------------------------------------*\
+    | Set up Keyboard End packet                            |
+    \*-----------------------------------------------------*/
+    usb_buf[0x00]           = 0x04;
+    usb_buf[0x01]           = 0x11 + data_offset;
+    usb_buf[0x02]           = data_size;
+    usb_buf[0x03]           = ( data_size / 3 ) - 1;
+    usb_buf[0x04]           = data_size;
+    usb_buf[0x05]           = data_offset & 0x00FF;
+    usb_buf[0x06]           = data_offset >> 8;
+
+    /*-----------------------------------------------------*\
+    | Copy in data bytes                                    |
+    \*-----------------------------------------------------*/
+    memcpy(&usb_buf[0x08], data, data_size);
+    
+    /*-----------------------------------------------------*\
+    | Send packet                                           |
+    \*-----------------------------------------------------*/
+    hid_write(dev, (unsigned char *)usb_buf, 64);
+    hid_read(dev, (unsigned char *)usb_buf, 64);
+}
+
+void RedragonK556Controller::SendKeyboardMode
+    (
+    unsigned char       mode
+    )
+{
+    char usb_buf[64];
+
+    /*-----------------------------------------------------*\
+    | Zero out buffer                                       |
+    \*-----------------------------------------------------*/
+    memset(usb_buf, 0x00, sizeof(usb_buf));
+
+    /*-----------------------------------------------------*\
+    | Set up Keyboard End packet                            |
+    \*-----------------------------------------------------*/
+    usb_buf[0x00]           = 0x04;
+    usb_buf[0x01]           = 0x00;
+    usb_buf[0x02]           = 0x00;
+    usb_buf[0x03]           = 0x06;
+    usb_buf[0x04]           = 0x01;
+
+    usb_buf[0x08]           = mode;
+    
+    /*-----------------------------------------------------*\
+    | Send packet                                           |
+    \*-----------------------------------------------------*/
+    hid_write(dev, (unsigned char *)usb_buf, 64);
+    hid_read(dev, (unsigned char *)usb_buf, 64);
+}
+
+void RedragonK556Controller::SendKeyboardEnd()
+{
+    char usb_buf[64];
+
+    /*-----------------------------------------------------*\
+    | Zero out buffer                                       |
+    \*-----------------------------------------------------*/
+    memset(usb_buf, 0x00, sizeof(usb_buf));
+
+    /*-----------------------------------------------------*\
+    | Set up Keyboard End packet                            |
+    \*-----------------------------------------------------*/
+    usb_buf[0x00]           = 0x04;
+    usb_buf[0x01]           = 0x02;
+    usb_buf[0x02]           = 0x00;
+    usb_buf[0x03]           = 0x02;
+    
+    /*-----------------------------------------------------*\
+    | Send packet                                           |
+    \*-----------------------------------------------------*/
+    hid_write(dev, (unsigned char *)usb_buf, 64);
+    hid_read(dev, (unsigned char *)usb_buf, 64);
+}

Controllers/RedragonController/RedragonK556Controller.h

@@ -0,0 +1,72 @@
+/*-----------------------------------------*\
+|  RedragonK556Controller.h                 |
+|                                           |
+|  Definitions and types for Redragon K556  |
+|  Devarajas keyboard lighting controller   |
+|                                           |
+|  Adam Honse (CalcProgrammer1) 3/15/2020   |
+\*-----------------------------------------*/
+
+#include "RGBController.h"
+
+#include <string>
+#include <hidapi/hidapi.h>
+
+#pragma once
+
+#define REDRAGON_K556_MAX_PACKET_SIZE   ( 0x36 )        /* max packet size for color*/
+                                                        /* update packets           */
+
+enum
+{
+    REDRAGON_K556_MODE_COLOR_WAVE_SHORT         = 0x01, /* "Go with the stream"     */
+    REDRAGON_K556_MODE_COLOR_WAVE_LONG          = 0x02, /* "Clouds fly"             */
+    REDRAGON_K556_MODE_COLOR_WHEEL              = 0x03, /* "Winding paths"          */
+    REDRAGON_K556_MODE_SPECTRUM_CYCLE           = 0x04, /* "The trial of light"     */
+    REDRAGON_K556_MODE_BREATHING                = 0x05, /* "Breathing"              */
+    REDRAGON_K556_MODE_STATIC                   = 0x06, /* "Normally on"            */
+    REDRAGON_K556_MODE_REACTIVE                 = 0x07, /* "Pass without trace"     */
+    REDRAGON_K556_MODE_REACTIVE_RIPPLE          = 0x08, /* "Ripple graff"           */
+    REDRAGON_K556_MODE_REACTIVE_LINE            = 0x09, /* "Fast run without trace" */
+    REDRAGON_K556_MODE_STARLIGHT_FAST           = 0x0A, /* "Swift action"           */
+    REDRAGON_K556_MODE_BLOOMING                 = 0x0B, /* "Flowers blooming"       */
+    REDRAGON_K556_MODE_RAINBOW_WAVE_VERTICAL    = 0x0C, /* "Snow winter jasmine"    */
+    REDRAGON_K556_MODE_HURRICANE                = 0x0D, /* "Hurricane"              */
+    REDRAGON_K556_MODE_ACCUMULATE               = 0x0E, /* "Accumulate"             */
+    REDRAGON_K556_MODE_STARLIGHT_SLOW           = 0x0F, /* "Digital times"          */
+    REDRAGON_K556_MODE_VISOR                    = 0x10, /* "Both ways"              */
+    REDRAGON_K556_MODE_RAINBOW_WAVE_CIRCLE      = 0x12, /* "Fast and the Furious"   */
+    REDRAGON_K556_MODE_CUSTOM                   = 0x14, /* "Coastal"                */
+};
+
+class RedragonK556Controller
+{
+public:
+    RedragonK556Controller(hid_device* dev_handle);
+    ~RedragonK556Controller();
+
+    void        SetKeyboardColors
+                    (
+                    unsigned char *     color_data,
+                    unsigned int        size
+                    );
+
+    void        SendKeyboardBegin();
+
+    void        SendKeyboardMode
+                    (
+                    unsigned char       mode
+                    );
+
+    void        SendKeyboardData
+                    (
+                    unsigned char *     data,
+                    unsigned char       data_size,
+                    unsigned short      data_offset
+                    );
+
+    void        SendKeyboardEnd();
+
+private:
+    hid_device*             dev;
+};

Controllers/RedragonController/RedragonM711Controller.cpp

@@ -0,0 +1,90 @@
+#include "RedragonM711Controller.h"
+
+#include <cstring>
+
+static void send_usb_msg(hid_device* dev, char * data_pkt, unsigned int size)
+{
+    char* usb_pkt = new char[size + 1];
+    
+    usb_pkt[0] = 0x00;
+    for(int i = 1; i < size + 1; i++)
+    {
+        usb_pkt[i] = data_pkt[i-1];
+    }
+    
+    hid_send_feature_report(dev, (unsigned char *)usb_pkt, size + 1);
+    
+    delete usb_pkt;
+}
+
+RedragonM711Controller::RedragonM711Controller(hid_device* dev_handle)
+{
+    dev = dev_handle;
+}
+
+/*-------------------------------------------------------------------------------------------------*\
+| Private packet sending functions.                                                                 |
+\*-------------------------------------------------------------------------------------------------*/
+
+void RedragonM711Controller::SendMouseApply()
+{
+    char usb_buf[16];
+
+    /*-----------------------------------------------------*\
+    | Zero out buffer                                       |
+    \*-----------------------------------------------------*/
+    memset(usb_buf, 0x00, sizeof(usb_buf));
+
+    /*-----------------------------------------------------*\
+    | Set up Apply packet                                   |
+    \*-----------------------------------------------------*/
+    usb_buf[0x00]           = 0x02;
+    usb_buf[0x01]           = 0xF1;
+    usb_buf[0x02]           = 0x02;
+    usb_buf[0x03]           = 0x04;
+    
+    /*-----------------------------------------------------*\
+    | Send packet                                           |
+    \*-----------------------------------------------------*/
+    send_usb_msg(dev, usb_buf, 16);
+}
+
+void RedragonM711Controller::SendMouseMode
+    (
+    unsigned char       mode,
+    unsigned char       speed,
+    unsigned char       red,
+    unsigned char       green,
+    unsigned char       blue
+    )
+{
+    char usb_buf[16];
+
+    /*-----------------------------------------------------*\
+    | Zero out buffer                                       |
+    \*-----------------------------------------------------*/
+    memset(usb_buf, 0x00, sizeof(usb_buf));
+
+    /*-----------------------------------------------------*\
+    | Set up Lighting Control packet                        |
+    \*-----------------------------------------------------*/
+    usb_buf[0x00]           = 0x02;
+    usb_buf[0x01]           = 0xF3;
+    usb_buf[0x02]           = 0x49;
+    usb_buf[0x03]           = 0x04;
+    usb_buf[0x04]           = 0x06;
+
+    usb_buf[0x08]           = red;
+    usb_buf[0x09]           = green;
+    usb_buf[0x0A]           = blue;
+
+    usb_buf[0x0B]           = 0x01; //on
+
+    usb_buf[0x0C]           = speed;
+    usb_buf[0x0D]           = mode;
+
+    /*-----------------------------------------------------*\
+    | Send packet                                           |
+    \*-----------------------------------------------------*/
+    send_usb_msg(dev, usb_buf, 16);
+}

Controllers/RedragonController/RedragonM711Controller.h

@@ -0,0 +1,46 @@
+/*-----------------------------------------*\
+|  RedragonM711Controller.h                 |
+|                                           |
+|  Definitions and types for Redragon M711  |
+|  Cobra mouse lighting controller          |
+|                                           |
+|  Adam Honse (CalcProgrammer1) 3/15/2020   |
+\*-----------------------------------------*/
+
+#include "RGBController.h"
+
+#include <string>
+#include <hidapi/hidapi.h>
+
+#pragma once
+
+enum
+{
+    REDRAGON_M711_MODE_WAVE              = 0x00,
+    REDRAGON_M711_MODE_RANDOM_BREATHING  = 0x01,
+    REDRAGON_M711_MODE_STATIC            = 0x02,
+    REDRAGON_M711_MODE_BREATHING         = 0x04,
+    REDRAGON_M711_MODE_RAINBOW           = 0x08,
+    REDRAGON_M711_MODE_FLASHING          = 0x10,
+};
+
+class RedragonM711Controller
+{
+public:
+    RedragonM711Controller(hid_device* dev_handle);
+    ~RedragonM711Controller();
+
+    void        SendMouseApply();
+
+    void        SendMouseMode
+                   (
+                   unsigned char       mode,
+                   unsigned char       speed,
+                   unsigned char       red,
+                   unsigned char       green,
+                   unsigned char       blue
+                   );
+
+private:
+    hid_device*             dev;
+};

Controllers/ThermaltakeRiingController/ThermaltakeRiingController.cpp

@@ -0,0 +1,111 @@
+/*-----------------------------------------*\
+|  ThermaltakeRiingController.cpp           |
+|                                           |
+|  Definitions and types for Thermaltake    |
+|  Riing Plus lighting controller           |
+|                                           |
+|  Adam Honse (CalcProgrammer1) 2/7/2020    |
+\*-----------------------------------------*/
+
+#include "ThermaltakeRiingController.h"
+
+#include <cstring>
+
+ThermaltakeRiingController::ThermaltakeRiingController(libusb_device_handle* dev_handle)
+{
+    dev = dev_handle;
+
+    SendInit();
+}
+
+ThermaltakeRiingController::~ThermaltakeRiingController()
+{
+
+}
+
+void ThermaltakeRiingController::SetChannelLEDs(unsigned char channel, RGBColor * colors, unsigned int num_colors)
+{
+    unsigned char* color_data = new unsigned char[3 * num_colors];
+
+    for(std::size_t color = 0; color < num_colors; color++)
+    {
+        int color_idx = color * 3;
+        color_data[color_idx + 0] = RGBGetGValue(colors[color]);
+        color_data[color_idx + 1] = RGBGetRValue(colors[color]);
+        color_data[color_idx + 2] = RGBGetBValue(colors[color]);
+    }
+
+    SendRGB(channel + 1, current_mode, current_speed, num_colors, color_data);
+
+    delete[] color_data;
+}
+
+void ThermaltakeRiingController::SetMode(unsigned char mode, unsigned char speed)
+{
+    current_mode        = mode;
+    current_speed       = speed;
+}
+
+/*-------------------------------------------------------------------------------------------------*\
+| Private packet sending functions.                                                                 |
+\*-------------------------------------------------------------------------------------------------*/
+
+void ThermaltakeRiingController::SendInit()
+{
+    unsigned char usb_buf[64];
+    int           actual;
+
+    /*-----------------------------------------------------*\
+    | Zero out buffer                                       |
+    \*-----------------------------------------------------*/
+    memset(usb_buf, 0x00, sizeof(usb_buf));
+
+    /*-----------------------------------------------------*\
+    | Set up Init packet                                    |
+    \*-----------------------------------------------------*/
+    usb_buf[0x00]   = 0xFE;
+    usb_buf[0x01]   = 0x33;
+
+    /*-----------------------------------------------------*\
+    | Send packet                                           |
+    \*-----------------------------------------------------*/
+    libusb_interrupt_transfer(dev, 0x01, usb_buf, 64, &actual, 0);
+    libusb_interrupt_transfer(dev, 0x81, usb_buf, 64, &actual, 0);
+}
+
+void ThermaltakeRiingController::SendRGB
+    (
+        unsigned char       port,
+        unsigned char       mode,
+        unsigned char       speed,
+        unsigned char       num_colors,
+        unsigned char*      color_data
+    )
+{
+    unsigned char usb_buf[64];
+    int           actual;
+
+    /*-----------------------------------------------------*\
+    | Zero out buffer                                       |
+    \*-----------------------------------------------------*/
+    memset(usb_buf, 0x00, sizeof(usb_buf));
+
+    /*-----------------------------------------------------*\
+    | Set up RGB packet                                     |
+    \*-----------------------------------------------------*/
+    usb_buf[0x00]   = 0x32;
+    usb_buf[0x01]   = 0x52;
+    usb_buf[0x02]   = port;
+    usb_buf[0x03]   = mode + ( speed & 0x03 );
+
+    /*-----------------------------------------------------*\
+    | Copy in GRB color data                                |
+    \*-----------------------------------------------------*/
+    memcpy(&usb_buf[0x04], color_data, (num_colors * 3));
+
+    /*-----------------------------------------------------*\
+    | Send packet                                           |
+    \*-----------------------------------------------------*/
+    libusb_interrupt_transfer(dev, 0x01, usb_buf, 64, &actual, 0);
+    libusb_interrupt_transfer(dev, 0x81, usb_buf, 64, &actual, 0);
+}

Controllers/ThermaltakeRiingController/ThermaltakeRiingController.h

@@ -0,0 +1,75 @@
+/*-----------------------------------------*\
+|  ThermaltakeRiingController.h             |
+|                                           |
+|  Definitions and types for Thermaltake    |
+|  Riing Plus lighting controller           |
+|                                           |
+|  Adam Honse (CalcProgrammer1) 2/7/2020    |
+\*-----------------------------------------*/
+
+#include "RGBController.h"
+#include <vector>
+#include <libusb-1.0/libusb.h>
+
+#pragma once
+
+enum
+{
+    THERMALTAKE_PORT_1              = 0x01,
+    THERMALTAKE_PORT_2              = 0x02,
+    THERMALTAKE_PORT_3              = 0x03,
+    THERMALTAKE_PORT_4              = 0x04,
+    THERMALTAKE_PORT_5              = 0x05
+};
+
+enum
+{
+    THERMALTAKE_MODE_FLOW           = 0x00,
+    THERMALTAKE_MODE_SPECTRUM       = 0x04,
+    THERMALTAKE_MODE_RIPPLE         = 0x08,
+    THERMALTAKE_MODE_BLINK          = 0x0C,
+    THERMALTAKE_MODE_PULSE          = 0x10,
+    THERMALTAKE_MODE_WAVE           = 0x14,
+    THERMALTAKE_MODE_PER_LED        = 0x18,
+    THERMALTAKE_MODE_FULL           = 0x19
+};
+
+enum
+{
+    THERMALTAKE_SPEED_SLOW          = 0x03,
+    THERMALTAKE_SPEED_NORMAL        = 0x02,
+    THERMALTAKE_SPEED_FAST          = 0x01,
+    THERMALTAKE_SPEED_EXTREME       = 0x00
+};
+
+#define THERMALTAKE_NUM_CHANNELS    5
+
+class ThermaltakeRiingController
+{
+public:
+    ThermaltakeRiingController(libusb_device_handle* dev_handle);
+    ~ThermaltakeRiingController();
+
+    void            SetChannelLEDs(unsigned char channel, RGBColor * colors, unsigned int num_colors);
+    void            SetMode(unsigned char mode, unsigned char speed);
+
+private:
+    libusb_device_handle*   dev;
+
+    unsigned char   current_mode;
+    unsigned char   current_speed;
+
+    void    SendInit();
+
+    void SendRGB
+        (
+            unsigned char       port,
+            unsigned char       mode,
+            unsigned char       speed,
+            unsigned char       num_colors,
+            unsigned char*      color_data
+        );
+
+    void    SendFan();
+    void    SendSave();
+};

Controllers/ThermaltakeRiingController/ThermaltakeRiingControllerDetect.cpp

@@ -0,0 +1,41 @@
+#include "ThermaltakeRiingController.h"
+#include "RGBController.h"
+#include "RGBController_ThermaltakeRiing.h"
+#include <vector>
+#include <libusb-1.0/libusb.h>
+
+#define THERMALTAKE_RIING_VID       0x264A
+#define THERMALTAKE_RIING_PID_BEGIN 0x1FA5
+#define THERMALTAKE_RIING_PID_END   0x1FB5
+
+/******************************************************************************************\
+*                                                                                          *
+*   DetectThermaltakeRiingControllers                                                      *
+*                                                                                          *
+*       Tests the USB address to see if an AMD Wraith Prism controller exists there.       *
+*                                                                                          *
+\******************************************************************************************/
+
+void DetectThermaltakeRiingControllers(std::vector<RGBController*>& rgb_controllers)
+{
+    libusb_context * ctx;
+    libusb_init(&ctx);
+
+    for(int pid = THERMALTAKE_RIING_PID_BEGIN; pid <= THERMALTAKE_RIING_PID_END; pid++)
+    {
+        //Look for Thermaltake Riing device
+        libusb_device_handle * dev = libusb_open_device_with_vid_pid(ctx, THERMALTAKE_RIING_VID, pid);
+
+        if( dev )
+        {
+            libusb_detach_kernel_driver(dev, 0);
+            libusb_claim_interface(dev, 0);
+
+            ThermaltakeRiingController* controller = new ThermaltakeRiingController(dev);
+
+            RGBController_ThermaltakeRiing* rgb_controller = new RGBController_ThermaltakeRiing(controller);
+
+            rgb_controllers.push_back(rgb_controller);
+        }
+    }
+}

OpenRGB.cpp

@@ -13,15 +13,13 @@
 #include <stdlib.h>
 
 #ifdef WIN32
-
 #include <regex>
 #include "i2c_smbus_piix4.h"
 #include "i2c_smbus_i801.h"
 #include "i2c_smbus_nct6775.h"
+#include "i2c_smbus_nvapi.h"
+#include "super_io.h"
 #include "wmi.h"
-#include "inpout32.h"
-
-#pragma comment(lib, "inpout32.lib")
 #else /* WIN32 */
 
 #include "i2c_smbus_linux.h"
@@ -36,68 +34,6 @@ std::vector<i2c_smbus_interface*> busses;
 std::vector<RGBController*> rgb_controllers;
 
 #ifdef WIN32
-/******************************************************************************************\
-*                                                                                          *
-*   Nuvoton Super IO constants                                                             *
-*                                                                                          *
-\******************************************************************************************/
-
-#define SIO_NCT5577_ID      0xC330  /* Device ID for NCT5577D (C333)        */
-#define SIO_NCT6102_ID      0x1060  /* Device ID for NCT6102D/6106D (1061)  */
-#define SIO_NCT6793_ID      0xd120  /* Device ID for NCT6793D (D121)        */
-#define SIO_NCT6796_ID      0xd420  /* Device ID for NCT6796D (D421)        */
-#define SIO_REG_LOGDEV      0x07    /* Logical Device Register              */
-#define SIO_REG_DEVID       0x20    /* Device ID Register                   */
-#define SIO_REG_SMBA        0x62    /* SMBus Base Address Register          */
-#define SIO_LOGDEV_SMBUS    0x0B    /* Logical Device for SMBus             */
-#define SIO_ID_MASK         0xFFF8  /* Device ID mask                       */
-
-
-/******************************************************************************************\
-*                                                                                          *
-*   superio_enter                                                                          *
-*                                                                                          *
-*   Put the Super IO chip into Extended Function Mode                                      *
-*                                                                                          *
-\******************************************************************************************/
-
-void superio_enter(int ioreg)
-{
-    Out32(ioreg, 0x87);
-    Out32(ioreg, 0x87);
-}
-
-
-/******************************************************************************************\
-*                                                                                          *
-*   superio_outb                                                                           *
-*                                                                                          *
-*   Write a byte to the Super IO configuration register                                    *
-*                                                                                          *
-\******************************************************************************************/
-
-void superio_outb(int ioreg, int reg, int val)
-{
-    Out32(ioreg, reg);
-    Out32(ioreg + 1, val);
-}
-
-
-/******************************************************************************************\
-*                                                                                          *
-*   superio_inb                                                                            *
-*                                                                                          *
-*   Read a byte to the Super IO configuration register                                     *
-*                                                                                          *
-\******************************************************************************************/
-
-int superio_inb(int ioreg, int reg)
-{
-    Out32(ioreg, reg);
-    return Inp32(ioreg + 1);
-}
-
-
 /******************************************************************************************\
 *                                                                                          *
 *   DetectNuvotonI2CBusses (Windows)                                                       *
@@ -152,6 +88,33 @@ void DetectNuvotonI2CBusses()
 
 }   /* DetectNuvotonI2CBusses() */
 
+/******************************************************************************************\
+*                                                                                          *
+*   DetectNvAPII2CBusses (Windows)                                                         *
+*                                                                                          *
+*       Detects available NVidia NvAPI I2C adapters and enumerates                         *
+*       i2c_smbus_interface objects for them.  Only enumerates the first bus for each GPU  *
+*                                                                                          *
+\******************************************************************************************/
+
+void DetectNvAPII2CBusses()
+{
+    static NV_PHYSICAL_GPU_HANDLE   gpu_handles[64];
+    static NV_S32                   gpu_count = 0;
+
+    NV_STATUS initialize = NvAPI_Initialize();
+
+    NvAPI_EnumPhysicalGPUs(gpu_handles, &gpu_count);
+
+    for(NV_S32 gpu_idx = 0; gpu_idx < gpu_count; gpu_idx++)
+    {
+        i2c_smbus_nvapi * nvapi_bus = new i2c_smbus_nvapi(gpu_handles[gpu_idx]);
+
+        sprintf(nvapi_bus->device_name, "NVidia NvAPI I2C on GPU %d", gpu_idx);
+
+        busses.push_back(nvapi_bus);
+    }
+}   /* DetectNvAPII2CBusses() */
 
 /******************************************************************************************\
 *                                                                                          *
@@ -235,6 +198,9 @@ void DetectI2CBusses()
     // Detect Nuvoton Super IO SMBus adapters
     DetectNuvotonI2CBusses();
 
+    // Detect NVidia NvAPI I2C adapters
+    DetectNvAPII2CBusses();
+
 }   /* DetectI2CBusses() */
 
 #else /* WIN32 */
@@ -281,16 +247,12 @@ void DetectI2CBusses()
 
                 if(test_fd)
                 {
+                    memset(device_string, 0x00, sizeof(device_string));
                     read(test_fd, device_string, sizeof(device_string));
+                    device_string[strlen(device_string) - 1] = 0x00;
+                    
                     close(test_fd);
-
-                    //ignore nvidia adapters for now
-                    if(strncmp(device_string, "NVIDIA", 6) == 0)
-                    {
-                        ent = readdir(dir);
-                        continue;
-                    }
-
+                    
                     bus = new i2c_smbus_linux();
                     strcpy(bus->device_name, device_string);
 
@@ -317,25 +279,32 @@ void DetectI2CBusses()
 
 #endif  /* WIN32 */
 
-void DetectAuraControllers(std::vector<i2c_smbus_interface*> &busses, std::vector<RGBController*> &rgb_controllers);
-void DetectCorsairControllers(std::vector<i2c_smbus_interface*> &busses, std::vector<RGBController*> &rgb_controllers);
-void DetectCorsairProControllers(std::vector<i2c_smbus_interface*> &busses, std::vector<RGBController*> &rgb_controllers);
-void DetectHyperXControllers(std::vector<i2c_smbus_interface*> &busses, std::vector<RGBController*> &rgb_controllers);
+void DetectAuraSMBusControllers(std::vector<i2c_smbus_interface*> &busses, std::vector<RGBController*> &rgb_controllers);
+void DetectAuraGPUControllers(std::vector<i2c_smbus_interface*> &busses, std::vector<RGBController*> &rgb_controllers);
+void DetectCorsairVengeanceControllers(std::vector<i2c_smbus_interface*> &busses, std::vector<RGBController*> &rgb_controllers);
+void DetectCorsairVengeanceProControllers(std::vector<i2c_smbus_interface*> &busses, std::vector<RGBController*> &rgb_controllers);
+void DetectCrucialControllers(std::vector<i2c_smbus_interface*> &busses, std::vector<RGBController*> &rgb_controllers);
+void DetectHyperXDRAMControllers(std::vector<i2c_smbus_interface*> &busses, std::vector<RGBController*> &rgb_controllers);
 void DetectPatriotViperControllers(std::vector<i2c_smbus_interface*> &busses, std::vector<RGBController*> &rgb_controllers);
 void DetectPolychromeControllers(std::vector<i2c_smbus_interface*>& busses, std::vector<RGBController*>& rgb_controllers);
 void DetectRGBFusionControllers(std::vector<i2c_smbus_interface*>& busses, std::vector<RGBController*>& rgb_controllers);
+void DetectRGBFusionGPUControllers(std::vector<i2c_smbus_interface*>& busses, std::vector<RGBController*>& rgb_controllers);
+void DetectMSIRGBControllers(std::vector<RGBController*> &rgb_controllers);
 void DetectLEDStripControllers(std::vector<RGBController*> &rgb_controllers);
 void DetectHue2Controllers(std::vector<RGBController*> &rgb_controllers);
 void DetectHuePlusControllers(std::vector<RGBController*> &rgb_controllers);
 void DetectOpenRazerControllers(std::vector<RGBController*> &rgb_controllers);
-void DetectRazerChromaSDKControllers(std::vector<RGBController*>& rgb_controllers);
 void DetectE131Controllers(std::vector<RGBController*> &rgb_controllers);
 void DetectAMDWraithPrismControllers(std::vector<RGBController*>& rgb_controllers);
-void DetectAorusGPUControllers(std::vector<RGBController*> &rgb_controllers);
 void DetectMSI3ZoneControllers(std::vector<RGBController*>& rgb_controllers);
 void DetectPoseidonZRGBControllers(std::vector<RGBController*>& rgb_controllers);
-void DetectCorsairCmdrProControllers(std::vector<RGBController*> &rgb_controllers);
-void DetectCorsairNodeProControllers(std::vector<RGBController*> &rgb_controllers);
+void DetectCorsairPeripheralControllers(std::vector<RGBController*>& rgb_controllers);
+void DetectCorsairLightingNodeControllers(std::vector<RGBController*> &rgb_controllers);
+void DetectFaustusControllers(std::vector<RGBController*> &rgb_controllers);
+void DetectHyperXKeyboardControllers(std::vector<RGBController*>& rgb_controllers);
+void DetectThermaltakeRiingControllers(std::vector<RGBController*>& rgb_controllers);
+void DetectRGBFusion2USBControllers(std::vector<RGBController*> &rgb_controllers);
+void DetectRedragonControllers(std::vector<RGBController*>& rgb_controllers);
 
 /******************************************************************************************\
 *                                                                                          *
@@ -349,13 +318,18 @@ void DetectRGBControllers(void)
 {
     DetectI2CBusses();
 
-    DetectAuraControllers(busses, rgb_controllers);
-    DetectCorsairControllers(busses, rgb_controllers);
-    DetectCorsairProControllers(busses, rgb_controllers);
-    DetectHyperXControllers(busses, rgb_controllers);
+    DetectAuraSMBusControllers(busses, rgb_controllers);
+    DetectAuraGPUControllers(busses, rgb_controllers);
+    DetectCorsairVengeanceControllers(busses, rgb_controllers);
+    DetectCorsairVengeanceProControllers(busses, rgb_controllers);
+    DetectCrucialControllers(busses, rgb_controllers);
+    DetectHyperXDRAMControllers(busses, rgb_controllers);
     DetectPatriotViperControllers(busses, rgb_controllers);
     DetectPolychromeControllers(busses, rgb_controllers);
+    DetectRGBFusionGPUControllers(busses, rgb_controllers);
+
     DetectRGBFusionControllers(busses, rgb_controllers);
+    DetectMSIRGBControllers(rgb_controllers);
 
     DetectLEDStripControllers(rgb_controllers);
     DetectHue2Controllers(rgb_controllers);
@@ -364,23 +338,26 @@ void DetectRGBControllers(void)
     DetectAMDWraithPrismControllers(rgb_controllers);
     DetectMSI3ZoneControllers(rgb_controllers);
     DetectPoseidonZRGBControllers(rgb_controllers);
-    DetectCorsairCmdrProControllers(rgb_controllers);
-    DetectCorsairNodeProControllers(rgb_controllers);
-    
+    DetectHyperXKeyboardControllers(rgb_controllers);
+    DetectCorsairPeripheralControllers(rgb_controllers);
+    DetectCorsairLightingNodeControllers(rgb_controllers);
+    DetectThermaltakeRiingControllers(rgb_controllers);
+    DetectRGBFusion2USBControllers(rgb_controllers);
+    DetectRedragonControllers(rgb_controllers);
+
     DetectE131Controllers(rgb_controllers);
 
+    DetectOpenRazerControllers(rgb_controllers);
+
     /*-------------------------------------*\
     | Windows-only devices                  |
     \*-------------------------------------*/
 #ifdef WIN32
-    DetectRazerChromaSDKControllers(rgb_controllers);
-    //DetectAorusGPUControllers(rgb_controllers);
-
     /*-------------------------------------*\
     | Linux-only devices                    |
     \*-------------------------------------*/
 #else
-    DetectOpenRazerControllers(rgb_controllers);
+    DetectFaustusControllers(rgb_controllers);
 #endif
 
 }   /* DetectRGBControllers() */

OpenRGB.patch

@@ -1,8 +1,8 @@
 diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
-index 09367fc014c3..25c0e02b3344 100644
+index 2ddca08f8a76..72647850f08e 100644
 --- a/drivers/i2c/busses/Kconfig
 +++ b/drivers/i2c/busses/Kconfig
-@@ -216,6 +216,15 @@ config I2C_CHT_WC
+@@ -217,6 +217,15 @@ config I2C_CHT_WC
  	  combined with a FUSB302 Type-C port-controller as such it is advised
  	  to also select CONFIG_TYPEC_FUSB302=m.
  
@@ -19,7 +19,7 @@ index 09367fc014c3..25c0e02b3344 100644
  	tristate "Nvidia nForce2, nForce3 and nForce4"
  	depends on PCI
 diff --git a/drivers/i2c/busses/Makefile b/drivers/i2c/busses/Makefile
-index 80c23895eaaf..57a2daf0b94e 100644
+index 25d60889713c..3c2a9b237ac6 100644
 --- a/drivers/i2c/busses/Makefile
 +++ b/drivers/i2c/busses/Makefile
 @@ -17,6 +17,7 @@ obj-$(CONFIG_I2C_CHT_WC)	+= i2c-cht-wc.o
@@ -32,10 +32,10 @@ index 80c23895eaaf..57a2daf0b94e 100644
  obj-$(CONFIG_I2C_NVIDIA_GPU)	+= i2c-nvidia-gpu.o
 diff --git a/drivers/i2c/busses/i2c-nct6775.c b/drivers/i2c/busses/i2c-nct6775.c
 new file mode 100644
-index 000000000000..e2b491a4b9f6
+index 000000000000..0462f0952043
 --- /dev/null
 +++ b/drivers/i2c/busses/i2c-nct6775.c
-@@ -0,0 +1,617 @@
+@@ -0,0 +1,647 @@
 +/*
 + * i2c-nct6775 - Driver for the SMBus master functionality of
 + *	       Nuvoton NCT677x Super-I/O chips
@@ -71,6 +71,7 @@ index 000000000000..e2b491a4b9f6
 +#include <linux/hwmon-vid.h>
 +#include <linux/err.h>
 +#include <linux/mutex.h>
++#include <linux/delay.h>
 +#include <linux/ioport.h>
 +#include <linux/i2c.h>
 +#include <linux/acpi.h>
@@ -115,6 +116,9 @@ index 000000000000..e2b491a4b9f6
 +
 +#define NCT6775_LD_SMBUS		0x0B
 +
++/* Other settings */
++#define MAX_RETRIES		400
++
 +enum kinds { nct6106, nct6775, nct6776, nct6779, nct6791, nct6792, nct6793,
 +	     nct6795, nct6796, nct6798 };
 +
@@ -237,10 +241,13 @@ index 000000000000..e2b491a4b9f6
 +	struct i2c_nct6775_adapdata *adapdata = i2c_get_adapdata(adap);
 +	unsigned short nuvoton_nct6793d_smba = adapdata->smba;
 +	int i, len, cnt;
++	union i2c_smbus_data tmp_data;
++	int timeout = 0;
 +
++	tmp_data.word = 0;
 +	cnt = 0;
 +	len = 0;
-+	
++
 +	outb_p(NCT6793D_SOFT_RESET, SMBHSTCTL);
 +
 +	switch (size) {
@@ -248,13 +255,14 @@ index 000000000000..e2b491a4b9f6
 +			outb_p((addr << 1) | read_write,
 +			       SMBHSTADD);
 +			break;
-+		case I2C_SMBUS_BYTE:
 +		case I2C_SMBUS_BYTE_DATA:
++			tmp_data.byte = data->byte;
++		case I2C_SMBUS_BYTE:
 +			outb_p((addr << 1) | read_write,
 +			       SMBHSTADD);
 +			outb_p(command, SMBHSTIDX);
 +			if (read_write == I2C_SMBUS_WRITE) {
-+				outb_p(data->byte, SMBHSTDAT);
++				outb_p(tmp_data.byte, SMBHSTDAT);
 +				outb_p(NCT6793D_WRITE_BYTE, SMBHSTCMD);
 +			}
 +			else {
@@ -268,7 +276,7 @@ index 000000000000..e2b491a4b9f6
 +			if (read_write == I2C_SMBUS_WRITE) {
 +				outb_p(data->word & 0xff, SMBHSTDAT);
 +				outb_p((data->word & 0xff00) >> 8, SMBHSTDAT);
-+				outb_p(NCT6793D_WRITE_WORD, SMBHSTCMD);			
++				outb_p(NCT6793D_WRITE_WORD, SMBHSTCMD);
 +			}
 +			else {
 +				outb_p(NCT6793D_READ_WORD, SMBHSTCMD);
@@ -316,7 +324,16 @@ index 000000000000..e2b491a4b9f6
 +
 +	while ((size == I2C_SMBUS_BLOCK_DATA) && (len > 0)) {
 +		if (read_write == I2C_SMBUS_WRITE) {
-+			while ((inb_p(SMBHSTSTS) & NCT6793D_FIFO_EMPTY) == 0);
++			timeout = 0;
++			while ((inb_p(SMBHSTSTS) & NCT6793D_FIFO_EMPTY) == 0)
++			{
++				if(timeout > MAX_RETRIES)
++				{
++					return -ETIMEDOUT;
++				}
++				usleep_range(250, 500);
++				timeout++;
++			}
 +
 +			//Load more bytes into FIFO
 +			if (len >= 4) {
@@ -335,10 +352,23 @@ index 000000000000..e2b491a4b9f6
 +				len = 0;
 +			}
 +		}
++		else {
++			return -ENOTSUPP;
++		}
++		
 +	}
 +
 +	//wait for manual mode to complete
-+	while ((inb_p(SMBHSTSTS) & NCT6793D_MANUAL_ACTIVE) != 0);
++	timeout = 0;
++	while ((inb_p(SMBHSTSTS) & NCT6793D_MANUAL_ACTIVE) != 0)
++	{
++		if(timeout > MAX_RETRIES)
++		{
++			return -ETIMEDOUT;
++		}
++		usleep_range(250, 500);
++		timeout++;
++	}
 +
 +	if ((inb_p(SMBHSTERR) & NCT6793D_NO_ACK) != 0) {    	
 +		return -ENXIO;
@@ -654,10 +684,10 @@ index 000000000000..e2b491a4b9f6
 +module_init(i2c_nct6775_init);
 +module_exit(i2c_nct6775_exit);
 diff --git a/drivers/i2c/busses/i2c-piix4.c b/drivers/i2c/busses/i2c-piix4.c
-index c46c4bddc7ca..8565d08178a2 100644
+index 30ded6422e7b..e25ce84c26af 100644
 --- a/drivers/i2c/busses/i2c-piix4.c
 +++ b/drivers/i2c/busses/i2c-piix4.c
-@@ -468,11 +468,11 @@ static int piix4_transaction(struct i2c_adapter *piix4_adapter)
+@@ -467,11 +467,11 @@ static int piix4_transaction(struct i2c_adapter *piix4_adapter)
  	if (srvrworks_csb5_delay) /* Extra delay for SERVERWORKS_CSB5 */
  		usleep_range(2000, 2100);
  	else
@@ -671,7 +701,7 @@ index c46c4bddc7ca..8565d08178a2 100644
  
  	/* If the SMBus is still busy, we give up */
  	if (timeout == MAX_TIMEOUT) {
-@@ -963,6 +963,11 @@ static int piix4_probe(struct pci_dev *dev, const struct pci_device_id *id)
+@@ -981,6 +981,11 @@ static int piix4_probe(struct pci_dev *dev, const struct pci_device_id *id)
  		retval = piix4_setup_sb800(dev, id, 1);
  	}
  

OpenRGB.pro

@@ -5,34 +5,63 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
 TARGET = OpenRGB
 TEMPLATE = app
 
+VERSION         = 0.1
+win32:BUILDDATE = $$system(date /t)
+unix:BUILDDATE  = $$system(date -R)
+GIT_COMMIT_ID   = $$system(git --git-dir $$_PRO_FILE_PWD_/.git --work-tree $$_PRO_FILE_PWD_ rev-parse HEAD)
+GIT_COMMIT_DATE = $$system(git --git-dir $$_PRO_FILE_PWD_/.git --work-tree $$_PRO_FILE_PWD_ show -s --format=%ci HEAD)
+GIT_BRANCH      = $$system(git --git-dir $$_PRO_FILE_PWD_/.git --work-tree $$_PRO_FILE_PWD_ rev-parse --abbrev-ref HEAD)
+
+DEFINES +=                                                              \
+    VERSION_STRING=\\"\"\"$$VERSION\\"\"\"                              \
+    BUILDDATE_STRING=\\"\"\"$$BUILDDATE\\"\"\"                          \
+    GIT_COMMIT_ID=\\"\"\"$$GIT_COMMIT_ID\\"\"\"                         \
+    GIT_COMMIT_DATE=\\"\"\"$$GIT_COMMIT_DATE\\"\"\"                     \
+    GIT_BRANCH=\\"\"\"$$GIT_BRANCH\\"\"\"
+
+RC_ICONS = qt/OpenRGB.ico
+
 INCLUDEPATH +=                                                          \
+    dependencies/hidapi                                                 \
     dependencies/libe131/src/                                           \
     i2c_smbus/                                                          \
     i2c_tools/                                                          \
     net_port/                                                           \
     serial_port/                                                        \
+    super_io/                                                           \
     Controllers/AMDWraithPrismController/                               \
-    Controllers/AuraController/                                         \
-    Controllers/CorsairController/                                      \
-    Controllers/CorsairCmdrProController/                               \
-    Controllers/CorsairNodeProController/                               \
-    Controllers/CorsairProController/                                   \
+    Controllers/AuraGPUController/                                      \
+    Controllers/AuraSMBusController/                                    \
+    Controllers/CorsairPeripheralController/                            \
+    Controllers/CorsairLightingNodeController/                          \
+    Controllers/CorsairVengeanceController/                             \
+    Controllers/CorsairVengeanceProController/                          \
+    Controllers/CrucialController/                                      \
     Controllers/Hue2Controller/                                         \
     Controllers/HuePlusController/                                      \
-    Controllers/HyperXController/                                       \
+    Controllers/HyperXDRAMController/                                   \
+    Controllers/HyperXKeyboardController/                               \
     Controllers/LEDStripController/                                     \
     Controllers/MSI3ZoneController/                                     \
+    Controllers/MSIRGBController/                                       \
     Controllers/PatriotViperController/                                 \
     Controllers/PolychromeController/                                   \
     Controllers/PoseidonZRGBController/                                 \
+    Controllers/RedragonController/                                     \
     Controllers/RGBFusionController/                                    \
+    Controllers/RGBFusion2USBController/                                \
+    Controllers/RGBFusionGPUController/                                 \
+    Controllers/ThermaltakeRiingController/                             \
     RGBController/                                                      \
     qt/
 
 SOURCES +=                                                              \
+    dependencies/hidapi/hidapi.c                                        \
     dependencies/libe131/src/e131.c                                     \
     main.cpp                                                            \
+    cli.cpp                                                             \
     OpenRGB.cpp                                                         \
+    ProfileManager.cpp                                                  \
     qt/OpenRGBDeviceInfoPage.cpp                                        \
     qt/OpenRGBDevicePage.cpp                                            \
     qt/OpenRGBDialog.cpp                                                \
@@ -40,31 +69,43 @@ SOURCES +=                                                              \
     i2c_tools/i2c_tools.cpp                                             \
     net_port/net_port.cpp                                               \
     qt/OpenRGBDialog2.cpp                                               \
+    qt/OpenRGBProfileSaveDialog.cpp                                     \
+    qt/OpenRGBSoftwareInfoPage.cpp                                      \
     qt/OpenRGBSystemInfoPage.cpp                                        \
+    qt/OpenRGBZoneResizeDialog.cpp                                      \
     qt/hsv.cpp                                                          \
     serial_port/serial_port.cpp                                         \
+    super_io/super_io.cpp                                               \
     Controllers/AMDWraithPrismController/AMDWraithPrismController.cpp   \
     Controllers/AMDWraithPrismController/AMDWraithPrismControllerDetect.cpp \
-    Controllers/AuraController/AuraController.cpp                       \
-    Controllers/AuraController/AuraControllerDetect.cpp                 \
-    Controllers/CorsairController/CorsairController.cpp                 \
-    Controllers/CorsairController/CorsairControllerDetect.cpp           \
-    Controllers/CorsairCmdrProController/CorsairCmdrProController.cpp   \
-    Controllers/CorsairCmdrProController/CorsairCmdrProControllerDetect.cpp \
-    Controllers/CorsairNodeProController/CorsairNodeProController.cpp   \
-    Controllers/CorsairNodeProController/CorsairNodeProControllerDetect.cpp \
-    Controllers/CorsairProController/CorsairProController.cpp           \
-    Controllers/CorsairProController/CorsairProControllerDetect.cpp     \
+    Controllers/AuraGPUController/AuraGPUController.cpp                 \
+    Controllers/AuraGPUController/AuraGPUControllerDetect.cpp           \
+    Controllers/AuraSMBusController/AuraSMBusController.cpp             \
+    Controllers/AuraSMBusController/AuraSMBusControllerDetect.cpp       \
+    Controllers/CorsairLightingNodeController/CorsairLightingNodeController.cpp \
+    Controllers/CorsairLightingNodeController/CorsairLightingNodeControllerDetect.cpp \
+    Controllers/CorsairPeripheralController/CorsairPeripheralController.cpp \
+    Controllers/CorsairPeripheralController/CorsairPeripheralControllerDetect.cpp \
+    Controllers/CorsairVengeanceController/CorsairVengeanceController.cpp \
+    Controllers/CorsairVengeanceController/CorsairVengeanceControllerDetect.cpp \
+    Controllers/CorsairVengeanceProController/CorsairVengeanceProController.cpp \
+    Controllers/CorsairVengeanceProController/CorsairVengeanceProControllerDetect.cpp \
+    Controllers/CrucialController/CrucialController.cpp                 \
+    Controllers/CrucialController/CrucialControllerDetect.cpp           \
     Controllers/Hue2Controller/Hue2Controller.cpp                       \
     Controllers/Hue2Controller/Hue2ControllerDetect.cpp                 \
     Controllers/HuePlusController/HuePlusController.cpp                 \
     Controllers/HuePlusController/HuePlusControllerDetect.cpp           \
-    Controllers/HyperXController/HyperXController.cpp                   \
-    Controllers/HyperXController/HyperXControllerDetect.cpp             \
+    Controllers/HyperXDRAMController/HyperXDRAMController.cpp           \
+    Controllers/HyperXDRAMController/HyperXDRAMControllerDetect.cpp     \
+    Controllers/HyperXKeyboardController/HyperXKeyboardController.cpp   \
+    Controllers/HyperXKeyboardController/HyperXKeyboardControllerDetect.cpp \
     Controllers/LEDStripController/LEDStripController.cpp               \
     Controllers/LEDStripController/LEDStripControllerDetect.cpp         \
     Controllers/MSI3ZoneController/MSI3ZoneController.cpp               \
     Controllers/MSI3ZoneController/MSI3ZoneControllerDetect.cpp         \
+    Controllers/MSIRGBController/MSIRGBController.cpp                   \
+    Controllers/MSIRGBController/MSIRGBControllerDetect.cpp             \
     Controllers/PatriotViperController/PatriotViperController.cpp       \
     Controllers/PatriotViperController/PatriotViperControllerDetect.cpp \
     Controllers/PolychromeController/PolychromeController.cpp           \
@@ -73,26 +114,46 @@ SOURCES +=                                                              \
     Controllers/PoseidonZRGBController/PoseidonZRGBControllerDetect.cpp \
     Controllers/RGBFusionController/RGBFusionController.cpp             \
     Controllers/RGBFusionController/RGBFusionControllerDetect.cpp       \
+    Controllers/RGBFusion2USBController/RGBFusion2USBController.cpp     \
+    Controllers/RGBFusion2USBController/RGBFusion2USBControllerDetect.cpp \
+    Controllers/RGBFusionGPUController/RGBFusionGPUController.cpp       \
+    Controllers/RGBFusionGPUController/RGBFusionGPUControllerDetect.cpp \
+    Controllers/RedragonController/RedragonK556Controller.cpp           \
+    Controllers/RedragonController/RedragonM711Controller.cpp           \
+    Controllers/RedragonController/RedragonControllerDetect.cpp         \
+    Controllers/ThermaltakeRiingController/ThermaltakeRiingController.cpp \
+    Controllers/ThermaltakeRiingController/ThermaltakeRiingControllerDetect.cpp \
     RGBController/RGBController.cpp                                     \
     RGBController/E131ControllerDetect.cpp                              \
     RGBController/RGBController_AMDWraithPrism.cpp                      \
-    RGBController/RGBController_Aura.cpp                                \
-    RGBController/RGBController_Corsair.cpp                             \
-    RGBController/RGBController_CorsairCmdrPro.cpp                      \
-    RGBController/RGBController_CorsairNodePro.cpp                      \
-    RGBController/RGBController_CorsairPro.cpp                          \
+    RGBController/RGBController_AuraGPU.cpp                             \
+    RGBController/RGBController_AuraSMBus.cpp                           \
+    RGBController/RGBController_CorsairLightingNode.cpp                 \
+    RGBController/RGBController_CorsairPeripheral.cpp                   \
+    RGBController/RGBController_CorsairVengeance.cpp                    \
+    RGBController/RGBController_CorsairVengeancePro.cpp                 \
+    RGBController/RGBController_Crucial.cpp                             \
+    RGBController/RGBController_Dummy.cpp                               \
     RGBController/RGBController_Hue2.cpp                                \
     RGBController/RGBController_HuePlus.cpp                             \
-    RGBController/RGBController_HyperX.cpp                              \
+    RGBController/RGBController_HyperXDRAM.cpp                          \
+    RGBController/RGBController_HyperXKeyboard.cpp                      \
     RGBController/RGBController_E131.cpp                                \
     RGBController/RGBController_LEDStrip.cpp                            \
     RGBController/RGBController_MSI3Zone.cpp                            \
+    RGBController/RGBController_MSIRGB.cpp                              \
     RGBController/RGBController_PatriotViper.cpp                        \
     RGBController/RGBController_Polychrome.cpp                          \
     RGBController/RGBController_PoseidonZRGB.cpp                        \
-    RGBController/RGBController_RGBFusion.cpp
+    RGBController/RGBController_RedragonK556.cpp                        \
+    RGBController/RGBController_RedragonM711.cpp                        \
+    RGBController/RGBController_RGBFusion.cpp                           \
+    RGBController/RGBController_RGBFusion2USB.cpp                       \
+    RGBController/RGBController_RGBFusionGPU.cpp                        \
+    RGBController/RGBController_ThermaltakeRiing.cpp                    \
 
 HEADERS +=                                                              \
+    ProfileManager.h                                                    \
     qt/OpenRGBDeviceInfoPage.h                                          \
     qt/OpenRGBDevicePage.h                                              \
     qt/OpenRGBDialog.h                                                  \
@@ -100,41 +161,64 @@ HEADERS +=                                                              \
     i2c_tools/i2c_tools.h                                               \
     net_port/net_port.h                                                 \
     qt/OpenRGBDialog2.h                                                 \
+    qt/OpenRGBProfileSaveDialog.h                                       \
+    qt/OpenRGBSoftwareInfoPage.h                                        \
     qt/OpenRGBSystemInfoPage.h                                          \
+    qt/OpenRGBZoneResizeDialog.h                                        \
     serial_port/find_usb_serial_port.h                                  \
     serial_port/serial_port.h                                           \
+    super_io/super_io.h                                                 \
     Controllers/AMDWraithPrismController/AMDWraithPrismController.h     \
-    Controllers/AuraController/AuraController.h                         \
-    Controllers/CorsairController/CorsairController.h                   \
-    Controllers/CorsairCmdrProController/CorsairCmdrProController.h     \
-    Controllers/CorsairNodeProController/CorsairNodeProController.h     \
-    Controllers/CorsairProController/CorsairProController.h             \
+    Controllers/AuraGPUController/AuraGPUController.h                   \
+    Controllers/AuraSMBusController/AuraSMBusController.h               \
+    Controllers/CorsairLightingNodeController/CorsairLightingNodeController.h \
+    Controllers/CorsairPeripheralController/CorsairPeripheralController.h \
+    Controllers/CorsairVengeanceController/CorsairVengeanceController.h \
+    Controllers/CorsairVengeanceProController/CorsairVengeanceProController.h \
+    Controllers/CrucialController/CrucialController.h                   \
     Controllers/Hue2Controller/Hue2Controller.h                         \
     Controllers/HuePlusController/HuePlusController.h                   \
-    Controllers/HyperXController/HyperXController.h                     \
+    Controllers/HyperXDRAMController/HyperXDRAMController.h             \
+    Controllers/HyperXKeyboardController/HyperXKeyboardController.h     \
     Controllers/LEDStripController/LEDStripController.h                 \
     Controllers/MSI3ZoneController/MSI3ZoneController.h                 \
+    Controllers/MSIRGBController/MSIRGBController.h                     \
     Controllers/PatriotViperController/PatriotViperController.h         \
     Controllers/PolychromeController/PolychromeController.h             \
     Controllers/PoseidonZRGBController/PoseidonZRGBController.h         \
     Controllers/RGBFusionController/RGBFusionController.h               \
+    Controllers/RGBFusion2USBController/RGBFusion2USBController.h       \
+    Controllers/RGBFusionGPUController/RGBFusionGPUController.h         \
+    Controllers/RedragonController/RedragonK556Controller.h             \
+    Controllers/RedragonController/RedragonM711Controller.h             \
+    Controllers/ThermaltakeRiingController/ThermaltakeRiingController.h \
     RGBController/RGBController.h                                       \
     RGBController/RGBController_AMDWraithPrism.h                        \
-    RGBController/RGBController_Aura.h                                  \
-    RGBController/RGBController_Corsair.h                               \
-    RGBController/RGBController_CorsairCmdrPro.h                        \
-    RGBController/RGBController_CorsairNodePro.h                        \
-    RGBController/RGBController_CorsairPro.h                            \
+    RGBController/RGBController_AuraGPU.h                               \
+    RGBController/RGBController_AuraSMBus.h                             \
+    RGBController/RGBController_CorsairLightingNode.h                   \
+    RGBController/RGBController_CorsairPeripheral.h                     \
+    RGBController/RGBController_CorsairVengeance.h                      \
+    RGBController/RGBController_CorsairVengeancePro.h                   \
+    RGBController/RGBController_Crucial.h                               \
+    RGBController/RGBController_Dummy.h                                 \
     RGBController/RGBController_E131.h                                  \
     RGBController/RGBController_Hue2.h                                  \
     RGBController/RGBController_HuePlus.h                               \
-    RGBController/RGBController_HyperX.h                                \
+    RGBController/RGBController_HyperXDRAM.h                            \
+    RGBController/RGBController_HyperXKeyboard.h                        \
     RGBController/RGBController_LEDStrip.h                              \
     RGBController/RGBController_MSI3Zone.h                              \
+    RGBController/RGBController_MSIRGB.h                                \
     RGBController/RGBController_PatriotViper.h                          \
     RGBController/RGBController_Polychrome.h                            \
     RGBController/RGBController_PoseidonZRGB.h                          \
-    RGBController/RGBController_RGBFusion.h
+    RGBController/RGBController_RedragonK556.h                          \
+    RGBController/RGBController_RedragonM711.h                          \
+    RGBController/RGBController_RGBFusion.h                             \
+    RGBController/RGBController_RGBFusion2USB.h                         \
+    RGBController/RGBController_RGBFusionGPU.h                          \
+    RGBController/RGBController_ThermaltakeRiing.h                      \
 
 RESOURCES += \
     qt/resources.qrc
@@ -144,43 +228,55 @@ FORMS += \
     qt/OpenRGBDevicePage.ui \
     qt/OpenRGBDialog.ui \
     qt/OpenRGBDialog2.ui \
-    qt/OpenRGBSystemInfoPage.ui
+    qt/OpenRGBProfileSaveDialog.ui \
+    qt/OpenRGBSoftwareInfoPage.ui \
+    qt/OpenRGBSystemInfoPage.ui \
+    qt/OpenRGBZoneResizeDialog.ui
 
 #-----------------------------------------------
 # Windows specific project configuration
 #-----------------------------------------------
 win32:INCLUDEPATH +=                                                    \
     dependencies/inpout32_1501/Win32/                                   \
-    dependencies/razer-chroma-2.9.0/inc                                 \
     dependencies/libusb-1.0.22/include                                  \
-    dependencies/hidapi                                                 \
+    dependencies/NVFC                                                   \
+    dependencies/openrazer-win32                                        \
     wmi/                                                                \
 
 win32:SOURCES +=                                                        \
+    dependencies/NVFC/nvapi.cpp                                         \
     i2c_smbus/i2c_smbus_i801.cpp                                        \
     i2c_smbus/i2c_smbus_nct6775.cpp                                     \
+    i2c_smbus/i2c_smbus_nvapi.cpp                                       \
     i2c_smbus/i2c_smbus_piix4.cpp                                       \
     serial_port/find_usb_serial_port_win.cpp                            \
     wmi/wmi.cpp                                                         \
-    RGBController/AorusGPUDetect.cpp                                    \
-    RGBController/RGBController_AorusGPU.cpp                            \
-    RGBController/RazerChromaSDKDetect.cpp                              \
-    RGBController/RGBController_RazerChromaSDK.cpp                      \
+    RGBController/OpenRazerWindowsDetect.cpp                            \
+    RGBController/RGBController_OpenRazerWindows.cpp                    \
 
 win32:HEADERS +=                                                        \
     dependencies/inpout32_1501/Win32/inpout32.h                         \
+    dependencies/NVFC/nvapi.h                                           \
     i2c_smbus/i2c_smbus_i801.h                                          \
     i2c_smbus/i2c_smbus_nct6775.h                                       \
+    i2c_smbus/i2c_smbus_nvapi.h                                         \
     i2c_smbus/i2c_smbus_piix4.h                                         \
     wmi/wmi.h                                                           \
-    RGBController/RGBController_AorusGPU.h                              \
-    RGBController/RGBController_RazerChromaSDK.h                        \
+    RGBController/RGBController_OpenRazerWindows.h                      \
 
-win32:LIBS +=                                                           \
-    -lws2_32                                                            \
-    -L"$$PWD/dependencies/inpout32_1501/Win32/" -linpout32              \
-    -L"$$PWD/dependencies/libusb-1.0.22/MS32/dll" -llibusb-1.0          \
-    -L"$$PWD/dependencies/hidapi-win/x86/" -lhidapi
+win32:contains(QMAKE_TARGET.arch, x86_64) {
+    LIBS +=                                                             \
+        -lws2_32                                                        \
+        -L"$$PWD/dependencies/inpout32_1501/x64/" -linpoutx64           \
+        -L"$$PWD/dependencies/libusb-1.0.22/MS64/dll" -llibusb-1.0      \
+}
+
+win32:contains(QMAKE_TARGET.arch, x86) {
+    LIBS +=                                                             \
+        -lws2_32                                                        \
+        -L"$$PWD/dependencies/inpout32_1501/Win32/" -linpout32          \
+        -L"$$PWD/dependencies/libusb-1.0.22/MS32/dll" -llibusb-1.0      \
+}
 
 win32:DEFINES -=                                                        \
     UNICODE
@@ -192,6 +288,23 @@ win32:DEFINES +=                                                        \
     _WINSOCK_DEPRECATED_NO_WARNINGS                                     \
     WIN32_LEAN_AND_MEAN
 
+# Copy OpenRazer.dll to output directory
+win32:contains(QMAKE_TARGET.arch, x86_64) {
+    copydata.commands = $(COPY_FILE) \"$$shell_path($$PWD\\dependencies\\openrazer-win32\\OpenRazer64.dll)\" \"$$shell_path($$OUT_PWD)\"
+    first.depends = $(first) copydata
+    export(first.depends)
+    export(copydata.commands)
+    QMAKE_EXTRA_TARGETS += first copydata
+}
+
+win32:contains(QMAKE_TARGET.arch, x86) {
+    copydata.commands = $(COPY_FILE) \"$$shell_path($$PWD\\dependencies\\openrazer-win32\\OpenRazer.dll)\" \"$$shell_path($$OUT_PWD)\"
+    first.depends = $(first) copydata
+    export(first.depends)
+    export(copydata.commands)
+    QMAKE_EXTRA_TARGETS += first copydata
+}
+
 #-----------------------------------------------
 # Linux specific project configuration
 #-----------------------------------------------
@@ -199,23 +312,15 @@ unix:INCLUDEPATH +=                                                     \
 
 unix:HEADERS +=                                                         \
     i2c_smbus/i2c_smbus_linux.h                                         \
+    RGBController/RGBController_Faustus.h                               \
 
 unix:LIBS +=                                                            \
     -lusb-1.0                                                           \
-
-packagesExist(hidapi-libusb){
-    unix:LIBS += -lhidapi-libusb
-} else {
-    packagesExist(hidapi) {
-        unix:LIBS += -lhidapi
-    } else {
-        unix:LIBS += -lhidapi-libusb
-    }
-}
-
+    -lstdc++fs                                                          \
 
 unix:SOURCES +=                                                         \
     i2c_smbus/i2c_smbus_linux.cpp                                       \
     serial_port/find_usb_serial_port_linux.cpp                          \
     RGBController/OpenRazerDetect.cpp                                   \
+    RGBController/RGBController_Faustus.cpp                             \
     RGBController/RGBController_OpenRazer.cpp                           \

ProfileManager.cpp

@@ -0,0 +1,300 @@
+#include "ProfileManager.h"
+#include "RGBController_Dummy.h"
+#define _SILENCE_EXPERIMENTAL_FILESYSTEM_DEPRECATION_WARNING
+#include <experimental/filesystem>
+#include <fstream>
+#include <iostream>
+#include <cstring>
+
+namespace fs = std::experimental::filesystem;
+
+ProfileManager::ProfileManager(std::vector<RGBController *>& control) : controllers(control)
+{
+    UpdateProfileList();
+}
+
+ProfileManager::~ProfileManager()
+{
+
+}
+
+bool ProfileManager::SaveProfile(std::string profile_name)
+{
+    /*---------------------------------------------------------*\
+    | If a name was entered, save the profile file              |
+    \*---------------------------------------------------------*/
+    if(profile_name != "")
+    {
+        /*---------------------------------------------------------*\
+        | Open an output file in binary mode                        |
+        \*---------------------------------------------------------*/
+        std::ofstream controller_file(profile_name, std::ios::out | std::ios::binary);
+
+        /*---------------------------------------------------------*\
+        | Write header                                              |
+        | 16 bytes - "OPENRGB_PROFILE"                              |
+        | 4 bytes - Version, unsigned int                           |
+        \*---------------------------------------------------------*/
+        unsigned int profile_version = 1;
+        controller_file.write("OPENRGB_PROFILE", 16);
+        controller_file.write((char *)&profile_version, sizeof(unsigned int));
+
+        /*---------------------------------------------------------*\
+        | Write controller data for each controller                 |
+        \*---------------------------------------------------------*/
+        for(std::size_t controller_index = 0; controller_index < controllers.size(); controller_index++)
+        {
+            unsigned char *controller_data = controllers[controller_index]->GetDeviceDescription();
+            unsigned int controller_size;
+
+            memcpy(&controller_size, controller_data, sizeof(controller_size));
+
+            controller_file.write((const char *)controller_data, controller_size);
+        }
+
+        /*---------------------------------------------------------*\
+        | Close the file when done                                  |
+        \*---------------------------------------------------------*/
+        controller_file.close();
+
+        /*---------------------------------------------------------*\
+        | Update the profile list                                   |
+        \*---------------------------------------------------------*/
+        UpdateProfileList();
+
+        return(true);
+    }
+    else
+    {
+        return(false);
+    }
+}
+
+bool ProfileManager::LoadProfile(std::string profile_name)
+{
+    return(LoadProfileWithOptions(profile_name, false, true));
+}
+
+bool ProfileManager::LoadSizeFromProfile(std::string profile_name)
+{
+    return(LoadProfileWithOptions(profile_name, true, false));
+}
+
+bool ProfileManager::LoadProfileWithOptions
+    (
+    std::string     profile_name,
+    bool            load_size,
+    bool            load_settings
+    )
+{
+    std::vector<RGBController*> temp_controllers;
+    std::vector<bool>           temp_controller_used;
+    unsigned int                controller_size;
+    unsigned int                controller_offset = 0;
+    bool                        ret_val = false;
+
+    std::string filename = profile_name;
+
+    /*---------------------------------------------------------*\
+    | Open input file in binary mode                            |
+    \*---------------------------------------------------------*/
+    std::ifstream controller_file(filename, std::ios::in | std::ios::binary);
+
+    /*---------------------------------------------------------*\
+    | Read and verify file header                               |
+    \*---------------------------------------------------------*/
+    char            header_string[16];
+    unsigned int    header_version;
+
+    controller_file.read(header_string, 16);
+    controller_file.read((char *)&header_version, sizeof(unsigned int));
+
+    controller_offset += 16 + sizeof(unsigned int);
+    controller_file.seekg(controller_offset);
+
+    if(strcmp(header_string, "OPENRGB_PROFILE") == 0)
+    {
+        if(header_version == 1)
+        {
+            /*---------------------------------------------------------*\
+            | Read controller data from file until EOF                  |
+            \*---------------------------------------------------------*/
+            while(!(controller_file.peek() == EOF))
+            {
+                controller_file.read((char *)&controller_size, sizeof(controller_size));
+
+                unsigned char *controller_data = new unsigned char[controller_size];
+
+                controller_file.seekg(controller_offset);
+
+                controller_file.read((char *)controller_data, controller_size);
+
+                RGBController_Dummy *temp_controller = new RGBController_Dummy();
+
+                temp_controller->ReadDeviceDescription(controller_data);
+
+                temp_controllers.push_back(temp_controller);
+                temp_controller_used.push_back(false);
+
+                delete[] controller_data;
+
+                controller_offset += controller_size;
+                controller_file.seekg(controller_offset);
+
+                ret_val = true;
+            }
+
+            /*---------------------------------------------------------*\
+            | Loop through all controllers.  For each controller, search|
+            | all saved controllers until a match is found              |
+            \*---------------------------------------------------------*/
+            for(std::size_t controller_index = 0; controller_index < controllers.size(); controller_index++)
+            {
+                RGBController *controller_ptr = controllers[controller_index];
+
+                for(std::size_t temp_index = 0; temp_index < temp_controllers.size(); temp_index++)
+                {
+                    RGBController *temp_controller = temp_controllers[temp_index];
+                    
+                    /*---------------------------------------------------------*\
+                    | Test if saved controller data matches this controller     |
+                    \*---------------------------------------------------------*/
+                    if((temp_controller_used[temp_index] == false                  )
+                     &&(temp_controller->type        == controller_ptr->type       )
+                     &&(temp_controller->name        == controller_ptr->name       )
+                     &&(temp_controller->description == controller_ptr->description)
+                     &&(temp_controller->version     == controller_ptr->version    )
+                     &&(temp_controller->serial      == controller_ptr->serial     )
+                     &&(temp_controller->location    == controller_ptr->location   ))
+                    {
+                        /*---------------------------------------------------------*\
+                        | Update zone sizes if requested                            |
+                        \*---------------------------------------------------------*/
+                        if(load_size)
+                        {
+                            if(temp_controller->zones.size() == controller_ptr->zones.size())
+                            {
+                                for(std::size_t zone_idx = 0; zone_idx < temp_controller->zones.size(); zone_idx++)
+                                {
+                                    if((temp_controller->zones[zone_idx].name       == controller_ptr->zones[zone_idx].name      )
+                                     &&(temp_controller->zones[zone_idx].type       == controller_ptr->zones[zone_idx].type      )
+                                     &&(temp_controller->zones[zone_idx].leds_min   == controller_ptr->zones[zone_idx].leds_min  )
+                                     &&(temp_controller->zones[zone_idx].leds_max   == controller_ptr->zones[zone_idx].leds_max  )
+                                     &&(temp_controller->zones[zone_idx].leds_count != controller_ptr->zones[zone_idx].leds_count))
+                                    {
+                                        controller_ptr->ResizeZone(zone_idx, temp_controller->zones[zone_idx].leds_count);
+                                    }
+                                }
+                            }
+                        }
+
+                        /*---------------------------------------------------------*\
+                        | Update settings if requested                              |
+                        \*---------------------------------------------------------*/
+                        if(load_settings)
+                        {
+                            /*---------------------------------------------------------*\
+                            | Update all modes                                          |
+                            \*---------------------------------------------------------*/
+                            if(temp_controller->modes.size() == controller_ptr->modes.size())
+                            {
+                                for(std::size_t mode_index = 0; mode_index < temp_controller->modes.size(); mode_index++)
+                                {
+                                    if((temp_controller->modes[mode_index].name       == controller_ptr->modes[mode_index].name      )
+                                     &&(temp_controller->modes[mode_index].value      == controller_ptr->modes[mode_index].value     )
+                                     &&(temp_controller->modes[mode_index].flags      == controller_ptr->modes[mode_index].flags     )
+                                     &&(temp_controller->modes[mode_index].speed_min  == controller_ptr->modes[mode_index].speed_min )
+                                     &&(temp_controller->modes[mode_index].speed_max  == controller_ptr->modes[mode_index].speed_max )
+                                     &&(temp_controller->modes[mode_index].colors_min == controller_ptr->modes[mode_index].colors_min)
+                                     &&(temp_controller->modes[mode_index].colors_max == controller_ptr->modes[mode_index].colors_max))
+                                    {
+                                        controller_ptr->modes[mode_index].speed      = temp_controller->modes[mode_index].speed;
+                                        controller_ptr->modes[mode_index].direction  = temp_controller->modes[mode_index].direction;
+                                        controller_ptr->modes[mode_index].color_mode = temp_controller->modes[mode_index].color_mode;
+
+                                        controller_ptr->modes[mode_index].colors.resize(temp_controller->modes[mode_index].colors.size());
+
+                                        for(std::size_t mode_color_index = 0; mode_color_index < temp_controller->modes[mode_index].colors.size(); mode_color_index++)
+                                        {
+                                            controller_ptr->modes[mode_index].colors[mode_color_index] = temp_controller->modes[mode_index].colors[mode_color_index];
+                                        }
+                                    }
+
+                                }
+
+                                controller_ptr->active_mode = temp_controller->active_mode;
+                            }
+
+                            /*---------------------------------------------------------*\
+                            | Update all colors                                         |
+                            \*---------------------------------------------------------*/
+                            if(temp_controller->colors.size() == controller_ptr->colors.size())
+                            {
+                                for(std::size_t color_index = 0; color_index < temp_controller->colors.size(); color_index++)
+                                {
+                                    controller_ptr->colors[color_index] = temp_controller->colors[color_index];
+                                }
+                            }
+
+                            temp_controller_used[temp_index] = true;
+
+                            break;
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    return(ret_val);
+}
+
+void ProfileManager::DeleteProfile(std::string profile_name)
+{
+    remove(profile_name.c_str());
+
+    UpdateProfileList();
+}
+
+void ProfileManager::UpdateProfileList()
+{
+    profile_list.clear();
+
+    /*---------------------------------------------------------*\
+    | Load profiles by looking for .orp files in current dir    |
+    \*---------------------------------------------------------*/
+    for(const auto & entry : fs::directory_iterator("."))
+    {
+        std::string filename = entry.path().filename().string();
+
+        if(filename.find(".orp") != std::string::npos)
+        {
+            /*---------------------------------------------------------*\
+            | Open input file in binary mode                            |
+            \*---------------------------------------------------------*/
+            std::ifstream profile_file(filename, std::ios::in | std::ios::binary);
+
+            /*---------------------------------------------------------*\
+            | Read and verify file header                               |
+            \*---------------------------------------------------------*/
+            char            header_string[16];
+            unsigned int    header_version;
+
+            profile_file.read(header_string, 16);
+            profile_file.read((char *)&header_version, sizeof(unsigned int));
+
+            if(strcmp(header_string, "OPENRGB_PROFILE") == 0)
+            {
+                if(header_version == 1)
+                {
+                    /*---------------------------------------------------------*\
+                    | Add this profile to the list                              |
+                    \*---------------------------------------------------------*/
+                    profile_list.push_back(filename);
+                }
+            }
+
+            profile_file.close();
+        }
+    }
+}

ProfileManager.h

@@ -0,0 +1,29 @@
+#include "RGBController.h"
+
+#pragma once
+
+class ProfileManager
+{
+public:
+    ProfileManager(std::vector<RGBController *>& control);
+    ~ProfileManager();
+
+    bool SaveProfile(std::string profile_name);
+    bool LoadProfile(std::string profile_name);
+    bool LoadSizeFromProfile(std::string profile_name);
+    void DeleteProfile(std::string profile_name);
+
+    std::vector<std::string> profile_list;
+    
+protected:
+    std::vector<RGBController *>& controllers;
+
+private:
+    void UpdateProfileList();
+    bool LoadProfileWithOptions
+            (
+            std::string     profile_name,
+            bool            load_size,
+            bool            load_settings
+            );
+};

README.md

@@ -21,13 +21,21 @@ See the [Project Wiki](https://gitlab.com/CalcProgrammer1/OpenRGB/-/wikis/home)
 **You must run the application as Administrator the first time to allow InpOut32 to set up.  It can be run as a normal user afterwards**
 
 #### Linux:
-  1. Either open the project using QT Creator or build it using qmake.  You will need the libusb-1.0-0 (or equivalent) development package from your distribution's package manager installed.
+  1. Either open the project using QT Creator or build it using qmake.  You will need the libusb-1.0-0 (or equivalent) and libhidapi development packages from your distribution's package manager installed.
     
-         git clone https://gitlab.com/CalcProgrammer1/OpenRGB
-         cd OpenRGB
-         git submodule update --init --recursive
-         qmake OpenRGB.pro
-         make
+    * sudo apt install qt5-default libusb-1.0-0-dev libhidapi-dev
+
+    * git clone https://gitlab.com/CalcProgrammer1/OpenRGB
+
+    * cd OpenRGB
+
+    * git submodule update --init --recursive
+
+    * qmake OpenRGB.pro
+
+    * make -j8
+    
+    * ./OpenRGB
      
 
   2. Allow access to SMBus:<br>

RGBController/AorusGPUDetect.cpp

@@ -1,21 +0,0 @@
-#include "RGBController.h"
-#include "RGBController_AorusGPU.h"
-#include <vector>
-#include <stdio.h>
-#include <stdlib.h>
-
-
-/******************************************************************************************\
-*                                                                                          *
-*   DetectAorusGPUControllers                                                              *
-*                                                                                          *
-*       Detect devices supported by the Aorus GPU driver                                   *
-*                                                                                          *                                                                                          *
-\******************************************************************************************/
-
-void DetectAorusGPUControllers(std::vector<RGBController*> &rgb_controllers)
-{
-    RGBController_AorusGPU * aorus_rgb = new RGBController_AorusGPU();
-
-    rgb_controllers.push_back(aorus_rgb);
-}   /* DetectLEDStripControllers() */

RGBController/OpenRazerDetect.cpp

@@ -58,7 +58,7 @@ void DetectOpenRazerControllers(std::vector<RGBController*> &rgb_controllers)
             break;
         
         case 7:
-            strcpy(driver_path, "/sys/bus/hid/drivers/razerchromahdk/");
+            strcpy(driver_path, "/sys/bus/hid/drivers/razeraccessory/");
             break;
         }
 
@@ -68,8 +68,6 @@ void DetectOpenRazerControllers(std::vector<RGBController*> &rgb_controllers)
 
         if(dir == NULL)
         {
-            closedir(dir);
-
             driver_to_read++;
             continue;
         }
@@ -102,7 +100,7 @@ void DetectOpenRazerControllers(std::vector<RGBController*> &rgb_controllers)
 
                     RGBController_OpenRazer * razer_rgb = new RGBController_OpenRazer(device_string);
 
-                    if(razer_rgb->device != -1)
+                    if(razer_rgb->device_index != -1)
                     {
                         rgb_controllers.push_back(razer_rgb);
                     }

RGBController/OpenRazerWindowsDetect.cpp

@@ -0,0 +1,387 @@
+#include "RGBController.h"
+#include "RGBController_OpenRazerWindows.h"
+#include <vector>
+#include <stdio.h>
+#include <stdlib.h>
+#include <Windows.h>
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/hid.h>
+
+#ifdef _WIN64
+#define OPENRAZERDLL            "OpenRazer64.dll"
+#elif WIN32
+#define OPENRAZERDLL            "OpenRazer.dll"
+#endif
+
+/******************************************************************************************\
+*                                                                                          *
+*   DetectOpenRazerControllers                                                             *
+*                                                                                          *
+*       Detect devices supported by the OpenRazer kernel drivers                           *
+*                                                                                          *
+\******************************************************************************************/
+
+void DetectOpenRazerControllers(std::vector<RGBController*> &rgb_controllers)
+{
+    static HMODULE module = LoadLibrary(OPENRAZERDLL);
+
+	if(module == nullptr)
+    {
+        return;
+    }
+
+    // map DLL calls
+	typedef unsigned int(*INITRAZERDRIVER)(struct hid_device** hdev);
+	
+	INITRAZERDRIVER init_razer_kbd_driver = reinterpret_cast<INITRAZERDRIVER>(GetProcAddress(module, "init_razer_kbd_driver"));
+    static struct device_attribute devkbd_attr_device_type         				= *(struct device_attribute*)reinterpret_cast<void*>(GetProcAddress(module, "devkbd_attr_device_type"));
+    static struct device_attribute devkbd_attr_device_serial       				= *(struct device_attribute*)reinterpret_cast<void*>(GetProcAddress(module, "devkbd_attr_device_serial"));
+    static struct device_attribute devkbd_attr_firmware_version    				= *(struct device_attribute*)reinterpret_cast<void*>(GetProcAddress(module, "devkbd_attr_firmware_version"));
+	static struct device_attribute devkbd_attr_matrix_effect_custom				= *(struct device_attribute*)reinterpret_cast<void*>(GetProcAddress(module, "devkbd_attr_matrix_effect_custom"));
+	static struct device_attribute devkbd_attr_matrix_custom_frame 				= *(struct device_attribute*)reinterpret_cast<void*>(GetProcAddress(module, "devkbd_attr_matrix_custom_frame"));
+	static struct device_attribute devkbd_attr_matrix_brightness   				= *(struct device_attribute*)reinterpret_cast<void*>(GetProcAddress(module, "devkbd_attr_matrix_brightness"));
+	static struct device_attribute devkbd_attr_matrix_effect_none  				= *(struct device_attribute*)reinterpret_cast<void*>(GetProcAddress(module, "devkbd_attr_matrix_effect_none"));
+	static struct device_attribute devkbd_attr_matrix_effect_static				= *(struct device_attribute*)reinterpret_cast<void*>(GetProcAddress(module, "devkbd_attr_matrix_effect_static"));
+	static struct device_attribute devkbd_attr_matrix_effect_breath			    = *(struct device_attribute*)reinterpret_cast<void*>(GetProcAddress(module, "devkbd_attr_matrix_effect_breath"));
+	static struct device_attribute devkbd_attr_matrix_effect_spectrum			= *(struct device_attribute*)reinterpret_cast<void*>(GetProcAddress(module, "devkbd_attr_matrix_effect_spectrum"));
+	static struct device_attribute devkbd_attr_matrix_effect_reactive			= *(struct device_attribute*)reinterpret_cast<void*>(GetProcAddress(module, "devkbd_attr_matrix_effect_reactive"));
+	static struct device_attribute devkbd_attr_matrix_effect_wave				= *(struct device_attribute*)reinterpret_cast<void*>(GetProcAddress(module, "devkbd_attr_matrix_effect_wave"));
+
+	INITRAZERDRIVER init_razer_mousemat_driver = reinterpret_cast<INITRAZERDRIVER>(GetProcAddress(module, "init_razer_mousemat_driver"));
+    static struct device_attribute devmousemat_attr_device_type                  = *(struct device_attribute*)reinterpret_cast<void*>(GetProcAddress(module, "devmousemat_attr_device_type"));
+    static struct device_attribute devmousemat_attr_device_serial                = *(struct device_attribute*)reinterpret_cast<void*>(GetProcAddress(module, "devmousemat_attr_device_serial"));
+    static struct device_attribute devmousemat_attr_firmware_version             = *(struct device_attribute*)reinterpret_cast<void*>(GetProcAddress(module, "devmousemat_attr_firmware_version"));
+	static struct device_attribute devmousemat_attr_matrix_effect_custom         = *(struct device_attribute*)reinterpret_cast<void*>(GetProcAddress(module, "devmousemat_attr_matrix_effect_custom"));
+	static struct device_attribute devmousemat_attr_matrix_custom_frame          = *(struct device_attribute*)reinterpret_cast<void*>(GetProcAddress(module, "devmousemat_attr_matrix_custom_frame"));
+	static struct device_attribute devmousemat_attr_matrix_brightness            = *(struct device_attribute*)reinterpret_cast<void*>(GetProcAddress(module, "devmousemat_attr_matrix_brightness"));
+	static struct device_attribute devmousemat_attr_matrix_effect_none           = *(struct device_attribute*)reinterpret_cast<void*>(GetProcAddress(module, "devmousemat_attr_matrix_effect_none"));
+	static struct device_attribute devmousemat_attr_matrix_effect_static         = *(struct device_attribute*)reinterpret_cast<void*>(GetProcAddress(module, "devmousemat_attr_matrix_effect_static"));
+	static struct device_attribute devmousemat_attr_matrix_effect_breath	        = *(struct device_attribute*)reinterpret_cast<void*>(GetProcAddress(module, "devmousemat_attr_matrix_effect_breath"));
+	static struct device_attribute devmousemat_attr_matrix_effect_spectrum       = *(struct device_attribute*)reinterpret_cast<void*>(GetProcAddress(module, "devmousemat_attr_matrix_effect_spectrum"));
+	static struct device_attribute devmousemat_attr_matrix_effect_reactive       = *(struct device_attribute*)reinterpret_cast<void*>(GetProcAddress(module, "devmousemat_attr_matrix_effect_reactive"));
+	static struct device_attribute devmousemat_attr_matrix_effect_wave           = *(struct device_attribute*)reinterpret_cast<void*>(GetProcAddress(module, "devmousemat_attr_matrix_effect_wave"));
+	
+	INITRAZERDRIVER init_razer_mouse_driver = reinterpret_cast<INITRAZERDRIVER>(GetProcAddress(module, "init_razer_mouse_driver"));
+    static struct device_attribute devmouse_attr_device_type                   	= *(struct device_attribute*)reinterpret_cast<void*>(GetProcAddress(module, "devmouse_attr_device_type"));
+    static struct device_attribute devmouse_attr_device_serial                 	= *(struct device_attribute*)reinterpret_cast<void*>(GetProcAddress(module, "devmouse_attr_device_serial"));
+    static struct device_attribute devmouse_attr_firmware_version              	= *(struct device_attribute*)reinterpret_cast<void*>(GetProcAddress(module, "devmouse_attr_firmware_version"));
+	static struct device_attribute devmouse_attr_matrix_effect_custom          	= *(struct device_attribute*)reinterpret_cast<void*>(GetProcAddress(module, "devmouse_attr_matrix_effect_custom"));
+	static struct device_attribute devmouse_attr_matrix_custom_frame           	= *(struct device_attribute*)reinterpret_cast<void*>(GetProcAddress(module, "devmouse_attr_matrix_custom_frame"));
+	static struct device_attribute devmouse_attr_matrix_brightness             	= *(struct device_attribute*)reinterpret_cast<void*>(GetProcAddress(module, "devmouse_attr_matrix_brightness"));
+	static struct device_attribute devmouse_attr_logo_led_brightness           	= *(struct device_attribute*)reinterpret_cast<void*>(GetProcAddress(module, "devmouse_attr_logo_led_brightness"));
+	static struct device_attribute devmouse_attr_scroll_led_brightness         	= *(struct device_attribute*)reinterpret_cast<void*>(GetProcAddress(module, "devmouse_attr_scroll_led_brightness"));
+	static struct device_attribute devmouse_attr_matrix_effect_none            	= *(struct device_attribute*)reinterpret_cast<void*>(GetProcAddress(module, "devmouse_attr_matrix_effect_none"));
+	static struct device_attribute devmouse_attr_logo_matrix_effect_none       	= *(struct device_attribute*)reinterpret_cast<void*>(GetProcAddress(module, "devmouse_attr_logo_matrix_effect_none"));
+	static struct device_attribute devmouse_attr_scroll_matrix_effect_none     	= *(struct device_attribute*)reinterpret_cast<void*>(GetProcAddress(module, "devmouse_attr_scroll_matrix_effect_none"));
+	static struct device_attribute devmouse_attr_matrix_effect_static          	= *(struct device_attribute*)reinterpret_cast<void*>(GetProcAddress(module, "devmouse_attr_matrix_effect_static"));
+	static struct device_attribute devmouse_attr_logo_matrix_effect_static     	= *(struct device_attribute*)reinterpret_cast<void*>(GetProcAddress(module, "devmouse_attr_logo_matrix_effect_static"));
+	static struct device_attribute devmouse_attr_scroll_matrix_effect_static   	= *(struct device_attribute*)reinterpret_cast<void*>(GetProcAddress(module, "devmouse_attr_scroll_matrix_effect_static"));
+	static struct device_attribute devmouse_attr_matrix_effect_breath 	        = *(struct device_attribute*)reinterpret_cast<void*>(GetProcAddress(module, "devmouse_attr_matrix_effect_breath"));
+	static struct device_attribute devmouse_attr_matrix_effect_spectrum        	= *(struct device_attribute*)reinterpret_cast<void*>(GetProcAddress(module, "devmouse_attr_matrix_effect_spectrum"));
+	static struct device_attribute devmouse_attr_logo_matrix_effect_spectrum   	= *(struct device_attribute*)reinterpret_cast<void*>(GetProcAddress(module, "devmouse_attr_logo_matrix_effect_spectrum"));
+	static struct device_attribute devmouse_attr_scroll_matrix_effect_spectrum 	= *(struct device_attribute*)reinterpret_cast<void*>(GetProcAddress(module, "devmouse_attr_scroll_matrix_effect_spectrum"));
+	static struct device_attribute devmouse_attr_matrix_effect_reactive        	= *(struct device_attribute*)reinterpret_cast<void*>(GetProcAddress(module, "devmouse_attr_matrix_effect_reactive"));
+	static struct device_attribute devmouse_attr_logo_matrix_effect_reactive   	= *(struct device_attribute*)reinterpret_cast<void*>(GetProcAddress(module, "devmouse_attr_logo_matrix_effect_reactive"));
+	static struct device_attribute devmouse_attr_scroll_matrix_effect_reactive 	= *(struct device_attribute*)reinterpret_cast<void*>(GetProcAddress(module, "devmouse_attr_scroll_matrix_effect_reactive"));
+	static struct device_attribute devmouse_attr_scroll_led_effect             	= *(struct device_attribute*)reinterpret_cast<void*>(GetProcAddress(module, "devmouse_attr_scroll_led_effect"));
+	static struct device_attribute devmouse_attr_scroll_led_rgb                	= *(struct device_attribute*)reinterpret_cast<void*>(GetProcAddress(module, "devmouse_attr_scroll_led_rgb"));
+	static struct device_attribute devmouse_attr_scroll_led_state              	= *(struct device_attribute*)reinterpret_cast<void*>(GetProcAddress(module, "devmouse_attr_scroll_led_state"));
+	static struct device_attribute devmouse_attr_matrix_effect_wave            	= *(struct device_attribute*)reinterpret_cast<void*>(GetProcAddress(module, "devmouse_attr_matrix_effect_wave"));
+
+	INITRAZERDRIVER init_razer_accessory_driver = reinterpret_cast<INITRAZERDRIVER>(GetProcAddress(module, "init_razer_accessory_driver"));
+    static struct device_attribute devaccessory_attr_device_type                      = *(struct device_attribute*)reinterpret_cast<void*>(GetProcAddress(module, "devaccessory_attr_device_type"));
+    static struct device_attribute devaccessory_attr_device_serial                    = *(struct device_attribute*)reinterpret_cast<void*>(GetProcAddress(module, "devaccessory_attr_device_serial"));
+    static struct device_attribute devaccessory_attr_firmware_version                 = *(struct device_attribute*)reinterpret_cast<void*>(GetProcAddress(module, "devaccessory_attr_firmware_version"));
+	static struct device_attribute devaccessory_attr_matrix_effect_custom             = *(struct device_attribute*)reinterpret_cast<void*>(GetProcAddress(module, "devaccessory_attr_matrix_effect_custom"));
+	static struct device_attribute devaccessory_attr_matrix_custom_frame              = *(struct device_attribute*)reinterpret_cast<void*>(GetProcAddress(module, "devaccessory_attr_matrix_custom_frame"));
+	static struct device_attribute devaccessory_attr_matrix_brightness                = *(struct device_attribute*)reinterpret_cast<void*>(GetProcAddress(module, "devaccessory_attr_matrix_brightness"));
+	static struct device_attribute devaccessory_attr_matrix_effect_none               = *(struct device_attribute*)reinterpret_cast<void*>(GetProcAddress(module, "devaccessory_attr_matrix_effect_none"));
+	static struct device_attribute devaccessory_attr_matrix_effect_static             = *(struct device_attribute*)reinterpret_cast<void*>(GetProcAddress(module, "devaccessory_attr_matrix_effect_static"));
+	static struct device_attribute devaccessory_attr_matrix_effect_breath	    	    = *(struct device_attribute*)reinterpret_cast<void*>(GetProcAddress(module, "devaccessory_attr_matrix_effect_breath"));
+	static struct device_attribute devaccessory_attr_matrix_effect_spectrum           = *(struct device_attribute*)reinterpret_cast<void*>(GetProcAddress(module, "devaccessory_attr_matrix_effect_spectrum"));
+	//static struct device_attribute devaccessory_attr_matrix_effect_reactive         = *(struct device_attribute*)reinterpret_cast<void*>(GetProcAddress(module, "devaccessory_attr_matrix_effect_reactive"));
+	static struct device_attribute devaccessory_attr_matrix_effect_wave               = *(struct device_attribute*)reinterpret_cast<void*>(GetProcAddress(module, "devaccessory_attr_matrix_effect_wave"));
+
+	INITRAZERDRIVER init_razer_kraken_driver = reinterpret_cast<INITRAZERDRIVER>(GetProcAddress(module, "init_razer_kraken_driver"));
+    static struct device_attribute devkraken_attr_device_type                   = *(struct device_attribute*)reinterpret_cast<void*>(GetProcAddress(module, "devkraken_attr_device_type"));
+    static struct device_attribute devkraken_attr_device_serial                 = *(struct device_attribute*)reinterpret_cast<void*>(GetProcAddress(module, "devkraken_attr_device_serial"));
+    static struct device_attribute devkraken_attr_firmware_version              = *(struct device_attribute*)reinterpret_cast<void*>(GetProcAddress(module, "devkraken_attr_firmware_version"));
+	static struct device_attribute devkraken_attr_matrix_effect_custom          = *(struct device_attribute*)reinterpret_cast<void*>(GetProcAddress(module, "devkraken_attr_matrix_effect_custom"));
+    //static struct device_attribute devkraken_attr_matrix_custom_frame           = *(struct device_attribute*)reinterpret_cast<void*>(GetProcAddress(module, "devkraken_attr_matrix_custom_frame"));
+	//static struct device_attribute devkraken_attr_matrix_brightness           = *(struct device_attribute*)reinterpret_cast<void*>(GetProcAddress(module, "devkraken_attr_matrix_brightness"));
+	static struct device_attribute devkraken_attr_matrix_effect_none            = *(struct device_attribute*)reinterpret_cast<void*>(GetProcAddress(module, "devkraken_attr_matrix_effect_none"));
+	static struct device_attribute devkraken_attr_matrix_effect_static          = *(struct device_attribute*)reinterpret_cast<void*>(GetProcAddress(module, "devkraken_attr_matrix_effect_static"));
+	static struct device_attribute devkraken_attr_matrix_effect_breath	        = *(struct device_attribute*)reinterpret_cast<void*>(GetProcAddress(module, "devkraken_attr_matrix_effect_breath"));
+	static struct device_attribute devkraken_attr_matrix_effect_spectrum        = *(struct device_attribute*)reinterpret_cast<void*>(GetProcAddress(module, "devkraken_attr_matrix_effect_spectrum"));
+
+	INITRAZERDRIVER init_razer_core_driver = reinterpret_cast<INITRAZERDRIVER>(GetProcAddress(module, "init_razer_core_driver"));
+    static struct device_attribute devcore_attr_device_type                     = *(struct device_attribute*)reinterpret_cast<void*>(GetProcAddress(module, "devcore_attr_device_type"));
+    static struct device_attribute devcore_attr_device_serial                   = *(struct device_attribute*)reinterpret_cast<void*>(GetProcAddress(module, "devcore_attr_device_serial"));
+    static struct device_attribute devcore_attr_firmware_version                = *(struct device_attribute*)reinterpret_cast<void*>(GetProcAddress(module, "devcore_attr_firmware_version"));
+	static struct device_attribute devcore_attr_matrix_effect_custom            = *(struct device_attribute*)reinterpret_cast<void*>(GetProcAddress(module, "devcore_attr_matrix_effect_custom"));
+	static struct device_attribute devcore_attr_matrix_custom_frame             = *(struct device_attribute*)reinterpret_cast<void*>(GetProcAddress(module, "devcore_attr_matrix_custom_frame"));
+	static struct device_attribute devcore_attr_matrix_brightness               = *(struct device_attribute*)reinterpret_cast<void*>(GetProcAddress(module, "devcore_attr_matrix_brightness"));
+	static struct device_attribute devcore_attr_matrix_effect_none              = *(struct device_attribute*)reinterpret_cast<void*>(GetProcAddress(module, "devcore_attr_matrix_effect_none"));
+	static struct device_attribute devcore_attr_matrix_effect_static            = *(struct device_attribute*)reinterpret_cast<void*>(GetProcAddress(module, "devcore_attr_matrix_effect_static"));
+	static struct device_attribute devcore_attr_matrix_effect_breath	        = *(struct device_attribute*)reinterpret_cast<void*>(GetProcAddress(module, "devcore_attr_matrix_effect_breath"));
+	static struct device_attribute devcore_attr_matrix_effect_spectrum          = *(struct device_attribute*)reinterpret_cast<void*>(GetProcAddress(module, "devcore_attr_matrix_effect_spectrum"));
+	static struct device_attribute devcore_attr_matrix_effect_reactive          = *(struct device_attribute*)reinterpret_cast<void*>(GetProcAddress(module, "devcore_attr_matrix_effect_reactive"));
+	static struct device_attribute devcore_attr_matrix_effect_wave              = *(struct device_attribute*)reinterpret_cast<void*>(GetProcAddress(module, "devcore_attr_matrix_effect_wave"));
+
+	struct hid_device* hdev;
+	unsigned int num;
+
+    hdev = NULL;
+	num = init_razer_kbd_driver(&hdev);
+	for (unsigned int i = 0; i < num; i++)
+    {
+        device_fn_type* device_fn = new device_fn_type;
+        device_fn->device_type             	     = &devkbd_attr_device_type;
+        device_fn->device_serial           	     = &devkbd_attr_device_serial;
+		device_fn->firmware_version			     = &devkbd_attr_firmware_version;
+        device_fn->matrix_effect_custom    	     = &devkbd_attr_matrix_effect_custom;
+        device_fn->matrix_custom_frame     	     = &devkbd_attr_matrix_custom_frame;
+        device_fn->matrix_brightness       	     = &devkbd_attr_matrix_brightness;
+        device_fn->matrix_effect_none      	     = &devkbd_attr_matrix_effect_none;
+        device_fn->matrix_effect_static    	     = &devkbd_attr_matrix_effect_static;
+		device_fn->matrix_effect_breath	         = &devkbd_attr_matrix_effect_breath;
+        device_fn->matrix_effect_spectrum  	     = &devkbd_attr_matrix_effect_spectrum;
+        device_fn->matrix_effect_reactive  	     = &devkbd_attr_matrix_effect_reactive;
+		device_fn->matrix_effect_wave		     = &devkbd_attr_matrix_effect_wave;
+        device_fn->logo_led_brightness           = NULL;
+        device_fn->logo_matrix_effect_none       = NULL;
+        device_fn->logo_matrix_effect_static     = NULL;
+        device_fn->logo_matrix_effect_spectrum   = NULL;
+        device_fn->logo_matrix_effect_reactive   = NULL;
+        device_fn->scroll_led_brightness         = NULL;
+        device_fn->scroll_matrix_effect_none     = NULL;
+        device_fn->scroll_matrix_effect_static   = NULL;
+        device_fn->scroll_matrix_effect_spectrum = NULL;
+        device_fn->scroll_matrix_effect_reactive = NULL;
+        device_fn->scroll_led_effect             = NULL;
+        device_fn->scroll_led_rgb                = NULL;
+        RGBController_OpenRazer * razer_rgb = new RGBController_OpenRazer(&hdev[i].dev, device_fn);
+
+        if(razer_rgb->device_index != -1)
+        {
+            rgb_controllers.push_back(razer_rgb);
+        }
+        else
+        {
+            delete razer_rgb;
+        }
+    }
+
+    hdev = NULL;
+	num = init_razer_mouse_driver(&hdev);
+	for (unsigned int i = 0; i < num; i++)
+    {
+        device_fn_type* device_fn = new device_fn_type;
+        device_fn->device_type             	     = &devmouse_attr_device_type;
+        device_fn->device_serial           	     = &devmouse_attr_device_serial;
+		device_fn->firmware_version			     = &devmouse_attr_firmware_version;
+        device_fn->matrix_effect_custom    	     = &devmouse_attr_matrix_effect_custom;
+        device_fn->matrix_custom_frame     	     = &devmouse_attr_matrix_custom_frame;
+        device_fn->matrix_brightness       	     = &devmouse_attr_matrix_brightness;
+        device_fn->matrix_effect_none      	     = &devmouse_attr_matrix_effect_none;
+        device_fn->matrix_effect_static    	     = &devmouse_attr_matrix_effect_static;
+		device_fn->matrix_effect_breath	         = &devmouse_attr_matrix_effect_breath;
+        device_fn->matrix_effect_spectrum  	     = &devmouse_attr_matrix_effect_spectrum;
+        device_fn->matrix_effect_reactive  	     = &devmouse_attr_matrix_effect_reactive;
+		device_fn->matrix_effect_wave		     = &devmouse_attr_matrix_effect_wave;
+        device_fn->logo_led_brightness           = NULL;
+        device_fn->logo_matrix_effect_none       = NULL;
+        device_fn->logo_matrix_effect_static     = NULL;
+        device_fn->logo_matrix_effect_spectrum   = NULL;
+        device_fn->logo_matrix_effect_reactive   = NULL;
+        device_fn->scroll_led_brightness         = NULL;
+        device_fn->scroll_matrix_effect_none     = NULL;
+        device_fn->scroll_matrix_effect_static   = NULL;
+        device_fn->scroll_matrix_effect_spectrum = NULL;
+        device_fn->scroll_matrix_effect_reactive = NULL;
+        device_fn->scroll_led_effect             = NULL;
+        device_fn->scroll_led_rgb                = NULL;
+
+        RGBController_OpenRazer * razer_rgb = new RGBController_OpenRazer(&hdev[i].dev, device_fn);
+
+        if(razer_rgb->device_index != -1)
+        {
+            rgb_controllers.push_back(razer_rgb);
+        }
+        else
+        {
+            delete razer_rgb;
+        }
+    }
+
+    hdev = NULL;
+	num = init_razer_mousemat_driver(&hdev);
+	for (unsigned int i = 0; i < num; i++)
+    {
+        device_fn_type* device_fn = new device_fn_type;
+        device_fn->device_type             	     = &devmousemat_attr_device_type;
+        device_fn->device_serial           	     = &devmousemat_attr_device_serial;
+		device_fn->firmware_version			     = &devmousemat_attr_firmware_version;
+        device_fn->matrix_effect_custom    	     = &devmousemat_attr_matrix_effect_custom;
+        device_fn->matrix_custom_frame     	     = &devmousemat_attr_matrix_custom_frame;
+        device_fn->matrix_brightness       	     = &devmousemat_attr_matrix_brightness;
+        device_fn->matrix_effect_none      	     = &devmousemat_attr_matrix_effect_none;
+        device_fn->matrix_effect_static    	     = &devmousemat_attr_matrix_effect_static;
+		device_fn->matrix_effect_breath	         = &devmousemat_attr_matrix_effect_breath;
+        device_fn->matrix_effect_spectrum  	     = &devmousemat_attr_matrix_effect_spectrum;
+        device_fn->matrix_effect_reactive  	     = &devmousemat_attr_matrix_effect_reactive;
+		device_fn->matrix_effect_wave		     = &devmousemat_attr_matrix_effect_wave;
+        device_fn->logo_led_brightness           = NULL;
+        device_fn->logo_matrix_effect_none       = NULL;
+        device_fn->logo_matrix_effect_static     = NULL;
+        device_fn->logo_matrix_effect_spectrum   = NULL;
+        device_fn->logo_matrix_effect_reactive   = NULL;
+        device_fn->scroll_led_brightness         = NULL;
+        device_fn->scroll_matrix_effect_none     = NULL;
+        device_fn->scroll_matrix_effect_static   = NULL;
+        device_fn->scroll_matrix_effect_spectrum = NULL;
+        device_fn->scroll_matrix_effect_reactive = NULL;
+        device_fn->scroll_led_effect             = NULL;
+        device_fn->scroll_led_rgb                = NULL;
+
+        RGBController_OpenRazer * razer_rgb = new RGBController_OpenRazer(&hdev[i].dev, device_fn);
+
+        if(razer_rgb->device_index != -1)
+        {
+            rgb_controllers.push_back(razer_rgb);
+        }
+        else
+        {
+            delete razer_rgb;
+        }
+    }
+
+    hdev = NULL;
+	num = init_razer_accessory_driver(&hdev);
+	for (unsigned int i = 0; i < num; i++)
+    {
+        device_fn_type* device_fn = new device_fn_type;
+        device_fn->device_type                   = &devaccessory_attr_device_type;
+        device_fn->device_serial                 = &devaccessory_attr_device_serial;
+		device_fn->firmware_version			     = &devaccessory_attr_firmware_version;
+        device_fn->matrix_effect_custom          = &devaccessory_attr_matrix_effect_custom;
+        device_fn->matrix_custom_frame           = &devaccessory_attr_matrix_custom_frame;
+        device_fn->matrix_brightness             = &devaccessory_attr_matrix_brightness;
+        device_fn->matrix_effect_none            = &devaccessory_attr_matrix_effect_none;
+        device_fn->matrix_effect_static          = &devaccessory_attr_matrix_effect_static;
+		device_fn->matrix_effect_breath	         = &devaccessory_attr_matrix_effect_breath;
+        device_fn->matrix_effect_spectrum        = &devaccessory_attr_matrix_effect_spectrum;
+        device_fn->matrix_effect_reactive        = NULL;//&devaccessory_attr_matrix_effect_reactive;
+		device_fn->matrix_effect_wave            = &devaccessory_attr_matrix_effect_wave;
+        device_fn->logo_led_brightness           = NULL;
+        device_fn->logo_matrix_effect_none       = NULL;
+        device_fn->logo_matrix_effect_static     = NULL;
+        device_fn->logo_matrix_effect_spectrum   = NULL;
+        device_fn->logo_matrix_effect_reactive   = NULL;
+        device_fn->scroll_led_brightness         = NULL;
+        device_fn->scroll_matrix_effect_none     = NULL;
+        device_fn->scroll_matrix_effect_static   = NULL;
+        device_fn->scroll_matrix_effect_spectrum = NULL;
+        device_fn->scroll_matrix_effect_reactive = NULL;
+        device_fn->scroll_led_effect             = NULL;
+        device_fn->scroll_led_rgb                = NULL;
+
+        RGBController_OpenRazer * razer_rgb = new RGBController_OpenRazer(&hdev[i].dev, device_fn);
+
+        if(razer_rgb->device_index != -1)
+        {
+            rgb_controllers.push_back(razer_rgb);
+        }
+        else
+        {
+            delete razer_rgb;
+        }
+    }
+
+    hdev = NULL;
+	num = init_razer_kraken_driver(&hdev);
+	for (unsigned int i = 0; i < num; i++)
+    {
+        device_fn_type* device_fn = new device_fn_type;
+        device_fn->device_type                   = &devkraken_attr_device_type;
+        device_fn->device_serial                 = &devkraken_attr_device_serial;
+		device_fn->firmware_version			     = &devkraken_attr_firmware_version;
+        device_fn->matrix_effect_custom          = &devkraken_attr_matrix_effect_custom;
+        device_fn->matrix_custom_frame           = NULL;//&devkraken_attr_matrix_custom_frame;
+        device_fn->matrix_brightness             = NULL;//&devkraken_attr_matrix_brightness;
+        device_fn->matrix_effect_none            = &devkraken_attr_matrix_effect_none;
+        device_fn->matrix_effect_static          = &devkraken_attr_matrix_effect_static;
+		device_fn->matrix_effect_breath	         = &devkraken_attr_matrix_effect_breath;
+        device_fn->matrix_effect_spectrum        = &devkraken_attr_matrix_effect_spectrum;
+        device_fn->matrix_effect_reactive        = NULL;//&devkraken_attr_matrix_effect_reactive;
+		device_fn->matrix_effect_wave            = NULL;//&devkraken_attr_matrix_effect_wave;
+        device_fn->logo_led_brightness           = NULL;
+        device_fn->logo_matrix_effect_none       = NULL;
+        device_fn->logo_matrix_effect_static     = NULL;
+        device_fn->logo_matrix_effect_spectrum   = NULL;
+        device_fn->logo_matrix_effect_reactive   = NULL;
+        device_fn->scroll_led_brightness         = NULL;
+        device_fn->scroll_matrix_effect_none     = NULL;
+        device_fn->scroll_matrix_effect_static   = NULL;
+        device_fn->scroll_matrix_effect_spectrum = NULL;
+        device_fn->scroll_matrix_effect_reactive = NULL;
+        device_fn->scroll_led_effect             = NULL;
+        device_fn->scroll_led_rgb                = NULL;
+
+        RGBController_OpenRazer * razer_rgb = new RGBController_OpenRazer(&hdev[i].dev, device_fn);
+
+        if(razer_rgb->device_index != -1)
+        {
+            rgb_controllers.push_back(razer_rgb);
+        }
+        else
+        {
+            delete razer_rgb;
+        }
+    }
+
+    hdev = NULL;
+	num = init_razer_core_driver(&hdev);
+	for (unsigned int i = 0; i < num; i++)
+    {
+        device_fn_type* device_fn = new device_fn_type;
+        device_fn->device_type                   = &devcore_attr_device_type;
+        device_fn->device_serial                 = &devcore_attr_device_serial;
+		device_fn->firmware_version			     = &devcore_attr_firmware_version;
+        device_fn->matrix_effect_custom          = &devcore_attr_matrix_effect_custom;
+        device_fn->matrix_custom_frame           = &devcore_attr_matrix_custom_frame;
+        device_fn->matrix_brightness             = &devcore_attr_matrix_brightness;
+        device_fn->matrix_effect_none            = &devcore_attr_matrix_effect_none;
+        device_fn->matrix_effect_static          = &devcore_attr_matrix_effect_static;
+		device_fn->matrix_effect_breath	         = &devcore_attr_matrix_effect_breath;
+        device_fn->matrix_effect_spectrum        = &devcore_attr_matrix_effect_spectrum;
+        device_fn->matrix_effect_reactive        = &devcore_attr_matrix_effect_reactive;
+		device_fn->matrix_effect_wave            = &devcore_attr_matrix_effect_wave;
+        device_fn->logo_led_brightness           = NULL;
+        device_fn->logo_matrix_effect_none       = NULL;
+        device_fn->logo_matrix_effect_static     = NULL;
+        device_fn->logo_matrix_effect_spectrum   = NULL;
+        device_fn->logo_matrix_effect_reactive   = NULL;
+        device_fn->scroll_led_brightness         = NULL;
+        device_fn->scroll_matrix_effect_none     = NULL;
+        device_fn->scroll_matrix_effect_static   = NULL;
+        device_fn->scroll_matrix_effect_spectrum = NULL;
+        device_fn->scroll_matrix_effect_reactive = NULL;
+        device_fn->scroll_led_effect             = NULL;
+        device_fn->scroll_led_rgb                = NULL;
+
+        RGBController_OpenRazer * razer_rgb = new RGBController_OpenRazer(&hdev[i].dev, device_fn);
+
+        if(razer_rgb->device_index != -1)
+        {
+            rgb_controllers.push_back(razer_rgb);
+        }
+        else
+        {
+            delete razer_rgb;
+        }
+    }
+
+}   /* DetectOpenRazerControllers() */

RGBController/RGBController.cpp

@@ -1,6 +1,680 @@
 #include "RGBController.h"
+#include <cstring>
 
-RGBColor RGBController::GetLED(int led)
+unsigned char * RGBController::GetDeviceDescription()
+{
+    unsigned int data_ptr = 0;
+    unsigned int data_size = 0;
+
+    /*---------------------------------------------------------*\
+    | Calculate data size                                       |
+    \*---------------------------------------------------------*/
+    unsigned short name_len         = strlen(name.c_str())          + 1;
+    unsigned short description_len  = strlen(description.c_str())   + 1;
+    unsigned short version_len      = strlen(version.c_str())       + 1;
+    unsigned short serial_len       = strlen(serial.c_str())        + 1;
+    unsigned short location_len     = strlen(location.c_str())      + 1;
+    unsigned short num_modes        = modes.size();
+    unsigned short num_zones        = zones.size();
+    unsigned short num_leds         = leds.size();
+    unsigned short num_colors       = colors.size();
+
+    unsigned short *mode_name_len   = new unsigned short[num_modes];
+    unsigned short *zone_name_len   = new unsigned short[num_zones];
+    unsigned short *led_name_len    = new unsigned short[num_leds];
+
+    unsigned short *mode_num_colors = new unsigned short[num_modes];
+
+    data_size += sizeof(data_size);
+    data_size += sizeof(device_type);
+    data_size += name_len           + sizeof(name_len);
+    data_size += description_len    + sizeof(description_len);
+    data_size += version_len        + sizeof(version_len);
+    data_size += serial_len         + sizeof(serial_len);
+    data_size += location_len       + sizeof(location_len);
+
+    data_size += sizeof(num_modes);
+    data_size += sizeof(active_mode);
+
+    for(int mode_index = 0; mode_index < num_modes; mode_index++)
+    {
+        mode_name_len[mode_index]   = strlen(modes[mode_index].name.c_str()) + 1;
+        mode_num_colors[mode_index] = modes[mode_index].colors.size();
+
+        data_size += mode_name_len[mode_index] + sizeof(mode_name_len[mode_index]);
+        data_size += sizeof(modes[mode_index].value);
+        data_size += sizeof(modes[mode_index].flags);
+        data_size += sizeof(modes[mode_index].speed_min);
+        data_size += sizeof(modes[mode_index].speed_max);
+        data_size += sizeof(modes[mode_index].colors_min);
+        data_size += sizeof(modes[mode_index].colors_max);
+        data_size += sizeof(modes[mode_index].speed);
+        data_size += sizeof(modes[mode_index].direction);
+        data_size += sizeof(modes[mode_index].color_mode);
+        data_size += sizeof(mode_num_colors[mode_index]);
+        data_size += (mode_num_colors[mode_index] * sizeof(RGBColor));
+    }
+
+    data_size += sizeof(num_zones);
+
+    for(int zone_index = 0; zone_index < num_zones; zone_index++)
+    {
+        zone_name_len[zone_index]   = strlen(zones[zone_index].name.c_str()) + 1;
+        
+        data_size += zone_name_len[zone_index] + sizeof(zone_name_len[zone_index]);
+        data_size += sizeof(zones[zone_index].type);
+        data_size += sizeof(zones[zone_index].leds_min);
+        data_size += sizeof(zones[zone_index].leds_max);
+        data_size += sizeof(zones[zone_index].leds_count);
+    }
+
+    data_size += sizeof(num_leds);
+
+    for(int led_index = 0; led_index < num_leds; led_index++)
+    {
+        led_name_len[led_index] = strlen(leds[led_index].name.c_str()) + 1;
+
+        data_size += led_name_len[led_index] + sizeof(led_name_len[led_index]);
+
+        data_size += sizeof(leds[led_index].value);
+    }
+
+    data_size += sizeof(num_colors);
+    data_size += num_colors * sizeof(RGBColor);
+
+    /*---------------------------------------------------------*\
+    | Create data buffer                                        |
+    \*---------------------------------------------------------*/
+    unsigned char *data_buf = new unsigned char[data_size];
+
+    /*---------------------------------------------------------*\
+    | Copy in data size                                         |
+    \*---------------------------------------------------------*/
+    memcpy(&data_buf[data_ptr], &data_size, sizeof(data_size));
+    data_ptr += sizeof(data_size);
+
+    /*---------------------------------------------------------*\
+    | Copy in type                                              |
+    \*---------------------------------------------------------*/
+    memcpy(&data_buf[data_ptr], &type, sizeof(device_type));
+    data_ptr += sizeof(device_type);
+
+    /*---------------------------------------------------------*\
+    | Copy in name (size+data)                                  |
+    \*---------------------------------------------------------*/
+    memcpy(&data_buf[data_ptr], &name_len, sizeof(unsigned short));
+    data_ptr += sizeof(unsigned short);
+
+    strcpy((char *)&data_buf[data_ptr], name.c_str());
+    data_ptr += name_len;
+
+    /*---------------------------------------------------------*\
+    | Copy in description (size+data)                           |
+    \*---------------------------------------------------------*/
+    memcpy(&data_buf[data_ptr], &description_len, sizeof(unsigned short));
+    data_ptr += sizeof(unsigned short);
+
+    strcpy((char *)&data_buf[data_ptr], description.c_str());
+    data_ptr += description_len;
+    
+    /*---------------------------------------------------------*\
+    | Copy in version (size+data)                               |
+    \*---------------------------------------------------------*/
+    memcpy(&data_buf[data_ptr], &version_len, sizeof(unsigned short));
+    data_ptr += sizeof(unsigned short);
+
+    strcpy((char *)&data_buf[data_ptr], version.c_str());
+    data_ptr += version_len;
+
+    /*---------------------------------------------------------*\
+    | Copy in serial (size+data)                                |
+    \*---------------------------------------------------------*/
+    memcpy(&data_buf[data_ptr], &serial_len, sizeof(unsigned short));
+    data_ptr += sizeof(unsigned short);
+
+    strcpy((char *)&data_buf[data_ptr], serial.c_str());
+    data_ptr += serial_len;
+
+    /*---------------------------------------------------------*\
+    | Copy in location (size+data)                              |
+    \*---------------------------------------------------------*/
+    memcpy(&data_buf[data_ptr], &location_len, sizeof(unsigned short));
+    data_ptr += sizeof(unsigned short);
+
+    strcpy((char *)&data_buf[data_ptr], location.c_str());
+    data_ptr += location_len;
+
+    /*---------------------------------------------------------*\
+    | Copy in number of modes (data)                            |
+    \*---------------------------------------------------------*/
+    memcpy(&data_buf[data_ptr], &num_modes, sizeof(unsigned short));
+    data_ptr += sizeof(unsigned short);
+
+    /*---------------------------------------------------------*\
+    | Copy in active mode (data)                                |
+    \*---------------------------------------------------------*/
+    memcpy(&data_buf[data_ptr], &active_mode, sizeof(active_mode));
+    data_ptr += sizeof(active_mode);
+
+    /*---------------------------------------------------------*\
+    | Copy in modes                                             |
+    \*---------------------------------------------------------*/
+    for(int mode_index = 0; mode_index < num_modes; mode_index++)
+    {
+        /*---------------------------------------------------------*\
+        | Copy in mode name (size+data)                             |
+        \*---------------------------------------------------------*/
+        memcpy(&data_buf[data_ptr], &mode_name_len[mode_index], sizeof(unsigned short));
+        data_ptr += sizeof(unsigned short);
+
+        strcpy((char *)&data_buf[data_ptr], modes[mode_index].name.c_str());
+        data_ptr += mode_name_len[mode_index];
+
+        /*---------------------------------------------------------*\
+        | Copy in mode value (data)                                 |
+        \*---------------------------------------------------------*/
+        memcpy(&data_buf[data_ptr], &modes[mode_index].value, sizeof(modes[mode_index].value));
+        data_ptr += sizeof(modes[mode_index].value);
+
+        /*---------------------------------------------------------*\
+        | Copy in mode flags (data)                                 |
+        \*---------------------------------------------------------*/
+        memcpy(&data_buf[data_ptr], &modes[mode_index].flags, sizeof(modes[mode_index].flags));
+        data_ptr += sizeof(modes[mode_index].flags);
+
+        /*---------------------------------------------------------*\
+        | Copy in mode speed_min (data)                             |
+        \*---------------------------------------------------------*/
+        memcpy(&data_buf[data_ptr], &modes[mode_index].speed_min, sizeof(modes[mode_index].speed_min));
+        data_ptr += sizeof(modes[mode_index].speed_min);
+
+        /*---------------------------------------------------------*\
+        | Copy in mode speed_max (data)                             |
+        \*---------------------------------------------------------*/
+        memcpy(&data_buf[data_ptr], &modes[mode_index].speed_max, sizeof(modes[mode_index].speed_max));
+        data_ptr += sizeof(modes[mode_index].speed_max);
+
+        /*---------------------------------------------------------*\
+        | Copy in mode colors_min (data)                            |
+        \*---------------------------------------------------------*/
+        memcpy(&data_buf[data_ptr], &modes[mode_index].colors_min, sizeof(modes[mode_index].colors_min));
+        data_ptr += sizeof(modes[mode_index].colors_min);
+
+        /*---------------------------------------------------------*\
+        | Copy in mode colors_max (data)                            |
+        \*---------------------------------------------------------*/
+        memcpy(&data_buf[data_ptr], &modes[mode_index].colors_max, sizeof(modes[mode_index].colors_max));
+        data_ptr += sizeof(modes[mode_index].colors_max);
+
+        /*---------------------------------------------------------*\
+        | Copy in mode speed (data)                                 |
+        \*---------------------------------------------------------*/
+        memcpy(&data_buf[data_ptr], &modes[mode_index].speed, sizeof(modes[mode_index].speed));
+        data_ptr += sizeof(modes[mode_index].speed);
+
+        /*---------------------------------------------------------*\
+        | Copy in mode direction (data)                             |
+        \*---------------------------------------------------------*/
+        memcpy(&data_buf[data_ptr], &modes[mode_index].direction, sizeof(modes[mode_index].direction));
+        data_ptr += sizeof(modes[mode_index].direction);
+
+        /*---------------------------------------------------------*\
+        | Copy in mode color_mode (data)                            |
+        \*---------------------------------------------------------*/
+        memcpy(&data_buf[data_ptr], &modes[mode_index].color_mode, sizeof(modes[mode_index].color_mode));
+        data_ptr += sizeof(modes[mode_index].color_mode);
+
+        /*---------------------------------------------------------*\
+        | Copy in mode number of colors                             |
+        \*---------------------------------------------------------*/
+        memcpy(&data_buf[data_ptr], &mode_num_colors[mode_index], sizeof(unsigned short));
+        data_ptr += sizeof(unsigned short);
+
+        /*---------------------------------------------------------*\
+        | Copy in mode mode colors                                  |
+        \*---------------------------------------------------------*/
+        for(int color_index = 0; color_index < mode_num_colors[mode_index]; color_index++)
+        {
+            /*---------------------------------------------------------*\
+            | Copy in color (data)                                      |
+            \*---------------------------------------------------------*/
+            memcpy(&data_buf[data_ptr], &modes[mode_index].colors[color_index], sizeof(modes[mode_index].colors[color_index]));
+            data_ptr += sizeof(modes[mode_index].colors[color_index]);
+        }
+    }
+
+    /*---------------------------------------------------------*\
+    | Copy in number of zones (data)                            |
+    \*---------------------------------------------------------*/
+    memcpy(&data_buf[data_ptr], &num_zones, sizeof(unsigned short));
+    data_ptr += sizeof(unsigned short);
+
+    /*---------------------------------------------------------*\
+    | Copy in zones                                             |
+    \*---------------------------------------------------------*/
+    for(int zone_index = 0; zone_index < num_zones; zone_index++)
+    {
+        /*---------------------------------------------------------*\
+        | Copy in zone name (size+data)                             |
+        \*---------------------------------------------------------*/
+        memcpy(&data_buf[data_ptr], &zone_name_len[zone_index], sizeof(unsigned short));
+        data_ptr += sizeof(unsigned short);
+
+        strcpy((char *)&data_buf[data_ptr], zones[zone_index].name.c_str());
+        data_ptr += zone_name_len[zone_index];
+
+        /*---------------------------------------------------------*\
+        | Copy in zone type (data)                                  |
+        \*---------------------------------------------------------*/
+        memcpy(&data_buf[data_ptr], &zones[zone_index].type, sizeof(zones[zone_index].type));
+        data_ptr += sizeof(zones[zone_index].type);
+
+        /*---------------------------------------------------------*\
+        | Copy in zone minimum LED count (data)                     |
+        \*---------------------------------------------------------*/
+        memcpy(&data_buf[data_ptr], &zones[zone_index].leds_min, sizeof(zones[zone_index].leds_min));
+        data_ptr += sizeof(zones[zone_index].leds_min);
+
+        /*---------------------------------------------------------*\
+        | Copy in zone maximum LED count (data)                     |
+        \*---------------------------------------------------------*/
+        memcpy(&data_buf[data_ptr], &zones[zone_index].leds_max, sizeof(zones[zone_index].leds_max));
+        data_ptr += sizeof(zones[zone_index].leds_max);
+
+        /*---------------------------------------------------------*\
+        | Copy in zone LED count (data)                             |
+        \*---------------------------------------------------------*/
+        memcpy(&data_buf[data_ptr], &zones[zone_index].leds_count, sizeof(zones[zone_index].leds_count));
+        data_ptr += sizeof(zones[zone_index].leds_count);
+    }
+
+    /*---------------------------------------------------------*\
+    | Copy in number of LEDs (data)                             |
+    \*---------------------------------------------------------*/
+    memcpy(&data_buf[data_ptr], &num_leds, sizeof(unsigned short));
+    data_ptr += sizeof(unsigned short);
+
+    /*---------------------------------------------------------*\
+    | Copy in LEDs                                              |
+    \*---------------------------------------------------------*/
+    for(int led_index = 0; led_index < num_leds; led_index++)
+    {
+        /*---------------------------------------------------------*\
+        | Copy in LED name (size+data)                              |
+        \*---------------------------------------------------------*/
+        unsigned short ledname_len = strlen(leds[led_index].name.c_str()) + 1;
+        memcpy(&data_buf[data_ptr], &ledname_len, sizeof(unsigned short));
+        data_ptr += sizeof(unsigned short);
+
+        strcpy((char *)&data_buf[data_ptr], leds[led_index].name.c_str());
+        data_ptr += ledname_len;
+
+        /*---------------------------------------------------------*\
+        | Copy in LED value (data)                                  |
+        \*---------------------------------------------------------*/
+        memcpy(&data_buf[data_ptr], &leds[led_index].value, sizeof(leds[led_index].value));
+        data_ptr += sizeof(leds[led_index].value);
+    }
+
+    /*---------------------------------------------------------*\
+    | Copy in number of colors (data)                           |
+    \*---------------------------------------------------------*/
+    memcpy(&data_buf[data_ptr], &num_colors, sizeof(unsigned short));
+    data_ptr += sizeof(unsigned short);
+
+    /*---------------------------------------------------------*\
+    | Copy in colors                                            |
+    \*---------------------------------------------------------*/
+    for(int color_index = 0; color_index < num_colors; color_index++)
+    {
+        /*---------------------------------------------------------*\
+        | Copy in color (data)                                      |
+        \*---------------------------------------------------------*/
+        memcpy(&data_buf[data_ptr], &colors[color_index], sizeof(colors[color_index]));
+        data_ptr += sizeof(colors[color_index]);
+    }
+
+
+    delete[] mode_name_len;
+    delete[] zone_name_len;
+    delete[] led_name_len;
+
+    delete[] mode_num_colors;
+
+    return(data_buf);
+}
+
+void RGBController::ReadDeviceDescription(unsigned char* data_buf)
+{
+    unsigned int data_ptr = 0;
+
+    data_ptr += sizeof(unsigned int);
+
+    /*---------------------------------------------------------*\
+    | Copy in type                                              |
+    \*---------------------------------------------------------*/
+    memcpy(&type, &data_buf[data_ptr], sizeof(device_type));
+    data_ptr += sizeof(device_type);
+
+    /*---------------------------------------------------------*\
+    | Copy in name                                              |
+    \*---------------------------------------------------------*/
+    unsigned short name_len;
+    memcpy(&name_len, &data_buf[data_ptr], sizeof(unsigned short));
+    data_ptr += sizeof(unsigned short);
+
+    name = (char *)&data_buf[data_ptr];
+    data_ptr += name_len;
+
+    /*---------------------------------------------------------*\
+    | Copy in description                                       |
+    \*---------------------------------------------------------*/
+    unsigned short description_len;
+    memcpy(&description_len, &data_buf[data_ptr], sizeof(unsigned short));
+    data_ptr += sizeof(unsigned short);
+
+    description = (char *)&data_buf[data_ptr];
+    data_ptr += description_len;
+
+    /*---------------------------------------------------------*\
+    | Copy in version                                           |
+    \*---------------------------------------------------------*/
+    unsigned short version_len;
+    memcpy(&version_len, &data_buf[data_ptr], sizeof(unsigned short));
+    data_ptr += sizeof(unsigned short);
+
+    version = (char *)&data_buf[data_ptr];
+    data_ptr += version_len;
+    
+    /*---------------------------------------------------------*\
+    | Copy in serial                                            |
+    \*---------------------------------------------------------*/
+    unsigned short serial_len;
+    memcpy(&serial_len, &data_buf[data_ptr], sizeof(unsigned short));
+    data_ptr += sizeof(unsigned short);
+
+    serial = (char *)&data_buf[data_ptr];
+    data_ptr += serial_len;
+
+    /*---------------------------------------------------------*\
+    | Copy in location                                          |
+    \*---------------------------------------------------------*/
+    unsigned short location_len;
+    memcpy(&location_len, &data_buf[data_ptr], sizeof(unsigned short));
+    data_ptr += sizeof(unsigned short);
+
+    location = (char *)&data_buf[data_ptr];
+    data_ptr += location_len;
+
+    /*---------------------------------------------------------*\
+    | Copy in number of modes (data)                            |
+    \*---------------------------------------------------------*/
+    unsigned short num_modes;
+    memcpy(&num_modes, &data_buf[data_ptr], sizeof(unsigned short));
+    data_ptr += sizeof(unsigned short);
+
+    /*---------------------------------------------------------*\
+    | Copy in active mode (data)                                |
+    \*---------------------------------------------------------*/
+    memcpy(&active_mode, &data_buf[data_ptr], sizeof(active_mode));
+    data_ptr += sizeof(active_mode);
+
+    /*---------------------------------------------------------*\
+    | Copy in modes                                             |
+    \*---------------------------------------------------------*/
+    for(int mode_index = 0; mode_index < num_modes; mode_index++)
+    {
+        mode new_mode;
+
+        /*---------------------------------------------------------*\
+        | Copy in mode name (size+data)                             |
+        \*---------------------------------------------------------*/
+        unsigned short modename_len;
+        memcpy(&modename_len, &data_buf[data_ptr], sizeof(unsigned short));
+        data_ptr += sizeof(unsigned short);
+
+        new_mode.name = (char *)&data_buf[data_ptr];
+        data_ptr += modename_len;
+
+        /*---------------------------------------------------------*\
+        | Copy in mode value (data)                                 |
+        \*---------------------------------------------------------*/
+        memcpy(&new_mode.value, &data_buf[data_ptr], sizeof(new_mode.value));
+        data_ptr += sizeof(new_mode.value);
+
+        /*---------------------------------------------------------*\
+        | Copy in mode flags (data)                                 |
+        \*---------------------------------------------------------*/
+        memcpy(&new_mode.flags, &data_buf[data_ptr], sizeof(new_mode.flags));
+        data_ptr += sizeof(new_mode.flags);
+
+        /*---------------------------------------------------------*\
+        | Copy in mode speed_min (data)                             |
+        \*---------------------------------------------------------*/
+        memcpy(&new_mode.speed_min, &data_buf[data_ptr], sizeof(new_mode.speed_min));
+        data_ptr += sizeof(new_mode.speed_min);
+
+        /*---------------------------------------------------------*\
+        | Copy in mode speed_max (data)                             |
+        \*---------------------------------------------------------*/
+        memcpy(&new_mode.speed_max, &data_buf[data_ptr], sizeof(new_mode.speed_max));
+        data_ptr += sizeof(new_mode.speed_max);
+
+        /*---------------------------------------------------------*\
+        | Copy in mode colors_min (data)                            |
+        \*---------------------------------------------------------*/
+        memcpy(&new_mode.colors_min, &data_buf[data_ptr], sizeof(new_mode.colors_min));
+        data_ptr += sizeof(new_mode.colors_min);
+
+        /*---------------------------------------------------------*\
+        | Copy in mode colors_max (data)                            |
+        \*---------------------------------------------------------*/
+        memcpy(&new_mode.colors_max, &data_buf[data_ptr], sizeof(new_mode.colors_max));
+        data_ptr += sizeof(new_mode.colors_max);
+
+        /*---------------------------------------------------------*\
+        | Copy in mode speed (data)                                 |
+        \*---------------------------------------------------------*/
+        memcpy(&new_mode.speed, &data_buf[data_ptr], sizeof(new_mode.speed));
+        data_ptr += sizeof(new_mode.speed);
+
+        /*---------------------------------------------------------*\
+        | Copy in mode direction (data)                             |
+        \*---------------------------------------------------------*/
+        memcpy(&new_mode.direction, &data_buf[data_ptr], sizeof(new_mode.direction));
+        data_ptr += sizeof(new_mode.direction);
+
+        /*---------------------------------------------------------*\
+        | Copy in mode color_mode (data)                            |
+        \*---------------------------------------------------------*/
+        memcpy(&new_mode.color_mode, &data_buf[data_ptr], sizeof(new_mode.color_mode));
+        data_ptr += sizeof(new_mode.color_mode);
+
+        /*---------------------------------------------------------*\
+        | Copy in mode number of colors                             |
+        \*---------------------------------------------------------*/
+        unsigned short mode_num_colors;
+        memcpy(&mode_num_colors, &data_buf[data_ptr], sizeof(unsigned short));
+        data_ptr += sizeof(unsigned short);
+
+        /*---------------------------------------------------------*\
+        | Copy in mode mode colors                                  |
+        \*---------------------------------------------------------*/
+        for(int color_index = 0; color_index < mode_num_colors; color_index++)
+        {
+            /*---------------------------------------------------------*\
+            | Copy in color (data)                                      |
+            \*---------------------------------------------------------*/
+            RGBColor new_color;
+            memcpy(&new_color, &data_buf[data_ptr], sizeof(RGBColor));
+            data_ptr += sizeof(modes[mode_index].colors[color_index]);
+
+            new_mode.colors.push_back(new_color);
+        }
+
+        modes.push_back(new_mode);
+    }
+
+    /*---------------------------------------------------------*\
+    | Copy in number of zones (data)                            |
+    \*---------------------------------------------------------*/
+    unsigned short num_zones;
+    memcpy(&num_zones, &data_buf[data_ptr], sizeof(unsigned short));
+    data_ptr += sizeof(unsigned short);
+
+    /*---------------------------------------------------------*\
+    | Copy in zones                                             |
+    \*---------------------------------------------------------*/
+    for(int zone_index = 0; zone_index < num_zones; zone_index++)
+    {
+        zone new_zone;
+
+        /*---------------------------------------------------------*\
+        | Copy in zone name (size+data)                             |
+        \*---------------------------------------------------------*/
+        unsigned short zonename_len;
+        memcpy(&zonename_len, &data_buf[data_ptr], sizeof(unsigned short));
+        data_ptr += sizeof(unsigned short);
+
+        new_zone.name = (char *)&data_buf[data_ptr];
+        data_ptr += zonename_len;
+
+        /*---------------------------------------------------------*\
+        | Copy in zone type (data)                                  |
+        \*---------------------------------------------------------*/
+        memcpy(&new_zone.type, &data_buf[data_ptr], sizeof(new_zone.type));
+        data_ptr += sizeof(new_zone.type);
+
+        /*---------------------------------------------------------*\
+        | Copy in zone minimum LED count (data)                     |
+        \*---------------------------------------------------------*/
+        memcpy(&new_zone.leds_min, &data_buf[data_ptr], sizeof(new_zone.leds_min));
+        data_ptr += sizeof(new_zone.leds_min);
+
+        /*---------------------------------------------------------*\
+        | Copy in zone maximum LED count (data)                     |
+        \*---------------------------------------------------------*/
+        memcpy(&new_zone.leds_max, &data_buf[data_ptr], sizeof(new_zone.leds_max));
+        data_ptr += sizeof(new_zone.leds_max);
+
+        /*---------------------------------------------------------*\
+        | Copy in zone LED count (data)                             |
+        \*---------------------------------------------------------*/
+        memcpy(&new_zone.leds_count, &data_buf[data_ptr], sizeof(new_zone.leds_count));
+        data_ptr += sizeof(new_zone.leds_count);
+
+        zones.push_back(new_zone);
+    }
+
+    /*---------------------------------------------------------*\
+    | Copy in number of LEDs (data)                             |
+    \*---------------------------------------------------------*/
+    unsigned short num_leds;
+    memcpy(&num_leds, &data_buf[data_ptr], sizeof(unsigned short));
+    data_ptr += sizeof(unsigned short);
+
+    /*---------------------------------------------------------*\
+    | Copy in LEDs                                              |
+    \*---------------------------------------------------------*/
+    for(int led_index = 0; led_index < num_leds; led_index++)
+    {
+        led new_led;
+
+        /*---------------------------------------------------------*\
+        | Copy in LED name (size+data)                              |
+        \*---------------------------------------------------------*/
+        unsigned short ledname_len;
+        memcpy(&ledname_len, &data_buf[data_ptr], sizeof(unsigned short));
+        data_ptr += sizeof(unsigned short);
+
+        new_led.name = (char *)&data_buf[data_ptr];
+        data_ptr += ledname_len;
+
+        /*---------------------------------------------------------*\
+        | Copy in LED value (data)                                  |
+        \*---------------------------------------------------------*/
+        memcpy(&new_led.value, &data_buf[data_ptr], sizeof(new_led.value));
+        data_ptr += sizeof(new_led.value);
+
+        leds.push_back(new_led);
+    }
+
+    /*---------------------------------------------------------*\
+    | Copy in number of colors (data)                           |
+    \*---------------------------------------------------------*/
+    unsigned short num_colors;
+    memcpy(&num_colors, &data_buf[data_ptr], sizeof(unsigned short));
+    data_ptr += sizeof(unsigned short);
+
+    /*---------------------------------------------------------*\
+    | Copy in colors                                            |
+    \*---------------------------------------------------------*/
+    for(int color_index = 0; color_index < num_colors; color_index++)
+    {
+        RGBColor new_color;
+
+        /*---------------------------------------------------------*\
+        | Copy in color (data)                                      |
+        \*---------------------------------------------------------*/
+        memcpy(&new_color, &data_buf[data_ptr], sizeof(RGBColor));
+        data_ptr += sizeof(RGBColor);
+
+        colors.push_back(new_color);
+    }
+}
+
+void RGBController::SetupColors()
+{
+    unsigned int total_led_count;
+
+    /*---------------------------------------------------------*\
+    | Determine total number of LEDs on the device              |
+    \*---------------------------------------------------------*/
+    total_led_count = 0;
+
+    for(std::size_t zone_idx = 0; zone_idx < zones.size(); zone_idx++)
+    {
+        total_led_count += zones[zone_idx].leds_count;
+    }
+
+    /*---------------------------------------------------------*\
+    | Set the size of the color buffer to the number of LEDs    |
+    \*---------------------------------------------------------*/
+    colors.resize(total_led_count);
+
+    /*---------------------------------------------------------*\
+    | Set the color buffer pointers on each zone                |
+    \*---------------------------------------------------------*/
+    total_led_count = 0;
+
+    for(std::size_t zone_idx = 0; zone_idx < zones.size(); zone_idx++)
+    {
+        zones[zone_idx].start_idx=total_led_count;
+
+        if((colors.size() > 0) && (zones[zone_idx].leds_count > 0))
+        {
+            zones[zone_idx].colors = &colors[total_led_count];
+        }
+        else
+        {
+            zones[zone_idx].colors = NULL;
+        }
+
+        if((leds.size() > 0) && (zones[zone_idx].leds_count > 0))
+        {
+            zones[zone_idx].leds   = &leds[total_led_count];
+        }
+        else
+        {
+            zones[zone_idx].leds    = NULL;
+        }
+
+
+        total_led_count += zones[zone_idx].leds_count;
+    }
+}
+
+RGBColor RGBController::GetLED(unsigned int led)
 {
     if(led < colors.size())
     {
@@ -12,7 +686,7 @@ RGBColor RGBController::GetLED(int led)
     }
 }
 
-void RGBController::SetLED(int led, RGBColor color)
+void RGBController::SetLED(unsigned int led, RGBColor color)
 {
     if(led < colors.size())
     {
@@ -24,9 +698,9 @@ void RGBController::SetLED(int led, RGBColor color)
 
 void RGBController::SetAllLEDs(RGBColor color)
 {
-    for(int led = 0; led < colors.size(); led++)
+    for(std::size_t zone_idx = 0; zone_idx < zones.size(); zone_idx++)
     {
-        colors[led] = color;
+        SetAllZoneLEDs(zone_idx, color);
     }
 
     UpdateLEDs();
@@ -34,12 +708,9 @@ void RGBController::SetAllLEDs(RGBColor color)
 
 void RGBController::SetAllZoneLEDs(int zone, RGBColor color)
 {
-    for (std::size_t x = 0; x < zones[zone].map.size(); x++)
+    for (std::size_t color_idx = 0; color_idx < zones[zone].leds_count; color_idx++)
     {
-        for (std::size_t y = 0; y < zones[zone].map[x].size(); y++)
-        {
-            colors[zones[zone].map[x][y]] = color;
-        }
+        zones[zone].colors[color_idx] = color;
     }
 
     UpdateZoneLEDs(zone);
@@ -55,4 +726,31 @@ void RGBController::SetMode(int mode)
     active_mode = mode;
 
     UpdateMode();
-}
+}
+
+std::string device_type_to_str(device_type type)
+{
+    switch(type)
+    {
+    case DEVICE_TYPE_MOTHERBOARD:
+        return "Motherboard";
+    case DEVICE_TYPE_DRAM:
+        return "DRAM";
+    case DEVICE_TYPE_GPU:
+        return "GPU";
+    case DEVICE_TYPE_COOLER:
+        return "Cooler";
+    case DEVICE_TYPE_LEDSTRIP:
+        return "LED Strip";
+    case DEVICE_TYPE_KEYBOARD:
+        return "Keyboard";
+    case DEVICE_TYPE_MOUSE:
+        return "Mouse";
+    case DEVICE_TYPE_MOUSEMAT:
+        return "Mousemat";
+    case DEVICE_TYPE_HEADSET:
+        return "Headset";
+    default:
+        return "Unknown";
+    }
+}

RGBController/RGBController.h

@@ -25,14 +25,14 @@ typedef unsigned int RGBColor;
 \*------------------------------------------------------------------*/
 enum
 {
-    MODE_FLAG_HAS_SPEED         = (1 << 0), /* Mode has speed parameter         */
-    MODE_FLAG_HAS_DIRECTION_LR  = (1 << 1), /* Mode has left/right parameter    */
-    MODE_FLAG_HAS_DIRECTION_UD  = (1 << 2), /* Mode has up/down parameter       */
-    MODE_FLAG_HAS_DIRECTION_HV  = (1 << 3), /* Mode has horiz/vert parameter    */
-    MODE_FLAG_HAS_BRIGHTNESS    = (1 << 4), /* Mode has brightness parameter    */
-    MODE_FLAG_HAS_COLOR         = (1 << 5), /* Mode has custom color parameter  */
-    MODE_FLAG_RANDOM_COLOR      = (1 << 6), /* Mode has random color option     */
-    MODE_FLAG_PER_LED_COLOR     = (1 << 7), /* Mode uses device LED colors      */
+    MODE_FLAG_HAS_SPEED                 = (1 << 0), /* Mode has speed parameter         */
+    MODE_FLAG_HAS_DIRECTION_LR          = (1 << 1), /* Mode has left/right parameter    */
+    MODE_FLAG_HAS_DIRECTION_UD          = (1 << 2), /* Mode has up/down parameter       */
+    MODE_FLAG_HAS_DIRECTION_HV          = (1 << 3), /* Mode has horiz/vert parameter    */
+    MODE_FLAG_HAS_BRIGHTNESS            = (1 << 4), /* Mode has brightness parameter    */
+    MODE_FLAG_HAS_PER_LED_COLOR         = (1 << 5), /* Mode has per-LED colors          */
+    MODE_FLAG_HAS_MODE_SPECIFIC_COLOR   = (1 << 6), /* Mode has mode specific colors    */
+    MODE_FLAG_HAS_RANDOM_COLOR          = (1 << 7), /* Mode has random color option     */
 };
 
 /*------------------------------------------------------------------*\
@@ -48,6 +48,14 @@ enum
     MODE_DIRECTION_VERTICAL     = 5,        /* Mode direction vertical          */
 };
 
+enum
+{
+    MODE_COLORS_NONE            = 0,        /* Mode has no colors               */
+    MODE_COLORS_PER_LED         = 1,        /* Mode has per LED colors selected */
+    MODE_COLORS_MODE_SPECIFIC   = 2,        /* Mode specific colors selected    */
+    MODE_COLORS_RANDOM          = 3,        /* Mode has random colors selected  */
+};
+
 /*------------------------------------------------------------------*\
 | Mode Type                                                          |
 \*------------------------------------------------------------------*/
@@ -61,18 +69,23 @@ typedef struct
     unsigned int        flags;  /* Mode flags bitfield              */
     unsigned int        speed_min;  /* speed minimum value          */
     unsigned int        speed_max;  /* speed maximum value          */
+    unsigned int        colors_min; /* minimum number of mode colors*/
+    unsigned int        colors_max; /* maximum numver of mode colors*/
     
     /*--------------------------------------------------------------*\
     | Mode Settings                                                  |
     \*--------------------------------------------------------------*/
     unsigned int        speed;  /* Mode speed parameter value       */
     unsigned int        direction;  /* Mode direction value         */
-    bool                random; /* Random color mode enabled        */
+    unsigned int        color_mode; /* Mode color selection         */
+    std::vector<RGBColor>
+                        colors; /* mode-specific colors             */
 } mode;
 
 typedef struct
 {
-    std::string         name;   /* LED name         */
+    std::string         name;   /* LED name                     */
+    unsigned int        value;  /* Device-specific LED value    */
 } led;
 
 typedef int zone_type;
@@ -100,12 +113,18 @@ enum
     DEVICE_TYPE_UNKNOWN
 };
 
+std::string device_type_to_str(device_type type);
+
 typedef struct
 {
-    std::string         name;   /* Zone name        */
-	zone_type           type;   /* Zone type        */
-    std::vector<std::vector<int>>
-                        map;    /* LED index map    */
+    std::string             name;           /* Zone name                */
+    zone_type               type;           /* Zone type                */
+    led *                   leds;           /* List of LEDs in zone     */
+    RGBColor *              colors;         /* Colors of LEDs in zone   */
+    unsigned int            start_idx;      /* Start index of led/color */
+    unsigned int            leds_count;     /* Number of LEDs in zone   */
+    unsigned int            leds_min;       /* Minimum number of LEDs   */
+    unsigned int            leds_max;       /* Maximum number of LEDs   */
 } zone;
 
 class RGBController
@@ -128,17 +147,26 @@ public:
     /*---------------------------------------------------------*\
     | Generic functions implemented in RGBController.cpp        |
     \*---------------------------------------------------------*/
-    RGBColor                GetLED(int led);
-    void                    SetLED(int led, RGBColor color);
+    void                    SetupColors();
+
+    RGBColor                GetLED(unsigned int led);
+    void                    SetLED(unsigned int led, RGBColor color);
     void                    SetAllLEDs(RGBColor color);
     void                    SetAllZoneLEDs(int zone, RGBColor color);
 
     int                     GetMode();
     void                    SetMode(int mode);
 
+    unsigned char *         GetDeviceDescription();
+    void                    ReadDeviceDescription(unsigned char* data_buf);
+
     /*---------------------------------------------------------*\
     | Functions to be implemented in device implementation      |
     \*---------------------------------------------------------*/
+    virtual void            SetupZones()                                = 0;
+
+    virtual void            ResizeZone(int zone, int new_size)          = 0;
+
     virtual void            UpdateLEDs()                                = 0;
     virtual void            UpdateZoneLEDs(int zone)                    = 0;
     virtual void            UpdateSingleLED(int led)                    = 0;

RGBController/RGBController_AMDWraithPrism.cpp

@@ -18,110 +18,73 @@ RGBController_AMDWraithPrism::RGBController_AMDWraithPrism(AMDWraithPrismControl
     version = wraith->GetFirmwareVersionString();
 
     mode Static;
-    Static.name   = "Static";
-    Static.value  = AMD_WRAITH_PRISM_EFFECT_CHANNEL_STATIC;
-    Static.flags  = MODE_FLAG_HAS_COLOR | MODE_FLAG_PER_LED_COLOR;
-    Static.random = false;
+    Static.name       = "Static";
+    Static.value      = AMD_WRAITH_PRISM_EFFECT_CHANNEL_STATIC;
+    Static.flags      = MODE_FLAG_HAS_PER_LED_COLOR;
+    Static.color_mode = MODE_COLORS_PER_LED;
     modes.push_back(Static);
 
     mode Breathing;
-    Breathing.name      = "Breathing";
-    Breathing.value     = AMD_WRAITH_PRISM_EFFECT_CHANNEL_BREATHING;
-    Breathing.flags     = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_COLOR | MODE_FLAG_PER_LED_COLOR | MODE_FLAG_RANDOM_COLOR;
-    Breathing.speed_min = AMD_WRAITH_PRISM_SPEED_SLOWEST;
-    Breathing.speed_max = AMD_WRAITH_PRISM_SPEED_FASTEST;
-    Breathing.random    = false;
-    Breathing.speed     = AMD_WRAITH_PRISM_SPEED_NORMAL;
+    Breathing.name       = "Breathing";
+    Breathing.value      = AMD_WRAITH_PRISM_EFFECT_CHANNEL_BREATHING;
+    Breathing.flags      = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_PER_LED_COLOR | MODE_FLAG_HAS_RANDOM_COLOR;
+    Breathing.speed_min  = AMD_WRAITH_PRISM_SPEED_SLOWEST;
+    Breathing.speed_max  = AMD_WRAITH_PRISM_SPEED_FASTEST;
+    Breathing.color_mode = MODE_COLORS_PER_LED;
+    Breathing.speed      = AMD_WRAITH_PRISM_SPEED_NORMAL;
     modes.push_back(Breathing);
 
     mode ColorCycle;
-    ColorCycle.name      = "Color Cycle";
-    ColorCycle.value     = AMD_WRAITH_PRISM_EFFECT_CHANNEL_COLOR_CYCLE;
-    ColorCycle.flags     = MODE_FLAG_HAS_SPEED;
-    ColorCycle.speed_min = AMD_WRAITH_PRISM_SPEED_SLOWEST;
-    ColorCycle.speed_max = AMD_WRAITH_PRISM_SPEED_FASTEST;
-    ColorCycle.random    = false;
-    ColorCycle.speed     = AMD_WRAITH_PRISM_SPEED_NORMAL;
+    ColorCycle.name       = "Color Cycle";
+    ColorCycle.value      = AMD_WRAITH_PRISM_EFFECT_CHANNEL_COLOR_CYCLE;
+    ColorCycle.flags      = MODE_FLAG_HAS_SPEED;
+    ColorCycle.speed_min  = AMD_WRAITH_PRISM_SPEED_SLOWEST;
+    ColorCycle.speed_max  = AMD_WRAITH_PRISM_SPEED_FASTEST;
+    ColorCycle.color_mode = MODE_COLORS_NONE;
+    ColorCycle.speed      = AMD_WRAITH_PRISM_SPEED_NORMAL;
     modes.push_back(ColorCycle);
 
     mode Rainbow;
-    Rainbow.name      = "Rainbow";
-    Rainbow.value     = AMD_WRAITH_PRISM_EFFECT_CHANNEL_RAINBOW;
-    Rainbow.flags     = MODE_FLAG_HAS_SPEED;
-    Rainbow.speed_min = AMD_WRAITH_PRISM_SPEED_SLOWEST;
-    Rainbow.speed_max = AMD_WRAITH_PRISM_SPEED_FASTEST;
-    Rainbow.random    = false;
-    Rainbow.speed     = AMD_WRAITH_PRISM_SPEED_NORMAL;
+    Rainbow.name       = "Rainbow";
+    Rainbow.value      = AMD_WRAITH_PRISM_EFFECT_CHANNEL_RAINBOW;
+    Rainbow.flags      = MODE_FLAG_HAS_SPEED;
+    Rainbow.speed_min  = AMD_WRAITH_PRISM_SPEED_SLOWEST;
+    Rainbow.speed_max  = AMD_WRAITH_PRISM_SPEED_FASTEST;
+    Rainbow.color_mode = MODE_COLORS_NONE;
+    Rainbow.speed      = AMD_WRAITH_PRISM_SPEED_NORMAL;
     modes.push_back(Rainbow);
 
     mode Bounce;
-    Bounce.name      = "Bounce";
-    Bounce.value     = AMD_WRAITH_PRISM_EFFECT_CHANNEL_BOUNCE;
-    Bounce.flags     = MODE_FLAG_HAS_SPEED;
-    Bounce.speed_min = AMD_WRAITH_PRISM_SPEED_SLOWEST;
-    Bounce.speed_max = AMD_WRAITH_PRISM_SPEED_FASTEST;
-    Bounce.random    = true;
-    Bounce.speed     = AMD_WRAITH_PRISM_SPEED_NORMAL;
+    Bounce.name       = "Bounce";
+    Bounce.value      = AMD_WRAITH_PRISM_EFFECT_CHANNEL_BOUNCE;
+    Bounce.flags      = MODE_FLAG_HAS_SPEED;
+    Bounce.speed_min  = AMD_WRAITH_PRISM_SPEED_SLOWEST;
+    Bounce.speed_max  = AMD_WRAITH_PRISM_SPEED_FASTEST;
+    Bounce.color_mode = MODE_COLORS_NONE;
+    Bounce.speed      = AMD_WRAITH_PRISM_SPEED_NORMAL;
     modes.push_back(Bounce);
 
     mode Chase;
-    Chase.name      = "Chase";
-    Chase.value     = AMD_WRAITH_PRISM_EFFECT_CHANNEL_CHASE;
-    Chase.flags     = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_COLOR | MODE_FLAG_PER_LED_COLOR | MODE_FLAG_RANDOM_COLOR;
-    Chase.speed_min = AMD_WRAITH_PRISM_SPEED_SLOWEST;
-    Chase.speed_max = AMD_WRAITH_PRISM_SPEED_FASTEST;
-    Chase.random    = false;
-    Chase.speed     = AMD_WRAITH_PRISM_SPEED_NORMAL;
+    Chase.name       = "Chase";
+    Chase.value      = AMD_WRAITH_PRISM_EFFECT_CHANNEL_CHASE;
+    Chase.flags      = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_PER_LED_COLOR | MODE_FLAG_HAS_RANDOM_COLOR;
+    Chase.speed_min  = AMD_WRAITH_PRISM_SPEED_SLOWEST;
+    Chase.speed_max  = AMD_WRAITH_PRISM_SPEED_FASTEST;
+    Chase.color_mode = MODE_COLORS_PER_LED;
+    Chase.speed      = AMD_WRAITH_PRISM_SPEED_NORMAL;
     modes.push_back(Chase);
 
     mode Swirl;
-    Swirl.name      = "Swirl";
-    Swirl.value     = AMD_WRAITH_PRISM_EFFECT_CHANNEL_SWIRL;
-    Swirl.flags     = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_COLOR | MODE_FLAG_PER_LED_COLOR | MODE_FLAG_RANDOM_COLOR;
-    Swirl.speed_min = AMD_WRAITH_PRISM_SPEED_SLOWEST;
-    Swirl.speed_max = AMD_WRAITH_PRISM_SPEED_FASTEST;
-    Swirl.random    = false;
-    Swirl.speed     = AMD_WRAITH_PRISM_SPEED_NORMAL;
+    Swirl.name       = "Swirl";
+    Swirl.value      = AMD_WRAITH_PRISM_EFFECT_CHANNEL_SWIRL;
+    Swirl.flags      = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_PER_LED_COLOR | MODE_FLAG_HAS_RANDOM_COLOR;
+    Swirl.speed_min  = AMD_WRAITH_PRISM_SPEED_SLOWEST;
+    Swirl.speed_max  = AMD_WRAITH_PRISM_SPEED_FASTEST;
+    Swirl.color_mode = MODE_COLORS_PER_LED;
+    Swirl.speed      = AMD_WRAITH_PRISM_SPEED_NORMAL;
     modes.push_back(Swirl);
 
-    led logo_led;
-    logo_led.name = "Logo";
-    leds.push_back(logo_led);
-    colors.push_back(0x00000000);
-
-    zone logo_zone;
-    logo_zone.name = "Logo";
-    logo_zone.type = ZONE_TYPE_SINGLE;
-    std::vector<int> logo_zone_map;
-    logo_zone_map.push_back(0);
-    logo_zone.map.push_back(logo_zone_map);
-    zones.push_back(logo_zone);
-
-    led fan_led;
-    fan_led.name = "Fan";
-    leds.push_back(fan_led);
-    colors.push_back(0x00000000);
-
-    zone fan_zone;
-    fan_zone.name = "Fan";
-    fan_zone.type = ZONE_TYPE_SINGLE;
-    std::vector<int> fan_zone_map;
-    fan_zone_map.push_back(1);
-    fan_zone.map.push_back(fan_zone_map);
-    zones.push_back(fan_zone);
-
-    led ring_led;
-    ring_led.name = "Ring";
-    leds.push_back(ring_led);
-    colors.push_back(0x00000000);
-
-    zone ring_zone;
-    ring_zone.name = "Ring";
-    ring_zone.type = ZONE_TYPE_SINGLE;
-    std::vector<int> ring_zone_map;
-    ring_zone_map.push_back(2);
-    ring_zone.map.push_back(ring_zone_map);
-    zones.push_back(ring_zone);   
+    SetupZones();
 }
 
 RGBController_AMDWraithPrism::~RGBController_AMDWraithPrism()
@@ -129,6 +92,60 @@ RGBController_AMDWraithPrism::~RGBController_AMDWraithPrism()
 
 }
 
+void RGBController_AMDWraithPrism::SetupZones()
+{
+    /*---------------------------------------------------------*\
+    | Set up zones                                              |
+    \*---------------------------------------------------------*/
+    zone logo_zone;
+    logo_zone.name          = "Logo";
+    logo_zone.type          = ZONE_TYPE_SINGLE;
+    logo_zone.leds_min      = 1;
+    logo_zone.leds_max      = 1;
+    logo_zone.leds_count    = 1;
+    zones.push_back(logo_zone);
+
+    zone fan_zone;
+    fan_zone.name           = "Fan";
+    fan_zone.type           = ZONE_TYPE_SINGLE;
+    fan_zone.leds_min       = 1;
+    fan_zone.leds_max       = 1;
+    fan_zone.leds_count     = 1;
+    zones.push_back(fan_zone);
+
+    zone ring_zone;
+    ring_zone.name          = "Ring";
+    ring_zone.type          = ZONE_TYPE_SINGLE;
+    ring_zone.leds_min      = 1;
+    ring_zone.leds_max      = 1;
+    ring_zone.leds_count    = 1;
+    zones.push_back(ring_zone);
+
+    /*---------------------------------------------------------*\
+    | Set up LEDs                                               |
+    \*---------------------------------------------------------*/
+    led logo_led;
+    logo_led.name = "Logo LED";
+    leds.push_back(logo_led);
+
+    led fan_led;
+    fan_led.name = "Fan LED";
+    leds.push_back(fan_led);
+
+    led ring_led;
+    ring_led.name = "Ring LED";
+    leds.push_back(ring_led);
+
+    SetupColors();
+}
+
+void RGBController_AMDWraithPrism::ResizeZone(int /*zone*/, int /*new_size*/)
+{
+    /*---------------------------------------------------------*\
+    | This device does not support resizing zones               |
+    \*---------------------------------------------------------*/
+}
+
 void RGBController_AMDWraithPrism::UpdateLEDs()
 {
     unsigned char red = RGBGetRValue(colors[0]);
@@ -175,40 +192,42 @@ void RGBController_AMDWraithPrism::UpdateSingleLED(int led)
 
 void RGBController_AMDWraithPrism::SetCustomMode()
 {
-    SetMode(0);
+    active_mode = 0;
 }
 
 void RGBController_AMDWraithPrism::UpdateMode()
 {
-    wraith->SetRingMode(modes[active_mode].value, modes[active_mode].speed, modes[active_mode].direction, modes[active_mode].random);
+    bool random = (modes[active_mode].color_mode == MODE_COLORS_RANDOM);
+
+    wraith->SetRingMode(modes[active_mode].value, modes[active_mode].speed, modes[active_mode].direction, random);
 
     switch(modes[active_mode].value)
     {
         case AMD_WRAITH_PRISM_EFFECT_CHANNEL_COLOR_CYCLE:
         case AMD_WRAITH_PRISM_EFFECT_CHANNEL_RAINBOW:
         case AMD_WRAITH_PRISM_EFFECT_CHANNEL_BOUNCE:
-            wraith->SetFanMode(AMD_WRAITH_PRISM_FAN_LOGO_MODE_COLOR_CYCLE, modes[active_mode].speed, modes[active_mode].random);
-            wraith->SetLogoMode(AMD_WRAITH_PRISM_FAN_LOGO_MODE_COLOR_CYCLE, modes[active_mode].speed, modes[active_mode].random);
+            wraith->SetFanMode(AMD_WRAITH_PRISM_FAN_LOGO_MODE_COLOR_CYCLE, modes[active_mode].speed, random);
+            wraith->SetLogoMode(AMD_WRAITH_PRISM_FAN_LOGO_MODE_COLOR_CYCLE, modes[active_mode].speed, random);
             break;
         
         case AMD_WRAITH_PRISM_EFFECT_CHANNEL_BREATHING:
-            wraith->SetFanMode(AMD_WRAITH_PRISM_FAN_LOGO_MODE_BREATHING, modes[active_mode].speed, modes[active_mode].random);
-            wraith->SetLogoMode(AMD_WRAITH_PRISM_FAN_LOGO_MODE_BREATHING, modes[active_mode].speed, modes[active_mode].random);
+            wraith->SetFanMode(AMD_WRAITH_PRISM_FAN_LOGO_MODE_BREATHING, modes[active_mode].speed, random);
+            wraith->SetLogoMode(AMD_WRAITH_PRISM_FAN_LOGO_MODE_BREATHING, modes[active_mode].speed, random);
             break;
 
         default:
-            if(modes[active_mode].random)
+            if(random)
             {
-                wraith->SetFanMode(AMD_WRAITH_PRISM_FAN_LOGO_MODE_COLOR_CYCLE, modes[active_mode].speed, modes[active_mode].random);
-                wraith->SetLogoMode(AMD_WRAITH_PRISM_FAN_LOGO_MODE_COLOR_CYCLE, modes[active_mode].speed, modes[active_mode].random);
+                wraith->SetFanMode(AMD_WRAITH_PRISM_FAN_LOGO_MODE_COLOR_CYCLE, modes[active_mode].speed, random);
+                wraith->SetLogoMode(AMD_WRAITH_PRISM_FAN_LOGO_MODE_COLOR_CYCLE, modes[active_mode].speed, random);
             }
             else
             {
-                wraith->SetFanMode(AMD_WRAITH_PRISM_FAN_LOGO_MODE_STATIC, modes[active_mode].speed, modes[active_mode].random);
-                wraith->SetLogoMode(AMD_WRAITH_PRISM_FAN_LOGO_MODE_STATIC, modes[active_mode].speed, modes[active_mode].random);
+                wraith->SetFanMode(AMD_WRAITH_PRISM_FAN_LOGO_MODE_STATIC, modes[active_mode].speed, random);
+                wraith->SetLogoMode(AMD_WRAITH_PRISM_FAN_LOGO_MODE_STATIC, modes[active_mode].speed, random);
             }
             break;
     }
 
     UpdateLEDs();
-}
+}

RGBController/RGBController_AMDWraithPrism.h

@@ -16,6 +16,11 @@ class RGBController_AMDWraithPrism : public RGBController
 public:
     RGBController_AMDWraithPrism(AMDWraithPrismController* wraith_ptr);
     ~RGBController_AMDWraithPrism();
+
+    void        SetupZones();
+
+    void        ResizeZone(int zone, int new_size);
+
     void        UpdateLEDs();
     void        UpdateZoneLEDs(int zone);
     void        UpdateSingleLED(int led);

RGBController/RGBController_AorusGPU.cpp

@@ -1,83 +0,0 @@
-/*-----------------------------------------*\
-|  RGBController_AorusGPU.cpp               |
-|                                           |
-|  Generic RGB Interface for OpenAuraSDK    |
-|  Aorus GPU                                |
-|                                           |
-|  Adam Honse (CalcProgrammer1) 6/17/2019   |
-\*-----------------------------------------*/
-
-#include "RGBController_AorusGPU.h"
-
-#include <Windows.h>
-
-static HMODULE handle;
-static unsigned char data[] = { 0x8E, 0x00, 0x00, 0x00,
-                                0x00, 0x00, 0x00, 0x00,
-                                0x40, 0x00, 0x00, 0x00,
-                                0x00, 0x00, 0x00, 0x00,
-                                0x04, 0x00, 0x00, 0x00,
-                                0x64, 0x00, 0x00, 0x00,
-                                0x01, 0x00, 0x00, 0x00 };
-
-void RGBController_AorusGPU::UpdateLEDs()
-{
-    RGBColor color = colors[0];
-    data[9] = RGBGetRValue(color);
-    data[10] = RGBGetGValue(color);
-    data[11] = RGBGetBValue(color);
-
-    GvWriteI2C(0x00000000, data, 0x00000000);
-}
-
-void RGBController_AorusGPU::UpdateZoneLEDs(int zone)
-{
-    UpdateLEDs();
-}
-
-void RGBController_AorusGPU::UpdateSingleLED(int led)
-{
-    UpdateLEDs();
-}
-
-RGBController_AorusGPU::RGBController_AorusGPU()
-{
-    name = "Aorus GPU";
-    type = DEVICE_TYPE_GPU;
-
-    handle = LoadLibrary("GvDisplay.dll");
-
-    GvWriteI2C = (_GvWriteI2C)GetProcAddress(handle, "GvWriteI2C");
-    GvFreeDispLib = (_GvFreeDispLib)GetProcAddress(handle, "GvFreeDispLib");
-    GvInitDispLib = (_GvInitDispLib)GetProcAddress(handle, "GvInitDispLib");
-    
-    GvFreeDispLib();
-    GvInitDispLib();
-
-    colors.push_back(0x00000000);
-
-    mode aorus_mode;
-    aorus_mode.name = "Static";
-    modes.push_back(aorus_mode);
-
-    led aorus_led;
-    aorus_led.name = "GPU LED";
-    leds.push_back(aorus_led);
-
-    zone aorus_zone;
-    aorus_zone.name = "GPU LED";
-    std::vector<int> aorus_zone_map;
-    aorus_zone_map.push_back(0);
-    aorus_zone.map.push_back(aorus_zone_map);
-    zones.push_back(aorus_zone);
-}
-
-void RGBController_AorusGPU::SetCustomMode()
-{
-
-}
-
-void RGBController_AorusGPU::UpdateMode()
-{
-
-}

RGBController/RGBController_AorusGPU.h

@@ -1,33 +0,0 @@
-/*-----------------------------------------*\
-|  RGBController_AorusGPU.h                 |
-|                                           |
-|  Generic RGB Interface for OpenAuraSDK    |
-|  Aorus GPU                                |
-|                                           |
-|  Adam Honse (CalcProgrammer1) 6/17/2019   |
-\*-----------------------------------------*/
-
-#pragma once
-#include "RGBController.h"
-
-typedef unsigned int uint32;
-typedef uint32(*_GvWriteI2C)(uint32, void*, uint32);
-typedef void (*_GvFreeDispLib)();
-typedef void (*_GvInitDispLib)();
-
-class RGBController_AorusGPU : public RGBController
-{
-public:
-    RGBController_AorusGPU();
-    void        UpdateLEDs();
-    void        UpdateZoneLEDs(int zone);
-    void        UpdateSingleLED(int led);
-
-    void        SetCustomMode();
-    void        UpdateMode();
-
-private:
-    _GvWriteI2C GvWriteI2C;
-    _GvFreeDispLib GvFreeDispLib;
-    _GvInitDispLib GvInitDispLib;
-};

RGBController/RGBController_Aura.cpp

@@ -1,294 +0,0 @@
-/*-----------------------------------------*\
-|  RGBController_Aura.cpp                   |
-|                                           |
-|  Generic RGB Interface for OpenAuraSDK    |
-|  Asus Aura driver                         |
-|                                           |
-|  Adam Honse (CalcProgrammer1) 6/13/2019   |
-\*-----------------------------------------*/
-
-#include "RGBController_Aura.h"
-
-int RGBController_Aura::GetDeviceMode()
-{
-    int  dev_mode = aura->AuraRegisterRead(AURA_REG_MODE);
-    bool random   = false;
-
-    switch(dev_mode)
-    {
-    case AURA_MODE_SPECTRUM_CYCLE_CHASE:
-        dev_mode = AURA_MODE_CHASE;
-        random   = true;
-        break;
-
-    case AURA_MODE_SPECTRUM_CYCLE_BREATHING:
-        dev_mode = AURA_MODE_BREATHING;
-        random   = true;
-        break;
-
-    case AURA_MODE_SPECTRUM_CYCLE_CHASE_FADE:
-        dev_mode = AURA_MODE_CHASE_FADE;
-        random   = true;
-        break;
-    }
-
-    if (aura->AuraRegisterRead(AURA_REG_DIRECT))
-    {
-        dev_mode = 0xFFFF;
-    }
-
-    for(int mode = 0; mode < modes.size(); mode++)
-    {
-        if(modes[mode].value == dev_mode)
-        {
-            active_mode        = mode;
-            modes[mode].random = random;
-        }
-    }
-
-    return(active_mode);
-}
-
-void RGBController_Aura::UpdateLEDs()
-{
-    for(std::size_t led = 0; led < colors.size(); led++)
-    {
-        unsigned char red = RGBGetRValue(colors[led]);
-        unsigned char grn = RGBGetGValue(colors[led]);
-        unsigned char blu = RGBGetBValue(colors[led]);
-
-        if (GetMode() == 0)
-        {
-            aura->SetLEDColorDirect(led, red, grn, blu);
-        }
-        else
-        {
-            aura->SetLEDColorEffect(led, red, grn, blu);
-        }
-    }
-}
-
-void RGBController_Aura::UpdateZoneLEDs(int zone)
-{
-    for (std::size_t x = 0; x < zones[zone].map.size(); x++)
-    {
-        for (std::size_t y = 0; y < zones[zone].map[x].size(); y++)
-        {
-            int           led   = zones[zone].map[x][y];
-            RGBColor      color = colors[led];
-            unsigned char red   = RGBGetRValue(color);
-            unsigned char grn   = RGBGetGValue(color);
-            unsigned char blu   = RGBGetBValue(color);
-
-            if (GetMode() == 0)
-            {
-                aura->SetLEDColorDirect(led, red, grn, blu);
-            }
-            else
-            {
-                aura->SetLEDColorEffect(led, red, grn, blu);
-            }
-        }
-    }
-}
-
-void RGBController_Aura::UpdateSingleLED(int led)
-{
-    RGBColor color    = colors[led];
-    unsigned char red = RGBGetRValue(color);
-    unsigned char grn = RGBGetGValue(color);
-    unsigned char blu = RGBGetBValue(color);
-
-    if (GetMode() == 0)
-    {
-        aura->SetLEDColorDirect(led, red, grn, blu);
-    }
-    else
-    {
-        aura->SetLEDColorEffect(led, red, grn, blu);
-    }
-}
-
-RGBController_Aura::RGBController_Aura(AuraController * aura_ptr)
-{
-    std::vector<unsigned char> aura_channels;
-
-    aura = aura_ptr;
-
-    version = aura->GetDeviceName();
-    location = aura->GetDeviceLocation();
-    if((version.find("DIMM_LED") != std::string::npos) || (version.find("AUDA") != std::string::npos) )
-    {
-        type = DEVICE_TYPE_DRAM;
-        name = "ASUS Aura DRAM";
-    }
-    else
-    {
-        type = DEVICE_TYPE_MOTHERBOARD;
-        name = "ASUS Aura Motherboard";
-    }
-
-    mode Direct;
-    Direct.name  = "Direct";
-    Direct.value = 0xFFFF;
-    Direct.flags = MODE_FLAG_HAS_COLOR | MODE_FLAG_PER_LED_COLOR;
-    modes.push_back(Direct);
-
-    mode Off;
-    Off.name  = "Off";
-    Off.value = AURA_MODE_OFF;
-    Off.flags = 0;
-    modes.push_back(Off);
-
-    mode Static;
-    Static.name  = "Static";
-    Static.value = AURA_MODE_STATIC;
-    Static.flags = MODE_FLAG_HAS_COLOR | MODE_FLAG_PER_LED_COLOR;
-    modes.push_back(Static);
-    
-    mode Breathing;
-    Breathing.name  = "Breathing";
-    Breathing.value = AURA_MODE_BREATHING;
-    Breathing.flags = MODE_FLAG_HAS_COLOR | MODE_FLAG_RANDOM_COLOR | MODE_FLAG_PER_LED_COLOR;
-    modes.push_back(Breathing);
-
-    mode Flashing;
-    Flashing.name  = "Flashing";
-    Flashing.value = AURA_MODE_FLASHING;
-    Flashing.flags = MODE_FLAG_HAS_COLOR | MODE_FLAG_PER_LED_COLOR;
-    modes.push_back(Flashing);
-
-    mode SpectrumCycle;
-    SpectrumCycle.name  = "Spectrum Cycle";
-    SpectrumCycle.value = AURA_MODE_SPECTRUM_CYCLE;
-    SpectrumCycle.flags = 0;
-    modes.push_back(SpectrumCycle);
-
-    mode Rainbow;
-    Rainbow.name  = "Rainbow";
-    Rainbow.value = AURA_MODE_RAINBOW;
-    Rainbow.flags = 0;
-    modes.push_back(Rainbow);
-
-    mode ChaseFade;
-    ChaseFade.name  = "Chase Fade";
-    ChaseFade.value = AURA_MODE_CHASE_FADE;
-    ChaseFade.flags = MODE_FLAG_HAS_COLOR | MODE_FLAG_RANDOM_COLOR | MODE_FLAG_PER_LED_COLOR;
-    modes.push_back(ChaseFade);
-
-    mode Chase;
-    Chase.name  = "Chase";
-    Chase.value = AURA_MODE_CHASE;
-    Chase.flags = MODE_FLAG_HAS_COLOR | MODE_FLAG_RANDOM_COLOR | MODE_FLAG_PER_LED_COLOR;
-    modes.push_back(Chase);
-
-    mode RandomFlicker;
-    RandomFlicker.name  = "Random Flicker";
-    RandomFlicker.value = AURA_MODE_RANDOM_FLICKER;
-    RandomFlicker.flags = 0;
-    modes.push_back(RandomFlicker);
-
-    colors.resize(aura->GetLEDCount());
-
-    for (std::size_t i = 0; i < aura->GetLEDCount(); i++)
-    {
-        aura_channels.push_back(aura->GetChannel(i));
-
-        led* new_led = new led();
-
-        new_led->name = aura->GetChannelName(i);
-
-        leds.push_back(*new_led);
-
-        unsigned char red = aura->GetLEDRed(i);
-        unsigned char grn = aura->GetLEDGreen(i);
-        unsigned char blu = aura->GetLEDBlue(i);
-
-        colors[i] = ToRGBColor(red, grn, blu);
-    }
-
-    std::vector<unsigned char> aura_zones;
-
-    // Search through all LEDs and create zones for each channel type
-    for (std::size_t i = 0; i < aura_channels.size(); i++)
-    {
-        bool matched = false;
-
-        // Search through existing zones to make sure we don't create a duplicate zone
-        for (std::size_t j = 0; j < aura_zones.size(); j++)
-        {
-            if (aura_channels[i] == aura_zones[j])
-            {
-                matched = true;
-            }
-        }
-
-        // If zone does not already exist, create it
-        if (matched == false)
-        {
-            zone* new_zone = new zone();
-            std::vector<int>* zone_row = new std::vector<int>();
-
-            // Set zone name to channel name
-            new_zone->name = aura->GetChannelName(i);
-
-            // Find all LEDs with this channel type and add them to zone
-            for (std::size_t j = 0; j < aura->GetLEDCount(); j++)
-            {
-                if (aura->GetChannel(j) == aura_channels[i])
-                {
-                    zone_row->push_back(j);
-                }
-            }
-
-            // Aura devices can be either single or linear, never matrix
-            // That means only one row is needed
-            new_zone->map.push_back(*zone_row);
-
-            // Save channel to aura_zones so we know not to create another zone with this channel
-            aura_zones.push_back(aura_channels[i]);
-
-            // Push new zone to zones vector
-            zones.push_back(*new_zone);
-        }
-    }
-
-    // Initialize active mode
-    active_mode = GetDeviceMode();
-}
-
-void RGBController_Aura::SetCustomMode()
-{
-    SetMode(0);
-}
-
-void RGBController_Aura::UpdateMode()
-{
-    if (modes[active_mode].value == 0xFFFF)
-    {
-        aura->SetDirect(true);
-    }
-    else
-    {
-        int new_mode = modes[active_mode].value;
-
-        if(modes[active_mode].random == true)
-        {
-            switch(new_mode)
-            {
-            case AURA_MODE_CHASE:
-                new_mode = AURA_MODE_SPECTRUM_CYCLE_CHASE;
-                break;
-            case AURA_MODE_BREATHING:
-                new_mode = AURA_MODE_SPECTRUM_CYCLE_BREATHING;
-                break;
-            case AURA_MODE_CHASE_FADE:
-                new_mode = AURA_MODE_SPECTRUM_CYCLE_CHASE_FADE;
-                break;
-            }
-        }
-
-        aura->SetMode(new_mode);
-        aura->SetDirect(false);
-    }
-}

RGBController/RGBController_AuraGPU.cpp

@@ -0,0 +1,196 @@
+/*-----------------------------------------*\
+|  RGBController_AuraGPU.h                  |
+|                                           |
+|  Generic RGB Interface for Asus Aura GPU  |
+|                                           |
+|  Jan Rettig (Klapstuhl) 14.02.2020        |
+\*-----------------------------------------*/
+
+#include "RGBController_AuraGPU.h"
+
+int RGBController_AuraGPU::GetDeviceMode()
+{
+    int dev_mode = aura_gpu->AuraGPURegisterRead(AURA_GPU_REG_MODE);
+    int color_mode = MODE_COLORS_PER_LED;
+
+    if(dev_mode == AURA_GPU_MODE_STATIC)
+    {
+        if (aura_gpu->direct)
+        {
+            dev_mode = AURA_GPU_MODE_DIRECT;
+        } 
+    }
+
+    switch(dev_mode)
+    {
+    case AURA_GPU_MODE_OFF:
+    case AURA_GPU_MODE_SPECTRUM_CYCLE:
+        color_mode = MODE_COLORS_NONE;
+        break;
+    }
+
+    for(std::size_t mode = 0; mode < modes.size(); mode++)
+    {
+        if(modes[mode].value == dev_mode)
+        {
+            active_mode            = mode;
+            modes[mode].color_mode = color_mode;
+        }   
+    }
+
+    return(active_mode);
+}
+
+RGBController_AuraGPU::RGBController_AuraGPU(AuraGPUController * aura_gpu_ptr)
+{
+    aura_gpu = aura_gpu_ptr;
+
+
+    name = aura_gpu->GetDeviceName();
+    version = "0.00.1";
+    location = aura_gpu->GetDeviceLocation();
+    type = DEVICE_TYPE_GPU;
+
+    mode Direct;
+    Direct.name       = "Direct";
+    Direct.value      = AURA_GPU_MODE_DIRECT;
+    Direct.flags      = MODE_FLAG_HAS_PER_LED_COLOR;
+    Direct.color_mode = MODE_COLORS_PER_LED;
+    modes.push_back(Direct);
+
+    mode Off;
+    Off.name       = "Off";
+    Off.value      = AURA_GPU_MODE_OFF;
+    Off.flags      = 0;
+    Off.color_mode = MODE_COLORS_NONE;
+    modes.push_back(Off);
+
+    mode Static;
+    Static.name       = "Static";
+    Static.value      = AURA_GPU_MODE_STATIC;
+    Static.flags      = MODE_FLAG_HAS_PER_LED_COLOR;
+    Static.color_mode = MODE_COLORS_PER_LED;
+    modes.push_back(Static);
+
+    mode Breathing;
+    Breathing.name       = "Breathing";
+    Breathing.value      = AURA_GPU_MODE_BREATHING;
+    Breathing.flags      = MODE_FLAG_HAS_PER_LED_COLOR;
+    Breathing.color_mode = MODE_COLORS_PER_LED;
+    modes.push_back(Breathing);
+
+    mode Flashing;
+    Flashing.name       = "Flashing";
+    Flashing.value      = AURA_GPU_MODE_FLASHING;
+    Flashing.flags      = MODE_FLAG_HAS_PER_LED_COLOR;
+    Flashing.color_mode = MODE_COLORS_PER_LED;
+    modes.push_back(Flashing);
+
+    mode Spectrum_Cycle;
+    Spectrum_Cycle.name       = "Spectrum Cycle";
+    Spectrum_Cycle.value      = AURA_GPU_MODE_SPECTRUM_CYCLE;
+    Spectrum_Cycle.flags      = 0;
+    Spectrum_Cycle.color_mode = MODE_COLORS_NONE;
+    modes.push_back(Spectrum_Cycle);
+
+    SetupZones();
+
+    active_mode = GetDeviceMode();
+}
+
+void RGBController_AuraGPU::SetupZones()
+{
+    /*---------------------------------------------------------*\
+    | Set up zone                                               |
+    \*---------------------------------------------------------*/
+    zone aura_gpu_zone;
+    aura_gpu_zone.name          = "GPU";
+    aura_gpu_zone.type          = ZONE_TYPE_SINGLE;
+    aura_gpu_zone.leds_min      = 1;
+    aura_gpu_zone.leds_max      = 1;
+    aura_gpu_zone.leds_count    = 1;
+    zones.push_back(aura_gpu_zone);
+
+    /*---------------------------------------------------------*\
+    | Set up LED                                                |
+    \*---------------------------------------------------------*/
+    led aura_gpu_led;
+    aura_gpu_led.name = "GPU";
+    leds.push_back(aura_gpu_led);
+
+    SetupColors();
+
+    /*---------------------------------------------------------*\
+    | Initialize color                                          |
+    \*---------------------------------------------------------*/
+    unsigned char red = aura_gpu->GetLEDRed();
+    unsigned char grn = aura_gpu->GetLEDGreen();
+    unsigned char blu = aura_gpu->GetLEDBlue();
+
+    colors[0] =  ToRGBColor(red, grn, blu);
+}
+
+void RGBController_AuraGPU::ResizeZone(int /*zone*/, int /*new_size*/)
+{
+    /*---------------------------------------------------------*\
+    | This device does not support resizing zones               |
+    \*---------------------------------------------------------*/
+}
+
+void RGBController_AuraGPU::UpdateLEDs()
+{
+    for(std::size_t led = 0; led < colors.size(); led++)
+    {
+        unsigned char red = RGBGetRValue(colors[led]);
+        unsigned char grn = RGBGetGValue(colors[led]);
+        unsigned char blu = RGBGetBValue(colors[led]);
+
+        if (GetMode() == 0)
+        {
+            aura_gpu->SetLEDColorsDirect(red, grn, blu);
+        }
+        else 
+        {
+            aura_gpu->SetLEDColorsEffect(red, grn, blu);
+        }
+    }
+}
+
+void RGBController_AuraGPU::UpdateZoneLEDs(int /*zone*/)
+{
+    UpdateLEDs();
+}
+
+void RGBController_AuraGPU::UpdateSingleLED(int /*led*/)
+{
+    UpdateLEDs();
+}
+
+void RGBController_AuraGPU::SetCustomMode()
+{
+    active_mode = 0;
+}
+
+void RGBController_AuraGPU::UpdateMode()
+{
+    int new_mode = modes[active_mode].value;
+    aura_gpu->direct = false;
+    
+    switch(new_mode)
+    {
+        
+    // Set all LEDs to 0 and Mode to static as a workaround for the non existing Off Mode
+    case AURA_GPU_MODE_OFF:
+        aura_gpu->SetLEDColorsEffect(0, 0, 0);
+        new_mode = AURA_GPU_MODE_STATIC;
+        break;
+    
+    // Direct mode is done by switching to Static and not applying color changes
+    case AURA_GPU_MODE_DIRECT:
+        aura_gpu->direct = true;
+        new_mode = AURA_GPU_MODE_STATIC;
+        break;
+    }
+
+    aura_gpu->SetMode(new_mode);
+}

RGBController/RGBController_AuraGPU.h

@@ -0,0 +1,34 @@
+/*-----------------------------------------*\
+|  RGBController_AuraGPU.h                  |
+|                                           |
+|  Generic RGB Interface for Asus Aura GPU  |
+|                                           |
+|  Jan Rettig (Klapstuhl) 14.02.2020        |
+\*-----------------------------------------*/
+
+#pragma once
+
+#include "RGBController.h"
+#include "AuraGPUController.h"
+
+class RGBController_AuraGPU : public RGBController
+{
+public:
+    RGBController_AuraGPU(AuraGPUController* aura_gpu_ptr);
+
+    void        SetupZones();
+
+    void        ResizeZone(int zone, int new_size);
+
+    void        UpdateLEDs();
+    void        UpdateZoneLEDs(int zone);
+    void        UpdateSingleLED(int led);
+
+    void        SetCustomMode();
+    void        UpdateMode();
+
+private:
+    AuraGPUController* aura_gpu;
+
+    int        GetDeviceMode();
+};

RGBController/RGBController_AuraSMBus.cpp

@@ -0,0 +1,360 @@
+/*-----------------------------------------*\
+|  RGBController_AuraSMBus.cpp              |
+|                                           |
+|  Generic RGB Interface for OpenAuraSDK    |
+|  Asus Aura SMBus driver                   |
+|                                           |
+|  Adam Honse (CalcProgrammer1) 6/13/2019   |
+\*-----------------------------------------*/
+
+#include "RGBController_AuraSMBus.h"
+
+int RGBController_AuraSMBus::GetDeviceMode()
+{
+    int  dev_mode  = aura->AuraRegisterRead(AURA_REG_MODE);
+    int color_mode = MODE_COLORS_PER_LED;
+
+    if (aura->AuraRegisterRead(AURA_REG_DIRECT))
+    {
+        dev_mode = 0xFFFF;
+    }
+
+    switch(dev_mode)
+    {
+    case AURA_MODE_OFF:
+    case AURA_MODE_RAINBOW:
+    case AURA_MODE_SPECTRUM_CYCLE:
+    case AURA_MODE_RANDOM_FLICKER:
+        color_mode = MODE_COLORS_NONE;
+        break;
+
+    case AURA_MODE_SPECTRUM_CYCLE_CHASE:
+        dev_mode   = AURA_MODE_CHASE;
+        color_mode = MODE_COLORS_RANDOM;
+        break;
+
+    case AURA_MODE_SPECTRUM_CYCLE_BREATHING:
+        dev_mode   = AURA_MODE_BREATHING;
+        color_mode = MODE_COLORS_RANDOM;
+        break;
+
+    case AURA_MODE_SPECTRUM_CYCLE_CHASE_FADE:
+        dev_mode   = AURA_MODE_CHASE_FADE;
+        color_mode = MODE_COLORS_RANDOM;
+        break;
+    }
+
+    for(std::size_t mode = 0; mode < modes.size(); mode++)
+    {
+        if(modes[mode].value == dev_mode)
+        {
+            active_mode            = mode;
+            modes[mode].color_mode = color_mode;
+        }
+    }
+
+    return(active_mode);
+}
+
+void RGBController_AuraSMBus::UpdateLEDs()
+{
+    for(std::size_t led = 0; led < colors.size(); led++)
+    {
+        unsigned char red = RGBGetRValue(colors[led]);
+        unsigned char grn = RGBGetGValue(colors[led]);
+        unsigned char blu = RGBGetBValue(colors[led]);
+
+        if (GetMode() == 0)
+        {
+            aura->SetLEDColorDirect(led, red, grn, blu);
+        }
+        else
+        {
+            aura->SetLEDColorEffect(led, red, grn, blu);
+        }
+    }
+}
+
+void RGBController_AuraSMBus::UpdateZoneLEDs(int zone)
+{
+    for (std::size_t led_idx = 0; led_idx < zones[zone].leds_count; led_idx++)
+    {
+        int           led   = zones[zone].leds[led_idx].value;
+        RGBColor      color = colors[led];
+        unsigned char red   = RGBGetRValue(color);
+        unsigned char grn   = RGBGetGValue(color);
+        unsigned char blu   = RGBGetBValue(color);
+
+        if (GetMode() == 0)
+        {
+            aura->SetLEDColorDirect(led, red, grn, blu);
+        }
+        else
+        {
+            aura->SetLEDColorEffect(led, red, grn, blu);
+        }
+    }
+}
+
+void RGBController_AuraSMBus::UpdateSingleLED(int led)
+{
+    RGBColor color    = colors[led];
+    unsigned char red = RGBGetRValue(color);
+    unsigned char grn = RGBGetGValue(color);
+    unsigned char blu = RGBGetBValue(color);
+
+    if (GetMode() == 0)
+    {
+        aura->SetLEDColorDirect(led, red, grn, blu);
+    }
+    else
+    {
+        aura->SetLEDColorEffect(led, red, grn, blu);
+    }
+}
+
+RGBController_AuraSMBus::RGBController_AuraSMBus(AuraSMBusController * aura_ptr)
+{
+    aura = aura_ptr;
+
+    version = aura->GetDeviceName();
+    location = aura->GetDeviceLocation();
+    if((version.find("DIMM_LED") != std::string::npos) || (version.find("AUDA") != std::string::npos) )
+    {
+        type = DEVICE_TYPE_DRAM;
+        name = "ASUS Aura DRAM";
+    }
+    else
+    {
+        type = DEVICE_TYPE_MOTHERBOARD;
+        name = "ASUS Aura Motherboard";
+    }
+    description = "ASUS Aura SMBus Device";
+
+    mode Direct;
+    Direct.name       = "Direct";
+    Direct.value      = 0xFFFF;
+    Direct.flags      = MODE_FLAG_HAS_PER_LED_COLOR;
+    Direct.color_mode = MODE_COLORS_PER_LED;
+    modes.push_back(Direct);
+
+    mode Off;
+    Off.name       = "Off";
+    Off.value      = AURA_MODE_OFF;
+    Off.flags      = 0;
+    Off.color_mode = MODE_COLORS_NONE;
+    modes.push_back(Off);
+
+    mode Static;
+    Static.name       = "Static";
+    Static.value      = AURA_MODE_STATIC;
+    Static.flags      = MODE_FLAG_HAS_PER_LED_COLOR;
+    Static.color_mode = MODE_COLORS_PER_LED;
+    modes.push_back(Static);
+    
+    mode Breathing;
+    Breathing.name       = "Breathing";
+    Breathing.value      = AURA_MODE_BREATHING;
+    Breathing.flags      = MODE_FLAG_HAS_RANDOM_COLOR | MODE_FLAG_HAS_PER_LED_COLOR;
+    Breathing.color_mode = MODE_COLORS_PER_LED;
+    modes.push_back(Breathing);
+
+    mode Flashing;
+    Flashing.name       = "Flashing";
+    Flashing.value      = AURA_MODE_FLASHING;
+    Flashing.flags      = MODE_FLAG_HAS_PER_LED_COLOR;
+    Flashing.color_mode = MODE_COLORS_PER_LED;
+    modes.push_back(Flashing);
+
+    mode SpectrumCycle;
+    SpectrumCycle.name       = "Spectrum Cycle";
+    SpectrumCycle.value      = AURA_MODE_SPECTRUM_CYCLE;
+    SpectrumCycle.flags      = 0;
+    SpectrumCycle.color_mode = MODE_COLORS_NONE;
+    modes.push_back(SpectrumCycle);
+
+    mode Rainbow;
+    Rainbow.name       = "Rainbow";
+    Rainbow.value      = AURA_MODE_RAINBOW;
+    Rainbow.flags      = 0;
+    Rainbow.color_mode = MODE_COLORS_NONE;
+    modes.push_back(Rainbow);
+
+    mode ChaseFade;
+    ChaseFade.name       = "Chase Fade";
+    ChaseFade.value      = AURA_MODE_CHASE_FADE;
+    ChaseFade.flags      = MODE_FLAG_HAS_RANDOM_COLOR | MODE_FLAG_HAS_PER_LED_COLOR;
+    ChaseFade.color_mode = MODE_COLORS_PER_LED;
+    modes.push_back(ChaseFade);
+
+    mode Chase;
+    Chase.name       = "Chase";
+    Chase.value      = AURA_MODE_CHASE;
+    Chase.flags      = MODE_FLAG_HAS_RANDOM_COLOR | MODE_FLAG_HAS_PER_LED_COLOR;
+    Chase.color_mode = MODE_COLORS_PER_LED;
+    modes.push_back(Chase);
+
+    mode RandomFlicker;
+    RandomFlicker.name       = "Random Flicker";
+    RandomFlicker.value      = AURA_MODE_RANDOM_FLICKER;
+    RandomFlicker.flags      = 0;
+    RandomFlicker.color_mode = MODE_COLORS_NONE;
+    modes.push_back(RandomFlicker);
+
+    SetupZones();
+
+    // Initialize active mode
+    active_mode = GetDeviceMode();
+}
+
+void RGBController_AuraSMBus::SetupZones()
+{
+    std::vector<int>    aura_led_map;
+
+    /*---------------------------------------------------------*\
+    | Search through all LEDs and create zones for each channel |
+    | type                                                      |
+    \*---------------------------------------------------------*/
+    for (std::size_t led_idx = 0; led_idx < aura->GetLEDCount(); led_idx++)
+    {
+        bool matched = false;
+
+        /*---------------------------------------------------------*\
+        | Search through existing zones to make sure we don't       |
+        | create a duplicate zone                                   |
+        \*---------------------------------------------------------*/
+        for (std::size_t existing_zone_idx = 0; existing_zone_idx < zones.size(); existing_zone_idx++)
+        {
+            if (aura->GetChannelName(led_idx) == zones[existing_zone_idx].name)
+            {
+                matched = true;
+            }
+        }
+
+        /*---------------------------------------------------------*\
+        | If zone does not already exist, create it                 |
+        \*---------------------------------------------------------*/
+        if (matched == false)
+        {
+            zone* new_zone = new zone();
+
+            /*---------------------------------------------------------*\
+            | Set zone name to channel name                             |
+            \*---------------------------------------------------------*/
+            new_zone->name = aura->GetChannelName(led_idx);
+
+            new_zone->leds_count = 0;
+
+            /*---------------------------------------------------------*\
+            | Find all LEDs with this channel type and add them to zone |
+            \*---------------------------------------------------------*/
+            for (std::size_t zone_led_idx = 0; zone_led_idx < aura->GetLEDCount(); zone_led_idx++)
+            {
+                if (aura->GetChannelName(zone_led_idx) == new_zone->name)
+                {
+                    new_zone->leds_count++;
+                    aura_led_map.push_back(zone_led_idx);
+                }
+            }
+
+            /*---------------------------------------------------------*\
+            | Aura zones have fixed size, so set min and max to count   |
+            \*---------------------------------------------------------*/
+            new_zone->leds_min = new_zone->leds_count;
+            new_zone->leds_max = new_zone->leds_count;
+
+            /*---------------------------------------------------------*\
+            | If this zone has more than one LED, mark it as linear type|
+            \*---------------------------------------------------------*/
+            if(new_zone->leds_count > 1)
+            {
+                new_zone->type = ZONE_TYPE_LINEAR;
+            }
+            else
+            {
+                new_zone->type = ZONE_TYPE_SINGLE;
+            }
+
+            /*---------------------------------------------------------*\
+            | Push new zone to zones vector                             |
+            \*---------------------------------------------------------*/
+            zones.push_back(*new_zone);
+        }
+    }
+
+    /*---------------------------------------------------------*\
+    | Create LED entries for each zone                          |
+    \*---------------------------------------------------------*/
+    for(std::size_t zone_idx = 0; zone_idx < zones.size(); zone_idx++)
+    {
+        for(std::size_t led_idx = 0; led_idx < zones[zone_idx].leds_count; led_idx++)
+        {
+            led* new_led = new led();
+
+            new_led->name = zones[zone_idx].name + " LED ";
+            new_led->name.append(std::to_string(led_idx + 1));
+
+            new_led->value = aura_led_map[led_idx];
+
+            leds.push_back(*new_led);
+        }
+    }
+
+    SetupColors();
+
+    /*---------------------------------------------------------*\
+    | Initialize colors for each LED                            |
+    \*---------------------------------------------------------*/
+    for(std::size_t led_idx = 0; led_idx < leds.size(); led_idx++)
+    {
+        unsigned int  led = leds[led_idx].value;
+        unsigned char red = aura->GetLEDRed(led);
+        unsigned char grn = aura->GetLEDGreen(led);
+        unsigned char blu = aura->GetLEDBlue(led);
+
+        colors[led_idx] = ToRGBColor(red, grn, blu);
+    }
+}
+
+void RGBController_AuraSMBus::ResizeZone(int /*zone*/, int /*new_size*/)
+{
+    /*---------------------------------------------------------*\
+    | This device does not support resizing zones               |
+    \*---------------------------------------------------------*/
+}
+
+void RGBController_AuraSMBus::SetCustomMode()
+{
+    active_mode = 0;
+}
+
+void RGBController_AuraSMBus::UpdateMode()
+{
+    if (modes[active_mode].value == 0xFFFF)
+    {
+        aura->SetDirect(true);
+    }
+    else
+    {
+        int new_mode = modes[active_mode].value;
+
+        if(modes[active_mode].color_mode == MODE_COLORS_RANDOM)
+        {
+            switch(new_mode)
+            {
+            case AURA_MODE_CHASE:
+                new_mode = AURA_MODE_SPECTRUM_CYCLE_CHASE;
+                break;
+            case AURA_MODE_BREATHING:
+                new_mode = AURA_MODE_SPECTRUM_CYCLE_BREATHING;
+                break;
+            case AURA_MODE_CHASE_FADE:
+                new_mode = AURA_MODE_SPECTRUM_CYCLE_CHASE_FADE;
+                break;
+            }
+        }
+
+        aura->SetMode(new_mode);
+        aura->SetDirect(false);
+    }
+}

RGBController/RGBController_AuraSMBus.h

@@ -1,8 +1,8 @@
 /*-----------------------------------------*\
-|  RGBController_Aura.h                     |
+|  RGBController_AuraSMBus.h                |
 |                                           |
 |  Generic RGB Interface for OpenAuraSDK    |
-|  Asus Aura driver                         |
+|  Asus Aura SMBus driver                   |
 |                                           |
 |  Adam Honse (CalcProgrammer1) 6/13/2019   |
 \*-----------------------------------------*/
@@ -10,12 +10,17 @@
 #pragma once
 
 #include "RGBController.h"
-#include "AuraController.h"
+#include "AuraSMBusController.h"
 
-class RGBController_Aura : public RGBController
+class RGBController_AuraSMBus : public RGBController
 {
 public:
-    RGBController_Aura(AuraController* aura_ptr);
+    RGBController_AuraSMBus(AuraSMBusController* aura_ptr);
+
+    void        SetupZones();
+
+    void        ResizeZone(int zone, int new_size);
+
     void        UpdateLEDs();
     void        UpdateZoneLEDs(int zone);
     void        UpdateSingleLED(int led);
@@ -24,7 +29,7 @@ public:
     void        UpdateMode();
 
 private:
-    AuraController* aura;
+    AuraSMBusController* aura;
 
     int         GetDeviceMode();
 };

RGBController/RGBController_Corsair.cpp

@@ -1,94 +0,0 @@
-/*-----------------------------------------*\
-|  RGBController_Corsair.cpp                |
-|                                           |
-|  Generic RGB Interface for OpenAuraSDK    |
-|  Corsair Vengeance RGB driver             |
-|                                           |
-|  Adam Honse (CalcProgrammer1) 6/13/2019   |
-\*-----------------------------------------*/
-
-#include "RGBController_Corsair.h"
-
-void RGBController_Corsair::UpdateLEDs()
-{
-    RGBColor      color = colors[0];
-    unsigned char red   = RGBGetRValue(color);
-    unsigned char grn   = RGBGetGValue(color);
-    unsigned char blu   = RGBGetBValue(color);
-
-    corsair->SetLEDColor(red, grn, blu);
-}
-
-void RGBController_Corsair::UpdateZoneLEDs(int zone)
-{
-    UpdateLEDs();
-}
-
-void RGBController_Corsair::UpdateSingleLED(int led)
-{
-    UpdateLEDs();
-}
-
-RGBController_Corsair::RGBController_Corsair(CorsairController* corsair_ptr)
-{
-    corsair = corsair_ptr;
-
-    name = corsair->GetDeviceName();
-    location = corsair->GetDeviceLocation();
-
-    type = DEVICE_TYPE_DRAM;
-
-    mode Static;
-    Static.name  = "Static";
-    Static.value = CORSAIR_VENGEANCE_RGB_MODE_SINGLE;
-    Static.flags = MODE_FLAG_HAS_COLOR | MODE_FLAG_PER_LED_COLOR;
-    modes.push_back(Static);
-
-    mode Fade;
-    Fade.name  = "Fade";
-    Fade.value = CORSAIR_VENGEANCE_RGB_MODE_FADE;
-    Fade.flags = MODE_FLAG_HAS_COLOR | MODE_FLAG_PER_LED_COLOR;
-    modes.push_back(Fade);
-
-    mode Pulse;
-    Pulse.name  = "Pulse";
-    Pulse.value = CORSAIR_VENGEANCE_RGB_MODE_PULSE;
-    Pulse.flags = MODE_FLAG_HAS_COLOR | MODE_FLAG_PER_LED_COLOR;
-    modes.push_back(Pulse);
-
-    for (unsigned int i = 0; i < corsair->GetLEDCount(); i++)
-    {
-        led* new_led = new led();
-
-        new_led->name = "Corsair LED";
-
-        leds.push_back(*new_led);
-        colors.push_back(0x00000000);
-    }
-
-    zone new_zone;
-
-    new_zone.name = "Corsair Zone";
-    new_zone.type = ZONE_TYPE_SINGLE;
-
-    std::vector<int> zone_row;
-
-    for (unsigned int i = 0; i < corsair->GetLEDCount(); i++)
-    {
-        zone_row.push_back(i);
-    }
-
-    new_zone.map.push_back(zone_row);
-
-    zones.push_back(new_zone);
-}
-
-void RGBController_Corsair::SetCustomMode()
-{
-    SetMode(0);
-}
-
-void RGBController_Corsair::UpdateMode()
-{
-    corsair->SetMode(modes[active_mode].value);
-}

RGBController/RGBController_CorsairCmdrPro.cpp

@@ -1,276 +0,0 @@
-/*-----------------------------------------*\
-|  RGBController_CorsairCmdrPro.cpp         |
-|                                           |
-|  Generic RGB Interface for Corsair        |
-|  Commander Pro                            |
-|                                           |
-|  Adam Honse (CalcProgrammer1) 1/16/2020   |
-\*-----------------------------------------*/
-
-#include "RGBController_CorsairCmdrPro.h"
-
-
-RGBController_CorsairCmdrPro::RGBController_CorsairCmdrPro(CorsairCmdrProController* corsair_ptr)
-{
-    corsair = corsair_ptr;
-
-    name = "Corsair Commander Pro";
-
-    type = DEVICE_TYPE_LEDSTRIP;
-    
-    mode Direct;
-    Direct.name  = "Direct";
-    Direct.value = 0xFFFF;
-    Direct.flags = MODE_FLAG_HAS_COLOR | MODE_FLAG_PER_LED_COLOR;
-    modes.push_back(Direct);
-
-    mode RainbowWave;
-    RainbowWave.name      = "Rainbow Wave";
-    RainbowWave.value     = CORSAIR_CMDR_PRO_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.direction = MODE_DIRECTION_RIGHT;
-    modes.push_back(RainbowWave);
-
-    mode ColorShift;
-    ColorShift.name       = "Color Shift";
-    ColorShift.value      = CORSAIR_CMDR_PRO_MODE_COLOR_SHIFT;
-    ColorShift.flags      = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_COLOR | MODE_FLAG_RANDOM_COLOR;
-    ColorShift.speed_min  = CORSAIR_CMDR_PRO_SPEED_SLOW;
-    ColorShift.speed_max  = CORSAIR_CMDR_PRO_SPEED_FAST;
-    ColorShift.speed      = CORSAIR_CMDR_PRO_SPEED_MEDIUM;
-    modes.push_back(ColorShift);
-
-    mode ColorPulse;
-    ColorPulse.name      = "Color Pulse";
-    ColorPulse.value     = CORSAIR_CMDR_PRO_MODE_COLOR_PULSE;
-    ColorPulse.flags     = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_COLOR | MODE_FLAG_RANDOM_COLOR;
-    ColorPulse.speed_min = CORSAIR_CMDR_PRO_SPEED_SLOW;
-    ColorPulse.speed_max = CORSAIR_CMDR_PRO_SPEED_FAST;
-    ColorPulse.speed     = CORSAIR_CMDR_PRO_SPEED_MEDIUM;
-    modes.push_back(ColorPulse);
-
-    mode ColorWave;
-    ColorWave.name      = "Color Wave";
-    ColorWave.value     = CORSAIR_CMDR_PRO_MODE_COLOR_WAVE;
-    ColorWave.flags     = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_DIRECTION_LR | MODE_FLAG_HAS_COLOR | MODE_FLAG_RANDOM_COLOR;
-    ColorWave.speed_min = CORSAIR_CMDR_PRO_SPEED_SLOW;
-    ColorWave.speed_max = CORSAIR_CMDR_PRO_SPEED_FAST;
-    ColorWave.speed     = CORSAIR_CMDR_PRO_SPEED_MEDIUM;
-    ColorWave.direction = MODE_DIRECTION_RIGHT;
-    modes.push_back(ColorWave);
-
-    mode Static;
-    Static.name  = "Static";
-    Static.value = CORSAIR_CMDR_PRO_MODE_STATIC;
-    Static.flags = MODE_FLAG_HAS_COLOR;
-    modes.push_back(Static);
-
-    mode Temperature;
-    Temperature.name  = "Temperature";
-    Temperature.value = CORSAIR_CMDR_PRO_MODE_TEMPERATURE;
-    Temperature.flags = MODE_FLAG_HAS_COLOR;
-    modes.push_back(Temperature);
-
-    mode Visor;
-    Visor.name      = "Visor";
-    Visor.value     = CORSAIR_CMDR_PRO_MODE_VISOR;
-    Visor.flags     = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_COLOR | MODE_FLAG_RANDOM_COLOR;
-    Visor.speed_min = CORSAIR_CMDR_PRO_SPEED_SLOW;
-    Visor.speed_max = CORSAIR_CMDR_PRO_SPEED_FAST;
-    Visor.speed     = CORSAIR_CMDR_PRO_SPEED_MEDIUM;
-    modes.push_back(Visor);
-
-    mode Marquee;
-    Marquee.name      = "Marquee";
-    Marquee.value     = CORSAIR_CMDR_PRO_MODE_MARQUEE;
-    Marquee.flags     = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_DIRECTION_LR | MODE_FLAG_HAS_COLOR | MODE_FLAG_RANDOM_COLOR;
-    Marquee.speed_min = CORSAIR_CMDR_PRO_SPEED_SLOW;
-    Marquee.speed_max = CORSAIR_CMDR_PRO_SPEED_FAST;
-    Marquee.speed     = CORSAIR_CMDR_PRO_SPEED_MEDIUM;
-    Marquee.direction = MODE_DIRECTION_RIGHT;
-    modes.push_back(Marquee);
-
-    mode Blink;
-    Blink.name      = "Blink";
-    Blink.value     = CORSAIR_CMDR_PRO_MODE_BLINK;
-    Blink.flags     = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_COLOR | MODE_FLAG_RANDOM_COLOR;
-    Blink.speed_min = CORSAIR_CMDR_PRO_SPEED_SLOW;
-    Blink.speed_max = CORSAIR_CMDR_PRO_SPEED_FAST;
-    Blink.speed     = CORSAIR_CMDR_PRO_SPEED_MEDIUM;
-    modes.push_back(Blink);
-
-    mode Sequential;
-    Sequential.name      = "Sequential";
-    Sequential.value     = CORSAIR_CMDR_PRO_MODE_SEQUENTIAL;
-    Sequential.flags     = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_DIRECTION_LR | MODE_FLAG_HAS_COLOR | MODE_FLAG_RANDOM_COLOR;
-    Sequential.speed_min = CORSAIR_CMDR_PRO_SPEED_SLOW;
-    Sequential.speed_max = CORSAIR_CMDR_PRO_SPEED_FAST;
-    Sequential.speed     = CORSAIR_CMDR_PRO_SPEED_MEDIUM;
-    Sequential.direction = MODE_DIRECTION_RIGHT;
-    modes.push_back(Sequential);
-
-    mode Rainbow;
-    Rainbow.name      = "Rainbow";
-    Rainbow.value     = CORSAIR_CMDR_PRO_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;
-    modes.push_back(Rainbow);
-
-    /*-------------------------------------------------*\
-    | Set size of colors array                          |
-    \*-------------------------------------------------*/
-    unsigned int led_count = 0;
-    for (unsigned int channel_idx = 0; channel_idx < CORSAIR_CMDR_PRO_NUM_CHANNELS; channel_idx++)
-    {
-        led_count += corsair->channel_leds[channel_idx];
-    }
-    colors.resize(led_count);
-
-    /*-------------------------------------------------*\
-    | Set zones and leds                                |
-    \*-------------------------------------------------*/
-    unsigned int led_idx = 0;
-    for (unsigned int channel_idx = 0; channel_idx < CORSAIR_CMDR_PRO_NUM_CHANNELS; channel_idx++)
-    {
-        if(corsair->channel_leds[channel_idx] > 0)
-        {
-            zone* new_zone = new zone;
-
-            char ch_idx_string[2];
-            sprintf(ch_idx_string, "%d", channel_idx + 1);
-
-            new_zone->name = "Corsair Channel ";
-            new_zone->name.append(ch_idx_string);
-            new_zone->type = ZONE_TYPE_LINEAR;
-
-            std::vector<int> *new_zone_map = new std::vector<int>();
-
-            for (unsigned int led_ch_idx = 0; led_ch_idx < corsair->channel_leds[channel_idx]; led_ch_idx++)
-            {
-                char led_idx_string[3];
-                sprintf(led_idx_string, "%d", led_ch_idx + 1);
-
-                led new_led;
-                new_led.name = "Corsair Channel ";
-                new_led.name.append(ch_idx_string);
-                new_led.name.append(", LED ");
-                new_led.name.append(led_idx_string);
-
-                leds.push_back(new_led);
-                leds_channel.push_back(channel_idx);
-
-                new_zone_map->push_back(led_idx);
-                led_idx++;
-            }
-
-            new_zone->map.push_back(*new_zone_map);
-            zones.push_back(*new_zone);
-            zones_channel.push_back(channel_idx);
-        }
-    }
-}
-
-void RGBController_CorsairCmdrPro::UpdateLEDs()
-{
-    for(std::size_t zone_idx = 0; zone_idx < zones.size(); zone_idx++)
-    {
-        unsigned int channel = zones_channel[zone_idx];
-
-        std::vector<RGBColor> channel_colors;
-
-        for(std::size_t color = 0; color < colors.size(); color++)
-        {
-            if(leds_channel[color] == channel)
-            {
-                channel_colors.push_back(colors[color]);
-            }
-        }
-
-        if(channel_colors.size() > 0)
-        {
-            corsair->SetChannelLEDs(channel, channel_colors);
-        }
-    }
-}
-
-void RGBController_CorsairCmdrPro::UpdateZoneLEDs(int zone)
-{
-    unsigned int channel = zones_channel[zone];
-
-    std::vector<RGBColor> channel_colors;
-
-    for(std::size_t color = 0; color < colors.size(); color++)
-    {
-        if(leds_channel[color] == channel)
-        {
-            channel_colors.push_back(colors[color]);
-        }
-    }
-
-    if(channel_colors.size() > 0)
-    {
-        corsair->SetChannelLEDs(channel, channel_colors);
-    }
-}
-
-void RGBController_CorsairCmdrPro::UpdateSingleLED(int led)
-{
-    unsigned int channel = leds_channel[led];
-
-    std::vector<RGBColor> channel_colors;
-
-    for(std::size_t color = 0; color < colors.size(); color++)
-    {
-        if(leds_channel[color] == channel)
-        {
-            channel_colors.push_back(colors[color]);
-        }
-    }
-
-    if(channel_colors.size() > 0)
-    {
-        corsair->SetChannelLEDs(channel, channel_colors);
-    }
-}
-
-void RGBController_CorsairCmdrPro::SetCustomMode()
-{
-    SetMode(9);
-}
-
-void RGBController_CorsairCmdrPro::UpdateMode()
-{
-    if(modes[active_mode].value == 0xFFFF)
-    {
-        UpdateLEDs();
-    }
-    else
-    {
-        for(int channel = 0; channel < CORSAIR_CMDR_PRO_NUM_CHANNELS; channel++)
-        {
-            unsigned int direction = 0;
-
-            if(modes[active_mode].direction == MODE_DIRECTION_RIGHT)
-            {
-                direction = 1;
-            }
-
-            corsair->SetChannelEffect(channel,
-                                      modes[active_mode].value,
-                                      modes[active_mode].speed,
-                                      direction,
-                                      modes[active_mode].random,
-                                      RGBGetRValue(colors[0]),
-                                      RGBGetGValue(colors[0]),
-                                      RGBGetBValue(colors[0]),
-                                      RGBGetRValue(colors[1]),
-                                      RGBGetGValue(colors[1]),
-                                      RGBGetBValue(colors[1]));
-        }
-    }
-}

RGBController/RGBController_CorsairLightingNode.cpp

@@ -0,0 +1,312 @@
+/*-----------------------------------------*\
+|  RGBController_CorsairLightingNode.cpp         |
+|                                           |
+|  Generic RGB Interface for Corsair        |
+|  Lighting Node Pro                        |
+|                                           |
+|  Adam Honse (CalcProgrammer1) 1/12/2020   |
+\*-----------------------------------------*/
+
+#include "RGBController_CorsairLightingNode.h"
+
+
+RGBController_CorsairLightingNode::RGBController_CorsairLightingNode(CorsairLightingNodeController* corsair_ptr)
+{
+    corsair = corsair_ptr;
+
+    name        = "Corsair Lighting Node Device";
+    description = "Corsair Lighting Node Device";
+    type        = DEVICE_TYPE_LEDSTRIP;
+    version     = corsair->GetFirmwareString();
+
+    mode Direct;
+    Direct.name       = "Direct";
+    Direct.value      = 0xFFFF;
+    Direct.flags      = MODE_FLAG_HAS_PER_LED_COLOR;
+    Direct.color_mode = MODE_COLORS_PER_LED;
+    modes.push_back(Direct);
+
+    mode RainbowWave;
+    RainbowWave.name       = "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_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_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_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_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_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_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_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);
+    modes.push_back(ColorWave);
+
+    mode Static;
+    Static.name       = "Static";
+    Static.value      = CORSAIR_LIGHTING_NODE_MODE_STATIC;
+    Static.flags      = MODE_FLAG_HAS_MODE_SPECIFIC_COLOR;
+    Static.colors_min = 1;
+    Static.colors_max = 1;
+    Static.color_mode = MODE_COLORS_MODE_SPECIFIC;
+    Static.colors.resize(1);
+    modes.push_back(Static);
+
+    mode Temperature;
+    Temperature.name       = "Temperature";
+    Temperature.value      = CORSAIR_LIGHTING_NODE_MODE_TEMPERATURE;
+    Temperature.flags      = MODE_FLAG_HAS_MODE_SPECIFIC_COLOR;
+    Temperature.colors_min = 3;
+    Temperature.colors_max = 3;
+    Temperature.color_mode = MODE_COLORS_MODE_SPECIFIC;
+    Temperature.colors.resize(3);
+    modes.push_back(Temperature);
+
+    mode Visor;
+    Visor.name       = "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_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_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_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);
+    modes.push_back(Marquee);
+
+    mode Blink;
+    Blink.name       = "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_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_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_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);
+    modes.push_back(Sequential);
+
+    mode Rainbow;
+    Rainbow.name       = "Rainbow";
+    Rainbow.value      = CORSAIR_LIGHTING_NODE_MODE_RAINBOW;
+    Rainbow.flags      = MODE_FLAG_HAS_SPEED;
+    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_CorsairLightingNode::SetupZones()
+{
+    /*-------------------------------------------------*\
+    | Only set LED count on the first run               |
+    \*-------------------------------------------------*/
+    bool first_run = false;
+
+    if(zones.size() == 0)
+    {
+        first_run = true;
+    }
+
+    /*-------------------------------------------------*\
+    | Clear any existing color/LED configuration        |
+    \*-------------------------------------------------*/
+    leds.clear();
+    colors.clear();
+    zones.resize(CORSAIR_LIGHTING_NODE_NUM_CHANNELS);
+
+    /*-------------------------------------------------*\
+    | Set zones and leds                                |
+    \*-------------------------------------------------*/
+    for (unsigned int channel_idx = 0; channel_idx < CORSAIR_LIGHTING_NODE_NUM_CHANNELS; channel_idx++)
+    {
+        char ch_idx_string[2];
+        sprintf(ch_idx_string, "%d", channel_idx + 1);
+
+        zones[channel_idx].name     = "Corsair Channel ";
+        zones[channel_idx].name.append(ch_idx_string);
+        zones[channel_idx].type     = ZONE_TYPE_LINEAR;
+
+        /*-------------------------------------------------*\
+        | According to some research on Corsair forums, the |
+        | maximum number of LEDs supported by Corsair Link  |
+        | devices is 96                                     |
+        \*-------------------------------------------------*/
+        zones[channel_idx].leds_min   = 0;
+        zones[channel_idx].leds_max   = 96;
+
+        if(first_run)
+        {
+            zones[channel_idx].leds_count = 0;
+        }
+
+        for (unsigned int led_ch_idx = 0; led_ch_idx < zones[channel_idx].leds_count; led_ch_idx++)
+        {
+            char led_idx_string[3];
+            sprintf(led_idx_string, "%d", led_ch_idx + 1);
+
+            led new_led;
+            new_led.name = "Corsair Channel ";
+            new_led.name.append(ch_idx_string);
+            new_led.name.append(", LED ");
+            new_led.name.append(led_idx_string);
+
+            leds.push_back(new_led);
+            leds_channel.push_back(channel_idx);
+        }
+    }
+
+    SetupColors();
+}
+
+void RGBController_CorsairLightingNode::ResizeZone(int zone, int new_size)
+{
+    if(((unsigned int)new_size >= zones[zone].leds_min) && ((unsigned int)new_size <= zones[zone].leds_max))
+    {
+        zones[zone].leds_count = new_size;
+
+        SetupZones();
+    }
+}
+
+void RGBController_CorsairLightingNode::UpdateLEDs()
+{
+    for(std::size_t zone_idx = 0; zone_idx < zones.size(); zone_idx++)
+    {
+        corsair->SetChannelLEDs(zone_idx, zones[zone_idx].colors, zones[zone_idx].leds_count);
+    }
+}
+
+void RGBController_CorsairLightingNode::UpdateZoneLEDs(int zone)
+{
+    corsair->SetChannelLEDs(zone, zones[zone].colors, zones[zone].leds_count);
+}
+
+void RGBController_CorsairLightingNode::UpdateSingleLED(int led)
+{
+    unsigned int channel = leds_channel[led];
+
+    corsair->SetChannelLEDs(channel, zones[channel].colors, zones[channel].leds_count);
+}
+
+void RGBController_CorsairLightingNode::SetCustomMode()
+{
+    active_mode = 0;
+}
+
+void RGBController_CorsairLightingNode::UpdateMode()
+{
+    if(modes[active_mode].value == 0xFFFF)
+    {
+        UpdateLEDs();
+    }
+    else
+    {
+        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);
+
+            if(modes[active_mode].direction == MODE_DIRECTION_RIGHT)
+            {
+                direction = 1;
+            }
+
+            unsigned char mode_colors[9];
+
+            if(modes[active_mode].color_mode == MODE_COLORS_MODE_SPECIFIC)
+            {
+                for(std::size_t i = 0; i < modes[active_mode].colors.size(); i++)
+                {
+                    mode_colors[(3 * i) + 0] = RGBGetRValue(modes[active_mode].colors[i]);
+                    mode_colors[(3 * i) + 1] = RGBGetGValue(modes[active_mode].colors[i]);
+                    mode_colors[(3 * i) + 2] = RGBGetBValue(modes[active_mode].colors[i]);
+                }
+            }
+
+            corsair->SetChannelEffect(channel,
+                                      zones[channel].leds_count,
+                                      modes[active_mode].value,
+                                      modes[active_mode].speed,
+                                      direction,
+                                      random,
+                                      mode_colors[0],
+                                      mode_colors[1],
+                                      mode_colors[2],
+                                      mode_colors[3],
+                                      mode_colors[4],
+                                      mode_colors[5],
+                                      mode_colors[6],
+                                      mode_colors[7],
+                                      mode_colors[8]);
+        }
+    }
+}

RGBController/RGBController_CorsairLightingNode.h

@@ -1,5 +1,5 @@
 /*-----------------------------------------*\
-|  RGBController_CorsairNodePro.h           |
+|  RGBController_CorsairLightingNode.h           |
 |                                           |
 |  Generic RGB Interface for Corsair        |
 |  Lighting Node Pro                        |
@@ -9,13 +9,17 @@
 
 #pragma once
 #include "RGBController.h"
-#include "serial_port.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();
+
+    void        ResizeZone(int zone, int new_size);
+
     void        UpdateLEDs();
     void        UpdateZoneLEDs(int zone);
     void        UpdateSingleLED(int led);
@@ -24,7 +28,7 @@ public:
     void        UpdateMode();
 
 private:
-    CorsairNodeProController*   corsair;
+    CorsairLightingNodeController*   corsair;
     std::vector<unsigned int>   leds_channel;
     std::vector<unsigned int>   zones_channel;
 };

RGBController/RGBController_CorsairNodePro.cpp

@@ -1,276 +0,0 @@
-/*-----------------------------------------*\
-|  RGBController_CorsairNodePro.cpp         |
-|                                           |
-|  Generic RGB Interface for Corsair        |
-|  Lighting Node Pro                        |
-|                                           |
-|  Adam Honse (CalcProgrammer1) 1/12/2020   |
-\*-----------------------------------------*/
-
-#include "RGBController_CorsairNodePro.h"
-
-
-RGBController_CorsairNodePro::RGBController_CorsairNodePro(CorsairNodeProController* corsair_ptr)
-{
-    corsair = corsair_ptr;
-
-    name = "Corsair Lighting Node Pro";
-
-    type = DEVICE_TYPE_LEDSTRIP;
-
-    mode Direct;
-    Direct.name  = "Direct";
-    Direct.value = 0xFFFF;
-    Direct.flags = MODE_FLAG_HAS_COLOR | MODE_FLAG_PER_LED_COLOR;
-    modes.push_back(Direct);
-
-    mode RainbowWave;
-    RainbowWave.name      = "Rainbow Wave";
-    RainbowWave.value     = CORSAIR_CMDR_PRO_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.direction = MODE_DIRECTION_RIGHT;
-    modes.push_back(RainbowWave);
-
-    mode ColorShift;
-    ColorShift.name       = "Color Shift";
-    ColorShift.value      = CORSAIR_CMDR_PRO_MODE_COLOR_SHIFT;
-    ColorShift.flags      = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_COLOR | MODE_FLAG_RANDOM_COLOR;
-    ColorShift.speed_min  = CORSAIR_CMDR_PRO_SPEED_SLOW;
-    ColorShift.speed_max  = CORSAIR_CMDR_PRO_SPEED_FAST;
-    ColorShift.speed      = CORSAIR_CMDR_PRO_SPEED_MEDIUM;
-    modes.push_back(ColorShift);
-
-    mode ColorPulse;
-    ColorPulse.name      = "Color Pulse";
-    ColorPulse.value     = CORSAIR_CMDR_PRO_MODE_COLOR_PULSE;
-    ColorPulse.flags     = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_COLOR | MODE_FLAG_RANDOM_COLOR;
-    ColorPulse.speed_min = CORSAIR_CMDR_PRO_SPEED_SLOW;
-    ColorPulse.speed_max = CORSAIR_CMDR_PRO_SPEED_FAST;
-    ColorPulse.speed     = CORSAIR_CMDR_PRO_SPEED_MEDIUM;
-    modes.push_back(ColorPulse);
-
-    mode ColorWave;
-    ColorWave.name      = "Color Wave";
-    ColorWave.value     = CORSAIR_CMDR_PRO_MODE_COLOR_WAVE;
-    ColorWave.flags     = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_DIRECTION_LR | MODE_FLAG_HAS_COLOR | MODE_FLAG_RANDOM_COLOR;
-    ColorWave.speed_min = CORSAIR_CMDR_PRO_SPEED_SLOW;
-    ColorWave.speed_max = CORSAIR_CMDR_PRO_SPEED_FAST;
-    ColorWave.speed     = CORSAIR_CMDR_PRO_SPEED_MEDIUM;
-    ColorWave.direction = MODE_DIRECTION_RIGHT;
-    modes.push_back(ColorWave);
-
-    mode Static;
-    Static.name  = "Static";
-    Static.value = CORSAIR_CMDR_PRO_MODE_STATIC;
-    Static.flags = MODE_FLAG_HAS_COLOR;
-    modes.push_back(Static);
-
-    mode Temperature;
-    Temperature.name  = "Temperature";
-    Temperature.value = CORSAIR_CMDR_PRO_MODE_TEMPERATURE;
-    Temperature.flags = MODE_FLAG_HAS_COLOR;
-    modes.push_back(Temperature);
-
-    mode Visor;
-    Visor.name      = "Visor";
-    Visor.value     = CORSAIR_CMDR_PRO_MODE_VISOR;
-    Visor.flags     = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_COLOR | MODE_FLAG_RANDOM_COLOR;
-    Visor.speed_min = CORSAIR_CMDR_PRO_SPEED_SLOW;
-    Visor.speed_max = CORSAIR_CMDR_PRO_SPEED_FAST;
-    Visor.speed     = CORSAIR_CMDR_PRO_SPEED_MEDIUM;
-    modes.push_back(Visor);
-
-    mode Marquee;
-    Marquee.name      = "Marquee";
-    Marquee.value     = CORSAIR_CMDR_PRO_MODE_MARQUEE;
-    Marquee.flags     = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_DIRECTION_LR | MODE_FLAG_HAS_COLOR | MODE_FLAG_RANDOM_COLOR;
-    Marquee.speed_min = CORSAIR_CMDR_PRO_SPEED_SLOW;
-    Marquee.speed_max = CORSAIR_CMDR_PRO_SPEED_FAST;
-    Marquee.speed     = CORSAIR_CMDR_PRO_SPEED_MEDIUM;
-    Marquee.direction = MODE_DIRECTION_RIGHT;
-    modes.push_back(Marquee);
-
-    mode Blink;
-    Blink.name      = "Blink";
-    Blink.value     = CORSAIR_CMDR_PRO_MODE_BLINK;
-    Blink.flags     = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_COLOR | MODE_FLAG_RANDOM_COLOR;
-    Blink.speed_min = CORSAIR_CMDR_PRO_SPEED_SLOW;
-    Blink.speed_max = CORSAIR_CMDR_PRO_SPEED_FAST;
-    Blink.speed     = CORSAIR_CMDR_PRO_SPEED_MEDIUM;
-    modes.push_back(Blink);
-
-    mode Sequential;
-    Sequential.name      = "Sequential";
-    Sequential.value     = CORSAIR_CMDR_PRO_MODE_SEQUENTIAL;
-    Sequential.flags     = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_DIRECTION_LR | MODE_FLAG_HAS_COLOR | MODE_FLAG_RANDOM_COLOR;
-    Sequential.speed_min = CORSAIR_CMDR_PRO_SPEED_SLOW;
-    Sequential.speed_max = CORSAIR_CMDR_PRO_SPEED_FAST;
-    Sequential.speed     = CORSAIR_CMDR_PRO_SPEED_MEDIUM;
-    Sequential.direction = MODE_DIRECTION_RIGHT;
-    modes.push_back(Sequential);
-
-    mode Rainbow;
-    Rainbow.name      = "Rainbow";
-    Rainbow.value     = CORSAIR_CMDR_PRO_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;
-    modes.push_back(Rainbow);
-    
-    /*-------------------------------------------------*\
-    | Set size of colors array                          |
-    \*-------------------------------------------------*/
-    unsigned int led_count = 0;
-    for (unsigned int channel_idx = 0; channel_idx < CORSAIR_NODE_PRO_NUM_CHANNELS; channel_idx++)
-    {
-        led_count += corsair->channel_leds[channel_idx];
-    }
-    colors.resize(led_count);
-
-    /*-------------------------------------------------*\
-    | Set zones and leds                                |
-    \*-------------------------------------------------*/
-    unsigned int led_idx = 0;
-    for (unsigned int channel_idx = 0; channel_idx < CORSAIR_NODE_PRO_NUM_CHANNELS; channel_idx++)
-    {
-        if(corsair->channel_leds[channel_idx] > 0)
-        {
-            zone* new_zone = new zone;
-
-            char ch_idx_string[2];
-            sprintf(ch_idx_string, "%d", channel_idx + 1);
-
-            new_zone->name = "Corsair Channel ";
-            new_zone->name.append(ch_idx_string);
-            new_zone->type = ZONE_TYPE_LINEAR;
-
-            std::vector<int> *new_zone_map = new std::vector<int>();
-
-            for (unsigned int led_ch_idx = 0; led_ch_idx < corsair->channel_leds[channel_idx]; led_ch_idx++)
-            {
-                char led_idx_string[3];
-                sprintf(led_idx_string, "%d", led_ch_idx + 1);
-
-                led new_led;
-                new_led.name = "Corsair Channel ";
-                new_led.name.append(ch_idx_string);
-                new_led.name.append(", LED ");
-                new_led.name.append(led_idx_string);
-
-                leds.push_back(new_led);
-                leds_channel.push_back(channel_idx);
-
-                new_zone_map->push_back(led_idx);
-                led_idx++;
-            }
-
-            new_zone->map.push_back(*new_zone_map);
-            zones.push_back(*new_zone);
-            zones_channel.push_back(channel_idx);
-        }
-    }
-}
-
-void RGBController_CorsairNodePro::UpdateLEDs()
-{
-    for(std::size_t zone_idx = 0; zone_idx < zones.size(); zone_idx++)
-    {
-        unsigned int channel = zones_channel[zone_idx];
-
-        std::vector<RGBColor> channel_colors;
-
-        for(std::size_t color = 0; color < colors.size(); color++)
-        {
-            if(leds_channel[color] == channel)
-            {
-                channel_colors.push_back(colors[color]);
-            }
-        }
-
-        if(channel_colors.size() > 0)
-        {
-            corsair->SetChannelLEDs(channel, channel_colors);
-        }
-    }
-}
-
-void RGBController_CorsairNodePro::UpdateZoneLEDs(int zone)
-{
-    unsigned int channel = zones_channel[zone];
-
-    std::vector<RGBColor> channel_colors;
-
-    for(std::size_t color = 0; color < colors.size(); color++)
-    {
-        if(leds_channel[color] == channel)
-        {
-            channel_colors.push_back(colors[color]);
-        }
-    }
-
-    if(channel_colors.size() > 0)
-    {
-        corsair->SetChannelLEDs(channel, channel_colors);
-    }
-}
-
-void RGBController_CorsairNodePro::UpdateSingleLED(int led)
-{
-    unsigned int channel = leds_channel[led];
-
-    std::vector<RGBColor> channel_colors;
-
-    for(std::size_t color = 0; color < colors.size(); color++)
-    {
-        if(leds_channel[color] == channel)
-        {
-            channel_colors.push_back(colors[color]);
-        }
-    }
-
-    if(channel_colors.size() > 0)
-    {
-        corsair->SetChannelLEDs(channel, channel_colors);
-    }
-}
-
-void RGBController_CorsairNodePro::SetCustomMode()
-{
-    SetMode(9);
-}
-
-void RGBController_CorsairNodePro::UpdateMode()
-{
-    if(modes[active_mode].value == 0xFFFF)
-    {
-        UpdateLEDs();
-    }
-    else
-    {
-        for(int channel = 0; channel < CORSAIR_CMDR_PRO_NUM_CHANNELS; channel++)
-        {
-            unsigned int direction = 0;
-
-            if(modes[active_mode].direction == MODE_DIRECTION_RIGHT)
-            {
-                direction = 1;
-            }
-
-            corsair->SetChannelEffect(channel,
-                                      modes[active_mode].value,
-                                      modes[active_mode].speed,
-                                      direction,
-                                      modes[active_mode].random,
-                                      RGBGetRValue(colors[0]),
-                                      RGBGetGValue(colors[0]),
-                                      RGBGetBValue(colors[0]),
-                                      RGBGetRValue(colors[1]),
-                                      RGBGetGValue(colors[1]),
-                                      RGBGetBValue(colors[1]));
-        }
-    }
-}

RGBController/RGBController_CorsairPeripheral.cpp

@@ -0,0 +1,267 @@
+/*-----------------------------------------*\
+|  RGBController_CorsairPeripheral.cpp      |
+|                                           |
+|  Generic RGB Interface for Corsair RGB    |
+|  keyboard, mouse, and mousemat devices    |
+|                                           |
+|  Adam Honse (CalcProgrammer1) 1/9/2020    |
+\*-----------------------------------------*/
+
+#include "RGBController_CorsairPeripheral.h"
+
+static const char* zone_names[] =
+{
+    "Keyboard",
+    "Media Keys"
+};
+
+static const unsigned int zone_sizes[] =
+{
+    104,
+    7
+};
+
+static const char* led_names[] =
+{
+    "Key: Escape",          //0
+    "Key: `",               //1
+    "Key: Tab",             //2
+    "Key: Caps Lock",       //3
+    "Key: Left Shift",      //4
+    "Key: Left Control",    //5
+    "Key: F12",             //6
+    "Key: =",               //7
+    "Key: Lock",            //8
+    "Key: Number Pad 7",    //9
+    "Key: F1",              //12
+    "Key: 1",               //13
+    "Key: Q",               //14
+    "Key: A",               //15
+    "Key: Left Windows",    //17
+    "Key: Print Screen",    //18
+    "Media Mute",           //20
+    "Key: Number Pad 8",    //21
+    "Key: F2",              //24
+    "Key: 2",               //25
+    "Key: W",               //26
+    "Key: S",               //27
+    "Key: Z",               //28
+    "Key: Left Alt",        //29
+    "Key: Scroll Lock",     //30
+    "Key: Backspace",       //31
+    "Media Stop",           //32
+    "Key: Number Pad 9",    //33
+    "Key: F3",              //36
+    "Key: 3",               //37
+    "Key: E",               //38
+    "Key: D",               //39
+    "Key: X",               //40
+    "Key: Pause/Break",     //42
+    "Key: Delete",          //43
+    "Media Previous",       //44
+    "Key: F4",              //48
+    "Key: 4",               //49
+    "Key: R",               //50
+    "Key: F",               //51
+    "Key: C",               //52
+    "Key: Space",           //53
+    "Key: Insert",          //54
+    "Key: End",             //55
+    "Media Play/Pause",     //56
+    "Key: Number Pad 4",    //57
+    "Key: F5",              //60
+    "Key: 5",               //61
+    "Key: T",               //62
+    "Key: G",               //63
+    "Key: V",               //64
+    "Key: Home",            //66
+    "Key: Page Down",       //67
+    "Media Next",           //68
+    "Key: Number Pad 5",    //69
+    "Key: F6",              //72
+    "Key: 6",               //73
+    "Key: Y",               //74
+    "Key: H",               //75
+    "Key: B",               //76
+    "Key: Page Up",         //78
+    "Key: Right Shift",     //79
+    "Key: Num Lock",        //80
+    "Key: Number Pad 6",    //81
+    "Key: F7",              //84
+    "Key: 7",               //85
+    "Key: U",               //86
+    "Key: J",               //87
+    "Key: N",               //88
+    "Key: Right Alt",       //89
+    "Key: ]",               //90
+    "Key: Right Control",   //91
+    "Key: Number Pad /",    //92
+    "Key: Number Pad 1",    //93
+    "Key: F8",              //96
+    "Key: 8",               //97
+    "Key: I",               //98
+    "Key: K",               //99
+    "Key: M",               //100
+    "Key: Right Windows",   //101
+    "Key: \\",              //102
+    "Key: Up Arrow",        //103
+    "Key: Number Pad *",    //104
+    "Key: Number Pad 2",    //105
+    "Key: F9",              //108
+    "Key: 9",               //109
+    "Key: O",               //110
+    "Key: L",               //111
+    "Key: ,",               //112
+    "Key: Context",         //113
+    "Key: Left Arrow",      //115
+    "Key: Number Pad -",    //116
+    "Key: Number Pad 3",    //117
+    "Key: F10",             //120
+    "Key: 0",               //121
+    "Key: P",               //122
+    "Key: ;",               //123
+    "Key: .",               //124
+    "Key: Enter",           //126
+    "Key: Down Arrow",      //127
+    "Key: Number Pad +",    //128
+    "Key: Number Pad 0",    //129
+    "Key: F11",             //132
+    "Key: -",               //133
+    "Key: [",               //134
+    "Key: '",               //135
+    "Key: /",               //136
+    "Key: Brightness",      //137
+    "Key: Right Arrow",     //139
+    "Key: Number Pad Enter",//140
+    "Key: Number Pad .",    //141
+    "Key: F12"
+};
+
+RGBController_CorsairPeripheral::RGBController_CorsairPeripheral(CorsairPeripheralController* corsair_ptr)
+{
+    corsair = corsair_ptr;
+
+    name        = "Corsair RGB Peripheral Device";
+    description = "Corsair RGB Peripheral Device";
+    type        = corsair->GetDeviceType();
+    version     = corsair->GetFirmwareString();
+
+    mode Direct;
+    Direct.name       = "Direct";
+    Direct.value      = 0;
+    Direct.flags      = MODE_FLAG_HAS_PER_LED_COLOR;
+    Direct.color_mode = MODE_COLORS_PER_LED;
+    modes.push_back(Direct);
+
+    SetupZones();
+}
+
+RGBController_CorsairPeripheral::~RGBController_CorsairPeripheral()
+{
+
+}
+
+void RGBController_CorsairPeripheral::SetupZones()
+{
+    /*---------------------------------------------------------*\
+    | Determine number of zones                                 |
+    |   For now, keyboard has 2 zones and mousemat has 1        |
+    \*---------------------------------------------------------*/
+    unsigned int num_zones = 0;
+
+    switch(type)
+    {
+        case DEVICE_TYPE_KEYBOARD:
+            num_zones = 2;
+            break;
+
+        case DEVICE_TYPE_MOUSE:
+        case DEVICE_TYPE_MOUSEMAT:
+            num_zones = 1;
+            break;
+    }
+
+    /*---------------------------------------------------------*\
+    | Set up zones                                              |
+    \*---------------------------------------------------------*/
+    unsigned int total_led_count = 0;
+    for(unsigned int zone_idx = 0; zone_idx < num_zones; zone_idx++)
+    {
+        zone new_zone;
+        switch(type)
+        {
+            case DEVICE_TYPE_KEYBOARD:
+                new_zone.name           = zone_names[zone_idx];
+                new_zone.leds_min       = zone_sizes[zone_idx];
+                new_zone.leds_max       = zone_sizes[zone_idx];
+                new_zone.leds_count     = zone_sizes[zone_idx];
+                break;
+
+            case DEVICE_TYPE_MOUSE:
+            case DEVICE_TYPE_MOUSEMAT:
+                new_zone.name           = "Mousemat Zone";
+                new_zone.leds_min       = 15;
+                new_zone.leds_max       = 15;
+                new_zone.leds_count     = 15;
+                break;
+        }
+
+        zones.push_back(new_zone);
+
+        total_led_count += new_zone.leds_count;
+    }
+
+    for(unsigned int led_idx = 0; led_idx < total_led_count; led_idx++)
+    {
+        led new_led;
+
+        switch(type)
+        {
+            case DEVICE_TYPE_KEYBOARD:
+                new_led.name = led_names[led_idx];
+                break;
+
+            case DEVICE_TYPE_MOUSE:
+            case DEVICE_TYPE_MOUSEMAT:
+                new_led.name = "Mousemat LED ";
+                new_led.name.append(std::to_string(led_idx + 1));
+                break;
+        }
+        
+        leds.push_back(new_led);
+    }
+
+    SetupColors();
+}
+
+void RGBController_CorsairPeripheral::ResizeZone(int /*zone*/, int /*new_size*/)
+{
+    /*---------------------------------------------------------*\
+    | This device does not support resizing zones               |
+    \*---------------------------------------------------------*/
+}
+
+void RGBController_CorsairPeripheral::UpdateLEDs()
+{
+    corsair->SetLEDs(colors);
+}
+
+void RGBController_CorsairPeripheral::UpdateZoneLEDs(int /*zone*/)
+{
+    corsair->SetLEDs(colors);
+}
+
+void RGBController_CorsairPeripheral::UpdateSingleLED(int /*led*/)
+{
+    corsair->SetLEDs(colors);
+}
+
+void RGBController_CorsairPeripheral::SetCustomMode()
+{
+    active_mode = 0;
+}
+
+void RGBController_CorsairPeripheral::UpdateMode()
+{
+
+}

RGBController/RGBController_CorsairPeripheral.h

@@ -0,0 +1,33 @@
+/*-----------------------------------------*\
+|  RGBController_CorsairPeripheral.h        |
+|                                           |
+|  Generic RGB Interface for Corsair RGB    |
+|  keyboard, mouse, and mousemat devices    |
+|                                           |
+|  Adam Honse (CalcProgrammer1) 1/9/2020    |
+\*-----------------------------------------*/
+
+#pragma once
+#include "RGBController.h"
+#include "CorsairPeripheralController.h"
+
+class RGBController_CorsairPeripheral : public RGBController
+{
+public:
+    RGBController_CorsairPeripheral(CorsairPeripheralController* corsair_ptr);
+    ~RGBController_CorsairPeripheral();
+
+    void        SetupZones();
+
+    void        ResizeZone(int zone, int new_size);
+    
+    void        UpdateLEDs();
+    void        UpdateZoneLEDs(int zone);
+    void        UpdateSingleLED(int led);
+
+    void        SetCustomMode();
+    void        UpdateMode();
+
+private:
+    CorsairPeripheralController*   corsair;
+};

RGBController/RGBController_CorsairPro.cpp

@@ -1,227 +0,0 @@
-/*-----------------------------------------*\
-|  RGBController_CorsairPro.cpp             |
-|                                           |
-|  Generic RGB Interface for OpenAuraSDK    |
-|  Corsair Vengeance Pro RGB driver         |
-|                                           |
-|  Adam Honse (CalcProgrammer1) 6/30/2019   |
-\*-----------------------------------------*/
-
-#include "RGBController_CorsairPro.h"
-
-void RGBController_CorsairPro::UpdateLEDs()
-{
-    for (std::size_t led = 0; led < colors.size(); led++)
-    {
-        RGBColor      color = colors[led];
-        unsigned char red   = RGBGetRValue(color);
-        unsigned char grn   = RGBGetGValue(color);
-        unsigned char blu   = RGBGetBValue(color);
-        corsair->SetLEDColor(led, red, grn, blu);
-    }
-
-    corsair->ApplyColors();
-}
-
-void RGBController_CorsairPro::UpdateZoneLEDs(int zone)
-{
-    UpdateLEDs();
-}
-
-void RGBController_CorsairPro::UpdateSingleLED(int led)
-{
-    RGBColor      color = colors[led];
-    unsigned char red   = RGBGetRValue(color);
-    unsigned char grn   = RGBGetGValue(color);
-    unsigned char blu   = RGBGetBValue(color);
-
-    corsair->SetLEDColor(led, red, grn, blu);
-    corsair->ApplyColors();
-}
-
-RGBController_CorsairPro::RGBController_CorsairPro(CorsairProController* corsair_ptr)
-{
-    corsair = corsair_ptr;
-
-    name = corsair->GetDeviceName();
-    location = corsair->GetDeviceLocation();
-
-    type = DEVICE_TYPE_DRAM;
-
-    mode ColorShift;
-    ColorShift.name      = "Color Shift";
-    ColorShift.value     = CORSAIR_PRO_MODE_COLOR_SHIFT;
-    ColorShift.flags     = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_COLOR | MODE_FLAG_RANDOM_COLOR;
-    ColorShift.speed_min = CORSAIR_PRO_SPEED_SLOW;
-    ColorShift.speed_max = CORSAIR_PRO_SPEED_FAST;
-    ColorShift.random    = false;
-    ColorShift.speed     = CORSAIR_PRO_SPEED_SLOW;
-    modes.push_back(ColorShift);
-
-    mode ColorPulse;
-    ColorPulse.name      = "Color Pulse";
-    ColorPulse.value     = CORSAIR_PRO_MODE_COLOR_PULSE;
-    ColorPulse.flags     = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_COLOR | MODE_FLAG_RANDOM_COLOR;
-    ColorPulse.speed_min = CORSAIR_PRO_SPEED_SLOW;
-    ColorPulse.speed_max = CORSAIR_PRO_SPEED_FAST;
-    ColorPulse.random    = false;
-    ColorPulse.speed     = CORSAIR_PRO_SPEED_SLOW;
-    modes.push_back(ColorPulse);
-
-    mode RainbowWave;
-    RainbowWave.name      = "Rainbow Wave";
-    RainbowWave.value     = CORSAIR_PRO_MODE_RAINBOW_WAVE;
-    RainbowWave.flags     = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_DIRECTION_LR | MODE_FLAG_HAS_DIRECTION_UD;
-    RainbowWave.speed_min = CORSAIR_PRO_SPEED_SLOW;
-    RainbowWave.speed_max = CORSAIR_PRO_SPEED_FAST;
-    RainbowWave.random    = false;
-    RainbowWave.speed     = CORSAIR_PRO_SPEED_SLOW;
-    RainbowWave.direction = MODE_DIRECTION_DOWN;
-    modes.push_back(RainbowWave);
-
-    mode ColorWave;
-    ColorWave.name      = "Color Wave";
-    ColorWave.value     = CORSAIR_PRO_MODE_COLOR_WAVE;
-    ColorWave.flags     = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_DIRECTION_LR | MODE_FLAG_HAS_DIRECTION_UD | MODE_FLAG_HAS_COLOR | MODE_FLAG_RANDOM_COLOR;
-    ColorWave.speed_min = CORSAIR_PRO_SPEED_SLOW;
-    ColorWave.speed_max = CORSAIR_PRO_SPEED_FAST;
-    ColorWave.random    = false;
-    ColorWave.speed     = CORSAIR_PRO_SPEED_SLOW;
-    ColorWave.direction = MODE_DIRECTION_DOWN;
-    modes.push_back(ColorWave); 
-    
-    mode Visor;
-    Visor.name      = "Visor";
-    Visor.value     = CORSAIR_PRO_MODE_VISOR;
-    Visor.flags     = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_DIRECTION_HV | MODE_FLAG_HAS_COLOR | MODE_FLAG_RANDOM_COLOR;
-    Visor.speed_min = CORSAIR_PRO_SPEED_SLOW;
-    Visor.speed_max = CORSAIR_PRO_SPEED_FAST;
-    Visor.random    = false;
-    Visor.speed     = CORSAIR_PRO_SPEED_SLOW;
-    Visor.direction = MODE_DIRECTION_VERTICAL;
-    modes.push_back(Visor);
-
-    mode Rain;
-    Rain.name      = "Rain";
-    Rain.value     = CORSAIR_PRO_MODE_RAIN;
-    Rain.flags     = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_DIRECTION_UD | MODE_FLAG_HAS_COLOR | MODE_FLAG_RANDOM_COLOR;
-    Rain.speed_min = CORSAIR_PRO_SPEED_SLOW;
-    Rain.speed_max = CORSAIR_PRO_SPEED_FAST;
-    Rain.random    = false;
-    Rain.speed     = CORSAIR_PRO_SPEED_SLOW;
-    Rain.direction = MODE_DIRECTION_DOWN;
-    modes.push_back(Rain);
-
-    mode Marquee;
-    Marquee.name      = "Marquee";
-    Marquee.value     = CORSAIR_PRO_MODE_MARQUEE;
-    Marquee.flags     = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_COLOR;
-    Marquee.speed_min = CORSAIR_PRO_SPEED_SLOW;
-    Marquee.speed_max = CORSAIR_PRO_SPEED_FAST;
-    Marquee.random    = false;
-    Marquee.speed     = CORSAIR_PRO_SPEED_SLOW;
-    modes.push_back(Marquee);
-    
-    mode Rainbow;
-    Rainbow.name      = "Rainbow";
-    Rainbow.value     = CORSAIR_PRO_MODE_RAINBOW;
-    Rainbow.flags     = MODE_FLAG_HAS_SPEED;
-    Rainbow.speed_min = CORSAIR_PRO_SPEED_SLOW;
-    Rainbow.speed_max = CORSAIR_PRO_SPEED_FAST;
-    Rainbow.random    = false;
-    Rainbow.speed     = CORSAIR_PRO_SPEED_SLOW;
-    modes.push_back(Rainbow);
-    
-    mode Sequential;
-    Sequential.name      = "Sequential";
-    Sequential.value     = CORSAIR_PRO_MODE_SEQUENTIAL;
-    Sequential.flags     = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_DIRECTION_UD | MODE_FLAG_HAS_COLOR | MODE_FLAG_RANDOM_COLOR;
-    Sequential.speed_min = CORSAIR_PRO_SPEED_SLOW;
-    Sequential.speed_max = CORSAIR_PRO_SPEED_FAST;
-    Sequential.random    = false;
-    Sequential.speed     = CORSAIR_PRO_SPEED_SLOW;
-    Sequential.direction = MODE_DIRECTION_DOWN;
-    modes.push_back(Sequential);
-
-    mode Static;
-    Static.name      = "Static";
-    Static.value     = CORSAIR_PRO_MODE_STATIC;
-    Static.flags     = MODE_FLAG_HAS_COLOR | MODE_FLAG_PER_LED_COLOR;
-    Static.speed_min = 0;
-    Static.speed_max = 0;
-    Static.random    = false;
-    Static.speed     = 0;
-    modes.push_back(Static);
-
-    active_mode = 9;
-
-    colors.resize(corsair->GetLEDCount());
-
-    for (unsigned int i = 0; i < corsair->GetLEDCount(); i++)
-    {
-        led* new_led = new led();
-
-        new_led->name = "Corsair Pro LED";
-
-        leds.push_back(*new_led);
-    }
-
-    zone new_zone;
-
-    new_zone.name = "Corsair Pro Zone";
-    new_zone.type = ZONE_TYPE_LINEAR;
-
-    std::vector<int> zone_row;
-
-    for (unsigned int i = 0; i < corsair->GetLEDCount(); i++)
-    {
-        zone_row.push_back(i);
-    }
-
-    new_zone.map.push_back(zone_row);
-
-    zones.push_back(new_zone);
-}
-
-void RGBController_CorsairPro::SetCustomMode()
-{
-    SetMode(9);
-}
-
-void RGBController_CorsairPro::UpdateMode()
-{
-    unsigned int corsair_direction;
-
-    switch(modes[active_mode].direction)
-    {
-        case MODE_DIRECTION_LEFT:
-            corsair_direction = CORSAIR_PRO_DIRECTION_LEFT;
-            break;
-        case MODE_DIRECTION_RIGHT:
-            corsair_direction = CORSAIR_PRO_DIRECTION_RIGHT;
-            break;
-        case MODE_DIRECTION_UP:
-            corsair_direction = CORSAIR_PRO_DIRECTION_UP;
-            break;
-        case MODE_DIRECTION_DOWN:
-            corsair_direction = CORSAIR_PRO_DIRECTION_DOWN;
-            break;
-        case MODE_DIRECTION_HORIZONTAL:
-            corsair_direction = CORSAIR_PRO_DIRECTION_HORIZONTAL;
-            break;
-        case MODE_DIRECTION_VERTICAL:
-            corsair_direction = CORSAIR_PRO_DIRECTION_VERTICAL;
-            break;
-    }
-
-    corsair->SetEffect(modes[active_mode].value,
-                       modes[active_mode].speed,
-                       corsair_direction,
-                       modes[active_mode].random,
-                       RGBGetRValue(colors[0]),
-                       RGBGetGValue(colors[0]),
-                       RGBGetBValue(colors[0]),
-                       RGBGetRValue(colors[1]),
-                       RGBGetGValue(colors[1]),
-                       RGBGetBValue(colors[1]));
-}

RGBController/RGBController_CorsairVengeance.cpp

@@ -0,0 +1,106 @@
+/*-----------------------------------------*\
+|  RGBController_CorsairVengeance.cpp       |
+|                                           |
+|  Generic RGB Interface for OpenAuraSDK    |
+|  Corsair Vengeance RGB driver             |
+|                                           |
+|  Adam Honse (CalcProgrammer1) 6/13/2019   |
+\*-----------------------------------------*/
+
+#include "RGBController_CorsairVengeance.h"
+
+RGBController_CorsairVengeance::RGBController_CorsairVengeance(CorsairVengeanceController* corsair_ptr)
+{
+    corsair = corsair_ptr;
+
+    name = corsair->GetDeviceName();
+    location = corsair->GetDeviceLocation();
+
+    type = DEVICE_TYPE_DRAM;
+
+    mode Static;
+    Static.name       = "Static";
+    Static.value      = CORSAIR_VENGEANCE_RGB_MODE_SINGLE;
+    Static.flags      = MODE_FLAG_HAS_PER_LED_COLOR;
+    Static.color_mode = MODE_COLORS_PER_LED;
+    modes.push_back(Static);
+
+    mode Fade;
+    Fade.name       = "Fade";
+    Fade.value      = CORSAIR_VENGEANCE_RGB_MODE_FADE;
+    Fade.flags      = MODE_FLAG_HAS_PER_LED_COLOR;
+    Fade.color_mode = MODE_COLORS_PER_LED;
+    modes.push_back(Fade);
+
+    mode Pulse;
+    Pulse.name       = "Pulse";
+    Pulse.value      = CORSAIR_VENGEANCE_RGB_MODE_PULSE;
+    Pulse.flags      = MODE_FLAG_HAS_PER_LED_COLOR;
+    Pulse.color_mode = MODE_COLORS_PER_LED;
+    modes.push_back(Pulse);
+
+    SetupZones();
+}
+
+void RGBController_CorsairVengeance::SetupZones()
+{
+    /*---------------------------------------------------------*\
+    | Create a single zone                                      |
+    \*---------------------------------------------------------*/
+    zone new_zone;
+    new_zone.name       = "Corsair Zone";
+    new_zone.type       = ZONE_TYPE_SINGLE;
+    new_zone.leds_min   = corsair->GetLEDCount();
+    new_zone.leds_max   = corsair->GetLEDCount();
+    new_zone.leds_count = corsair->GetLEDCount();
+    zones.push_back(new_zone);
+
+    /*---------------------------------------------------------*\
+    | Set up LEDs                                               |
+    \*---------------------------------------------------------*/
+    for(std::size_t led_idx = 0; led_idx < zones[0].leds_count; led_idx++)
+    {
+        led* new_led = new led();
+        new_led->name = "Corsair LED";
+        leds.push_back(*new_led);
+    }
+
+    SetupColors();
+}
+
+void RGBController_CorsairVengeance::ResizeZone(int /*zone*/, int /*new_size*/)
+{
+    /*---------------------------------------------------------*\
+    | This device does not support resizing zones               |
+    \*---------------------------------------------------------*/
+}
+
+void RGBController_CorsairVengeance::UpdateLEDs()
+{
+    RGBColor      color = colors[0];
+    unsigned char red   = RGBGetRValue(color);
+    unsigned char grn   = RGBGetGValue(color);
+    unsigned char blu   = RGBGetBValue(color);
+
+    corsair->SetLEDColor(red, grn, blu);
+}
+
+void RGBController_CorsairVengeance::UpdateZoneLEDs(int /*zone*/)
+{
+    UpdateLEDs();
+}
+
+void RGBController_CorsairVengeance::UpdateSingleLED(int /*led*/)
+{
+    UpdateLEDs();
+}
+
+void RGBController_CorsairVengeance::SetCustomMode()
+{
+    active_mode = 0;
+}
+
+void RGBController_CorsairVengeance::UpdateMode()
+{
+    corsair->SetMode(modes[active_mode].value);
+}

RGBController/RGBController_CorsairVengeance.h

@@ -1,5 +1,5 @@
 /*-----------------------------------------*\
-|  RGBController_Corsair.h                  |
+|  RGBController_CorsairVengeance.h         |
 |                                           |
 |  Generic RGB Interface for OpenAuraSDK    |
 |  Corsair Vengeance RGB driver             |
@@ -10,12 +10,17 @@
 #pragma once
 
 #include "RGBController.h"
-#include "CorsairController.h"
+#include "CorsairVengeanceController.h"
 
-class RGBController_Corsair : public RGBController
+class RGBController_CorsairVengeance : public RGBController
 {
 public:
-    RGBController_Corsair(CorsairController* corsair_ptr);
+    RGBController_CorsairVengeance(CorsairVengeanceController* corsair_ptr);
+
+    void        SetupZones();
+
+    void        ResizeZone(int zone, int new_size);
+
     void        UpdateLEDs();
     void        UpdateZoneLEDs(int zone);
     void        UpdateSingleLED(int led);
@@ -24,5 +29,5 @@ public:
     void        UpdateMode();
 
 private:
-    CorsairController* corsair;
+    CorsairVengeanceController* corsair;
 };

RGBController/RGBController_CorsairVengeancePro.cpp

@@ -0,0 +1,280 @@
+/*-----------------------------------------*\
+|  RGBController_CorsairVengeancePro.cpp    |
+|                                           |
+|  Generic RGB Interface for OpenAuraSDK    |
+|  Corsair Vengeance Pro RGB driver         |
+|                                           |
+|  Adam Honse (CalcProgrammer1) 6/30/2019   |
+\*-----------------------------------------*/
+
+#include "RGBController_CorsairVengeancePro.h"
+
+RGBController_CorsairVengeancePro::RGBController_CorsairVengeancePro(CorsairVengeanceProController* corsair_ptr)
+{
+    corsair = corsair_ptr;
+
+    name = corsair->GetDeviceName();
+    location = corsair->GetDeviceLocation();
+
+    type = DEVICE_TYPE_DRAM;
+
+    mode ColorShift;
+    ColorShift.name       = "Color Shift";
+    ColorShift.value      = CORSAIR_PRO_MODE_COLOR_SHIFT;
+    ColorShift.flags      = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_MODE_SPECIFIC_COLOR | MODE_FLAG_HAS_RANDOM_COLOR;
+    ColorShift.speed_min  = CORSAIR_PRO_SPEED_SLOW;
+    ColorShift.speed_max  = CORSAIR_PRO_SPEED_FAST;
+    ColorShift.colors_min = 2;
+    ColorShift.colors_max = 2;
+    ColorShift.speed      = CORSAIR_PRO_SPEED_SLOW;
+    ColorShift.color_mode = MODE_COLORS_MODE_SPECIFIC;
+    ColorShift.colors.resize(2);
+    modes.push_back(ColorShift);
+
+    mode ColorPulse;
+    ColorPulse.name       = "Color Pulse";
+    ColorPulse.value      = CORSAIR_PRO_MODE_COLOR_PULSE;
+    ColorPulse.flags      = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_MODE_SPECIFIC_COLOR | MODE_FLAG_HAS_RANDOM_COLOR;
+    ColorPulse.speed_min  = CORSAIR_PRO_SPEED_SLOW;
+    ColorPulse.speed_max  = CORSAIR_PRO_SPEED_FAST;
+    ColorPulse.colors_min = 2;
+    ColorPulse.colors_max = 2;
+    ColorPulse.speed      = CORSAIR_PRO_SPEED_SLOW;
+    ColorPulse.color_mode = MODE_COLORS_MODE_SPECIFIC;
+    ColorPulse.colors.resize(2);
+    modes.push_back(ColorPulse);
+
+    mode RainbowWave;
+    RainbowWave.name       = "Rainbow Wave";
+    RainbowWave.value      = CORSAIR_PRO_MODE_RAINBOW_WAVE;
+    RainbowWave.flags      = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_DIRECTION_LR | MODE_FLAG_HAS_DIRECTION_UD;
+    RainbowWave.speed_min  = CORSAIR_PRO_SPEED_SLOW;
+    RainbowWave.speed_max  = CORSAIR_PRO_SPEED_FAST;
+    RainbowWave.speed      = CORSAIR_PRO_SPEED_SLOW;
+    RainbowWave.direction  = MODE_DIRECTION_DOWN;
+    RainbowWave.color_mode = MODE_COLORS_NONE;
+    modes.push_back(RainbowWave);
+
+    mode ColorWave;
+    ColorWave.name       = "Color Wave";
+    ColorWave.value      = CORSAIR_PRO_MODE_COLOR_WAVE;
+    ColorWave.flags      = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_DIRECTION_LR | MODE_FLAG_HAS_DIRECTION_UD | MODE_FLAG_HAS_MODE_SPECIFIC_COLOR | MODE_FLAG_HAS_RANDOM_COLOR;
+    ColorWave.speed_min  = CORSAIR_PRO_SPEED_SLOW;
+    ColorWave.speed_max  = CORSAIR_PRO_SPEED_FAST;
+    ColorWave.colors_min = 2;
+    ColorWave.colors_max = 2;
+    ColorWave.speed      = CORSAIR_PRO_SPEED_SLOW;
+    ColorWave.direction  = MODE_DIRECTION_DOWN;
+    ColorWave.color_mode = MODE_COLORS_MODE_SPECIFIC;
+    ColorWave.colors.resize(2);
+    modes.push_back(ColorWave);
+
+    mode Visor;
+    Visor.name       = "Visor";
+    Visor.value      = CORSAIR_PRO_MODE_VISOR;
+    Visor.flags      = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_DIRECTION_HV | MODE_FLAG_HAS_MODE_SPECIFIC_COLOR | MODE_FLAG_HAS_RANDOM_COLOR;
+    Visor.speed_min  = CORSAIR_PRO_SPEED_SLOW;
+    Visor.speed_max  = CORSAIR_PRO_SPEED_FAST;
+    Visor.colors_min = 2;
+    Visor.colors_max = 2;
+    Visor.speed      = CORSAIR_PRO_SPEED_SLOW;
+    Visor.direction  = MODE_DIRECTION_VERTICAL;
+    Visor.color_mode = MODE_COLORS_MODE_SPECIFIC;
+    Visor.colors.resize(2);
+    modes.push_back(Visor);
+
+    mode Rain;
+    Rain.name       = "Rain";
+    Rain.value      = CORSAIR_PRO_MODE_RAIN;
+    Rain.flags      = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_DIRECTION_UD | MODE_FLAG_HAS_MODE_SPECIFIC_COLOR | MODE_FLAG_HAS_RANDOM_COLOR;
+    Rain.speed_min  = CORSAIR_PRO_SPEED_SLOW;
+    Rain.speed_max  = CORSAIR_PRO_SPEED_FAST;
+    Rain.colors_min = 2;
+    Rain.colors_max = 2;
+    Rain.speed      = CORSAIR_PRO_SPEED_SLOW;
+    Rain.direction  = MODE_DIRECTION_DOWN;
+    Rain.color_mode = MODE_COLORS_MODE_SPECIFIC;
+    Rain.colors.resize(2);
+    modes.push_back(Rain);
+
+    mode Marquee;
+    Marquee.name       = "Marquee";
+    Marquee.value      = CORSAIR_PRO_MODE_MARQUEE;
+    Marquee.flags      = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_MODE_SPECIFIC_COLOR;
+    Marquee.speed_min  = CORSAIR_PRO_SPEED_SLOW;
+    Marquee.speed_max  = CORSAIR_PRO_SPEED_FAST;
+    Marquee.colors_min = 1;
+    Marquee.colors_max = 1;
+    Marquee.speed      = CORSAIR_PRO_SPEED_SLOW;
+    Marquee.color_mode = MODE_COLORS_MODE_SPECIFIC;
+    Marquee.colors.resize(1);
+    modes.push_back(Marquee);
+
+    mode Rainbow;
+    Rainbow.name       = "Rainbow";
+    Rainbow.value      = CORSAIR_PRO_MODE_RAINBOW;
+    Rainbow.flags      = MODE_FLAG_HAS_SPEED;
+    Rainbow.speed_min  = CORSAIR_PRO_SPEED_SLOW;
+    Rainbow.speed_max  = CORSAIR_PRO_SPEED_FAST;
+    Rainbow.speed      = CORSAIR_PRO_SPEED_SLOW;
+    Rainbow.color_mode = MODE_COLORS_NONE;
+    modes.push_back(Rainbow);
+
+    mode Sequential;
+    Sequential.name       = "Sequential";
+    Sequential.value      = CORSAIR_PRO_MODE_SEQUENTIAL;
+    Sequential.flags      = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_DIRECTION_UD | MODE_FLAG_HAS_MODE_SPECIFIC_COLOR | MODE_FLAG_HAS_RANDOM_COLOR;
+    Sequential.speed_min  = CORSAIR_PRO_SPEED_SLOW;
+    Sequential.speed_max  = CORSAIR_PRO_SPEED_FAST;
+    Sequential.colors_min = 1;
+    Sequential.colors_max = 1;
+    Sequential.speed      = CORSAIR_PRO_SPEED_SLOW;
+    Sequential.direction  = MODE_DIRECTION_DOWN;
+    Sequential.color_mode = MODE_COLORS_MODE_SPECIFIC;
+    Sequential.colors.resize(1);
+    modes.push_back(Sequential);
+
+    mode Static;
+    Static.name       = "Static";
+    Static.value      = CORSAIR_PRO_MODE_STATIC;
+    Static.flags      = MODE_FLAG_HAS_PER_LED_COLOR;
+    Static.speed_min  = 0;
+    Static.speed_max  = 0;
+    Static.speed      = 0;
+    Static.color_mode = MODE_COLORS_PER_LED;
+    modes.push_back(Static);
+
+    SetupZones();
+
+    active_mode = 9;
+}
+
+void RGBController_CorsairVengeancePro::SetupZones()
+{
+    /*---------------------------------------------------------*\
+    | Set up zone                                               |
+    \*---------------------------------------------------------*/
+    zone new_zone;
+    new_zone.name           = "Corsair Pro Zone";
+    new_zone.type           = ZONE_TYPE_LINEAR;
+    new_zone.leds_min       = corsair->GetLEDCount();
+    new_zone.leds_max       = corsair->GetLEDCount();
+    new_zone.leds_count     = corsair->GetLEDCount();
+    zones.push_back(new_zone);
+
+    /*---------------------------------------------------------*\
+    | Set up LEDs                                               |
+    \*---------------------------------------------------------*/
+    for(std::size_t led_idx = 0; led_idx < zones[0].leds_count; led_idx++)
+    {
+        led* new_led = new led();
+        new_led->name = "Corsair Pro LED ";
+        new_led->name.append(std::to_string(led_idx));
+        leds.push_back(*new_led);
+    }
+
+    SetupColors();
+}
+
+void RGBController_CorsairVengeancePro::ResizeZone(int /*zone*/, int /*new_size*/)
+{
+    /*---------------------------------------------------------*\
+    | This device does not support resizing zones               |
+    \*---------------------------------------------------------*/
+}
+
+void RGBController_CorsairVengeancePro::UpdateLEDs()
+{
+    for (std::size_t led = 0; led < colors.size(); led++)
+    {
+        RGBColor      color = colors[led];
+        unsigned char red   = RGBGetRValue(color);
+        unsigned char grn   = RGBGetGValue(color);
+        unsigned char blu   = RGBGetBValue(color);
+        corsair->SetLEDColor(led, red, grn, blu);
+    }
+
+    corsair->ApplyColors();
+}
+
+void RGBController_CorsairVengeancePro::UpdateZoneLEDs(int /*zone*/)
+{
+    UpdateLEDs();
+}
+
+void RGBController_CorsairVengeancePro::UpdateSingleLED(int led)
+{
+    RGBColor      color = colors[led];
+    unsigned char red   = RGBGetRValue(color);
+    unsigned char grn   = RGBGetGValue(color);
+    unsigned char blu   = RGBGetBValue(color);
+
+    corsair->SetLEDColor(led, red, grn, blu);
+    corsair->ApplyColors();
+}
+
+void RGBController_CorsairVengeancePro::SetCustomMode()
+{
+    active_mode = 9;
+}
+
+void RGBController_CorsairVengeancePro::UpdateMode()
+{
+    unsigned int corsair_direction = 0;
+    bool random = (modes[active_mode].color_mode == MODE_COLORS_RANDOM);
+    unsigned char mode_colors[6];
+
+    switch(modes[active_mode].direction)
+    {
+        case MODE_DIRECTION_LEFT:
+            corsair_direction = CORSAIR_PRO_DIRECTION_LEFT;
+            break;
+        case MODE_DIRECTION_RIGHT:
+            corsair_direction = CORSAIR_PRO_DIRECTION_RIGHT;
+            break;
+        case MODE_DIRECTION_UP:
+            corsair_direction = CORSAIR_PRO_DIRECTION_UP;
+            break;
+        case MODE_DIRECTION_DOWN:
+            corsair_direction = CORSAIR_PRO_DIRECTION_DOWN;
+            break;
+        case MODE_DIRECTION_HORIZONTAL:
+            corsair_direction = CORSAIR_PRO_DIRECTION_HORIZONTAL;
+            break;
+        case MODE_DIRECTION_VERTICAL:
+            corsair_direction = CORSAIR_PRO_DIRECTION_VERTICAL;
+            break;
+    }
+
+    mode_colors[0] = 0;
+    mode_colors[1] = 0;
+    mode_colors[2] = 0;
+    mode_colors[3] = 0;
+    mode_colors[4] = 0;
+    mode_colors[5] = 0;
+
+    if(modes[active_mode].color_mode == MODE_COLORS_MODE_SPECIFIC)
+    {
+        mode_colors[0] = RGBGetRValue(modes[active_mode].colors[0]);
+        mode_colors[1] = RGBGetGValue(modes[active_mode].colors[0]);
+        mode_colors[2] = RGBGetBValue(modes[active_mode].colors[0]);
+
+        if(modes[active_mode].colors.size() == 2)
+        {
+            mode_colors[3] = RGBGetRValue(modes[active_mode].colors[1]);
+            mode_colors[4] = RGBGetGValue(modes[active_mode].colors[1]);
+            mode_colors[5] = RGBGetBValue(modes[active_mode].colors[1]);
+        }        
+    }
+
+    corsair->SetEffect(modes[active_mode].value,
+                       modes[active_mode].speed,
+                       corsair_direction,
+                       random,
+                       mode_colors[0],
+                       mode_colors[1],
+                       mode_colors[2],
+                       mode_colors[3],
+                       mode_colors[4],
+                       mode_colors[5]);
+}

RGBController/RGBController_CorsairVengeancePro.h

@@ -1,5 +1,5 @@
 /*-----------------------------------------*\
-|  RGBController_CorsairPro.h               |
+|  RGBController_CorsairVengeancePro.h      |
 |                                           |
 |  Generic RGB Interface for OpenAuraSDK    |
 |  Corsair Vengeance Pro RGB driver         |
@@ -10,12 +10,17 @@
 #pragma once
 
 #include "RGBController.h"
-#include "CorsairProController.h"
+#include "CorsairVengeanceProController.h"
 
-class RGBController_CorsairPro : public RGBController
+class RGBController_CorsairVengeancePro : public RGBController
 {
 public:
-    RGBController_CorsairPro(CorsairProController* corsair_ptr);
+    RGBController_CorsairVengeancePro(CorsairVengeanceProController* corsair_ptr);
+
+    void        SetupZones();
+
+    void        ResizeZone(int zone, int new_size);
+
     void        UpdateLEDs();
     void        UpdateZoneLEDs(int zone);
     void        UpdateSingleLED(int led);
@@ -24,5 +29,5 @@ public:
     void        UpdateMode();
 
 private:
-    CorsairProController* corsair;
+    CorsairVengeanceProController* corsair;
 };

RGBController/RGBController_Crucial.cpp

@@ -0,0 +1,181 @@
+/*-----------------------------------------*\
+|  RGBController_Crucial.cpp                |
+|                                           |
+|  Generic RGB Interface for Crucial        |
+|  Ballistix RGB controller                 |
+|                                           |
+|  Adam Honse (CalcProgrammer1) 1/19/2020   |
+\*-----------------------------------------*/
+
+#include "RGBController_Crucial.h"
+
+RGBController_Crucial::RGBController_Crucial(CrucialController * crucial_ptr)
+{
+    crucial = crucial_ptr;
+
+    location = crucial->GetDeviceLocation();
+    type = DEVICE_TYPE_DRAM;
+    name = "Crucial DRAM";
+
+    mode Direct;
+    Direct.name       = "Direct";
+    Direct.value      = 0xFFFF;
+    Direct.flags      = MODE_FLAG_HAS_PER_LED_COLOR;
+    Direct.color_mode = MODE_COLORS_PER_LED;
+    modes.push_back(Direct);
+
+    mode Shift;
+    Shift.name       = "Shift";
+    Shift.value      = CRUCIAL_MODE_SHIFT;
+    Shift.flags      = MODE_FLAG_HAS_MODE_SPECIFIC_COLOR;
+    Shift.colors_min = 1;
+    Shift.colors_max = 1;
+    Shift.color_mode = MODE_COLORS_MODE_SPECIFIC;
+    Shift.colors.resize(1);
+    modes.push_back(Shift);
+    
+    mode GradientShift;
+    GradientShift.name       = "Gradient Shift";
+    GradientShift.value      = CRUCIAL_MODE_GRADIENT_SHIFT;
+    GradientShift.flags      = 0;
+    GradientShift.color_mode = MODE_COLORS_NONE;
+    modes.push_back(GradientShift);
+
+    mode Fill;
+    Fill.name       = "Fill";
+    Fill.value      = CRUCIAL_MODE_FILL;
+    Fill.flags      = 0;
+    Fill.color_mode = MODE_COLORS_NONE;
+    modes.push_back(Fill);
+
+    mode Stack;
+    Stack.name       = "Stack";
+    Stack.value      = CRUCIAL_MODE_STACK;
+    Stack.flags      = 0;
+    Stack.color_mode = MODE_COLORS_NONE;
+    modes.push_back(Stack);
+
+    mode DoubleStack;
+    DoubleStack.name       = "Double Stack";
+    DoubleStack.value      = CRUCIAL_MODE_DOUBLE_STACK;
+    DoubleStack.flags      = 0;
+    DoubleStack.color_mode = MODE_COLORS_NONE;
+    modes.push_back(DoubleStack);
+
+    mode Breathing;
+    Breathing.name       = "Breathing";
+    Breathing.value      = CRUCIAL_MODE_BREATHING;
+    Breathing.flags      = 0;
+    Breathing.color_mode = MODE_COLORS_NONE;
+    modes.push_back(Breathing);
+
+    mode MotionPoint;
+    MotionPoint.name       = "Motion Point";
+    MotionPoint.value      = CRUCIAL_MODE_MOTION_POINT;
+    MotionPoint.flags      = 0;
+    MotionPoint.color_mode = MODE_COLORS_NONE;
+    modes.push_back(MotionPoint);
+
+    mode InsideOut;
+    InsideOut.name       = "Inside Out";
+    InsideOut.value      = CRUCIAL_MODE_INSIDE_OUT;
+    InsideOut.flags      = 0;
+    InsideOut.color_mode = MODE_COLORS_NONE;
+    modes.push_back(InsideOut);
+
+    mode ColorStep;
+    ColorStep.name       = "Color Step";
+    ColorStep.value      = CRUCIAL_MODE_COLOR_STEP;
+    ColorStep.flags      = 0;
+    ColorStep.color_mode = MODE_COLORS_NONE;
+    modes.push_back(ColorStep);
+
+    mode WaterWave;
+    WaterWave.name       = "Water Wave (Color Blending)";
+    WaterWave.value      = CRUCIAL_MODE_WATER_WAVE;
+    WaterWave.flags      = 0;
+    WaterWave.color_mode = MODE_COLORS_NONE;
+    modes.push_back(WaterWave);
+
+    mode Flashing;
+    Flashing.name       = "Flashing";
+    Flashing.value      = CRUCIAL_MODE_FLASHING;
+    Flashing.flags      = 0;
+    Flashing.color_mode = MODE_COLORS_NONE;
+    modes.push_back(Flashing);
+
+    mode Static;
+    Static.name       = "Static";
+    Static.value      = CRUCIAL_MODE_STATIC;
+    Static.flags      = 0;
+    Static.color_mode = MODE_COLORS_NONE;
+    modes.push_back(Static);
+
+    SetupZones();
+}
+
+void RGBController_Crucial::SetupZones()
+{
+    /*---------------------------------------------------------*\
+    | Set up zone                                               |
+    \*---------------------------------------------------------*/
+    zone new_zone;
+    new_zone.name           = "DRAM";
+    new_zone.type           = ZONE_TYPE_LINEAR;
+    new_zone.leds_min       = 8;
+    new_zone.leds_max       = 8;
+    new_zone.leds_count     = 8;
+    zones.push_back(new_zone);
+
+    /*---------------------------------------------------------*\
+    | Set up LEDs                                               |
+    \*---------------------------------------------------------*/
+    for(std::size_t led_idx = 0; led_idx < zones[0].leds_count; led_idx++)
+    {
+        led new_led;
+        new_led.name = "DRAM LED ";
+        new_led.name.append(std::to_string(led_idx));
+        leds.push_back(new_led);
+    }
+
+    SetupColors();
+}
+
+void RGBController_Crucial::ResizeZone(int /*zone*/, int /*new_size*/)
+{
+    /*---------------------------------------------------------*\
+    | This device does not support resizing zones               |
+    \*---------------------------------------------------------*/
+}
+
+void RGBController_Crucial::UpdateLEDs()
+{
+    if(modes[active_mode].value == 0xFFFF)
+    {
+        crucial->SetAllColorsDirect(&colors[0]);
+    }
+    else
+    {
+        crucial->SetAllColorsEffect(&colors[0]);
+    }
+}
+
+void RGBController_Crucial::UpdateZoneLEDs(int /*zone*/)
+{
+    UpdateLEDs();
+}
+
+void RGBController_Crucial::UpdateSingleLED(int /*led*/)
+{
+    UpdateLEDs();
+}
+
+void RGBController_Crucial::SetCustomMode()
+{
+    active_mode = 0;
+}
+
+void RGBController_Crucial::UpdateMode()
+{
+    crucial->SetMode(modes[active_mode].value);
+}

RGBController/RGBController_Crucial.h

@@ -0,0 +1,33 @@
+/*-----------------------------------------*\
+|  RGBController_Crucial.h                  |
+|                                           |
+|  Generic RGB Interface for Crucial        |
+|  Ballistix RGB controller                 |
+|                                           |
+|  Adam Honse (CalcProgrammer1) 1/19/2020   |
+\*-----------------------------------------*/
+
+#pragma once
+
+#include "RGBController.h"
+#include "CrucialController.h"
+
+class RGBController_Crucial : public RGBController
+{
+public:
+    RGBController_Crucial(CrucialController* crucial_ptr);
+
+    void        SetupZones();
+
+    void        ResizeZone(int zone, int new_size);
+    
+    void        UpdateLEDs();
+    void        UpdateZoneLEDs(int zone);
+    void        UpdateSingleLED(int led);
+
+    void        SetCustomMode();
+    void        UpdateMode();
+
+private:
+    CrucialController*  crucial;
+};

RGBController/RGBController_Dummy.cpp

@@ -0,0 +1,49 @@
+/*-----------------------------------------*\
+|  RGBController_Dummy.cpp                  |
+|                                           |
+|  Generic RGB Interface Dummy Class        |
+|                                           |
+|  Adam Honse (CalcProgrammer1) 2/25/2020   |
+\*-----------------------------------------*/
+
+#include "RGBController_Dummy.h"
+
+RGBController_Dummy::RGBController_Dummy()
+{
+
+}
+
+void RGBController_Dummy::SetupZones()
+{
+
+}
+
+void RGBController_Dummy::ResizeZone(int /*zone*/, int /*new_size*/)
+{
+
+}
+
+void RGBController_Dummy::UpdateLEDs()
+{
+
+}
+
+void RGBController_Dummy::UpdateZoneLEDs(int /*zone*/)
+{
+
+}
+
+void RGBController_Dummy::UpdateSingleLED(int /*led*/)
+{
+
+}
+
+void RGBController_Dummy::SetCustomMode()
+{
+
+}
+
+void RGBController_Dummy::UpdateMode()
+{
+    
+}

RGBController/RGBController_Dummy.h

@@ -0,0 +1,28 @@
+/*-----------------------------------------*\
+|  RGBController_Dummy.h                    |
+|                                           |
+|  Generic RGB Interface Dummy Class        |
+|                                           |
+|  Adam Honse (CalcProgrammer1) 2/25/2020   |
+\*-----------------------------------------*/
+
+#pragma once
+
+#include "RGBController.h"
+
+class RGBController_Dummy : public RGBController
+{
+public:
+    RGBController_Dummy();
+
+    void        SetupZones();
+
+    void        ResizeZone(int zone, int new_size);
+
+    void        UpdateLEDs();
+    void        UpdateZoneLEDs(int zone);
+    void        UpdateSingleLED(int led);
+
+    void        SetCustomMode();
+    void        UpdateMode();
+};