Don't test for 0x48, just assume it exists

Only needed to add a new subdevice ID.

.gitignore

@@ -6,3 +6,4 @@ qrc_*
 OpenRGB
 Makefile
 OpenRGB-x86_64.AppImage
+.qmake.stash

60-openrgb.rules

@@ -68,6 +68,7 @@ SUBSYSTEMS=="usb", ATTR{idVendor}=="1b1c", ATTR{idProduct}=="0c12", TAG+="uacces
 #       Corsair LS100                                           #
 #       Corsair 1000D Obsidian                                  #
 #       Corsair Spec Omega RGB                                  #
+#       Corsair LT100                                           #
 #---------------------------------------------------------------#
 SUBSYSTEMS=="usb", ATTR{idVendor}=="1b1c", ATTR{idProduct}=="0c1a", TAG+="uaccess"
 SUBSYSTEMS=="usb", ATTR{idVendor}=="1b1c", ATTR{idProduct}=="0c0b", TAG+="uaccess"
@@ -75,6 +76,7 @@ SUBSYSTEMS=="usb", ATTR{idVendor}=="1b1c", ATTR{idProduct}=="0c10", TAG+="uacces
 SUBSYSTEMS=="usb", ATTR{idVendor}=="1b1c", ATTR{idProduct}=="0c1e", TAG+="uaccess"
 SUBSYSTEMS=="usb", ATTR{idVendor}=="1b1c", ATTR{idProduct}=="1d00", TAG+="uaccess"
 SUBSYSTEMS=="usb", ATTR{idVendor}=="1b1c", ATTR{idProduct}=="1d04", TAG+="uaccess"
+SUBSYSTEMS=="usb", ATTR{idVendor}=="1b1c", ATTR{idProduct}=="0a32", TAG+="uaccess"
 
 #---------------------------------------------------------------#
 #  Corsair Peripheral Devices                                   #
@@ -134,12 +136,28 @@ SUBSYSTEMS=="usb", ATTR{idVendor}=="1b1c", ATTR{idProduct}=="0a34", TAG+="uacces
 #                                                               #
 #  Keyboards:                                                   #
 #       HyperX Alloy Elite                                      #
+#                                                               #
+#  Mice:                                                        #
+#       HyperX Pulsefire Surge                                  #
+#                                                               #
+#  Mousemats:                                                   #
+#       HyperX Fury Ultra                                       #
 #---------------------------------------------------------------#
 SUBSYSTEMS=="usb", ATTR{idVendor}=="0951", ATTR{idProduct}=="16be", TAG+="uaccess"
+SUBSYSTEMS=="usb", ATTR{idVendor}=="0951", ATTR{idProduct}=="16d3", TAG+="uaccess"
+SUBSYSTEMS=="usb", ATTR{idVendor}=="0951", ATTR{idProduct}=="1705", TAG+="uaccess"
 
 #---------------------------------------------------------------#
 #  Logitech Peripheral Devices                                  #
 #                                                               #
+#   Keyboards:                                                  #
+#       Logitech G213                                           #
+#       Logitech G512                                           #
+#       Logitech G512 RGB                                       #
+#       Logitech G610                                           #
+#       Logitech G810 #1                                        #
+#       Logitech G810 #2                                        #
+#                                                               #
 #  Mice:                                                        #
 #       Logitech G203 Prodigy                                   #
 #       Logitech G203 Lightsync                                 #
@@ -148,27 +166,28 @@ SUBSYSTEMS=="usb", ATTR{idVendor}=="0951", ATTR{idProduct}=="16be", TAG+="uacces
 #       Logitech G502 Proteus Spectrum                          #
 #       Logitech G Lightspeed Wireless Gaming Mouse             #
 #       Logitech G Pro Wireless Gaming Mouse (Wired)            #
+#                                                               #
+#  Mousemats:                                                   #
 #       Logitech G Powerplay Mousepad with Lightspeed           #
 #                                                               #
-#   Keyboards:                                                  #
-#       Logitech G512                                           #
-#       Logitech G512 RGB                                       #
-#       Logitech G810 #1                                        #
-#       Logitech G810 #2                                        #
 #---------------------------------------------------------------#
+SUBSYSTEMS=="usb", ATTR{idVendor}=="046d", ATTR{idProduct}=="c336", TAG+="uaccess"
+SUBSYSTEMS=="usb", ATTR{idVendor}=="046d", ATTR{idProduct}=="c342", TAG+="uaccess"
+SUBSYSTEMS=="usb", ATTR{idVendor}=="046d", ATTR{idProduct}=="c33c", TAG+="uaccess"
+SUBSYSTEMS=="usb", ATTR{idVendor}=="046d", ATTR{idProduct}=="c333", TAG+="uaccess"
+SUBSYSTEMS=="usb", ATTR{idVendor}=="046d", ATTR{idProduct}=="c331", TAG+="uaccess"
+SUBSYSTEMS=="usb", ATTR{idVendor}=="046d", ATTR{idProduct}=="c337", TAG+="uaccess"
+
 SUBSYSTEMS=="usb", ATTR{idVendor}=="046d", ATTR{idProduct}=="c084", TAG+="uaccess"
 SUBSYSTEMS=="usb", ATTR{idVendor}=="046d", ATTR{idProduct}=="c092", TAG+="uaccess"
 SUBSYSTEMS=="usb", ATTR{idVendor}=="046d", ATTR{idProduct}=="c083", TAG+="uaccess"
 SUBSYSTEMS=="usb", ATTR{idVendor}=="046d", ATTR{idProduct}=="c08f", TAG+="uaccess"
 SUBSYSTEMS=="usb", ATTR{idVendor}=="046d", ATTR{idProduct}=="c332", TAG+="uaccess"
+SUBSYSTEMS=="usb", ATTR{idVendor}=="046d", ATTR{idProduct}=="c08b", TAG+="uaccess"
 SUBSYSTEMS=="usb", ATTR{idVendor}=="046d", ATTR{idProduct}=="c539", TAG+="uaccess"
 SUBSYSTEMS=="usb", ATTR{idVendor}=="046d", ATTR{idProduct}=="c088", TAG+="uaccess"
-SUBSYSTEMS=="usb", ATTR{idVendor}=="046d", ATTR{idProduct}=="c53a", TAG+="uaccess"
 
-SUBSYSTEMS=="usb", ATTR{idVendor}=="046d", ATTR{idProduct}=="c342", TAG+="uaccess"
-SUBSYSTEMS=="usb", ATTR{idVendor}=="046d", ATTR{idProduct}=="c33c", TAG+="uaccess"
-SUBSYSTEMS=="usb", ATTR{idVendor}=="046d", ATTR{idProduct}=="c337", TAG+="uaccess"
-SUBSYSTEMS=="usb", ATTR{idVendor}=="046d", ATTR{idProduct}=="c331", TAG+="uaccess"
+SUBSYSTEMS=="usb", ATTR{idVendor}=="046d", ATTR{idProduct}=="c53a", TAG+="uaccess"
 
 #---------------------------------------------------------------#
 #  MSI Mysticlight                                              #
@@ -254,6 +273,7 @@ SUBSYSTEMS=="usb", ATTR{idVendor}=="0c45", ATTR{idProduct}=="652f", TAG+="uacces
 
 SUBSYSTEMS=="usb", ATTR{idVendor}=="04d9", ATTR{idProduct}=="fc30", TAG+="uaccess"
 SUBSYSTEMS=="usb", ATTR{idVendor}=="04d9", ATTR{idProduct}=="fc39", TAG+="uaccess"
+SUBSYSTEMS=="usb", ATTR{idVendor}=="04d9", ATTR{idProduct}=="fc4d", TAG+="uaccess"
 
 #---------------------------------------------------------------#
 #  Gigabyte/Aorus RGB Fusion 2 USB                              #

Controllers/AMDWraithPrismController/AMDWraithPrismControllerDetect.cpp

@@ -2,8 +2,8 @@
 #include "AMDWraithPrismController.h"
 #include "RGBController.h"
 #include "RGBController_AMDWraithPrism.h"
-#include <vector>
 #include <hidapi/hidapi.h>
+
 #define AMD_WRAITH_PRISM_VID 0x2516
 #define AMD_WRAITH_PRISM_PID 0x0051
 
@@ -15,40 +15,16 @@
 *                                                                                          *
 \******************************************************************************************/
 
-void DetectAMDWraithPrismControllers(std::vector<RGBController*>& rgb_controllers)
+void DetectAMDWraithPrismControllers(hid_device_info* info, const std::string&)
 {
-    hid_device_info* info;
-    hid_device* dev = NULL;
-
-    hid_init();
-
-    info = hid_enumerate(AMD_WRAITH_PRISM_VID, AMD_WRAITH_PRISM_PID);
-
-    //Look for AMD Wraith Prism
-    while(info)
+    hid_device* dev = hid_open_path(info->path);
+    if( dev )
     {
-        if((info->vendor_id == AMD_WRAITH_PRISM_VID)
-         &&(info->product_id == AMD_WRAITH_PRISM_PID)
-#if USE_HID_USAGE
-         &&(info->interface_number == 1)
-         &&(info->usage_page == 0xFF00))
-#else
-         &&(info->interface_number == 1))
-#endif
-        {
-            dev = hid_open_path(info->path);
-        
-            if( dev )
-            {
-                AMDWraithPrismController* controller = new AMDWraithPrismController(dev, info->path);
-
-                RGBController_AMDWraithPrism* rgb_controller = new RGBController_AMDWraithPrism(controller);
-
-                rgb_controllers.push_back(rgb_controller);
-            }
-        }
-        info = info->next;
+        AMDWraithPrismController* controller = new AMDWraithPrismController(dev, info->path);
+        RGBController_AMDWraithPrism* rgb_controller = new RGBController_AMDWraithPrism(controller);
+        // Constructor sets the name
+        ResourceManager::get()->RegisterRGBController(rgb_controller);
     }
 }
 
-REGISTER_DETECTOR("AMD Wraith Prism", DetectAMDWraithPrismControllers);
+REGISTER_HID_DETECTOR_IP("AMD Wraith Prism", DetectAMDWraithPrismControllers, AMD_WRAITH_PRISM_VID, AMD_WRAITH_PRISM_PID, 1, 0xFF00);

Controllers/ASRockPolychromeSMBusController/ASRockPolychromeSMBusController.cpp

@@ -1,5 +1,5 @@
 /*-----------------------------------------*\
-|  PolychromeController.cpp                 |
+|  ASRockPolychromeSMBusController.cpp      |
 |                                           |
 |  Driver for for ASRock ASR LED and        |
 |  Polychrome RGB lighting controller       |
@@ -7,7 +7,7 @@
 |  Adam Honse (CalcProgrammer1) 12/14/2019  |
 \*-----------------------------------------*/
 
-#include "PolychromeController.h"
+#include "ASRockPolychromeSMBusController.h"
 #include <cstring>
 
 using namespace std::chrono_literals;

Controllers/ASRockPolychromeSMBusController/ASRockPolychromeSMBusController.h

@@ -1,5 +1,5 @@
 /*-----------------------------------------*\
-|  PolychromeController.h                   |
+|  ASRockPolychromeSMBusController.h        |
 |                                           |
 |  Definitions and types for ASRock         |
 |  ASR LED and Polychrome RGB lighting      |

Controllers/ASRockPolychromeSMBusController/ASRockPolychromeSMBusControllerDetect.cpp

@@ -1,7 +1,7 @@
 #include "Detector.h"
-#include "PolychromeController.h"
+#include "ASRockPolychromeSMBusController.h"
 #include "RGBController.h"
-#include "RGBController_Polychrome.h"
+#include "RGBController_ASRockPolychromeSMBus.h"
 #include "i2c_smbus.h"
 #include "pci_ids.h"
 #include <vector>
@@ -10,14 +10,14 @@
 
 /******************************************************************************************\
 *                                                                                          *
-*   TestForPolychromeController                                                            *
+*   TestForPolychromeSMBusController                                                       *
 *                                                                                          *
 *       Tests the given address to see if an ASRock Polychrome RGB controller exists there.*
 *       First does a quick write to test for a response                                    *
 *                                                                                          *
 \******************************************************************************************/
 
-bool TestForPolychromeController(i2c_smbus_interface* bus, unsigned char address)
+bool TestForPolychromeSMBusController(i2c_smbus_interface* bus, unsigned char address)
 {
     bool pass = false;
 
@@ -36,15 +36,15 @@ bool TestForPolychromeController(i2c_smbus_interface* bus, unsigned char address
 *                                                                                          *
 *   DetectPolychromeControllers                                                            *
 *                                                                                          *
-*       Detect ASRock Polychrome RGB controllers on the enumerated I2C busses at address   *
-*       0x6A.                                                                              *
+*       Detect ASRock Polychrome RGB SMBus controllers on the enumerated I2C busses at     *
+*       address 0x6A.                                                                      *
 *                                                                                          *
 *           bus - pointer to i2c_smbus_interface where Polychrome device is connected      *
 *           dev - I2C address of Polychrome device                                         *
 *                                                                                          *
 \******************************************************************************************/
 
-void DetectPolychromeControllers(std::vector<i2c_smbus_interface*>& busses, std::vector<RGBController*>& rgb_controllers)
+void DetectPolychromeSMBusControllers(std::vector<i2c_smbus_interface*>& busses, std::vector<RGBController*>& rgb_controllers)
 {
     PolychromeController* new_polychrome;
     RGBController_Polychrome* new_controller;
@@ -54,7 +54,7 @@ void DetectPolychromeControllers(std::vector<i2c_smbus_interface*>& busses, std:
         IF_MOBO_SMBUS(busses[bus]->pci_vendor, busses[bus]->pci_device)
         {
             // Check for Polychrome controller at 0x6A
-            if (TestForPolychromeController(busses[bus], 0x6A))
+            if (TestForPolychromeSMBusController(busses[bus], 0x6A))
             {
                 new_polychrome = new PolychromeController(busses[bus], 0x6A);
 
@@ -71,6 +71,6 @@ void DetectPolychromeControllers(std::vector<i2c_smbus_interface*>& busses, std:
         }
     }
 
-}   /* DetectPolychromeControllers() */
+}   /* DetectSMBusPolychromeControllers() */
 
-REGISTER_I2C_DETECTOR("ASRock Polychrome", DetectPolychromeControllers);
+REGISTER_I2C_DETECTOR("ASRock Polychrome SMBus", DetectPolychromeSMBusControllers);

Controllers/ASRockPolychromeSMBusController/RGBController_ASRockPolychromeSMBus.cpp

@@ -1,5 +1,5 @@
 /*-----------------------------------------*\
-|  RGBController_Polychrome.cpp             |
+|  RGBController_ASRockPolychromeSMBus.cpp  |
 |                                           |
 |  Generic RGB Interface for OpenRGB        |
 |  ASRock ASR LED and Polychrome RGB Driver |
@@ -7,7 +7,7 @@
 |  Adam Honse (CalcProgrammer1) 12/15/2019  |
 \*-----------------------------------------*/
 
-#include "RGBController_Polychrome.h"
+#include "RGBController_ASRockPolychromeSMBus.h"
 
 #define ASROCK_MAX_ZONES    4
 #define ASROCK_MAX_LEDS     22

Controllers/ASRockPolychromeSMBusController/RGBController_ASRockPolychromeSMBus.h

@@ -1,5 +1,5 @@
 /*-----------------------------------------*\
-|  RGBController_Polychrome.h               |
+|  RGBController_ASRockPolychromeSMBus.h    |
 |                                           |
 |  Generic RGB Interface for OpenRGB        |
 |  ASRock ASR LED and Polychrome RGB Driver |
@@ -10,7 +10,7 @@
 #pragma once
 
 #include "RGBController.h"
-#include "PolychromeController.h"
+#include "ASRockPolychromeSMBusController.h"
 
 class RGBController_Polychrome : public RGBController
 {

Controllers/AorusCPUCoolerController/AorusCPUCoolerControllerDetect.cpp

@@ -1,87 +0,0 @@
-#include "Detector.h"
-#include "RGBController.h"
-#include "ATC800Controller.h"
-#include "RGBController_AorusATC800.h"
-#include <vector>
-#include <hidapi/hidapi.h>
-
-/*-----------------------------------------------------*\
-| Vendor ID                                             |
-\*-----------------------------------------------------*/
-#define HOLTEK_VID                            0x1044
-
-/*-----------------------------------------------------*\
-| Controller product ids                                |
-\*-----------------------------------------------------*/
-#define ATC_800_CONTROLLER_PID                0x7A42
-
-typedef struct
-{
-    unsigned short  usb_vid;
-    unsigned short  usb_pid;
-    char            usb_interface;
-    device_type     type;
-    const char *    name;
-} device;
-
-#define NUM_DEVICES (sizeof(device_list) / sizeof(device_list[ 0 ]))
-
-static const device device_list[] =
-{
-    { HOLTEK_VID,             ATC_800_CONTROLLER_PID,                  0,  DEVICE_TYPE_KEYBOARD,   "Aorus ATC800 CPU Cooler"                             },
-};
-
-/******************************************************************************************\
-*                                                                                          *
-*   DetectAorusCPUCoolerControllers                                                        *
-*                                                                                          *
-*       Tests the USB address to see if a Aorus RGB CPU Cooler exists there.               *
-*                                                                                          *
-\******************************************************************************************/
-
-void DetectAorusCPUCoolerControllers(std::vector<RGBController*>& rgb_controllers)
-{
-    hid_init();
-
-    for(unsigned int device_idx = 0; device_idx < NUM_DEVICES; device_idx++)
-    {
-        hid_device_info* info = hid_enumerate(device_list[device_idx].usb_vid, device_list[device_idx].usb_pid);
-
-        while(info)
-        {
-            if((info->vendor_id == device_list[device_idx].usb_vid)
-            &&(info->product_id == device_list[device_idx].usb_pid)
-#ifdef USE_HID_USAGE                    
-            &&(info->interface_number == device_list[device_idx].usb_interface)
-            &&(info->usage_page == 0xFF01)
-            &&(info->usage == 1))
-#else
-            &&(info->interface_number == device_list[device_idx].usb_interface))
-#endif
-            {
-                hid_device* dev = hid_open_path(info->path);
-
-                if(dev)
-                {
-                    switch(device_list[device_idx].usb_pid)
-                    {
-                    case ATC_800_CONTROLLER_PID:
-                        {
-                            ATC800Controller* controller = new ATC800Controller(dev, info->path);
-
-                            RGBController_AorusATC800* rgb_controller = new RGBController_AorusATC800(controller);
-
-                            rgb_controller->name = device_list[device_idx].name;
-                            rgb_controllers.push_back(rgb_controller);
-                        }
-                        break;
-                    }
-                }
-            }
-        info = info->next;
-        }
-        hid_free_enumeration(info);
-    }
-}
-
-REGISTER_DETECTOR("Aorus CPU Coolers", DetectAorusCPUCoolerControllers);

Controllers/AsusAuraCoreController/AsusAuraCoreController.cpp

@@ -1,5 +1,5 @@
 /*-----------------------------------------*\
-|  AuraCoreController.cpp                   | 
+|  AsusAuraCoreController.cpp               | 
 |                                           |
 |  Driver for ASUS ROG Aura Core RGB        |
 |  lighting controller                      |
@@ -7,7 +7,7 @@
 |  Adam Honse (CalcProgrammer1) 4/13/2020   |
 \*-----------------------------------------*/
 
-#include "AuraCoreController.h"
+#include "AsusAuraCoreController.h"
 #include <cstring>
 
 AuraCoreController::AuraCoreController(hid_device* dev_handle)

Controllers/AsusAuraCoreController/AsusAuraCoreController.h

@@ -1,5 +1,5 @@
 /*-----------------------------------------*\
-|  AuraCoreController.h                     |
+|  AsusAuraCoreController.h                 |
 |                                           |
 |  Definitions and types for ASUS ROG Aura  |
 |  Core RGB lighting controller             |

Controllers/AsusAuraCoreController/AsusAuraCoreControllerDetect.cpp

@@ -0,0 +1,31 @@
+#include "Detector.h"
+#include "AsusAuraCoreController.h"
+#include "RGBController.h"
+#include "RGBController_AsusAuraCore.h"
+#include <hidapi/hidapi.h>
+
+#define AURA_CORE_VID 0x0B05
+
+/******************************************************************************************\
+*                                                                                          *
+*   DetectAuraCoreControllers                                                              *
+*                                                                                          *
+*       Tests the USB address to see if an Asus ROG Aura Core controller exists there      *
+*                                                                                          *
+\******************************************************************************************/
+
+void DetectAsusAuraCoreControllers(hid_device_info* info, const std::string&)
+{
+    hid_device* dev = hid_open_path(info->path);
+    if( dev )
+    {
+        AuraCoreController* controller = new AuraCoreController(dev);
+        RGBController_AuraCore* rgb_controller = new RGBController_AuraCore(controller);
+        // Constructor sets the name
+        ResourceManager::get()->RegisterRGBController(rgb_controller);
+    }
+}
+
+REGISTER_HID_DETECTOR("ASUS Aura Core", DetectAsusAuraCoreControllers, AURA_CORE_VID, 0x1854);
+REGISTER_HID_DETECTOR("ASUS Aura Core", DetectAsusAuraCoreControllers, AURA_CORE_VID, 0x1866);
+REGISTER_HID_DETECTOR("ASUS Aura Core", DetectAsusAuraCoreControllers, AURA_CORE_VID, 0x1869);

Controllers/AsusAuraCoreController/RGBController_AsusAuraCore.cpp

@@ -1,12 +1,12 @@
 /*-----------------------------------------*\
-|  RGBController_AuraCore.cpp               |
+|  RGBController_AsusAuraCore.cpp           |
 |                                           |
 |  Generic RGB Interface for ROG Aura Core  |
 |                                           |
 |  Adam Honse (CalcProgrammer1) 4/17/2020   |
 \*-----------------------------------------*/
 
-#include "RGBController_AuraCore.h"
+#include "RGBController_AsusAuraCore.h"
 
 RGBController_AuraCore::RGBController_AuraCore(AuraCoreController* aura_ptr)
 {

Controllers/AsusAuraCoreController/RGBController_AsusAuraCore.h

@@ -1,5 +1,5 @@
 /*-----------------------------------------*\
-|  RGBController_AuraCore.h                 |
+|  RGBController_AsusAuraCore.h             |
 |                                           |
 |  Generic RGB Interface for ROG Aura Core  |
 |                                           |
@@ -9,7 +9,7 @@
 #pragma once
 
 #include "RGBController.h"
-#include "AuraCoreController.h"
+#include "AsusAuraCoreController.h"
 
 class RGBController_AuraCore : public RGBController
 {

Controllers/AsusAuraGPUController/AsusAuraGPUController.cpp

@@ -1,12 +1,12 @@
 /*-----------------------------------------*\
-|  AuraGPUController.cpp                    |
+|  AsusAuraGPUController.cpp                |
 |                                           |
 |  Driver for ASUS Aura RGB on GPUs         |
 |                                           |
 |  Jan Rettig (Klapstuhl) 14.02.2020        |
 \*-----------------------------------------*/
 
-#include "AuraGPUController.h"
+#include "AsusAuraGPUController.h"
 #include <cstring>
 
 AuraGPUController::AuraGPUController(i2c_smbus_interface* bus, aura_gpu_dev_id dev)

Controllers/AsusAuraGPUController/AsusAuraGPUController.h

@@ -1,5 +1,5 @@
 /*-----------------------------------------*\
-|  AuraGPUController.h                      |
+|  AsusAuraGPUController.h                  |
 |                                           |
 |  Definitions for ASUS Aura RGB on GPUs    |
 |                                           |

Controllers/AsusAuraGPUController/AsusAuraGPUControllerDetect.cpp

@@ -1,5 +1,5 @@
 /*-----------------------------------------*\
-|  AuraGPUControllerDetect.cpp              |
+|  AsusAuraGPUControllerDetect.cpp          |
 |                                           |
 |  Driver for ASUS Aura RGB on GPUs         |
 |                                           |
@@ -7,9 +7,9 @@
 \*-----------------------------------------*/
 
 #include "Detector.h"
-#include "AuraGPUController.h"
+#include "AsusAuraGPUController.h"
 #include "RGBController.h"
-#include "RGBController_AuraGPU.h"
+#include "RGBController_AsusAuraGPU.h"
 #include "i2c_smbus.h"
 #include <vector>
 #include <stdio.h>
@@ -38,7 +38,7 @@ static const unsigned char aura_gpu_addresses[] =
 *                                                                                          *
 \******************************************************************************************/
 
-bool TestForAuraGPUController(i2c_smbus_interface* bus, unsigned char address)
+bool TestForAsusAuraGPUController(i2c_smbus_interface* bus, unsigned char address)
 {
     bool pass = false;
 
@@ -63,7 +63,7 @@ bool TestForAuraGPUController(i2c_smbus_interface* bus, unsigned char address)
 *                                                                                          *
 \******************************************************************************************/
 
-void DetectAuraGPUControllers(std::vector<i2c_smbus_interface*> &busses, std::vector<RGBController*> &rgb_controllers)
+void DetectAsusAuraGPUControllers(std::vector<i2c_smbus_interface*> &busses, std::vector<RGBController*> &rgb_controllers)
 {
     AuraGPUController* new_aura_gpu;
     RGBController_AuraGPU* new_controller;
@@ -73,7 +73,7 @@ void DetectAuraGPUControllers(std::vector<i2c_smbus_interface*> &busses, std::ve
         // 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]))
+            if (TestForAsusAuraGPUController(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);
@@ -85,4 +85,4 @@ void DetectAuraGPUControllers(std::vector<i2c_smbus_interface*> &busses, std::ve
     }
 } /* DetectAuraGPUControllers() */
 
-REGISTER_I2C_DETECTOR("ASUS Aura GPU", DetectAuraGPUControllers);
+REGISTER_I2C_DETECTOR("ASUS Aura GPU", DetectAsusAuraGPUControllers);

Controllers/AsusAuraGPUController/RGBController_AsusAuraGPU.cpp

@@ -1,12 +1,12 @@
 /*-----------------------------------------*\
-|  RGBController_AuraGPU.h                  |
+|  RGBController_AsusAuraGPU.h              |
 |                                           |
 |  Generic RGB Interface for Asus Aura GPU  |
 |                                           |
 |  Jan Rettig (Klapstuhl) 14.02.2020        |
 \*-----------------------------------------*/
 
-#include "RGBController_AuraGPU.h"
+#include "RGBController_AsusAuraGPU.h"
 
 int RGBController_AuraGPU::GetDeviceMode()
 {

Controllers/AsusAuraGPUController/RGBController_AsusAuraGPU.h

@@ -1,5 +1,5 @@
 /*-----------------------------------------*\
-|  RGBController_AuraGPU.h                  |
+|  RGBController_AsusAuraGPU.h              |
 |                                           |
 |  Generic RGB Interface for Asus Aura GPU  |
 |                                           |
@@ -9,7 +9,7 @@
 #pragma once
 
 #include "RGBController.h"
-#include "AuraGPUController.h"
+#include "AsusAuraGPUController.h"
 
 class RGBController_AuraGPU : public RGBController
 {

Controllers/AsusAuraSMBusController/AsusAuraSMBusController.cpp

@@ -1,5 +1,5 @@
 /*-----------------------------------------*\
-|  AuraSMBusController.cpp                  |
+|  AsusAuraSMBusController.cpp              |
 |                                           |
 |  Driver for ASUS Aura RGB lighting        |
 |  controller                               |
@@ -7,7 +7,7 @@
 |  Adam Honse (CalcProgrammer1) 8/19/2018   |
 \*-----------------------------------------*/
 
-#include "AuraSMBusController.h"
+#include "AsusAuraSMBusController.h"
 #include <cstring>
 
 static const char* aura_channels[] =                /* Aura channel strings                 */

Controllers/AsusAuraSMBusController/AsusAuraSMBusController.h

@@ -1,5 +1,5 @@
 /*-----------------------------------------*\
-|  AuraSMBusController.h                    |
+|  AsusAuraSMBusController.h                |
 |                                           |
 |  Definitions and types for ASUS Aura RGB  |
 |  lighting controller                      |

Controllers/AsusAuraSMBusController/AsusAuraSMBusControllerDetect.cpp

@@ -1,7 +1,7 @@
 #include "Detector.h"
-#include "AuraSMBusController.h"
+#include "AsusAuraSMBusController.h"
 #include "RGBController.h"
-#include "RGBController_AuraSMBus.h"
+#include "RGBController_AsusAuraSMBus.h"
 #include "i2c_smbus.h"
 #include "pci_ids.h"
 #include <vector>
@@ -64,7 +64,7 @@ static const unsigned char aura_mobo_addresses[] =
 *                                                                                          *
 \******************************************************************************************/
 
-void AuraRegisterWrite(i2c_smbus_interface* bus, aura_dev_id dev, aura_register reg, unsigned char val)
+void AsusAuraRegisterWrite(i2c_smbus_interface* bus, aura_dev_id dev, aura_register reg, unsigned char val)
 {
     //Write Aura register
     bus->i2c_smbus_write_word_data(dev, 0x00, ((reg << 8) & 0xFF00) | ((reg >> 8) & 0x00FF));
@@ -83,7 +83,7 @@ void AuraRegisterWrite(i2c_smbus_interface* bus, aura_dev_id dev, aura_register
 *                                                                                          *
 \******************************************************************************************/
 
-bool TestForAuraSMBusController(i2c_smbus_interface* bus, unsigned char address)
+bool TestForAsusAuraSMBusController(i2c_smbus_interface* bus, unsigned char address)
 {
     bool pass = false;
 
@@ -122,7 +122,7 @@ bool TestForAuraSMBusController(i2c_smbus_interface* bus, unsigned char address)
 *                                                                                          *
 \******************************************************************************************/
 
-void DetectAuraSMBusControllers(std::vector<i2c_smbus_interface*> &busses, std::vector<RGBController*> &rgb_controllers)
+void DetectAsusAuraSMBusControllers(std::vector<i2c_smbus_interface*> &busses, std::vector<RGBController*> &rgb_controllers)
 {
     AuraSMBusController* new_aura;
     RGBController_AuraSMBus* new_controller;
@@ -159,15 +159,15 @@ void DetectAuraSMBusControllers(std::vector<i2c_smbus_interface*> &busses, std::
 
                 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));
+                    AsusAuraRegisterWrite(busses[bus], 0x77, AURA_REG_SLOT_INDEX, slot);
+                    AsusAuraRegisterWrite(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 (TestForAuraSMBusController(busses[bus], aura_ram_addresses[address_list_idx]))
+                if (TestForAsusAuraSMBusController(busses[bus], aura_ram_addresses[address_list_idx]))
                 {
                     new_aura = new AuraSMBusController(busses[bus], aura_ram_addresses[address_list_idx]);
                     new_controller = new RGBController_AuraSMBus(new_aura);
@@ -183,7 +183,7 @@ void DetectAuraSMBusControllers(std::vector<i2c_smbus_interface*> &busses, std::
         {
             for (unsigned int address_list_idx = 0; address_list_idx < AURA_MOBO_ADDRESS_COUNT; address_list_idx++)
             {
-                if (TestForAuraSMBusController(busses[bus], aura_mobo_addresses[address_list_idx]))
+                if (TestForAsusAuraSMBusController(busses[bus], aura_mobo_addresses[address_list_idx]))
                 {
                     new_aura = new AuraSMBusController(busses[bus], aura_mobo_addresses[address_list_idx]);
                     new_controller = new RGBController_AuraSMBus(new_aura);
@@ -197,4 +197,4 @@ void DetectAuraSMBusControllers(std::vector<i2c_smbus_interface*> &busses, std::
 
 }   /* DetectAuraSMBusControllers() */
 
-REGISTER_I2C_DETECTOR("ASUS Aura SMBus", DetectAuraSMBusControllers);
+REGISTER_I2C_DETECTOR("ASUS Aura SMBus", DetectAsusAuraSMBusControllers);

Controllers/AsusAuraSMBusController/RGBController_AsusAuraSMBus.cpp

@@ -1,5 +1,5 @@
 /*-----------------------------------------*\
-|  RGBController_AuraSMBus.cpp              |
+|  RGBController_AsusAuraSMBus.cpp          |
 |                                           |
 |  Generic RGB Interface for OpenAuraSDK    |
 |  Asus Aura SMBus driver                   |
@@ -7,7 +7,7 @@
 |  Adam Honse (CalcProgrammer1) 6/13/2019   |
 \*-----------------------------------------*/
 
-#include "RGBController_AuraSMBus.h"
+#include "RGBController_AsusAuraSMBus.h"
 
 int RGBController_AuraSMBus::GetDeviceMode()
 {

Controllers/AsusAuraSMBusController/RGBController_AsusAuraSMBus.h

@@ -1,5 +1,5 @@
 /*-----------------------------------------*\
-|  RGBController_AuraSMBus.h                |
+|  RGBController_AsusAuraSMBus.h            |
 |                                           |
 |  Generic RGB Interface for OpenAuraSDK    |
 |  Asus Aura SMBus driver                   |
@@ -10,7 +10,7 @@
 #pragma once
 
 #include "RGBController.h"
-#include "AuraSMBusController.h"
+#include "AsusAuraSMBusController.h"
 
 class RGBController_AuraSMBus : public RGBController
 {

Controllers/AsusAuraUSBController/AsusAuraAddressableController.cpp

@@ -1,5 +1,5 @@
 /*-----------------------------------------*\
-|  AuraAddressableController.cpp            |
+|  AsusAuraAddressableController.cpp        |
 |                                           |
 |  Driver for ASUS Aura RGB Addressable     |
 |  lighting controller                      |
@@ -7,7 +7,7 @@
 |  Adam Honse (CalcProgrammer1) 1/18/2020   |
 \*-----------------------------------------*/
 
-#include "AuraAddressableController.h"
+#include "AsusAuraAddressableController.h"
 #include <cstring>
 
 AuraAddressableController::AuraAddressableController(hid_device* dev_handle, const char* path) : AuraUSBController(dev_handle, path)

Controllers/AsusAuraUSBController/AsusAuraAddressableController.h

@@ -1,5 +1,5 @@
 /*-----------------------------------------*\
-|  AuraAddressableController.h              |
+|  AsusAuraAddressableController.h          |
 |                                           |
 |  Definitions and types for ASUS Aura      |
 |  Addressable RGB lighting controller      |
@@ -8,7 +8,7 @@
 \*-----------------------------------------*/
 
 #include "RGBController.h"
-#include "AuraUSBController.h"
+#include "AsusAuraUSBController.h"
 
 #include <string>
 #include <hidapi/hidapi.h>

Controllers/AsusAuraUSBController/AsusAuraMainboardController.cpp

@@ -1,5 +1,5 @@
 /*-----------------------------------------*\
-|  AuraMainboardController.cpp              |
+|  AsusAuraMainboardController.cpp          |
 |                                           |
 |  Driver for ASUS Aura RGB USB mainboard   |
 |  lighting controller                      |
@@ -7,7 +7,7 @@
 |  Martin Hartl (inlart) 4/25/2020          |
 \*-----------------------------------------*/
 
-#include "AuraMainboardController.h"
+#include "AsusAuraMainboardController.h"
 #include <cstring>
 
 AuraMainboardController::AuraMainboardController(hid_device* dev_handle, const char* path) : AuraUSBController(dev_handle, path), mode(AURA_MODE_DIRECT)

Controllers/AsusAuraUSBController/AsusAuraMainboardController.h

@@ -1,5 +1,5 @@
 /*-----------------------------------------*\
-|  AuraMainboardController.h                |
+|  AsusAuraMainboardController.h            |
 |                                           |
 |  Definitions and types for ASUS Aura      |
 |  USB Mainboard RGB lighting controller    |
@@ -8,7 +8,7 @@
 \*-----------------------------------------*/
 
 #include "RGBController.h"
-#include "AuraUSBController.h"
+#include "AsusAuraUSBController.h"
 
 #include <string>
 #include <hidapi/hidapi.h>

Controllers/AsusAuraUSBController/AsusAuraMouseController.cpp

@@ -1,5 +1,5 @@
 /*-----------------------------------------*\
-|  AuraMouseController.cpp                  |
+|  AsusAuraMouseController.cpp              |
 |                                           |
 |  Driver for ASUS Aura RGB USB             |
 |  lighting controller                      |
@@ -7,7 +7,7 @@
 |  Adam Honse (CalcProgrammer1) 10/23/2020  |
 \*-----------------------------------------*/
 
-#include "AuraMouseController.h"
+#include "AsusAuraMouseController.h"
 
 #include <cstring>
 

Controllers/AsusAuraUSBController/AsusAuraMouseController.h

@@ -1,5 +1,5 @@
 /*-----------------------------------------*\
-|  AuraMouseController.h                    |
+|  AsusAuraMouseController.h                |
 |                                           |
 |  Definitions and types for ASUS Aura      |
 |  USB RGB lighting controller              |

Controllers/AsusAuraUSBController/AsusAuraUSBController.cpp

@@ -1,5 +1,5 @@
 /*-----------------------------------------*\
-|  AuraUSBController.cpp                    |
+|  AsusAuraUSBController.cpp                |
 |                                           |
 |  Driver for ASUS Aura RGB USB             |
 |  lighting controller                      |
@@ -7,7 +7,7 @@
 |  Martin Hartl (inlart) 4/25/2020          |
 \*-----------------------------------------*/
 
-#include "AuraUSBController.h"
+#include "AsusAuraUSBController.h"
 #include <cstring>
 #include <stdexcept>
 

Controllers/AsusAuraUSBController/AsusAuraUSBController.h

@@ -1,5 +1,5 @@
 /*-----------------------------------------*\
-|  AuraUSBController.h                      |
+|  AsusAuraUSBController.h                  |
 |                                           |
 |  Definitions and types for ASUS Aura      |
 |  USB RGB lighting controller              |

Controllers/AsusAuraUSBController/AsusAuraUSBControllerDetect.cpp

@@ -0,0 +1,76 @@
+#include "Detector.h"
+#include "AsusAuraAddressableController.h"
+#include "AsusAuraMainboardController.h"
+#include "AsusAuraMouseController.h"
+#include "RGBController.h"
+#include "RGBController_AsusAuraUSB.h"
+#include "RGBController_AsusAuraMouse.h"
+#include <stdexcept>
+#include <hidapi/hidapi.h>
+
+#define AURA_USB_VID                            0x0B05
+#define AURA_TERMINAL_PID                       0x1889
+#define AURA_ADDRESSABLE_1_PID                  0x1867
+#define AURA_ADDRESSABLE_2_PID                  0x1872
+#define AURA_ADDRESSABLE_3_PID                  0x18A3
+#define AURA_ADDRESSABLE_4_PID                  0x18A5
+#define AURA_MOTHERBOARD_1_PID                  0x18F3
+#define AURA_MOTHERBOARD_2_PID                  0x1939
+#define AURA_ROG_GLADIUS_II_CORE_PID            0x18DD
+#define AURA_ROG_GLADIUS_II_PID                 0x1845
+#define AURA_ROG_GLADIUS_II_ORIGIN_PID          0x1877
+
+void DetectAsusAuraUSBAddressable(hid_device_info* info, const std::string& name)
+{
+    hid_device* dev = hid_open_path(info->path);
+
+    if(dev)
+    {
+        AuraAddressableController* controller = new AuraAddressableController(dev, info->path);
+        RGBController_AuraUSB* rgb_controller = new RGBController_AuraUSB(controller);
+        rgb_controller->name = name;
+        ResourceManager::get()->RegisterRGBController(rgb_controller);
+    }
+}
+
+void DetectAsusAuraUSBMotherboards(hid_device_info* info, const std::string& name)
+{
+    hid_device* dev = hid_open_path(info->path);
+    if(dev)
+    {
+        try
+        {
+            AuraMainboardController* controller = new AuraMainboardController(dev, info->path);
+            RGBController_AuraUSB* rgb_controller = new RGBController_AuraUSB(controller);
+            rgb_controller->name = name;
+            ResourceManager::get()->RegisterRGBController(rgb_controller);
+        }
+        catch(std::runtime_error&)
+        {
+            // reading the config table failed
+        }
+    }
+}
+
+void DetectAsusAuraUSBMice(hid_device_info* info, const std::string& name)
+{
+    hid_device* dev = hid_open_path(info->path);
+    if(dev)
+    {
+        AuraMouseController* controller = new AuraMouseController(dev, info->path);
+        RGBController_AuraMouse* rgb_controller = new RGBController_AuraMouse(controller);
+        rgb_controller->name = name;
+        ResourceManager::get()->RegisterRGBController(rgb_controller);
+    }
+}
+
+REGISTER_HID_DETECTOR   ("ASUS ROG AURA Terminal",     DetectAsusAuraUSBAddressable,  AURA_USB_VID, AURA_TERMINAL_PID);
+REGISTER_HID_DETECTOR   ("ASUS Aura Addressable",      DetectAsusAuraUSBAddressable,  AURA_USB_VID, AURA_ADDRESSABLE_1_PID);
+REGISTER_HID_DETECTOR   ("ASUS Aura Addressable",      DetectAsusAuraUSBAddressable,  AURA_USB_VID, AURA_ADDRESSABLE_2_PID);
+REGISTER_HID_DETECTOR   ("ASUS Aura Addressable",      DetectAsusAuraUSBAddressable,  AURA_USB_VID, AURA_ADDRESSABLE_3_PID);
+REGISTER_HID_DETECTOR   ("ASUS Aura Addressable",      DetectAsusAuraUSBAddressable,  AURA_USB_VID, AURA_ADDRESSABLE_4_PID);
+REGISTER_HID_DETECTOR   ("ASUS Aura Motherboard",      DetectAsusAuraUSBMotherboards, AURA_USB_VID, AURA_MOTHERBOARD_1_PID);
+REGISTER_HID_DETECTOR   ("ASUS Aura Motherboard",      DetectAsusAuraUSBMotherboards, AURA_USB_VID, AURA_MOTHERBOARD_2_PID);
+REGISTER_HID_DETECTOR_IP("ASUS ROG Gladius II Core",   DetectAsusAuraUSBMice,         AURA_USB_VID, AURA_ROG_GLADIUS_II_CORE_PID,   0, 0xFF01);
+REGISTER_HID_DETECTOR_IP("ASUS ROG Gladius II",        DetectAsusAuraUSBMice,         AURA_USB_VID, AURA_ROG_GLADIUS_II_PID,        2, 0xFF01);
+REGISTER_HID_DETECTOR_IP("ASUS ROG Gladius II Origin", DetectAsusAuraUSBMice,         AURA_USB_VID, AURA_ROG_GLADIUS_II_ORIGIN_PID, 2, 0xFF01);

Controllers/AsusAuraUSBController/RGBController_AsusAuraMouse.cpp

@@ -1,5 +1,5 @@
 /*-----------------------------------------*\
-|  RGBController_AuraMouse.cpp              |
+|  RGBController_AsusAuraMouse.cpp          |
 |                                           |
 |  Generic RGB Interface for Asus Aura      |
 |  USB controller driver                    |
@@ -7,7 +7,7 @@
 |  Adam Honse (CalcProgrammer1) 10/25/2020  |
 \*-----------------------------------------*/
 
-#include "RGBController_AuraMouse.h"
+#include "RGBController_AsusAuraMouse.h"
 
 RGBController_AuraMouse::RGBController_AuraMouse(AuraMouseController* aura_ptr)
 {

Controllers/AsusAuraUSBController/RGBController_AsusAuraMouse.h

@@ -1,5 +1,5 @@
 /*-----------------------------------------*\
-|  RGBController_AuraMouse.h                |
+|  RGBController_AsusAuraMouse.h            |
 |                                           |
 |  Generic RGB Interface for Asus Aura      |
 |  USB controller driver                    |
@@ -9,7 +9,7 @@
 
 #pragma once
 #include "RGBController.h"
-#include "AuraMouseController.h"
+#include "AsusAuraMouseController.h"
 
 class RGBController_AuraMouse : public RGBController
 {

Controllers/AsusAuraUSBController/RGBController_AsusAuraUSB.cpp

@@ -1,5 +1,5 @@
 /*-----------------------------------------*\
-|  RGBController_AuraUSB.cpp                |
+|  RGBController_AsusAuraUSB.cpp            |
 |                                           |
 |  Generic RGB Interface for Asus Aura      |
 |  USB controller driver                    |
@@ -7,7 +7,7 @@
 |  Adam Honse (CalcProgrammer1) 1/18/2020   |
 \*-----------------------------------------*/
 
-#include "RGBController_AuraUSB.h"
+#include "RGBController_AsusAuraUSB.h"
 
 RGBController_AuraUSB::RGBController_AuraUSB(AuraUSBController* aura_ptr)
 {

Controllers/AsusAuraUSBController/RGBController_AsusAuraUSB.h

@@ -1,5 +1,5 @@
 /*-----------------------------------------*\
-|  RGBController_AuraUSB.h                  |
+|  RGBController_AsusAuraUSB.h              |
 |                                           |
 |  Generic RGB Interface for Asus Aura      |
 |  USB controller driver                    |
@@ -9,7 +9,7 @@
 
 #pragma once
 #include "RGBController.h"
-#include "AuraUSBController.h"
+#include "AsusAuraUSBController.h"
 
 #define AURA_ADDRESSABLE_MAX_LEDS       120
 

Controllers/AuraCoreController/AuraCoreControllerDetect.cpp

@@ -1,48 +0,0 @@
-#include "Detector.h"
-#include "AuraCoreController.h"
-#include "RGBController.h"
-#include "RGBController_AuraCore.h"
-#include <vector>
-#include <hidapi/hidapi.h>
-
-#define AURA_CORE_VID 0x0B05
-
-#define NUM_PIDS 3
-static const unsigned short pid_table[] =
-    {
-    0x1854,
-    0x1869,
-    0x1866
-    };
-
-/******************************************************************************************\
-*                                                                                          *
-*   DetectAuraCoreControllers                                                              *
-*                                                                                          *
-*       Tests the USB address to see if an Asus ROG Aura Core controller exists there      *
-*                                                                                          *
-\******************************************************************************************/
-
-void DetectAuraCoreControllers(std::vector<RGBController*>& rgb_controllers)
-{
-    hid_device* dev;
-
-    //Look for Asus ROG Aura Core RGB controller
-    hid_init();
-
-    for(int pid_idx = 0; pid_idx < NUM_PIDS; pid_idx++)
-    {
-        dev = hid_open(AURA_CORE_VID, pid_table[pid_idx], 0);
-
-        if( dev )
-        {
-            AuraCoreController* controller = new AuraCoreController(dev);
-
-            RGBController_AuraCore* rgb_controller = new RGBController_AuraCore(controller);
-
-            rgb_controllers.push_back(rgb_controller);
-        }
-    }
-}
-
-REGISTER_DETECTOR("ASUS Aura Core", DetectAuraCoreControllers);

Controllers/AuraUSBController/AuraUSBControllerDetect.cpp

@@ -1,170 +0,0 @@
-#include "Detector.h"
-#include "AuraAddressableController.h"
-#include "AuraMainboardController.h"
-#include "AuraMouseController.h"
-#include "RGBController.h"
-#include "RGBController_AuraUSB.h"
-#include "RGBController_AuraMouse.h"
-#include <vector>
-#include <stdexcept>
-#include <hidapi/hidapi.h>
-
-#define AURA_USB_VID                            0x0B05
-#define AURA_TERMINAL_PID                       0x1889
-#define AURA_ADDRESSABLE_1_PID                  0x1867
-#define AURA_ADDRESSABLE_2_PID                  0x1872
-#define AURA_ADDRESSABLE_3_PID                  0x18A3
-#define AURA_ADDRESSABLE_4_PID                  0x18A5
-#define AURA_MOTHERBOARD_1_PID                  0x18F3
-#define AURA_MOTHERBOARD_2_PID                  0x1939
-#define AURA_ROG_GLADIUS_II_CORE_PID            0x18DD
-#define AURA_ROG_GLADIUS_II_PID                 0x1845
-#define AURA_ROG_GLADIUS_II_ORIGIN_PID          0x1877
-
-typedef struct
-{
-    unsigned short  usb_vid;
-    unsigned short  usb_pid;
-    unsigned short  usb_interface;
-    const char *    name;
-} aura_device;
-
-#define ADDRESSABLE_NUM_DEVICES (sizeof(addressable_device_list) / sizeof(addressable_device_list[ 0 ]))
-
-static const aura_device addressable_device_list[] =
-{
-/*---------------------------------------------------------------------------------*\
-| ASUS AURA Addressable                                                             |
-\*---------------------------------------------------------------------------------*/
-    { AURA_USB_VID,     AURA_TERMINAL_PID,          0,  "ASUS ROG AURA Terminal"    },
-    { AURA_USB_VID,     AURA_ADDRESSABLE_1_PID,     0,  "ASUS Aura Addressable"     },
-    { AURA_USB_VID,     AURA_ADDRESSABLE_2_PID,     0,  "ASUS Aura Addressable"     },
-    { AURA_USB_VID,     AURA_ADDRESSABLE_3_PID,     0,  "ASUS Aura Addressable"     },
-    { AURA_USB_VID,     AURA_ADDRESSABLE_4_PID,     0,  "ASUS Aura Addressable"     },
-};
-
-#define MOTHERBOARD_NUM_DEVICES (sizeof(motherboard_device_list) / sizeof(motherboard_device_list[ 0 ]))
-
-static const aura_device motherboard_device_list[] =
-{
-/*---------------------------------------------------------------------------------*\
-| ASUS AURA Motherboard                                                             |
-\*---------------------------------------------------------------------------------*/
-    { AURA_USB_VID,     AURA_MOTHERBOARD_1_PID,     0,  "ASUS Aura Motherboard"     },
-    { AURA_USB_VID,     AURA_MOTHERBOARD_2_PID,     0,  "ASUS Aura Motherboard"     },
-};
-
-#define MOUSE_NUM_DEVICES (sizeof(mouse_device_list) / sizeof(mouse_device_list[ 0 ]))
-
-static const aura_device mouse_device_list[] =
-{
-    { AURA_USB_VID,     AURA_ROG_GLADIUS_II_CORE_PID,   0,  "ASUS ROG Gladius II Core"      },
-    { AURA_USB_VID,     AURA_ROG_GLADIUS_II_PID,        2,  "ASUS ROG Gladius II"           },
-    { AURA_USB_VID,     AURA_ROG_GLADIUS_II_ORIGIN_PID, 2,  "ASUS ROG Gladius II Origin"    },
-};
-
-void DetectAuraUSBControllers(std::vector<RGBController*>& rgb_controllers)
-{
-    hid_device_info* info = NULL;
-
-    hid_init();
-
-    /*ASUS AURA Addressable*/
-    for(unsigned int pid_idx = 0; pid_idx < ADDRESSABLE_NUM_DEVICES; pid_idx++)
-    {
-        info = hid_enumerate(addressable_device_list[pid_idx].usb_vid, addressable_device_list[pid_idx].usb_pid);
-
-        while(info)
-        {
-            hid_device* dev = NULL;
-
-            if((info->vendor_id  == addressable_device_list[pid_idx].usb_vid)
-             &&(info->product_id == addressable_device_list[pid_idx].usb_pid))
-            {
-                dev = hid_open_path(info->path);
-
-                if(dev)
-                {
-                    AuraAddressableController* controller = new AuraAddressableController(dev, info->path);
-                    RGBController_AuraUSB* rgb_controller = new RGBController_AuraUSB(controller);
-                    rgb_controller->name = addressable_device_list[pid_idx].name;
-                    rgb_controllers.push_back(rgb_controller);
-                }
-            }
-
-            info = info->next;
-        }
-    }
-
-    info = NULL;
-
-    /*ASUS AURA Motherboard*/
-    for(unsigned int pid_idx = 0; pid_idx < MOTHERBOARD_NUM_DEVICES; pid_idx++)
-    {
-        info = hid_enumerate(motherboard_device_list[pid_idx].usb_vid, motherboard_device_list[pid_idx].usb_pid);
-
-        while(info)
-        {
-            hid_device* dev = NULL;
-
-            if((info->vendor_id  == motherboard_device_list[pid_idx].usb_vid)
-             &&(info->product_id == motherboard_device_list[pid_idx].usb_pid))
-            {
-                dev = hid_open_path(info->path);
-
-                if(dev)
-                {
-                    try
-                    {
-                        AuraMainboardController* controller = new AuraMainboardController(dev, info->path);
-                        RGBController_AuraUSB* rgb_controller = new RGBController_AuraUSB(controller);
-                        rgb_controller->name = motherboard_device_list[pid_idx].name;
-                        rgb_controllers.push_back(rgb_controller);
-                    }
-                    catch(std::runtime_error&)
-                    {
-                        // reading the config table failed
-                    }
-                }
-            }
-
-            info = info->next;
-        }
-    }
-
-    /*ASUS AURA Mouse*/
-    for(unsigned int pid_idx = 0; pid_idx < MOUSE_NUM_DEVICES; pid_idx++)
-    {
-        info = hid_enumerate(mouse_device_list[pid_idx].usb_vid, mouse_device_list[pid_idx].usb_pid);
-
-        while(info)
-        {
-            hid_device* dev = NULL;
-
-            if((info->vendor_id  == mouse_device_list[pid_idx].usb_vid)
-             &&(info->product_id == mouse_device_list[pid_idx].usb_pid)
-#ifdef USE_HID_USAGE
-             &&(info->interface_number == mouse_device_list[pid_idx].usb_interface )
-             &&(info->usage_page == 0xFF01))
-#else
-             &&(info->interface_number == mouse_device_list[pid_idx].usb_interface ))
-#endif
-            {
-                dev = hid_open_path(info->path);
-
-                if(dev)
-                {
-                    AuraMouseController* controller = new AuraMouseController(dev, info->path);
-                    RGBController_AuraMouse* rgb_controller = new RGBController_AuraMouse(controller);
-                    rgb_controller->name = mouse_device_list[pid_idx].name;
-                    rgb_controllers.push_back(rgb_controller);
-                }
-            }
-
-            info = info->next;
-        }
-    }
-
-}  /* DetectAuraUSBControllers() */
-
-REGISTER_DETECTOR("ASUS Aura USB", DetectAuraUSBControllers);

Controllers/CoolerMasterController/CMMP750Controller.cpp

@@ -27,20 +27,25 @@ static unsigned char speed_mode_data[][9] =
     { 0xFF, 0xE0, 0xC0, 0xA0, 0x80, 0x60, 0x40, 0x20, 0x00 } /* Colour Breath                */
 };
 
-CMMP750Controller::CMMP750Controller(hid_device* dev_handle, wchar_t *_vendor, wchar_t *_device_name, char *_path)
+CMMP750Controller::CMMP750Controller(hid_device* dev_handle, char *_path)
 {
-    std::size_t tmp_size    = wcslen(_vendor);
-    dev                     = dev_handle;
-    location                = _path;
+    dev             = dev_handle;
+    location        = _path;
 
-    for(std::size_t i = 0; (i < tmp_size) && (i < CM_DEVICE_NAME_SIZE); i++)
-    {
-        device_name[i] = (char)_vendor[i];
-    }
-    for(std::size_t j = 0; (j < wcslen(_vendor)) && (tmp_size + j < CM_DEVICE_NAME_SIZE); j++)
-    {
-        device_name[tmp_size + j] = (char)_device_name[j];
-    }
+    const int szTemp = 256;
+    wchar_t tmpName[szTemp];
+
+    hid_get_manufacturer_string(dev, tmpName, szTemp);
+    std::wstring wName = std::wstring(tmpName);
+    device_name        = std::string(wName.begin(), wName.end());
+
+    hid_get_product_string(dev, tmpName, szTemp);
+    wName  = std::wstring(tmpName);
+    device_name.append(" ").append(std::string(wName.begin(), wName.end()));
+
+    hid_get_serial_number_string(dev, tmpName, szTemp);
+    wName  = std::wstring(tmpName);
+    serial = std::string(wName.begin(), wName.end());
 
     GetStatus();        //When setting up device get current status
 }
@@ -82,12 +87,12 @@ void CMMP750Controller::GetStatus()
     }
 }
 
-char* CMMP750Controller::GetDeviceName()
+std::string CMMP750Controller::GetDeviceName()
 {
     return device_name;
 }
 
-char* CMMP750Controller::GetSerial()
+std::string CMMP750Controller::GetSerial()
 {
     return serial;
 }

Controllers/CoolerMasterController/CMMP750Controller.h

@@ -60,11 +60,11 @@ enum
 class CMMP750Controller
 {
 public:
-    CMMP750Controller(hid_device* dev_handle, wchar_t *_vendor, wchar_t *_device_name, char *_path);
+    CMMP750Controller(hid_device* dev_handle, char *_path);
     ~CMMP750Controller();
 
-    char* GetDeviceName();
-    char* GetSerial();
+    std::string GetDeviceName();
+    std::string GetSerial();
     std::string GetLocation();
 
     unsigned char GetMode();
@@ -76,8 +76,8 @@ public:
     void SetColor(unsigned char red, unsigned char green, unsigned char blue);
 
 private:
-    char                    device_name[32];
-    char                    serial[32];
+    std::string             device_name;
+    std::string             serial;
     std::string             location;
     hid_device*             dev;
 

Controllers/CoolerMasterController/CoolerMasterControllerDetect.cpp

@@ -12,24 +12,6 @@
 #define COOLERMASTER_MP750_MEDIUM_PID   0x0105
 #define COOLERMASTER_ARGB_PID           0x1011
 
-#define COOLERMASTER_NUM_DEVICES (sizeof(cm_pids) / sizeof(cm_pids[ 0 ]))
-
-struct coolermaster_device
-{
-    unsigned int    product_id;
-    unsigned short  interface;
-    unsigned int    usage_page;
-    unsigned int    usage;
-    device_type     type;
-};
-
-static const coolermaster_device cm_pids[] =
-{  // PID,                              Interface,  Usage_Page, Usage,  Device_Type
-    { COOLERMASTER_MP750_XL_PID,        0x00,       0xFF00,     0x01,   DEVICE_TYPE_MOUSEMAT  },    //Coolermaster MP750 (Extra Large)
-    { COOLERMASTER_MP750_MEDIUM_PID,    0x00,       0xFF00,     0x01,   DEVICE_TYPE_MOUSEMAT  },    //Coolermaster MP750 (Medium)
-    { COOLERMASTER_ARGB_PID,            0x00,       0xFF00,     0x01,   DEVICE_TYPE_LEDSTRIP  }     //Coolermaster ARGB Controller
-};
-
 /******************************************************************************************\
 *                                                                                          *
 *   DetectCoolerMasterControllers                                                          *
@@ -38,60 +20,33 @@ static const coolermaster_device cm_pids[] =
 *                                                                                          *
 \******************************************************************************************/
 
-void DetectCoolerMasterControllers(std::vector<RGBController*>& rgb_controllers)
+void DetectCoolerMasterMousemats(hid_device_info* info, const std::string&)
 {
-    hid_device_info* info;
-
-    //Look for the passed in cm_pids
-    hid_init();
-    info = hid_enumerate(COOLERMASTER_VID, 0x0);
-
-    while(info)
+    hid_device* dev = hid_open_path(info->path);
+    if(dev)
     {
-        hid_device* dev = NULL;
-        device_type dev_type;
-
-        if(info->vendor_id == COOLERMASTER_VID)
-        {
-            for(unsigned int cm_pid_idx = 0; cm_pid_idx < COOLERMASTER_NUM_DEVICES; cm_pid_idx++)
-            {
-                if((info->product_id        == cm_pids[cm_pid_idx].product_id)
-#ifdef USE_HID_USAGE
-                    &&(info->usage             == cm_pids[cm_pid_idx].usage)     //Usage and usage page required to get the correct interface
-                    &&(info->usage_page        == cm_pids[cm_pid_idx].usage_page))
-#else
-                    &&(info->interface_number  == cm_pids[cm_pid_idx].interface))
-#endif  //USE_HID_USAGE
-                {
-                    dev         = hid_open_path(info->path);
-                    dev_type    = cm_pids[cm_pid_idx].type;
-                    break;
-                }
-            }
-        }
-
-        if(dev)
-        {
-            if (dev_type == DEVICE_TYPE_MOUSEMAT)
-            {
-                CMMP750Controller* controller                   = new CMMP750Controller(dev, info->manufacturer_string, info->product_string, info->path);
-                RGBController_CMMP750Controller* rgb_controller = new RGBController_CMMP750Controller(controller);
-                rgb_controllers.push_back(rgb_controller);
-            }
-            else if(dev_type == DEVICE_TYPE_LEDSTRIP)
-            {
-                for(std::size_t i = 0; i < CM_ARGB_HEADER_DATA_SIZE; i++)
-                {
-                    CMARGBController* controller = new CMARGBController(dev, info->path, i);
-                    RGBController_CMARGBController* rgb_controller = new RGBController_CMARGBController(controller);
-                    rgb_controllers.push_back(rgb_controller);
-                }
-            }
-        }
-        info = info->next;
+        CMMP750Controller* controller                   = new CMMP750Controller(dev, info->path);
+        RGBController_CMMP750Controller* rgb_controller = new RGBController_CMMP750Controller(controller);
+        // Constructor sets the name
+        ResourceManager::get()->RegisterRGBController(rgb_controller);
     }
-    hid_free_enumeration(info);
+}
 
-}   /* DetectCoolerMasterControllers() */
+void DetectCoolerMasterARGB(hid_device_info* info, const std::string&)
+{
+    hid_device* dev = hid_open_path(info->path);
+    if(dev)
+    {
+        for(std::size_t i = 0; i < CM_ARGB_HEADER_DATA_SIZE; i++)
+        {
+            CMARGBController* controller = new CMARGBController(dev, info->path, i);
+            RGBController_CMARGBController* rgb_controller = new RGBController_CMARGBController(controller);
+            // Constructor sets the name
+            ResourceManager::get()->RegisterRGBController(rgb_controller);
+        }
+    }
+}
 
-REGISTER_DETECTOR("Cooler Master", DetectCoolerMasterControllers);
+REGISTER_HID_DETECTOR_IPU("Cooler Master MP750 XL",     DetectCoolerMasterMousemats, COOLERMASTER_VID, COOLERMASTER_MP750_XL_PID,     0, 0xFF00, 1);
+REGISTER_HID_DETECTOR_IPU("Cooler Master MP750 Medium", DetectCoolerMasterMousemats, COOLERMASTER_VID, COOLERMASTER_MP750_MEDIUM_PID, 0, 0xFF00, 1);
+REGISTER_HID_DETECTOR_IPU("Cooler Master ARGB",         DetectCoolerMasterARGB,      COOLERMASTER_VID, COOLERMASTER_ARGB_PID,         0, 0xFF00, 1);

Controllers/CoolerMasterController/RGBController_CMMP750Controller.cpp

@@ -18,7 +18,7 @@ RGBController_CMMP750Controller::RGBController_CMMP750Controller(CMMP750Controll
     type                = DEVICE_TYPE_MOUSEMAT;
     description         = cmmp750->GetDeviceName();
     version             = "1.0";
-    serial              = "";
+    serial              = cmmp750->GetSerial();
     location            = cmmp750->GetLocation();
 
     mode Static;
@@ -143,25 +143,5 @@ void RGBController_CMMP750Controller::SetCustomMode()
 
 void RGBController_CMMP750Controller::DeviceUpdateMode()
 {
-    switch(modes[active_mode].value)
-    {
-        case MP750_MODE_STATIC:
-            cmmp750->SetMode(MP750_MODE_STATIC, modes[active_mode].speed);
-            break;
-        case MP750_MODE_BLINK:
-            cmmp750->SetMode(MP750_MODE_BLINK, modes[active_mode].speed);
-            break;
-        case MP750_MODE_BREATHING:
-            cmmp750->SetMode(MP750_MODE_BREATHING, modes[active_mode].speed);
-            break;
-        case MP750_MODE_COLOR_CYCLE:
-            cmmp750->SetMode(MP750_MODE_COLOR_CYCLE, modes[active_mode].speed);
-            break;
-        case MP750_MODE_BREATH_CYCLE:
-            cmmp750->SetMode(MP750_MODE_BREATH_CYCLE, modes[active_mode].speed);
-            break;
-        default:
-            cmmp750->SetMode(MP750_MODE_BREATHING, modes[active_mode].speed);
-            break;
-    }
+    cmmp750->SetMode(modes[active_mode].value, modes[active_mode].speed);
 }

Controllers/CorsairLightingNodeController/CorsairLightingNodeController.cpp

@@ -11,32 +11,8 @@
 #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
-
 using namespace std::chrono_literals;
 
-THREAD keepalive_thread(void *param)
-{
-    CorsairLightingNodeController* corsair = static_cast<CorsairLightingNodeController*>(param);
-    corsair->KeepaliveThread();
-    THREADRETURN
-}
-
 CorsairLightingNodeController::CorsairLightingNodeController(hid_device* dev_handle, const char* path)
 {
     dev         = dev_handle;
@@ -50,21 +26,20 @@ CorsairLightingNodeController::CorsairLightingNodeController(hid_device* dev_han
     | 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
+    keepalive_thread_run = 1;
+    keepalive_thread = new std::thread(&CorsairLightingNodeController::KeepaliveThread, this);
 }
 
 CorsairLightingNodeController::~CorsairLightingNodeController()
 {
+    keepalive_thread_run = 0;
+    keepalive_thread->join();
+    delete keepalive_thread;
 }
 
 void CorsairLightingNodeController::KeepaliveThread()
 {
-    while(1)
+    while(keepalive_thread_run.load())
     {
         if((std::chrono::steady_clock::now() - last_commit_time) > std::chrono::seconds(5))
         {

Controllers/CorsairLightingNodeController/CorsairLightingNodeController.h

@@ -112,6 +112,8 @@ private:
     hid_device*             dev;
     std::string             firmware_version;
     std::string             location;
+    std::thread*            keepalive_thread;
+    std::atomic<bool>       keepalive_thread_run;
     std::chrono::time_point<std::chrono::steady_clock> last_commit_time;
 
     void            SendFirmwareRequest();

Controllers/CorsairLightingNodeController/CorsairLightingNodeControllerDetect.cpp

@@ -12,26 +12,7 @@
 #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   channel_count;
-    const char *    name;
-} corsair_node_device;
-
-#define CORSAIR_NUM_DEVICES (sizeof(device_list) / sizeof(device_list[ 0 ]))
-
-static const corsair_node_device device_list[] =
-{
-    { CORSAIR_VID,          CORSAIR_LIGHTING_NODE_CORE_PID,     1,      "Corsair Lighting Node Core"    },
-    { CORSAIR_VID,          CORSAIR_LIGHTING_NODE_PRO_PID,      2,      "Corsair Lighting Node Pro"     },
-    { CORSAIR_VID,          CORSAIR_COMMANDER_PRO_PID,          2,      "Corsair Commander Pro"         },
-    { CORSAIR_VID,          CORSAIR_LS100_PID,                  1,      "Corsair LS100 Lighting Kit"    },
-    { CORSAIR_VID,          CORSAIR_1000D_OBSIDIAN_PID,         2,      "Corsair 1000D Obsidian"        },
-    { CORSAIR_VID,          CORSAIR_SPEC_OMEGA_RGB_PID,         2,      "Corsair SPEC OMEGA RGB"        }
-};
+#define CORSAIR_LT100_PID               0x0C23
 
 /******************************************************************************************\
 *                                                                                          *
@@ -41,42 +22,22 @@ static const corsair_node_device device_list[] =
 *                                                                                          *
 \******************************************************************************************/
 
-void DetectCorsairLightingNodeControllers(std::vector<RGBController*> &rgb_controllers)
+void DetectCorsairLightingNodeControllers(hid_device_info* info, const std::string& name)
 {
-    hid_device_info* info;
-    hid_device* dev;
-
-    hid_init();
-
-    for(std::size_t device_idx = 0; device_idx < CORSAIR_NUM_DEVICES; device_idx++)
+    hid_device* dev = hid_open_path(info->path);
+    if( dev )
     {
-        dev = NULL;
-
-        info = hid_enumerate(device_list[device_idx].usb_vid, device_list[device_idx].usb_pid);
-
-        //Look for Corsair Lighting Node Devices
-        while(info)
-        {
-            if((info->vendor_id == device_list[device_idx].usb_vid)
-            &&(info->product_id == device_list[device_idx].usb_pid))
-            {
-                dev = hid_open_path(info->path);
-
-                if( dev )
-                {
-                    CorsairLightingNodeController* controller = new CorsairLightingNodeController(dev, info->path);
-
-                    RGBController_CorsairLightingNode* rgb_controller = new RGBController_CorsairLightingNode(controller);
-
-                    rgb_controller->name = device_list[device_idx].name;
-
-                    rgb_controllers.push_back(rgb_controller);
-                }
-            }
-
-            info = info->next;
-        }
+        CorsairLightingNodeController* controller = new CorsairLightingNodeController(dev, info->path);
+        RGBController_CorsairLightingNode* rgb_controller = new RGBController_CorsairLightingNode(controller);
+        rgb_controller->name = name;
+        ResourceManager::get()->RegisterRGBController(rgb_controller);
     }
 }   /* DetectCorsairLightingNodeControllers() */
 
-REGISTER_DETECTOR("Corsair Lighting Node", DetectCorsairLightingNodeControllers);
+REGISTER_HID_DETECTOR("Corsair Lighting Node Core", DetectCorsairLightingNodeControllers, CORSAIR_VID, CORSAIR_LIGHTING_NODE_CORE_PID); // 1 channel
+REGISTER_HID_DETECTOR("Corsair Lighting Node Pro",  DetectCorsairLightingNodeControllers, CORSAIR_VID, CORSAIR_LIGHTING_NODE_PRO_PID);  // 2 channels
+REGISTER_HID_DETECTOR("Corsair Commander Pro",      DetectCorsairLightingNodeControllers, CORSAIR_VID, CORSAIR_COMMANDER_PRO_PID);      // 2 channels
+REGISTER_HID_DETECTOR("Corsair LS100 Lighting Kit", DetectCorsairLightingNodeControllers, CORSAIR_VID, CORSAIR_LS100_PID);              // 1 channel
+REGISTER_HID_DETECTOR("Corsair 1000D Obsidian",     DetectCorsairLightingNodeControllers, CORSAIR_VID, CORSAIR_1000D_OBSIDIAN_PID);     // 2 channels
+REGISTER_HID_DETECTOR("Corsair SPEC OMEGA RGB",     DetectCorsairLightingNodeControllers, CORSAIR_VID, CORSAIR_SPEC_OMEGA_RGB_PID);     // 2 channels
+REGISTER_HID_DETECTOR("Corsair LT100",              DetectCorsairLightingNodeControllers, CORSAIR_VID, CORSAIR_LT100_PID);              // 2 channels

Controllers/CorsairPeripheralController/CorsairPeripheralController.cpp

@@ -60,7 +60,10 @@ CorsairPeripheralController::CorsairPeripheralController(hid_device* dev_handle,
 
 CorsairPeripheralController::~CorsairPeripheralController()
 {
-
+    if(dev)
+    {
+        hid_close(dev);
+    }
 }
 
 device_type CorsairPeripheralController::GetDeviceType()

Controllers/CorsairPeripheralController/CorsairPeripheralControllerDetect.cpp

@@ -2,7 +2,6 @@
 #include "CorsairPeripheralController.h"
 #include "RGBController.h"
 #include "RGBController_CorsairPeripheral.h"
-#include <vector>
 #include <hidapi/hidapi.h>
 
 /*-----------------------------------------------------*\
@@ -60,56 +59,6 @@
 \*-----------------------------------------------------*/
 #define CORSAIR_ST100_PID               0x0A34
 
-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_K55_RGB_PID,                1,      "Corsair K55 RGB"                   }, //Not per-key, disabled for now
-    { CORSAIR_VID,          CORSAIR_K65_RGB_PID,                1,      "Corsair K65 RGB"                   },
-    { CORSAIR_VID,          CORSAIR_K65_LUX_RGB_PID,            1,      "Corsair K65 LUX RGB"               },
-    { CORSAIR_VID,          CORSAIR_K65_RGB_RAPIDFIRE_PID,      1,      "Corsair K65 RGB RAPIDFIRE"         },
-    { 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"          },
-    { CORSAIR_VID,          CORSAIR_STRAFE_PID,                 1,      "Corsair Strafe"                    },
-    { CORSAIR_VID,          CORSAIR_STRAFE_MK2_PID,             1,      "Corsair Strafe MK.2"               },
-    /*-----------------------------------------------------------------------------------------------------*\
-    | Mice                                                                                                  |
-    \*-----------------------------------------------------------------------------------------------------*/
-    { CORSAIR_VID,          CORSAIR_GLAIVE_RGB_PRO_PID,         1,      "Corsair Glaive RGB PRO"            },
-    { CORSAIR_VID,          CORSAIR_HARPOON_RGB_PID,            1,      "Corsair Harpoon RGB"               },
-    { CORSAIR_VID,          CORSAIR_HARPOON_RGB_PRO_PID,        1,      "Corsair Harpoon RGB PRO"           },
-    { CORSAIR_VID,          CORSAIR_M65_PRO_PID,                1,      "Corsair M65 PRO"                   },
-    { CORSAIR_VID,          CORSAIR_M65_RGB_ELITE_PID,          1,      "Corsair M65 RGB Elite"             },
-    { CORSAIR_VID,          CORSAIR_SCIMITAR_PRO_RGB_PID,       1,      "Corsair Scimitar PRO RGB"          },
-    { CORSAIR_VID,          CORSAIR_SABRE_RGB_PID,              1,      "Corsair Sabre RGB"                 },
-    /*-----------------------------------------------------------------------------------------------------*\
-    | Mousemats                                                                                             |
-    \*-----------------------------------------------------------------------------------------------------*/
-    { CORSAIR_VID,          CORSAIR_MM800_RGB_POLARIS_PID,      0,      "Corsair MM800 RGB Polaris"         },
-    /*-----------------------------------------------------------------------------------------------------*\
-    | Headset Stands                                                                                        |
-    \*-----------------------------------------------------------------------------------------------------*/
-    { CORSAIR_VID,          CORSAIR_ST100_PID,                  0,      "Corsair ST100 RGB"                 }
-};
-
 /******************************************************************************************\
 *                                                                                          *
 *   DetectCorsairPeripheralControllers                                                     *
@@ -118,50 +67,58 @@ static const corsair_node_device device_list[] =
 *                                                                                          *
 \******************************************************************************************/
 
-void DetectCorsairPeripheralControllers(std::vector<RGBController*>& rgb_controllers)
+void DetectCorsairPeripheralControllers(hid_device_info* info, const std::string& name)
 {
-    hid_device_info* info;
-    hid_device* dev;
-
-    hid_init();
-
-    for(std::size_t device_idx = 0; device_idx < CORSAIR_NUM_DEVICES; device_idx++)
+    hid_device* dev = hid_open_path(info->path);
+    if( dev )
     {
-        dev = NULL;
-
-        info = hid_enumerate(device_list[device_idx].usb_vid, device_list[device_idx].usb_pid);
-
-        //Look for Corsair RGB Peripheral
-        while(info)
+        CorsairPeripheralController* controller = new CorsairPeripheralController(dev, info->path);
+        if(controller->GetDeviceType() != DEVICE_TYPE_UNKNOWN)
         {
-            if((info->vendor_id == device_list[device_idx].usb_vid)
-#ifdef USE_HID_USAGE
-            &&(info->product_id == device_list[device_idx].usb_pid)
-            &&(info->usage_page == 0xFFC2))
-#else
-            &&(info->product_id == device_list[device_idx].usb_pid)
-            &&(info->interface_number == device_list[device_idx].usb_interface))
-#endif
-            {
-                dev = hid_open_path(info->path);
-
-                if( dev )
-                {
-                    CorsairPeripheralController* controller = new CorsairPeripheralController(dev, info->path);
-
-                    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);
-                    }
-                }
-            }
-            info = info->next;
+            RGBController_CorsairPeripheral* rgb_controller = new RGBController_CorsairPeripheral(controller);
+            rgb_controller->name = name;
+            ResourceManager::get()->RegisterRGBController(rgb_controller);
+        }
+        else
+        {
+            delete controller;
         }
     }
 }   /* DetectCorsairPeripheralControllers() */
 
-REGISTER_DETECTOR("Corsair Peripheral", DetectCorsairPeripheralControllers);
+/*-----------------------------------------------------------------------------------------------------*\
+| Keyboards                                                                                             |
+\*-----------------------------------------------------------------------------------------------------*/
+//REGISTER_HID_DETECTOR_IP("Corsair K55 RGB",                  DetectCorsairPeripheralControllers, CORSAIR_VID, CORSAIR_K55_RGB_PID,           1, 0xFFC2); // Not per-key, disabled for now
+REGISTER_HID_DETECTOR_IP("Corsair K65 RGB",                  DetectCorsairPeripheralControllers, CORSAIR_VID, CORSAIR_K65_RGB_PID,           1, 0xFFC2);
+REGISTER_HID_DETECTOR_IP("Corsair K65 LUX RGB",              DetectCorsairPeripheralControllers, CORSAIR_VID, CORSAIR_K65_LUX_RGB_PID,       1, 0xFFC2);
+REGISTER_HID_DETECTOR_IP("Corsair K65 RGB RAPIDFIRE",        DetectCorsairPeripheralControllers, CORSAIR_VID, CORSAIR_K65_RGB_RAPIDFIRE_PID, 1, 0xFFC2);
+REGISTER_HID_DETECTOR_IP("Corsair K68 RGB",                  DetectCorsairPeripheralControllers, CORSAIR_VID, CORSAIR_K68_RGB,               1, 0xFFC2);
+REGISTER_HID_DETECTOR_IP("Corsair K70 RGB",                  DetectCorsairPeripheralControllers, CORSAIR_VID, CORSAIR_K70_RGB_PID,           1, 0xFFC2);
+REGISTER_HID_DETECTOR_IP("Corsair K70 LUX RGB",              DetectCorsairPeripheralControllers, CORSAIR_VID, CORSAIR_K70_LUX_RGB_PID,       1, 0xFFC2);
+REGISTER_HID_DETECTOR_IP("Corsair K70 RGB RAPIDFIRE",        DetectCorsairPeripheralControllers, CORSAIR_VID, CORSAIR_K70_RGB_RAPIDFIRE_PID, 1, 0xFFC2);
+REGISTER_HID_DETECTOR_IP("Corsair K70 RGB MK.2",             DetectCorsairPeripheralControllers, CORSAIR_VID, CORSAIR_K70_RGB_MK2_PID,       1, 0xFFC2);
+REGISTER_HID_DETECTOR_IP("Corsair K70 RGB MK.2 SE",          DetectCorsairPeripheralControllers, CORSAIR_VID, CORSAIR_K70_RGB_MK2_SE_PID,    1, 0xFFC2);
+REGISTER_HID_DETECTOR_IP("Corsair K70 RGB MK.2 Low Profile", DetectCorsairPeripheralControllers, CORSAIR_VID, CORSAIR_K70_RGB_MK2_LP_PID,    1, 0xFFC2);
+REGISTER_HID_DETECTOR_IP("Corsair K95 RGB",                  DetectCorsairPeripheralControllers, CORSAIR_VID, CORSAIR_K95_RGB_PID,           1, 0xFFC2);
+REGISTER_HID_DETECTOR_IP("Corsair K95 RGB PLATINUM",         DetectCorsairPeripheralControllers, CORSAIR_VID, CORSAIR_K95_PLATINUM_PID,      1, 0xFFC2);
+REGISTER_HID_DETECTOR_IP("Corsair Strafe",                   DetectCorsairPeripheralControllers, CORSAIR_VID, CORSAIR_STRAFE_PID,            1, 0xFFC2);
+REGISTER_HID_DETECTOR_IP("Corsair Strafe MK.2",              DetectCorsairPeripheralControllers, CORSAIR_VID, CORSAIR_STRAFE_MK2_PID,        1, 0xFFC2);
+/*-----------------------------------------------------------------------------------------------------*\
+| Mice                                                                                                  |
+\*-----------------------------------------------------------------------------------------------------*/
+REGISTER_HID_DETECTOR_IP("Corsair Glaive RGB PRO",           DetectCorsairPeripheralControllers, CORSAIR_VID, CORSAIR_GLAIVE_RGB_PRO_PID,    1, 0xFFC2);
+REGISTER_HID_DETECTOR_IP("Corsair Harpoon RGB",              DetectCorsairPeripheralControllers, CORSAIR_VID, CORSAIR_HARPOON_RGB_PID,       1, 0xFFC2);
+REGISTER_HID_DETECTOR_IP("Corsair Harpoon RGB PRO",          DetectCorsairPeripheralControllers, CORSAIR_VID, CORSAIR_HARPOON_RGB_PRO_PID,   1, 0xFFC2);
+REGISTER_HID_DETECTOR_IP("Corsair M65 PRO",                  DetectCorsairPeripheralControllers, CORSAIR_VID, CORSAIR_M65_PRO_PID,           1, 0xFFC2);
+REGISTER_HID_DETECTOR_IP("Corsair M65 RGB Elite" ,           DetectCorsairPeripheralControllers, CORSAIR_VID, CORSAIR_M65_RGB_ELITE_PID,     1, 0xFFC2);
+REGISTER_HID_DETECTOR_IP("Corsair Scimitar PRO RGB",         DetectCorsairPeripheralControllers, CORSAIR_VID, CORSAIR_SCIMITAR_PRO_RGB_PID,  1, 0xFFC2);
+REGISTER_HID_DETECTOR_IP("Corsair Sabre RGB",                DetectCorsairPeripheralControllers, CORSAIR_VID, CORSAIR_SABRE_RGB_PID,         1, 0xFFC2);
+/*-----------------------------------------------------------------------------------------------------*\
+| Mousemats                                                                                             |
+\*-----------------------------------------------------------------------------------------------------*/
+REGISTER_HID_DETECTOR_IP("Corsair MM800 RGB Polaris",        DetectCorsairPeripheralControllers, CORSAIR_VID, CORSAIR_MM800_RGB_POLARIS_PID, 0, 0xFFC2);
+/*-----------------------------------------------------------------------------------------------------*\
+| Headset Stands                                                                                        |
+\*-----------------------------------------------------------------------------------------------------*/
+REGISTER_HID_DETECTOR_IP("Corsair ST100 RGB",                DetectCorsairPeripheralControllers, CORSAIR_VID, CORSAIR_ST100_PID,             0, 0xFFC2);

Controllers/CrucialController/CrucialController.cpp

@@ -15,6 +15,9 @@ CrucialController::CrucialController(i2c_smbus_interface* bus, crucial_dev_id de
 {
     this->bus = bus;
     this->dev = dev;
+
+    // We don't know what mode the sticks are in until we set one.
+    this->last_mode = CRUCIAL_MODE_UNKNOWN;
 }
 
 CrucialController::~CrucialController()
@@ -44,7 +47,11 @@ unsigned int CrucialController::GetLEDCount()
 
 void CrucialController::SetMode(unsigned char mode)
 {
+    // Don't set a mode if we've already set the same one before.
+    // This is mostly useful for direct mode and updating colors often.
+    if (mode == last_mode) return;
     SendEffectMode(mode, 0x10);
+    last_mode = mode;
 }
 
 void CrucialController::SetAllColorsDirect(RGBColor* colors)
@@ -80,6 +87,8 @@ void CrucialController::SendEffectMode(unsigned char mode, unsigned char speed)
 
 void CrucialController::SendDirectColors(RGBColor* color_buf)
 {
+    SetMode(CRUCIAL_MODE_STATIC);
+
     //Red Channels
     CrucialRegisterWrite(0x8300, RGBGetRValue(color_buf[0]));
     CrucialRegisterWrite(0x8301, RGBGetRValue(color_buf[1]));

Controllers/CrucialController/CrucialController.h

@@ -18,6 +18,7 @@ typedef unsigned short	crucial_register;
 
 enum
 {
+    CRUCIAL_MODE_UNKNOWN            = 0x00,     /* We don't know what the mode is   */
     CRUCIAL_MODE_SHIFT              = 0x1F,     /* Shift effect mode                */
     CRUCIAL_MODE_GRADIENT_SHIFT     = 0x2F,     /* Gradient shift mode              */
     CRUCIAL_MODE_FILL               = 0x3F,     /* Fill effect mode                 */
@@ -53,6 +54,7 @@ private:
     unsigned char           config_table[64];
     unsigned int            led_count;
     unsigned char           channel_cfg;
+    unsigned char           last_mode;
     i2c_smbus_interface *   bus;
     crucial_dev_id          dev;
 

Controllers/DuckyKeyboardController/DuckyKeyboardControllerDetect.cpp

@@ -2,7 +2,6 @@
 #include "DuckyKeyboardController.h"
 #include "RGBController.h"
 #include "RGBController_DuckyKeyboard.h"
-#include <vector>
 #include <hidapi/hidapi.h>
 
 /*-----------------------------------------------------*\
@@ -16,25 +15,6 @@
 #define DUCKY_SHINE_7_ONE_2_RGB_PID     0x0348
 #define DUCKY_ONE_2_RGB_TKL_PID         0x0356
 
-typedef struct
-{
-    unsigned short  usb_vid;
-    unsigned short  usb_pid;
-    unsigned char   usb_interface;
-    const char *    name;
-} ducky_device;
-
-#define DUCKY_NUM_DEVICES (sizeof(device_list) / sizeof(device_list[ 0 ]))
-
-static const ducky_device device_list[] =
-{
-    /*-----------------------------------------------------------------------------------------------------*\
-    | Keyboards                                                                                             |
-    \*-----------------------------------------------------------------------------------------------------*/
-    { DUCKY_VID,            DUCKY_SHINE_7_ONE_2_RGB_PID,        1,      "Ducky Shine 7/Ducky One 2 RGB"     },
-    { DUCKY_VID,            DUCKY_ONE_2_RGB_TKL_PID,            1,      "Ducky One 2 RGB TKL"               },
-};
-
 /******************************************************************************************\
 *                                                                                          *
 *   DetectDuckyKeyboardControllers                                                         *
@@ -43,42 +23,17 @@ static const ducky_device device_list[] =
 *                                                                                          *
 \******************************************************************************************/
 
-void DetectDuckyKeyboardControllers(std::vector<RGBController*>& rgb_controllers)
+void DetectDuckyKeyboardControllers(hid_device_info* info, const std::string& name)
 {
-    hid_device_info* info;
-    hid_device* dev;
-
-    hid_init();
-
-    for(std::size_t device_idx = 0; device_idx < DUCKY_NUM_DEVICES; device_idx++)
+    hid_device* dev = hid_open_path(info->path);
+    if( dev )
     {
-        dev = NULL;
-
-        info = hid_enumerate(device_list[device_idx].usb_vid, device_list[device_idx].usb_pid);
-
-        //Look for Ducky 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);
-
-                if( dev )
-                {
-                    DuckyKeyboardController* controller = new DuckyKeyboardController(dev, info->path);
-
-                    RGBController_DuckyKeyboard* rgb_controller = new RGBController_DuckyKeyboard(controller);
-
-                    rgb_controller->name = device_list[device_idx].name;
-                    
-                    rgb_controllers.push_back(rgb_controller);
-                }
-            }
-            info = info->next;
-        }
+        DuckyKeyboardController* controller = new DuckyKeyboardController(dev, info->path);
+        RGBController_DuckyKeyboard* rgb_controller = new RGBController_DuckyKeyboard(controller);
+        rgb_controller->name = name;
+        ResourceManager::get()->RegisterRGBController(rgb_controller);
     }
 }   /* DetectDuckyKeyboardControllers() */
 
-REGISTER_DETECTOR("Ducky Keyboard", DetectDuckyKeyboardControllers);
+REGISTER_HID_DETECTOR_I("Ducky Shine 7/Ducky One 2 RGB", DetectDuckyKeyboardControllers, DUCKY_VID, DUCKY_SHINE_7_ONE_2_RGB_PID, 1);
+REGISTER_HID_DETECTOR_I("Ducky One 2 RGB TKL",           DetectDuckyKeyboardControllers, DUCKY_VID, DUCKY_ONE_2_RGB_TKL_PID,     1);

Controllers/E131Controller/RGBController_E131.cpp

@@ -261,12 +261,21 @@ RGBController_E131::RGBController_E131(std::vector<E131Device> device_list)
 
     if(keepalive_delay.count() > 0)
     {
-        KeepaliveThread = new std::thread(&RGBController_E131::KeepaliveThreadFunction, this);
+        keepalive_thread_run = 1;
+        keepalive_thread = new std::thread(&RGBController_E131::KeepaliveThreadFunction, this);
+    }
+    else
+    {
+        keepalive_thread_run = 0;
+        keepalive_thread = nullptr;
     }
 }
 
 RGBController_E131::~RGBController_E131()
 {
+    keepalive_thread_run = 0;
+    keepalive_thread->join();
+    delete keepalive_thread;
     /*---------------------------------------------------------*\
     | Delete the matrix map                                     |
     \*---------------------------------------------------------*/
@@ -413,7 +422,7 @@ void RGBController_E131::DeviceUpdateMode()
 
 void RGBController_E131::KeepaliveThreadFunction()
 {
-    while(1)
+    while(keepalive_thread_run.load())
     {
         if((std::chrono::steady_clock::now() - last_update_time) > ( keepalive_delay * 0.95f ) )
         {

Controllers/E131Controller/RGBController_E131.h

@@ -78,7 +78,8 @@ private:
 	std::vector<e131_addr_t> 	dest_addrs;
 	std::vector<unsigned int> 	universes;
 	int 						sockfd;
-    std::thread *               KeepaliveThread;
+    std::thread *               keepalive_thread;
+    std::atomic<bool>           keepalive_thread_run;
     std::chrono::milliseconds                           keepalive_delay;
     std::chrono::time_point<std::chrono::steady_clock>  last_update_time;
 };

Controllers/EKController/EKController.cpp

@@ -9,7 +9,7 @@
 
 #include "EKController.h"
 
-static unsigned char colour_mode_data[][16] =
+static unsigned char ek_colour_mode_data[][16] =
 {
     { 0x10, 0x12, 0x29, 0xAA, 0x01, 0x10, 0xA2, 0x60,
       0x00, 0x10, 0x20, 0x01, 0x01, 0x00, 0xFF, 0x64},          // Static
@@ -31,7 +31,7 @@ static unsigned char colour_mode_data[][16] =
       0x00, 0x10, 0x20, 0x01, 0x09, 0x00, 0xFF, 0x64},          // Candle
 };
 
-static unsigned char speed_mode_data[][9] =
+static unsigned char ek_speed_mode_data[][9] =
 {
     { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },   // Static
     { 0x00, 0x0C, 0x19, 0x25, 0x32, 0x3E, 0x4B, 0x57, 0x64 },   // Breathing
@@ -44,21 +44,24 @@ static unsigned char speed_mode_data[][9] =
     { 0x00, 0x0C, 0x19, 0x25, 0x32, 0x3E, 0x4B, 0x57, 0x64 }    // Candle
 };
 
-EKController::EKController(hid_device* dev_handle, wchar_t *_vendor, wchar_t *_device_name, char *_path)
+EKController::EKController(hid_device* dev_handle, char *_path)
 {
-    std::size_t tmp_size = wcslen(_vendor);
+    const int szTemp = 256;
+    wchar_t tmpName[szTemp];
 
     dev = dev_handle;
 
-    for(std::size_t i = 0; (i < tmp_size) && (i < EK_DEVICE_NAME_SIZE); i++)
-    {
-        device_name[i] = (char)_vendor[i];
-    }
+    hid_get_manufacturer_string(dev, tmpName, szTemp);
+    std::wstring wName = std::wstring(tmpName);
+    device_name = std::string(wName.begin(), wName.end());
 
-    for(std::size_t j = 0; (j < wcslen(_vendor)) && ((tmp_size + j) < EK_DEVICE_NAME_SIZE); j++)
-    {
-        device_name[tmp_size + j] = (char)_device_name[j];
-    }
+    hid_get_product_string(dev, tmpName, szTemp);
+    wName = std::wstring(tmpName);
+    device_name.append(" ").append(std::string(wName.begin(), wName.end()));
+
+    hid_get_serial_number_string(dev, tmpName, szTemp);
+    wName = std::wstring(tmpName);
+    serial = std::string(wName.begin(), wName.end());
 
     location = _path;
 
@@ -68,18 +71,15 @@ EKController::EKController(hid_device* dev_handle, wchar_t *_vendor, wchar_t *_d
 
 EKController::~EKController()
 {
-    if(dev)
-    {
-        hid_close(dev);
-    }
+    hid_close(dev);
 }
 
-char* EKController::GetDeviceName()
+std::string EKController::GetDeviceName()
 {
     return device_name;
 }
 
-char* EKController::GetSerial()
+std::string EKController::GetSerial()
 {
     return serial;
 }
@@ -113,14 +113,14 @@ void EKController::SendUpdate()
 
     for(std::size_t i = 0; i < EK_COLOUR_MODE_DATA_SIZE; i++)
     {
-        buffer[i] = colour_mode_data[current_mode][i];
+        buffer[i] = ek_colour_mode_data[current_mode][i];
     }
 
     //Set the relevant colour info
     buffer[EK_RED_BYTE]   = current_red;
     buffer[EK_GREEN_BYTE] = current_green;
     buffer[EK_BLUE_BYTE]  = current_blue;
-    buffer[EK_SPEED_BYTE] = speed_mode_data[current_mode][current_speed];
+    buffer[EK_SPEED_BYTE] = ek_speed_mode_data[current_mode][current_speed];
 
     buffer[10] = 0x10;
     buffer[47] = 0xFF;

Controllers/EKController/EKController.h

@@ -13,7 +13,7 @@
 #include <string>
 #include <hidapi/hidapi.h>
 
-#define EK_COLOUR_MODE_DATA_SIZE (sizeof(colour_mode_data[0]) / sizeof(colour_mode_data[0][0]))
+#define EK_COLOUR_MODE_DATA_SIZE (sizeof(ek_colour_mode_data[0]) / sizeof(ek_colour_mode_data[0][0]))
 #define EK_DEVICE_NAME_SIZE (sizeof(device_name) / sizeof(device_name[ 0 ]))
 #define EK_PACKET_LENGTH    0x3F
 
@@ -55,19 +55,19 @@ enum
 class EKController
 {
 public:
-    EKController(hid_device* dev_handle, wchar_t *_vendor, wchar_t *_device_name, char *_path);
+    EKController(hid_device* dev_handle, char *_path);
     ~EKController();
 
-    char* GetDeviceName();
-    char* GetSerial();
+    std::string GetDeviceName();
+    std::string GetSerial();
     std::string GetLocation();
 
     void SetMode(unsigned char mode, unsigned char speed);
     void SetColor(unsigned char red, unsigned char green, unsigned char blue);
 
 private:
-    char                    device_name[32];
-    char                    serial[32];
+    std::string             device_name;
+    std::string             serial;
     std::string             location;
     hid_device*             dev;
 

Controllers/EKController/EKControllerDetect.cpp

@@ -5,22 +5,8 @@
 #include <hidapi/hidapi.h>
 
 #define EK_VID                0x0483
-
 #define EK_LOOP_CONNECT       0x5750
 
-#define EK_NUM_DEVICES (sizeof(ek_pids) / sizeof(ek_pids[ 0 ]))
-
-enum
-{
-    EK_PID = 0,
-    EK_INTERFACE = 1
-};
-
-static const unsigned int ek_pids[][2] =
-{  // PID,      Interface
-    { EK_LOOP_CONNECT,        0x00 }     //EK Loop Connect
-};
-
 /******************************************************************************************\
 *                                                                                          *
 *   DetectEKControllers                                                                    *
@@ -29,39 +15,17 @@ static const unsigned int ek_pids[][2] =
 *                                                                                          *
 \******************************************************************************************/
 
-void DetectEKControllers(std::vector<RGBController*>& rgb_controllers)
+void DetectEKControllers(hid_device_info* info, const std::string&)
 {
-    hid_device_info* info = NULL;
-
-    //Look for the passed in cm_pids
-    hid_init();
-    info = hid_enumerate(EK_VID, 0x0);
-
-    while(info)
+    hid_device* dev = hid_open_path(info->path);
+    if(dev)
     {
-        hid_device* dev = NULL;
-        if(info->vendor_id == EK_VID)
-        {
-            for(unsigned int ek_pid_idx = 0; ek_pid_idx < EK_NUM_DEVICES; ek_pid_idx++)
-            {
-                if((info->product_id        == ek_pids[ek_pid_idx][EK_PID])
-                 &&(info->interface_number  == ek_pids[ek_pid_idx][EK_INTERFACE]))
-                {
-                    dev = hid_open_path(info->path);
-                    break;
-                }
-            }
-        }
-
-        if(dev)
-        {
-            EKController* controller = new EKController(dev, info->manufacturer_string, info->product_string, info->path);
-            RGBController_EKController* rgb_controller = new RGBController_EKController(controller);
-            rgb_controllers.push_back(rgb_controller);
-        }
-        info = info->next;
+        EKController* controller = new EKController(dev, info->path);
+        RGBController_EKController* rgb_controller = new RGBController_EKController(controller);
+        // Constructor sets the name
+        ResourceManager::get()->RegisterRGBController(rgb_controller);
     }
-    hid_free_enumeration(info);
+    info = info->next;
 }   /* DetectEKControllers() */
 
-REGISTER_DETECTOR("EK", DetectEKControllers);
+REGISTER_HID_DETECTOR_IPU("EK Loop Connect", DetectEKControllers, EK_VID, EK_LOOP_CONNECT, 0, 0xFFA0, 1);

Controllers/EKController/RGBController_EKController.cpp

@@ -7,7 +7,6 @@
 |                                                                     |
 \*-------------------------------------------------------------------*/
 
-
 #include "RGBController_EKController.h"
 
 RGBController_EKController::RGBController_EKController(EKController* _dev)

Controllers/EVGAGPUController/EVGAGPUControllerDetect.cpp

@@ -31,6 +31,7 @@ typedef struct
 static const gpu_pci_device device_list[] =
 {
     { NVIDIA_VEN,   NVIDIA_GTX1070_DEV,     EVGA_SUB_VEN,   EVGA_GTX1070_FTW_SUB_DEV,       EVGA_RGB_V1,    "EVGA GeForce GTX 1070 FTW"             },
+    { NVIDIA_VEN,   NVIDIA_GTX1080_DEV,     EVGA_SUB_VEN,   EVGA_GTX1080_FTW_SUB_DEV,       EVGA_RGB_V1,    "EVGA GeForce GTX 1080 FTW"             },
     { NVIDIA_VEN,   NVIDIA_RTX2070_OC_DEV,  EVGA_SUB_VEN,   EVGA_RTX2070_XC_OC_SUB_DEV,     EVGA_RGB_V2,    "EVGA GeForce RTX 2070 XC OC"           },
     { NVIDIA_VEN,   NVIDIA_RTX2070S_DEV,    EVGA_SUB_VEN,   EVGA_RTX2070S_XC_ULTRA_SUB_DEV, EVGA_RGB_V2,    "EVGA GeForce RTX 2070 SUPER XC ULTRA"  },
     { NVIDIA_VEN,   NVIDIA_RTX2080_DEV,     EVGA_SUB_VEN,   EVGA_RTX2080_XC_GAMING_SUB_DEV, EVGA_RGB_V2,    "EVGA GeForce RTX 2080 XC GAMING"       },

Controllers/EVGAGPUController/EVGAGPUv1Controller.cpp

@@ -30,6 +30,11 @@ std::string EVGAGPUv1Controller::GetDeviceLocation()
     return("I2C: " + return_string);
 }
 
+unsigned char EVGAGPUv1Controller::GetMode()
+{
+    return(bus->i2c_smbus_read_byte_data(dev, EVGA_GPU_V1_REG_MODE));
+}
+
 unsigned char EVGAGPUv1Controller::GetRed()
 {
     return(bus->i2c_smbus_read_byte_data(dev, EVGA_GPU_V1_REG_RED));

Controllers/EVGAGPUController/EVGAGPUv1Controller.h

@@ -38,6 +38,7 @@ public:
 
     std::string     GetDeviceLocation();
 
+    unsigned char   GetMode();
     unsigned char   GetRed();
     unsigned char   GetGreen();
     unsigned char   GetBlue();

Controllers/EVGAGPUController/RGBController_EVGAGPUv1.cpp

@@ -49,8 +49,26 @@ RGBController_EVGAGPUv1::RGBController_EVGAGPUv1(EVGAGPUv1Controller* evga_ptr)
 
     SetupZones();
 
-    // Initialize active mode
+    // Initialize active mode and stored color
+
+    unsigned char raw_active_mode = evga->GetMode();
+
     active_mode = 0;
+    for(unsigned int i = 0; i < modes.size(); i++)
+    {
+        if (modes[i].value == raw_active_mode)
+        {
+            active_mode = i;
+            break;
+        }
+    }
+
+    unsigned char r = evga->GetRed();
+    unsigned char g = evga->GetGreen();
+    unsigned char b = evga->GetBlue();
+
+    RGBColor color = ToRGBColor(r, g, b);
+    colors[0] = color;
 }
 
 void RGBController_EVGAGPUv1::SetupZones()

Controllers/GigabyteAorusCPUCoolerController/GigabyteAorusCPUCoolerControllerDetect.cpp

@@ -0,0 +1,37 @@
+#include "Detector.h"
+#include "RGBController.h"
+#include "ATC800Controller.h"
+#include "RGBController_AorusATC800.h"
+#include <hidapi/hidapi.h>
+
+/*-----------------------------------------------------*\
+| Vendor ID                                             |
+\*-----------------------------------------------------*/
+#define HOLTEK_VID                            0x1044
+
+/*-----------------------------------------------------*\
+| Controller product ids                                |
+\*-----------------------------------------------------*/
+#define ATC_800_CONTROLLER_PID                0x7A42
+
+/******************************************************************************************\
+*                                                                                          *
+*   DetectAorusCPUCoolerControllers                                                        *
+*                                                                                          *
+*       Tests the USB address to see if a Aorus RGB CPU Cooler exists there.               *
+*                                                                                          *
+\******************************************************************************************/
+
+void DetectGigabyteAorusCPUCoolerControllers(hid_device_info* info, const std::string& name)
+{
+    hid_device* dev = hid_open_path(info->path);
+    if(dev)
+    {
+        ATC800Controller* controller = new ATC800Controller(dev, info->path);
+        RGBController_AorusATC800* rgb_controller = new RGBController_AorusATC800(controller);
+        rgb_controller->name = name;
+        ResourceManager::get()->RegisterRGBController(rgb_controller);
+    }
+}
+
+REGISTER_HID_DETECTOR_IPU("Aorus CPU Coolers", DetectGigabyteAorusCPUCoolerControllers, HOLTEK_VID, ATC_800_CONTROLLER_PID, 0, 0xFF01, 1);

Controllers/GigabyteRGBFusion2DRAMController/GigabyteRGBFusion2DRAMController.cpp

@@ -1,5 +1,5 @@
 /*-----------------------------------------*\
-|  RGBFusion2DRAMController.cpp             |
+|  GigabyteRGBFusion2DRAMController.cpp     |
 |                                           |
 |  Driver for Gigabyte Aorus RGB Fusion 2   |
 |  DRAM lighting controller                 |
@@ -7,7 +7,7 @@
 |  Adam Honse (CalcProgrammer1) 6/7/2020    |
 \*-----------------------------------------*/
 
-#include "RGBFusion2DRAMController.h"
+#include "GigabyteRGBFusion2DRAMController.h"
 
 #include <cstring>
 #include <stdio.h>

Controllers/GigabyteRGBFusion2DRAMController/GigabyteRGBFusion2DRAMController.h

@@ -1,5 +1,5 @@
 /*-----------------------------------------*\
-|  RGBFusion2DRAMController.h               |
+|  GigabyteRGBFusion2DRAMController.h       |
 |                                           |
 |  Definitions and types for Gigabyte Aorus |
 |  RGB Fusion 2 DRAM lighting controller    |

Controllers/GigabyteRGBFusion2DRAMController/GigabyteRGBFusion2DRAMControllerDetect.cpp

@@ -1,7 +1,7 @@
 #include "Detector.h"
-#include "RGBFusion2DRAMController.h"
+#include "GigabyteRGBFusion2DRAMController.h"
 #include "RGBController.h"
-#include "RGBController_RGBFusion2DRAM.h"
+#include "RGBController_GigabyteRGBFusion2DRAM.h"
 #include "i2c_smbus.h"
 #include "pci_ids.h"
 #include <vector>
@@ -11,14 +11,14 @@
 
 /******************************************************************************************\
 *                                                                                          *
-*   TestForRGBFusion2DRAMController                                                        *
+*   TestForGigabyteRGBFusion2DRAMController                                                *
 *                                                                                          *
 *       Tests the given address to see if an RGB 2 Fusion DRAMcontroller exists there.     *
 *       First does a quick write to test for a response                                    *
 *                                                                                          *
 \******************************************************************************************/
 
-bool TestForRGBFusion2DRAMController(i2c_smbus_interface* bus, unsigned char address)
+bool TestForGigabyteRGBFusion2DRAMController(i2c_smbus_interface* bus, unsigned char address)
 {
     bool pass = false;
 
@@ -37,20 +37,20 @@ bool TestForRGBFusion2DRAMController(i2c_smbus_interface* bus, unsigned char add
 
     return(pass);
 
-}   /* TestForRGBFusion2DRAMController() */
+}   /* TestForGigabyteRGBFusion2DRAMController() */
 
-/******************************************************************************************\
-*                                                                                          *
-*   DetectRGBFusion2DRAMControllers                                                        *
-*                                                                                          *
-*       Detect RGB Fusion 2 controllers on the enumerated I2C busses at address 0x67.      *
-*                                                                                          *
-*           bus - pointer to i2c_smbus_interface where RGB Fusion device is connected      *
-*           dev - I2C address of RGB Fusion device                                         *
-*                                                                                          *
-\******************************************************************************************/
+/***********************************************************************************************\
+*                                                                                               *
+*   DetectGigabyteRGBFusion2DRAMControllers                                                     *
+*                                                                                               *
+*       Detect Gigabyte RGB Fusion 2 controllers on the enumerated I2C buses at address 0x67.   * 
+*                                                                                               *
+*           bus - pointer to i2c_smbus_interface where RGB Fusion device is connected           *
+*           dev - I2C address of RGB Fusion device                                              *
+*                                                                                               *
+\***********************************************************************************************/
 
-void DetectRGBFusion2DRAMControllers(std::vector<i2c_smbus_interface*>& busses, std::vector<RGBController*>& rgb_controllers)
+void DetectGigabyteRGBFusion2DRAMControllers(std::vector<i2c_smbus_interface*>& busses, std::vector<RGBController*>& rgb_controllers)
 {
     RGBFusion2DRAMController* new_rgb_fusion;
     RGBController_RGBFusion2DRAM* new_controller;
@@ -60,7 +60,7 @@ void DetectRGBFusion2DRAMControllers(std::vector<i2c_smbus_interface*>& busses,
         IF_DRAM_SMBUS(busses[bus]->pci_vendor, busses[bus]->pci_device)
         {
             // Check for RGB Fusion 2 DRAM controller at 0x67
-            if (TestForRGBFusion2DRAMController(busses[bus], 0x67))
+            if (TestForGigabyteRGBFusion2DRAMController(busses[bus], 0x67))
             {
                 new_rgb_fusion = new RGBFusion2DRAMController(busses[bus], 0x67);
                 new_controller = new RGBController_RGBFusion2DRAM(new_rgb_fusion);
@@ -69,7 +69,7 @@ void DetectRGBFusion2DRAMControllers(std::vector<i2c_smbus_interface*>& busses,
         }
     }
 
-}   /* DetectRGBFusion2DRAMControllers() */
+}   /* DetectGigabyteRGBFusion2DRAMControllers() */
 
 // This detector is disabled as proper detection isn't implemented
-//REGISTER_I2C_DETECTOR("Gigabyte RGB Fusion 2 DRAM", DetectRGBFusion2DRAMControllers);
+//REGISTER_I2C_DETECTOR("Gigabyte RGB Fusion 2 DRAM", DetectGigabyteRGBFusion2DRAMControllers);

Controllers/GigabyteRGBFusion2DRAMController/RGBController_GigabyteRGBFusion2DRAM.cpp

@@ -1,5 +1,5 @@
 /*-----------------------------------------*\
-|  RGBController_RGBFusion2DRAM.cpp         |
+|  GigabyteRGBController_RGBFusion2DRAM.cpp |
 |                                           |
 |  Generic RGB Interface for OpenRGB        |
 |  Gigabyte RGB Fusion 2 DRAM Driver        |
@@ -7,7 +7,7 @@
 |  Adam Honse (CalcProgrammer1) 6/7/2020    |
 \*-----------------------------------------*/
 
-#include "RGBController_RGBFusion2DRAM.h"
+#include "RGBController_GigabyteRGBFusion2DRAM.h"
 
 RGBController_RGBFusion2DRAM::RGBController_RGBFusion2DRAM(RGBFusion2DRAMController* rgb_fusion_ptr)
 {

Controllers/GigabyteRGBFusion2DRAMController/RGBController_GigabyteRGBFusion2DRAM.h

@@ -1,5 +1,5 @@
 /*-----------------------------------------*\
-|  RGBController_RGBFusion2DRAM.h           |
+|  RGBController_GigabyteRGBFusion2DRAM.h   |
 |                                           |
 |  Generic RGB Interface for OpenRGB        |
 |  Gigabyte RGB Fusion 2 DRAM Driver        |
@@ -10,7 +10,7 @@
 #pragma once
 
 #include "RGBController.h"
-#include "RGBFusion2DRAMController.h"
+#include "GigabyteRGBFusion2DRAMController.h"
 
 class RGBController_RGBFusion2DRAM : public RGBController
 {

Controllers/GigabyteRGBFusion2SMBusController/GigabyteRGBFusion2SMBusController.cpp

@@ -1,5 +1,5 @@
 /*-----------------------------------------*\
-|  RGBFusion2SMBusController.cpp            |
+|  GigabyteRGBFusion2SMBusController.cpp    |
 |                                           |
 |  Driver for Gigabyte Aorus RGB Fusion 2   |
 |  SMBus lighting controller                |
@@ -8,7 +8,7 @@
 |  Matt Harper                  5/5/2020    |
 \*-----------------------------------------*/
 
-#include "RGBFusion2SMBusController.h"
+#include "GigabyteRGBFusion2SMBusController.h"
 #include <cstring>
 #include <stdio.h>
 #include <stdlib.h>

Controllers/GigabyteRGBFusion2SMBusController/GigabyteRGBFusion2SMBusController.h

@@ -1,5 +1,5 @@
 /*-----------------------------------------*\
-|  RGBFusion2SMBusController.h              |
+|  GigabyteRGBFusion2SMBusController.h      |
 |                                           |
 |  Definitions and types for Gigabyte Aorus |
 |  RGB Fusion 2 SMBus lighting controller   |

Controllers/GigabyteRGBFusion2SMBusController/GigabyteRGBFusion2SMBusControllerDetect.cpp

@@ -1,7 +1,7 @@
 #include "Detector.h"
-#include "RGBFusion2SMBusController.h"
+#include "GigabyteRGBFusion2SMBusController.h"
 #include "RGBController.h"
-#include "RGBController_RGBFusion2SMBus.h"
+#include "RGBController_GigabyteRGBFusion2SMBus.h"
 #include "i2c_smbus.h"
 #include "pci_ids.h"
 #include <vector>
@@ -21,29 +21,30 @@ typedef struct
 const motherboard_info rgb_fusion_2_smbus_motherboards[] =
 {
     { "Gigabyte Technology Co., Ltd.",      "B450 AORUS ELITE"              },
-    { "Gigabyte Technology Co., Ltd.",      "X470 AORUS ULTRA GAMING-CF"    },
-    { "Gigabyte Technology Co., Ltd.",      "X470 AORUS ULTRA GAMING"       },
-    { "Gigabyte Technology Co., Ltd.",      "X470 AORUS GAMING 5 WIFI"      },
     { "Gigabyte Technology Co., Ltd.",      "B450 AORUS M"                  },
+    { "Gigabyte Technology Co., Ltd.",      "B450 AORUS PRO WIFI-CF"        },
+    { "Gigabyte Technology Co., Ltd.",      "B450 AORUS PRO-CF"             },
+    { "Gigabyte Technology Co., Ltd.",      "B450 AORUS PRO-CF4"            },
+    { "Gigabyte Technology Co., Ltd.",      "B450 I AORUS PRO WIFI-CF"      },
+    { "Gigabyte Technology Co., Ltd.",      "B450M DS3H-CF"                 },
     { "Gigabyte Technology Co., Ltd.",      "X399 AORUS XTREME-CF"          },
     { "Gigabyte Technology Co., Ltd.",      "X399 DESIGNARE EX-CF"          },
-    { "Gigabyte Technology Co., Ltd.",      "B450 I AORUS PRO WIFI-CF"      },
-    { "Gigabyte Technology Co., Ltd.",      "B450 AORUS PRO-CF"             },    
-    { "Gigabyte Technology Co., Ltd.",      "B450 AORUS PRO-CF4"            },
+    { "Gigabyte Technology Co., Ltd.",      "X470 AORUS GAMING 5 WIFI"      },
     { "Gigabyte Technology Co., Ltd.",      "X470 AORUS GAMING 7 WIFI-CF"   },
-    { "Gigabyte Technology Co., Ltd.",      "B450 AORUS PRO WIFI-CF"        },
+    { "Gigabyte Technology Co., Ltd.",      "X470 AORUS ULTRA GAMING"       },
+    { "Gigabyte Technology Co., Ltd.",      "X470 AORUS ULTRA GAMING-CF"    },
 };
 
 /******************************************************************************************\
 *                                                                                          *
-*   TestForRGBFusion2SMBusController                                                       *
+*   TestForGigabyteRGBFusion2SMBusController                                               *
 *                                                                                          *
 *       Tests the given address to see if an RGB 2 Fusion controller exists there.  First  *
 *       does a quick write to test for a response                                          *
 *                                                                                          *
 \******************************************************************************************/
 
-bool TestForRGBFusion2SMBusController(i2c_smbus_interface* bus, unsigned char address)
+bool TestForGigabyteRGBFusion2SMBusController(i2c_smbus_interface* bus, unsigned char address)
 {
     bool pass = false;
 
@@ -60,7 +61,7 @@ bool TestForRGBFusion2SMBusController(i2c_smbus_interface* bus, unsigned char ad
 
 /******************************************************************************************\
 *                                                                                          *
-*   DetectRGBFusion2SMBusControllers                                                       *
+*   DetectGigabyteRGBFusion2SMBusControllers                                               *
 *                                                                                          *
 *       Detect RGB Fusion 2 controllers on the enumerated I2C busses at address 0x68.      *
 *                                                                                          *
@@ -69,7 +70,7 @@ bool TestForRGBFusion2SMBusController(i2c_smbus_interface* bus, unsigned char ad
 *                                                                                          *
 \******************************************************************************************/
 
-void DetectRGBFusion2SMBusControllers(std::vector<i2c_smbus_interface*>& busses, std::vector<RGBController*>& rgb_controllers)
+void DetectGigabyteRGBFusion2SMBusControllers(std::vector<i2c_smbus_interface*>& busses, std::vector<RGBController*>& rgb_controllers)
 {
     RGBFusion2SMBusController* new_rgb_fusion;
     RGBController_RGBFusion2SMBus* new_controller;
@@ -98,7 +99,7 @@ void DetectRGBFusion2SMBusControllers(std::vector<i2c_smbus_interface*>& busses,
                 if (device_name.find("dmdc") == std::string::npos)
                 {
                     // Check for RGB Fusion 2 controller at 0x68
-                    if (TestForRGBFusion2SMBusController(busses[bus], 0x68))
+                    if (TestForGigabyteRGBFusion2SMBusController(busses[bus], 0x68))
                     {
                         new_rgb_fusion = new RGBFusion2SMBusController(busses[bus], 0x68);
                         new_controller = new RGBController_RGBFusion2SMBus(new_rgb_fusion);
@@ -111,4 +112,4 @@ void DetectRGBFusion2SMBusControllers(std::vector<i2c_smbus_interface*>& busses,
 
 }   /* DetectRGBFusion2SMBusControllers() */
 
-REGISTER_I2C_DETECTOR("Gigabyte RGB Fusion 2 SMBus", DetectRGBFusion2SMBusControllers);
+REGISTER_I2C_DETECTOR("Gigabyte RGB Fusion 2 SMBus", DetectGigabyteRGBFusion2SMBusControllers);

Controllers/GigabyteRGBFusion2SMBusController/RGBController_GigabyteRGBFusion2SMBus.cpp

@@ -1,5 +1,5 @@
 /*-----------------------------------------*\
-|  RGBController_RGBFusion2SMBus.cpp        |
+|  RGBController_GigabyteRGBFusion2SMBus.cpp|
 |                                           |
 |  Generic RGB Interface for OpenRGB        |
 |  Gigabyte RGB Fusion 2 SMBUS Driver       |
@@ -7,7 +7,7 @@
 |  Matt Harper (5/5/2020)		            |
 \*-----------------------------------------*/
 
-#include "RGBController_RGBFusion2SMBus.h"
+#include "RGBController_GigabyteRGBFusion2SMBus.h"
 
 /* TODO - Validate all of these
  *	CPU

Controllers/GigabyteRGBFusion2SMBusController/RGBController_GigabyteRGBFusion2SMBus.h

@@ -1,6 +1,6 @@
 
 /*-----------------------------------------*\
-|  RGBController_RGBFusion2SMBus.h          |
+|  RGBController_GigabyteRGBFusion2SMBus.h  |
 |                                           |
 |  Generic RGB Interface for OpenRGB        |
 |  Gigabyte RGB Fusion 2 SMBUS Driver       |
@@ -11,7 +11,7 @@
 #pragma once
 
 #include "RGBController.h"
-#include "RGBFusion2SMBusController.h"
+#include "GigabyteRGBFusion2SMBusController.h"
 
 class RGBController_RGBFusion2SMBus : public RGBController
 {

Controllers/GigabyteRGBFusion2USBController/GigabyteRGBFusion2USBController.cpp

@@ -1,5 +1,5 @@
 /*-----------------------------------------*\
-|  RGBFusion2USBController.cpp              |
+|  GigabyteRGBFusion2USBController.cpp      |
 |                                           |
 |  Driver for Gigabyte Aorus RGB Fusion 2.0 |
 |  USB lighting controller                  |
@@ -7,7 +7,7 @@
 |  jackun 1/8/2020                          |
 \*-----------------------------------------*/
 
-#include "RGBFusion2USBController.h"
+#include "GigabyteRGBFusion2USBController.h"
 #include <algorithm>
 #include <array>
 #include <thread>

Controllers/GigabyteRGBFusion2USBController/GigabyteRGBFusion2USBController.h

@@ -1,5 +1,5 @@
 /*-----------------------------------------*\
-|  RGBFusion2USBController.h                |
+|  GigabyteRGBFusion2USBController.h        |
 |                                           |
 |  Definitions and types for Gigabyte Aorus |
 |  RGB Fusion 2.0 USB lighting controller   |

Controllers/GigabyteRGBFusion2USBController/GigabyteRGBFusion2USBControllerDetect.cpp

@@ -0,0 +1,33 @@
+#include "Detector.h"
+#include "GigabyteRGBFusion2USBController.h"
+#include "RGBController_GigabyteRGBFusion2USB.h"
+#include "dependencies/dmiinfo.h"
+
+#define IT8297_VID              0x048D
+#define IT8297_IFC              0
+#define IT8297_U                0xCC
+#define IT8297_UPG              0xFF89
+
+/******************************************************************************************\
+*                                                                                          *
+*   DetectGigabyteRGBFusion2USBControllers                                                 *
+*                                                                                          *
+*       Detect GigabyteRGB Fusion 2 devices that use IT8297 RGB controller                 *
+*                                                                                          *
+\******************************************************************************************/
+
+void DetectGigabyteRGBFusion2USBControllers(hid_device_info* info, const std::string&)
+{
+    DMIInfo     MB_info;
+    hid_device* dev = hid_open_path(info->path);
+    if (dev)
+    {
+        RGBFusion2USBController * controller = new RGBFusion2USBController(dev, info->path, MB_info.getMainboard());
+        RGBController_RGBFusion2USB * rgb_controller = new RGBController_RGBFusion2USB(controller);
+        // Constructor sets the name
+        ResourceManager::get()->RegisterRGBController(rgb_controller);
+    }
+}   /* DetectRGBFusion2USBControllers() */
+
+REGISTER_HID_DETECTOR_IPU("Gigabyte RGB Fusion 2 USB", DetectGigabyteRGBFusion2USBControllers, IT8297_VID, 0x8297, IT8297_IFC, IT8297_UPG, IT8297_U);
+REGISTER_HID_DETECTOR_IPU("Gigabyte RGB Fusion 2 USB", DetectGigabyteRGBFusion2USBControllers, IT8297_VID, 0x5702, IT8297_IFC, IT8297_UPG, IT8297_U);

Controllers/GigabyteRGBFusion2USBController/RGBController_GigabyteRGBFusion2USB.cpp

@@ -1,5 +1,5 @@
 /*-----------------------------------------*\
-|  RGBController_RGBFusion2USB.cpp          |
+|  RGBController_GigabyteRGBFusion2USB.cpp  |
 |                                           |
 |  Generic RGB Interface for OpenRGB        |
 |  Gigabyte RGB Fusion 2.0 USB Driver       |
@@ -7,7 +7,7 @@
 |  jackun 1/8/2020                          |
 \*-----------------------------------------*/
 
-#include "RGBController_RGBFusion2USB.h"
+#include "RGBController_GigabyteRGBFusion2USB.h"
 #include <sstream>
 #include <array>
 

Controllers/GigabyteRGBFusion2USBController/RGBController_GigabyteRGBFusion2USB.h

@@ -1,5 +1,5 @@
 /*-----------------------------------------*\
-|  RGBController_RGBFusion2USB.h            |
+|  RGBController_GigabyteRGBFusion2USB.h    |
 |                                           |
 |  Generic RGB Interface for OpenRGB        |
 |  Gigabyte RGB Fusion 2.0 USB Driver       |
@@ -9,7 +9,7 @@
 
 #pragma once
 #include "RGBController.h"
-#include "RGBFusion2USBController.h"
+#include "GigabyteRGBFusion2USBController.h"
 #include <map>
 #include <vector>
 

Controllers/GigabyteRGBFusionController/GigabyteRGBFusionController.cpp

@@ -1,5 +1,5 @@
 /*-----------------------------------------*\
-|  RGBFusionController.cpp                  |
+|  GigabyteRGBFusionController.cpp          |
 |                                           |
 |  Driver for Gigabyte Aorus RGB Fusion     |
 |  lighting controller                      |
@@ -7,7 +7,7 @@
 |  Adam Honse (CalcProgrammer1) 12/10/2019  |
 \*-----------------------------------------*/
 
-#include "RGBFusionController.h"
+#include "GigabyteRGBFusionController.h"
 #include <cstring>
 #include <stdio.h>
 #include <stdlib.h>

Controllers/GigabyteRGBFusionController/GigabyteRGBFusionController.h

@@ -1,5 +1,5 @@
 /*-----------------------------------------*\
-|  RGBFusionController.h                    |
+|  GigabyteRGBFusionController.h            |
 |                                           |
 |  Definitions and types for Gigabyte Aorus |
 |  RGB Fusion lighting controller           |

Controllers/GigabyteRGBFusionController/GigabyteRGBFusionControllerDetect.cpp

@@ -1,7 +1,7 @@
 #include "Detector.h"
-#include "RGBFusionController.h"
+#include "GigabyteRGBFusionController.h"
 #include "RGBController.h"
-#include "RGBController_RGBFusion.h"
+#include "RGBController_GigabyteRGBFusion.h"
 #include "i2c_smbus.h"
 #include "pci_ids.h"
 #include <vector>
@@ -10,14 +10,14 @@
 
 /******************************************************************************************\
 *                                                                                          *
-*   TestForRGBFusionController                                                             *
+*   TestForGigabyteRGBFusionController                                                     *
 *                                                                                          *
 *       Tests the given address to see if an RGB Fusion controller exists there.  First    *
 *       does a quick write to test for a response                                          *
 *                                                                                          *
 \******************************************************************************************/
 
-bool TestForRGBFusionController(i2c_smbus_interface* bus, unsigned char address)
+bool TestForGigabyteRGBFusionController(i2c_smbus_interface* bus, unsigned char address)
 {
     bool pass = false;
 
@@ -37,11 +37,11 @@ bool TestForRGBFusionController(i2c_smbus_interface* bus, unsigned char address)
 
     return(pass);
 
-}   /* TestForRGBFusionController() */
+}   /* TestForGigabyteRGBFusionController() */
 
 /******************************************************************************************\
 *                                                                                          *
-*   DetectRGBFusionControllers                                                             *
+*   DetectGigabyteRGBFusionControllers                                                     *
 *                                                                                          *
 *       Detect RGB Fusion controllers on the enumerated I2C busses at address 0x28.        *
 *                                                                                          *
@@ -50,7 +50,7 @@ bool TestForRGBFusionController(i2c_smbus_interface* bus, unsigned char address)
 *                                                                                          *
 \******************************************************************************************/
 
-void DetectRGBFusionControllers(std::vector<i2c_smbus_interface*>& busses, std::vector<RGBController*>& rgb_controllers)
+void DetectGigabyteRGBFusionControllers(std::vector<i2c_smbus_interface*>& busses, std::vector<RGBController*>& rgb_controllers)
 {
     RGBFusionController* new_rgb_fusion;
     RGBController_RGBFusion* new_controller;
@@ -60,7 +60,7 @@ void DetectRGBFusionControllers(std::vector<i2c_smbus_interface*>& busses, std::
         IF_MOBO_SMBUS(busses[bus]->pci_vendor, busses[bus]->pci_device)
         {
             // Check for RGB Fusion controller at 0x28
-            if (TestForRGBFusionController(busses[bus], 0x28))
+            if (TestForGigabyteRGBFusionController(busses[bus], 0x28))
             {
                 new_rgb_fusion = new RGBFusionController(busses[bus], 0x28);
                 new_controller = new RGBController_RGBFusion(new_rgb_fusion);
@@ -69,6 +69,6 @@ void DetectRGBFusionControllers(std::vector<i2c_smbus_interface*>& busses, std::
         }
     }
 
-}   /* DetectRGBFusionControllers() */
+}   /* DetectGigabyteRGBFusionControllers() */
 
-REGISTER_I2C_DETECTOR("Gigabyte RGB Fusion", DetectRGBFusionControllers);
+REGISTER_I2C_DETECTOR("Gigabyte RGB Fusion", DetectGigabyteRGBFusionControllers);

Controllers/GigabyteRGBFusionController/RGBController_GigabyteRGBFusion.cpp

@@ -1,5 +1,5 @@
 /*-----------------------------------------*\
-|  RGBController_RGBFusion.cpp              |
+|  RGBController_GigabyteRGBFusion.cpp      |
 |                                           |
 |  Generic RGB Interface for OpenRGB        |
 |  Gigabyte RGB Fusion Driver               |
@@ -7,7 +7,7 @@
 |  Adam Honse (CalcProgrammer1) 12/11/2019  |
 \*-----------------------------------------*/
 
-#include "RGBController_RGBFusion.h"
+#include "RGBController_GigabyteRGBFusion.h"
 
 static const char* rgb_fusion_zone_names[] =
 {

Controllers/GigabyteRGBFusionController/RGBController_GigabyteRGBFusion.h

@@ -1,5 +1,5 @@
 /*-----------------------------------------*\
-|  RGBController_RGBFusion.h                |
+|  RGBController_GigabyteRGBFusion.h        |
 |                                           |
 |  Generic RGB Interface for OpenRGB        |
 |  Gigabyte RGB Fusion Driver               |
@@ -10,7 +10,7 @@
 #pragma once
 
 #include "RGBController.h"
-#include "RGBFusionController.h"
+#include "GigabyteRGBFusionController.h"
 
 class RGBController_RGBFusion : public RGBController
 {

Controllers/GigabyteRGBFusionGPUController/GigabyteRGBFusionGPUController.cpp

@@ -1,5 +1,5 @@
 /*-----------------------------------------*\
-|  RGBFusionGPUController.cpp               |
+|  GigabyteRGBFusionGPUController.cpp       |
 |                                           |
 |  Driver for Gigabyte Aorus RGB Fusion GPU |
 |  lighting controller                      |
@@ -7,7 +7,7 @@
 |  Adam Honse (CalcProgrammer1) 2/20/2020   |
 \*-----------------------------------------*/
 
-#include "RGBFusionGPUController.h"
+#include "GigabyteRGBFusionGPUController.h"
 
 RGBFusionGPUController::RGBFusionGPUController(i2c_smbus_interface* bus, rgb_fusion_dev_id dev)
 {

Controllers/GigabyteRGBFusionGPUController/GigabyteRGBFusionGPUController.h

@@ -1,5 +1,5 @@
 /*-----------------------------------------*\
-|  RGBFusionGPUController.h                 |
+|  GigabyteRGBFusionGPUController.h         |
 |                                           |
 |  Definitions and types for Gigabyte Aorus |
 |  RGB Fusion GPU lighting controller       |

Controllers/GigabyteRGBFusionGPUController/GigabyteRGBFusionGPUControllerDetect.cpp

@@ -1,7 +1,7 @@
 #include "Detector.h"
-#include "RGBFusionGPUController.h"
+#include "GigabyteRGBFusionGPUController.h"
 #include "RGBController.h"
-#include "RGBController_RGBFusionGPU.h"
+#include "RGBController_GigabyteRGBFusionGPU.h"
 #include "i2c_smbus.h"
 #include "pci_ids.h"
 #include <vector>
@@ -22,51 +22,91 @@ typedef struct
 
 static const gpu_pci_device device_list[] =
 {
-    { NVIDIA_VEN,   NVIDIA_GTX1080_DEV,     GIGABYTE_SUB_VEN,   GIGABYTE_GTX1080_G1_GAMING_SUB_DEV, 0x48,   "Gigabyte GTX1080 G1 Gaming"        },    
-    { NVIDIA_VEN,   NVIDIA_GTX1080TI_DEV,   GIGABYTE_SUB_VEN,   GIGABYTE_GTX1080TI_XTREME_SUB_DEV,  0x47,   "Gigabyte GTX1080Ti Xtreme Edition" },
+    { NVIDIA_VEN,   NVIDIA_GTX1080_DEV,         GIGABYTE_SUB_VEN,   GIGABYTE_GTX1080_G1_GAMING_SUB_DEV, 0x48,   "Gigabyte GTX1080 G1 Gaming"        },    
+    { NVIDIA_VEN,   NVIDIA_GTX1080TI_DEV,       GIGABYTE_SUB_VEN,   GIGABYTE_GTX1080TI_XTREME_SUB_DEV,  0x47,   "Gigabyte GTX1080Ti Xtreme Edition" },
+    { NVIDIA_VEN,   NVIDIA_RTX2060_TU106_DEV,   GIGABYTE_SUB_VEN,   GIGABYTE_RTX2060_GAMING_OC_SUB_DEV, 0x47,   "Gigabyte RTX2060 Gaming OC"        },
+    { NVIDIA_VEN,   NVIDIA_RTX2060S_DEV,        GIGABYTE_SUB_VEN,   GIGABYTE_RTX2060S_GAMING_SUB_DEV,   0x47,   "Gigabyte RTX2060 SUPER Gaming"     },
 };
 
 /******************************************************************************************\
 *                                                                                          *
-*   TestForRGBFusionGPUController                                                          *
+*   TestForGigabyteRGBFusionGPUController                                                  *
 *                                                                                          *
 *       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 TestForGigabyteRGBFusionGPUController(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)
+    switch(address)
     {
-        bus->i2c_smbus_write_byte(address, 0x00);
-        bus->i2c_smbus_write_byte(address, 0x00);
-        bus->i2c_smbus_write_byte(address, 0x00);
+        case 0x47:
+            //Write out 0xAB 0x00 0x00 0x00 sequence
+            res = bus->i2c_smbus_write_byte(address, 0xAB);
 
-        pass = true;
+            if (res >= 0)
+            {
+                bus->i2c_smbus_write_byte(address, 0x00);
+                bus->i2c_smbus_write_byte(address, 0x00);
+                bus->i2c_smbus_write_byte(address, 0x00);
 
-        res = bus->i2c_smbus_read_byte(address);
+                pass = true;
 
-        if (res != 0xAB)
-        {
-            pass = false;
-        }
+                res = bus->i2c_smbus_read_byte(address);
 
-        res = bus->i2c_smbus_read_byte(address);
+                if (res != 0xAB)
+                {
+                    pass = false;
+                }
 
-        if(res != 0x14)
-        {
-            pass = false;
-        }
+                res = bus->i2c_smbus_read_byte(address);
 
-        bus->i2c_smbus_read_byte(address);
-        bus->i2c_smbus_read_byte(address);
+                if(res != 0x14)
+                {
+                    pass = false;
+                }
+
+                bus->i2c_smbus_read_byte(address);
+                bus->i2c_smbus_read_byte(address);
+            }
+            break;
+
+        case 0x48:
+            pass = true;
+
+            //Write out 0xCC 0x01 0x00 0x00 sequence
+            // res = bus->i2c_smbus_write_byte(address, 0xCC);
+
+            // if (res >= 0)
+            // {
+            //     bus->i2c_smbus_write_byte(address, 0x01);
+            //     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 != 0xCC)
+            //     {
+            //         pass = false;
+            //     }
+
+            //     res = bus->i2c_smbus_read_byte(address);
+
+            //     if(res != 0x01)
+            //     {
+            //         pass = false;
+            //     }
+
+            //     bus->i2c_smbus_read_byte(address);
+            //     bus->i2c_smbus_read_byte(address);
+            // }
+            break;
     }
 
     return(pass);
@@ -77,14 +117,14 @@ bool TestForRGBFusionGPUController(i2c_smbus_interface* bus, unsigned char addre
 *                                                                                          *
 *   DetectRGBFusionGPUControllers                                                          *
 *                                                                                          *
-*       Detect RGB Fusion controllers on the enumerated I2C busses at address 0x47.        *
+*       Detect GigabyteRGB 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)
+void DetectGigabyteRGBFusionGPUControllers(std::vector<i2c_smbus_interface*>& busses, std::vector<RGBController*>& rgb_controllers)
 {
     RGBFusionGPUController* new_rgb_fusion;
     RGBController_RGBFusionGPU* new_controller;
@@ -99,7 +139,7 @@ void DetectRGBFusionGPUControllers(std::vector<i2c_smbus_interface*>& busses, st
                busses[bus]->pci_subsystem_device == device_list[dev_idx].pci_subsystem_device)
             {
                 // Check for RGB Fusion controller
-                if (TestForRGBFusionGPUController(busses[bus], device_list[dev_idx].controller_address))
+                if (TestForGigabyteRGBFusionGPUController(busses[bus], device_list[dev_idx].controller_address))
                 {
                     new_rgb_fusion = new RGBFusionGPUController(busses[bus], device_list[dev_idx].controller_address);
                     new_controller = new RGBController_RGBFusionGPU(new_rgb_fusion);
@@ -110,6 +150,6 @@ void DetectRGBFusionGPUControllers(std::vector<i2c_smbus_interface*>& busses, st
         }
     }
 
-}   /* DetectRGBFusionGPUControllers() */
+}   /* DetectGigabyteRGBFusionGPUControllers() */
 
-REGISTER_I2C_DETECTOR("Gigabyte RGB Fusion GPU", DetectRGBFusionGPUControllers);
+REGISTER_I2C_DETECTOR("Gigabyte RGB Fusion GPU", DetectGigabyteRGBFusionGPUControllers);

Controllers/GigabyteRGBFusionGPUController/RGBController_GigabyteRGBFusionGPU.cpp

@@ -1,5 +1,5 @@
 /*-----------------------------------------*\
-|  RGBController_RGBFusionGPU.cpp           |
+|  RGBController_GigabyteRGBFusionGPU.cpp   |
 |                                           |
 |  Generic RGB Interface for OpenRGB        |
 |  Gigabyte RGB Fusion GPU Driver           |
@@ -7,7 +7,7 @@
 |  Adam Honse (CalcProgrammer1) 2/23/2020   |
 \*-----------------------------------------*/
 
-#include "RGBController_RGBFusionGPU.h"
+#include "RGBController_GigabyteRGBFusionGPU.h"
 
 RGBController_RGBFusionGPU::RGBController_RGBFusionGPU(RGBFusionGPUController* rgb_fusion_ptr)
 {

Controllers/GigabyteRGBFusionGPUController/RGBController_GigabyteRGBFusionGPU.h

@@ -1,5 +1,5 @@
 /*-----------------------------------------*\
-|  RGBController_RGBFusionGPU.h             |
+|  RGBController_GigabyteRGBFusionGPU.h     |
 |                                           |
 |  Generic RGB Interface for OpenRGB        |
 |  Gigabyte RGB Fusion GPU Driver           |
@@ -10,7 +10,7 @@
 #pragma once
 
 #include "RGBController.h"
-#include "RGBFusionGPUController.h"
+#include "GigabyteRGBFusionGPUController.h"
 
 class RGBController_RGBFusionGPU : public RGBController
 {

Controllers/HoltekController/HoltekControllerDetect.cpp

@@ -14,76 +14,16 @@
 \*-----------------------------------------------------*/
 #define HOLTEK_A070_PID               0xA070
 
-typedef struct
+void DetectHoltekControllers(hid_device_info* info, const std::string& name)
 {
-    unsigned short  usb_vid;
-    unsigned short  usb_pid;
-    unsigned char   usb_interface;
-    device_type     type;
-    const char *    name;
-} holtek_device;
-
-#define HOLTEK_NUM_DEVICES (sizeof(device_list) / sizeof(device_list[ 0 ]))
-
-static const holtek_device device_list[] =
-{
-    /*-------------------------------------------------------------------------------------------------------------*\
-    | Mice                                                                                                          |
-    \*-------------------------------------------------------------------------------------------------------------*/
-    { HOLTEK_VID,             HOLTEK_A070_PID,      1,  DEVICE_TYPE_MOUSE,      "Holtek USB Gaming Mouse"         },
-};
-
-void DetectHoltekControllers(std::vector<RGBController*>& rgb_controllers)
-{
-    hid_init();
-
-    for(unsigned int device_idx = 0; device_idx < HOLTEK_NUM_DEVICES; device_idx++)
+    hid_device* dev = hid_open_path(info->path);
+    if(dev)
     {
-        switch(device_list[device_idx].type)
-        {
-        case DEVICE_TYPE_MOUSE:
-            {
-                hid_device_info* info = hid_enumerate(device_list[device_idx].usb_vid, device_list[device_idx].usb_pid);
-
-                while(info)
-                {
-                    if((info->vendor_id == device_list[device_idx].usb_vid)
-                    &&(info->product_id == device_list[device_idx].usb_pid)
-#ifdef USE_HID_USAGE                    
-                    &&(info->interface_number == device_list[device_idx].usb_interface)
-                    &&(info->usage_page == 0xFF00)
-                    &&(info->usage == 2))
-#else
-                    &&(info->interface_number == device_list[device_idx].usb_interface))
-#endif
-                    {
-                        hid_device* dev = hid_open_path(info->path);
-
-                        if(dev)
-                        {
-                            switch(device_list[device_idx].usb_pid)
-                            {
-                            case HOLTEK_A070_PID:
-                                {
-                                    HoltekA070Controller* controller = new HoltekA070Controller(dev, info->path);
-
-                                    RGBController_HoltekA070* rgb_controller = new RGBController_HoltekA070(controller);
-
-                                    rgb_controller->name = device_list[device_idx].name;
-                                    rgb_controllers.push_back(rgb_controller);
-                                }
-                                break;
-                            }
-                        }
-                    }
-                    info = info->next;
-                }
-                hid_free_enumeration(info);
-            }
-            break;
-        }
-
+        HoltekA070Controller* controller = new HoltekA070Controller(dev, info->path);
+        RGBController_HoltekA070* rgb_controller = new RGBController_HoltekA070(controller);
+        rgb_controller->name = name;
+        ResourceManager::get()->RegisterRGBController(rgb_controller);
     }
 }   /* DetectHoltekControllers() */
 
-REGISTER_DETECTOR("Holtek", DetectHoltekControllers);
+REGISTER_HID_DETECTOR_IPU("Holtek USB Gaming Mouse", DetectHoltekControllers, HOLTEK_VID, HOLTEK_A070_PID, 1, 0xFF00, 2);

Controllers/HyperXKeyboardController/HyperXKeyboardControllerDetect.cpp

@@ -4,7 +4,6 @@
 #include "RGBController.h"
 #include "RGBController_HyperXAlloyOrigins.h"
 #include "RGBController_HyperXKeyboard.h"
-#include <vector>
 #include <hidapi/hidapi.h>
 
 /*-----------------------------------------------------*\
@@ -16,97 +15,37 @@
 #define HYPERX_ALLOY_ORIGINS_PID        0x16E5
 #define HYPERX_ALLOY_ORIGINS_CORE_PID   0x16E6
 
-typedef struct
+void DetectHyperXKeyboards(hid_device_info* info, const std::string& name)
 {
-    unsigned short  usb_vid;
-    unsigned short  usb_pid;
-    unsigned char   usb_interface;
-    const char *    name;
-} hyperx_device;
-
-#define HYPERX_NUM_DEVICES (sizeof(device_list) / sizeof(device_list[ 0 ]))
-
-static const hyperx_device device_list[] =
-{
-    /*-----------------------------------------------------------------------------------------------------*\
-    | Keyboards                                                                                             |
-    \*-----------------------------------------------------------------------------------------------------*/
-    { HYPERX_KEYBOARD_VID,  HYPERX_ALLOY_ELITE_PID,         2,  "HyperX Alloy Elite RGB"                    },
-    { HYPERX_KEYBOARD_VID,  HYPERX_ALLOY_FPS_RGB_PID,       2,  "HyperX Alloy FPS RGB"                      },
-    { HYPERX_KEYBOARD_VID,  HYPERX_ALLOY_ORIGINS_PID,       3,  "HyperX Alloy Origins"                      },
-    { HYPERX_KEYBOARD_VID,  HYPERX_ALLOY_ORIGINS_CORE_PID,  3,  "HyperX Alloy Origins Core"                 },
-};
-
-/******************************************************************************************\
-*                                                                                          *
-*   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();
-
-    for(std::size_t device_idx = 0; device_idx < HYPERX_NUM_DEVICES; device_idx++)
+    hid_device* dev = hid_open_path(info->path);
+    if( dev )
     {
-        dev = NULL;
-
-        info = hid_enumerate(device_list[device_idx].usb_vid, device_list[device_idx].usb_pid);
-
-        //Look for HyperX RGB Peripheral
-        while(info)
-        {
-            if((device_list[device_idx].usb_pid != HYPERX_ALLOY_ORIGINS_PID)
-            &&(info->vendor_id == device_list[device_idx].usb_vid)
-            &&(info->product_id == device_list[device_idx].usb_pid)
-#ifdef USE_HID_USAGE
-            &&(info->interface_number == device_list[device_idx].usb_interface)
-            &&(info->usage_page == 0xFF01))
-#else
-            &&(info->interface_number == device_list[device_idx].usb_interface))
-#endif
-            {
-                dev = hid_open_path(info->path);
-
-                if( dev )
-                {
-                    HyperXKeyboardController* controller = new HyperXKeyboardController(dev, info->path);
-
-                    RGBController_HyperXKeyboard* rgb_controller = new RGBController_HyperXKeyboard(controller);
-
-                    rgb_controller->name = device_list[device_idx].name;
-
-                    rgb_controllers.push_back(rgb_controller);
-                }
-            }
-
-            if((device_list[device_idx].usb_pid == HYPERX_ALLOY_ORIGINS_PID)
-            &&(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);
-
-                if( dev )
-                {
-                    HyperXAlloyOriginsController* controller = new HyperXAlloyOriginsController(dev, info->path);
-
-                    RGBController_HyperXAlloyOrigins* rgb_controller = new RGBController_HyperXAlloyOrigins(controller);
-
-                    rgb_controller->name = device_list[device_idx].name;
-                    
-                    rgb_controllers.push_back(rgb_controller);
-                }
-            }
-
-            info = info->next;
-        }
+        HyperXKeyboardController* controller = new HyperXKeyboardController(dev, info->path);
+        RGBController_HyperXKeyboard* rgb_controller = new RGBController_HyperXKeyboard(controller);
+        rgb_controller->name = name;
+        ResourceManager::get()->RegisterRGBController(rgb_controller);
     }
-}   /* DetectHyperXKeyboardControllers() */
+}
 
-REGISTER_DETECTOR("HyperX Keyboard", DetectHyperXKeyboardControllers);
+void DetectHyperXAlloyOrigins(hid_device_info* info, const std::string& name)
+{
+    hid_device* dev = hid_open_path(info->path);
+    if( dev )
+    {
+        HyperXAlloyOriginsController* controller = new HyperXAlloyOriginsController(dev, info->path);
+        RGBController_HyperXAlloyOrigins* rgb_controller = new RGBController_HyperXAlloyOrigins(controller);
+        rgb_controller->name = name;
+        ResourceManager::get()->RegisterRGBController(rgb_controller);
+    }
+}
+
+REGISTER_HID_DETECTOR_IP("HyperX Alloy Elite RGB",    DetectHyperXKeyboards,    HYPERX_KEYBOARD_VID, HYPERX_ALLOY_ELITE_PID,         2, 0xFF01);
+REGISTER_HID_DETECTOR_IP("HyperX Alloy FPS RGB",      DetectHyperXKeyboards,    HYPERX_KEYBOARD_VID, HYPERX_ALLOY_FPS_RGB_PID,       2, 0xFF01);
+
+#ifdef _WIN32
+REGISTER_HID_DETECTOR_I("HyperX Alloy Origins Core", DetectHyperXAlloyOrigins, HYPERX_KEYBOARD_VID, HYPERX_ALLOY_ORIGINS_CORE_PID,  3);
+REGISTER_HID_DETECTOR_I("HyperX Alloy Origins",      DetectHyperXAlloyOrigins, HYPERX_KEYBOARD_VID, HYPERX_ALLOY_ORIGINS_PID,       3);
+#else
+REGISTER_HID_DETECTOR_I("HyperX Alloy Origins Core", DetectHyperXAlloyOrigins, HYPERX_KEYBOARD_VID, HYPERX_ALLOY_ORIGINS_CORE_PID,  0);
+REGISTER_HID_DETECTOR_I("HyperX Alloy Origins",      DetectHyperXAlloyOrigins, HYPERX_KEYBOARD_VID, HYPERX_ALLOY_ORIGINS_PID,       0);
+#endif

Controllers/HyperXKeyboardController/RGBController_HyperXAlloyOrigins.cpp

@@ -9,32 +9,8 @@
 
 #include "RGBController_HyperXAlloyOrigins.h"
 
-//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
-
 using namespace std::chrono_literals;
 
-THREAD keepalive_thread(void *param)
-{
-    RGBController_HyperXAlloyOrigins* controller = static_cast<RGBController_HyperXAlloyOrigins*>(param);
-    controller->KeepaliveThread();
-    THREADRETURN
-}
-
 //0xFFFFFFFF indicates an unused entry in matrix
 #define NA  0xFFFFFFFF
 
@@ -215,16 +191,16 @@ RGBController_HyperXAlloyOrigins::RGBController_HyperXAlloyOrigins(HyperXAlloyOr
     | 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
+    keepalive_thread_run = 1;
+    keepalive_thread = new std::thread(&RGBController_HyperXAlloyOrigins::KeepaliveThread, this);
 }
 
 RGBController_HyperXAlloyOrigins::~RGBController_HyperXAlloyOrigins()
 {
+    keepalive_thread_run = 0;
+    keepalive_thread->join();
+    delete keepalive_thread;
+
     /*---------------------------------------------------------*\
     | Delete the matrix map                                     |
     \*---------------------------------------------------------*/
@@ -313,13 +289,13 @@ void RGBController_HyperXAlloyOrigins::DeviceUpdateMode()
 
 void RGBController_HyperXAlloyOrigins::KeepaliveThread()
 {
-    while(1)
+    while(keepalive_thread_run.load())
     {
         if(active_mode == 0)
         {
             if((std::chrono::steady_clock::now() - last_update_time) > std::chrono::milliseconds(50))
             {
-                UpdateLEDs();
+                DeviceUpdateLEDs();
             }
         }
         std::this_thread::sleep_for(10ms);;

Controllers/HyperXKeyboardController/RGBController_HyperXAlloyOrigins.h

@@ -34,6 +34,7 @@ public:
     
 private:
     HyperXAlloyOriginsController*   hyperx;
-
+    std::thread*                    keepalive_thread;
+    std::atomic<bool>               keepalive_thread_run;
     std::chrono::time_point<std::chrono::steady_clock>  last_update_time;
 };

Controllers/HyperXKeyboardController/RGBController_HyperXKeyboard.cpp

@@ -230,15 +230,15 @@ RGBController_HyperXKeyboard::RGBController_HyperXKeyboard(HyperXKeyboardControl
     | to not revert back into rainbow mode.  Start a thread |
     | to continuously send a keepalive packet every 5s      |
     \*-----------------------------------------------------*/
-    KeepaliveThreadRunning = true;
-    KeepaliveThread = new std::thread(&RGBController_HyperXKeyboard::KeepaliveThreadFunction, this);
+    keepalive_thread_run = true;
+    keepalive_thread = new std::thread(&RGBController_HyperXKeyboard::KeepaliveThreadFunction, this);
 }
 
 RGBController_HyperXKeyboard::~RGBController_HyperXKeyboard()
 {
-    KeepaliveThreadRunning = false;
-    KeepaliveThread->join();
-    delete KeepaliveThread;
+    keepalive_thread_run = false;
+    keepalive_thread->join();
+    delete keepalive_thread;
 
     /*---------------------------------------------------------*\
     | Delete the matrix map                                     |
@@ -345,13 +345,13 @@ void RGBController_HyperXKeyboard::DeviceUpdateMode()
 
 void RGBController_HyperXKeyboard::KeepaliveThreadFunction()
 {
-    while(KeepaliveThreadRunning)
+    while(keepalive_thread_run)
     {
         if(active_mode == 0)
         {
             if((std::chrono::steady_clock::now() - last_update_time) > std::chrono::milliseconds(50))
             {
-                UpdateLEDs();
+                DeviceUpdateLEDs();
             }
         }
         std::this_thread::sleep_for(10ms);;

Controllers/HyperXKeyboardController/RGBController_HyperXKeyboard.h

@@ -36,9 +36,7 @@ public:
     
 private:
     HyperXKeyboardController*   hyperx;
-
-    std::atomic<bool>   KeepaliveThreadRunning;
-    std::thread*        KeepaliveThread;
-
+    std::atomic<bool>   keepalive_thread_run;
+    std::thread*        keepalive_thread;
     std::chrono::time_point<std::chrono::steady_clock>  last_update_time;
 };

Controllers/HyperXMouseController/HyperXMouseControllerDetect.cpp

@@ -2,83 +2,24 @@
 #include "HyperXPulsefireSurgeController.h"
 #include "RGBController.h"
 #include "RGBController_HyperXPulsefireSurge.h"
-#include <vector>
 #include <hidapi/hidapi.h>
 
 /*-----------------------------------------------------*\
-| HyperX keyboard vendor IDs                            |
+| HyperX mouse vendor IDs                               |
 \*-----------------------------------------------------*/
 #define HYPERX_VID                  0x0951
 #define HYPERX_PULSEFIRE_SURGE_PID  0x16D3
 
-typedef struct
+void DetectHyperXMouseControllers(hid_device_info* info, const std::string& name)
 {
-    unsigned short  usb_vid;
-    unsigned short  usb_pid;
-    unsigned char   usb_interface;
-    const char *    name;
-} hyperx_device;
-
-#define HYPERX_NUM_DEVICES (sizeof(device_list) / sizeof(device_list[ 0 ]))
-
-static const hyperx_device device_list[] =
-{
-    /*-----------------------------------------------------------------------------------------------------*\
-    | Mice                                                                                                  |
-    \*-----------------------------------------------------------------------------------------------------*/
-    { HYPERX_VID,           HYPERX_PULSEFIRE_SURGE_PID, 1,      "HyperX Pulsefire Surge"                    },
-};
-
-/******************************************************************************************\
-*                                                                                          *
-*   DetectHyperXMouseControllers                                                           *
-*                                                                                          *
-*       Tests the USB address to see if a HyperX Mouse controller exists there.            *
-*                                                                                          *
-\******************************************************************************************/
-
-void DetectHyperXMouseControllers(std::vector<RGBController*>& rgb_controllers)
-{
-    hid_device_info* info;
-    hid_device* dev = NULL;
-
-    hid_init();
-
-    for(std::size_t device_idx = 0; device_idx < HYPERX_NUM_DEVICES; device_idx++)
+    hid_device* dev = hid_open_path(info->path);
+    if( dev )
     {
-        dev = NULL;
-
-        info = hid_enumerate(device_list[device_idx].usb_vid, device_list[device_idx].usb_pid);
-
-        //Look for HyperX RGB Peripheral
-        while(info)
-        {
-            if((info->vendor_id        == device_list[device_idx].usb_vid)
-             &&(info->product_id       == device_list[device_idx].usb_pid)
-    #ifdef USE_HID_USAGE
-            &&(info->interface_number == device_list[device_idx].usb_interface)
-            &&(info->usage_page       == 0xFF01))
-    #else
-            &&(info->interface_number == device_list[device_idx].usb_interface))
-    #endif
-            {
-                dev = hid_open_path(info->path);
-
-                if( dev )
-                {
-                    HyperXPulsefireSurgeController* controller = new HyperXPulsefireSurgeController(dev, info->path);
-
-                    RGBController_HyperXPulsefireSurge* rgb_controller = new RGBController_HyperXPulsefireSurge(controller);
-
-                    rgb_controller->name = device_list[device_idx].name;
-                    
-                    rgb_controllers.push_back(rgb_controller);
-                }
-            }
-
-            info = info->next;
-        }
+        HyperXPulsefireSurgeController* controller = new HyperXPulsefireSurgeController(dev, info->path);
+        RGBController_HyperXPulsefireSurge* rgb_controller = new RGBController_HyperXPulsefireSurge(controller);
+        rgb_controller->name = name;
+        ResourceManager::get()->RegisterRGBController(rgb_controller);
     }
 }   /* DetectHyperXMouseControllers() */
 
-REGISTER_DETECTOR("HyperX Mouse", DetectHyperXMouseControllers);
+REGISTER_HID_DETECTOR_IP("HyperX Pulsefire Surge", DetectHyperXMouseControllers, HYPERX_VID, HYPERX_PULSEFIRE_SURGE_PID, 1, 0xFF01);

Controllers/HyperXMouseController/RGBController_HyperXPulsefireSurge.cpp

@@ -9,32 +9,8 @@
 
 #include "RGBController_HyperXPulsefireSurge.h"
 
-//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
-
 using namespace std::chrono_literals;
 
-THREAD keepalive_thread(void *param)
-{
-    RGBController_HyperXPulsefireSurge* controller = static_cast<RGBController_HyperXPulsefireSurge*>(param);
-    controller->KeepaliveThread();
-    THREADRETURN
-}
-
 RGBController_HyperXPulsefireSurge::RGBController_HyperXPulsefireSurge(HyperXPulsefireSurgeController* hyperx_ptr)
 {
     hyperx = hyperx_ptr;
@@ -59,17 +35,15 @@ RGBController_HyperXPulsefireSurge::RGBController_HyperXPulsefireSurge(HyperXPul
     | 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
+    keepalive_thread_run = 1;
+    keepalive_thread = new std::thread(&RGBController_HyperXPulsefireSurge::KeepaliveThread, this);
 };
 
 RGBController_HyperXPulsefireSurge::~RGBController_HyperXPulsefireSurge()
 {
-
+    keepalive_thread_run = 0;
+    keepalive_thread->join();
+    delete keepalive_thread;
 }
 
 void RGBController_HyperXPulsefireSurge::SetupZones()
@@ -156,13 +130,13 @@ void RGBController_HyperXPulsefireSurge::DeviceUpdateMode()
 
 void RGBController_HyperXPulsefireSurge::KeepaliveThread()
 {
-    while(1)
+    while(keepalive_thread_run.load())
     {
         if(active_mode == 0)
         {
             if((std::chrono::steady_clock::now() - last_update_time) > std::chrono::milliseconds(50))
             {
-                UpdateLEDs();
+                DeviceUpdateLEDs();
             }
         }
         std::this_thread::sleep_for(10ms);

Controllers/HyperXMouseController/RGBController_HyperXPulsefireSurge.h

@@ -34,6 +34,7 @@ public:
     
 private:
     HyperXPulsefireSurgeController* hyperx;
-
+    std::thread*                    keepalive_thread;
+    std::atomic<bool>               keepalive_thread_run;
     std::chrono::time_point<std::chrono::steady_clock>  last_update_time;
 };