Organize most controller files into subfolders

Controllers/AsusAuraUSBController/AsusAuraUSBControllerDetect.cpp

@@ -6,6 +6,7 @@
 #include "AsusAuraMainboardController.h"
 #include "AsusAuraMouseController.h"
 #include "AsusROGAllyController.h"
+#include "AsusROGStrixLCController.h"
 #include "AsusAuraMouseGen1Controller.h"
 #include "AsusAuraMousematController.h"
 #include "AsusAuraMonitorController.h"
@@ -19,7 +20,7 @@
 #include "RGBController_AsusAuraMouse.h"
 #include "RGBController_AsusAuraMousemat.h"
 #include "RGBController_AsusROGAlly.h"
-#include "RGBController_ROGStrixLC_Controller.h"
+#include "RGBController_AsusROGStrixLC.h"
 #include "RGBController_AsusROGSpatha.h"
 #include "RGBController_AsusROGStrixEvolve.h"
 #include "RGBController_AsusAuraMonitor.h"
@@ -226,9 +227,9 @@ void DetectAsusAuraUSBROGStrixLC(hid_device_info* info, const std::string& name)
 
     if(dev)
     {
-        ROGStrixLC_Controller* controller                   = new ROGStrixLC_Controller(dev, info->path);
-        RGBController_ROGStrixLC_Controller* rgb_controller = new RGBController_ROGStrixLC_Controller(controller);
-        rgb_controller->name                                = name;
+        AsusROGStrixLCController*     controller     = new AsusROGStrixLCController(dev, info->path);
+        RGBController_AsusROGStrixLC* rgb_controller = new RGBController_AsusROGStrixLC(controller);
+        rgb_controller->name                         = name;
         ResourceManager::get()->RegisterRGBController(rgb_controller);
     }
 }

Controllers/AsusAuraUSBController/AsusROGStrixLCController/AsusROGStrixLCController.cpp

@@ -1,5 +1,5 @@
 /*-------------------------------------------------------------------*\
-|  ROGStrixLC_Controller.cpp                                          |
+|  AsusROGStrixLCController.cpp                                       |
 |                                                                     |
 |  Driver for the ASUS Aura Liquid Cooler (LC) series                 |
 |    of lighting controllers                                          |
@@ -8,9 +8,9 @@
 |                                                                     |
 \*-------------------------------------------------------------------*/
 
-#include "ROGStrixLC_Controller.h"
+#include "AsusROGStrixLCController.h"
 
-ROGStrixLC_Controller::ROGStrixLC_Controller(hid_device* dev_handle, const char* path) : AuraUSBController(dev_handle, path)
+AsusROGStrixLCController::AsusROGStrixLCController(hid_device* dev_handle, const char* path) : AuraUSBController(dev_handle, path)
 {
     /*-----------------------------------------------------*\
     | Add addressable devices                               |
@@ -21,17 +21,17 @@ ROGStrixLC_Controller::ROGStrixLC_Controller(hid_device* dev_handle, const char*
     device_info.push_back({0x00, 0x00, 4, 0, AuraDeviceType::FIXED});
 }
 
-ROGStrixLC_Controller::~ROGStrixLC_Controller()
+AsusROGStrixLCController::~AsusROGStrixLCController()
 {
     // Device will close at AuraUSBController destructor
 }
 
-std::string ROGStrixLC_Controller::GetLocation()
+std::string AsusROGStrixLCController::GetLocation()
 {
     return("HID: " + location);
 }
 
-void ROGStrixLC_Controller::SetMode(unsigned char /*channel*/, unsigned char /*mode*/, unsigned char /*red*/, unsigned char /*grn*/, unsigned char /*blu*/)
+void AsusROGStrixLCController::SetMode(unsigned char /*channel*/, unsigned char /*mode*/, unsigned char /*red*/, unsigned char /*grn*/, unsigned char /*blu*/)
 {
     /*---------------------------------------------------------*\
     | This interface is not used in this controller however is  |
@@ -39,7 +39,7 @@ void ROGStrixLC_Controller::SetMode(unsigned char /*channel*/, unsigned char /*m
     \*---------------------------------------------------------*/
 }
 
-void ROGStrixLC_Controller::SetMode(unsigned char mode, unsigned char speed, unsigned char direction, RGBColor colour)
+void AsusROGStrixLCController::SetMode(unsigned char mode, unsigned char speed, unsigned char direction, RGBColor colour)
 {
     bool needs_update       = !( (current_mode == mode) && (ToRGBColor(current_red, current_green, current_blue) == colour) && (current_speed == speed) && (current_direction == direction));
 
@@ -55,7 +55,7 @@ void ROGStrixLC_Controller::SetMode(unsigned char mode, unsigned char speed, uns
     }
 }
 
-void ROGStrixLC_Controller::SetChannelLEDs(unsigned char /*channel*/, RGBColor* /*colors*/, unsigned int /*num_colors*/)
+void AsusROGStrixLCController::SetChannelLEDs(unsigned char /*channel*/, RGBColor* /*colors*/, unsigned int /*num_colors*/)
 {
     /*---------------------------------------------------------*\
     | This interface is not used in this controller however is  |
@@ -63,7 +63,7 @@ void ROGStrixLC_Controller::SetChannelLEDs(unsigned char /*channel*/, RGBColor*
     \*---------------------------------------------------------*/
 }
 
-void ROGStrixLC_Controller::SetLedsDirect(RGBColor * led_colours, uint8_t led_count)
+void AsusROGStrixLCController::SetLedsDirect(RGBColor * led_colours, uint8_t led_count)
 {
     uint8_t buffer[write_packet_size]   = { 0xEC, 0x40, 0x00, 0xFF, led_count };
 
@@ -90,7 +90,7 @@ void ROGStrixLC_Controller::SetLedsDirect(RGBColor * led_colours, uint8_t led_co
     hid_write(dev, buffer, write_packet_size);
 }
 
-void ROGStrixLC_Controller::GetStatus()
+void AsusROGStrixLCController::GetStatus()
 {
     uint8_t buffer[write_packet_size]   = { 0xEC, 0x01, 0x02 };
 
@@ -102,7 +102,7 @@ void ROGStrixLC_Controller::GetStatus()
     current_blue            = buffer[ROGSTRIXLC_BLUE_BYTE - 1];
 }
 
-void ROGStrixLC_Controller::SendUpdate()
+void AsusROGStrixLCController::SendUpdate()
 {
     uint8_t buffer[write_packet_size];
 

Controllers/AsusAuraUSBController/AsusROGStrixLCController/AsusROGStrixLCController.h

@@ -1,5 +1,5 @@
 /*-------------------------------------------------------------------*\
-|  ROGStrixLC_Controller.h                                            |
+|  AsusROGStrixLCController.h                                         |
 |                                                                     |
 |  Driver for the ASUS Aura Liquid Cooler (LC) series                 |
 |    of lighting controllers                                          |
@@ -54,11 +54,11 @@ enum
     ROGSTRIXLC_CONTROLLER_SPEED_FASTEST     = 0x00, // Fastest speed
 };
 
-class ROGStrixLC_Controller : public AuraUSBController
+class AsusROGStrixLCController : public AuraUSBController
 {
 public:
-    ROGStrixLC_Controller(hid_device* dev_handle, const char* path);
-    ~ROGStrixLC_Controller();
+    AsusROGStrixLCController(hid_device* dev_handle, const char* path);
+    ~AsusROGStrixLCController();
 
     std::string             GetLocation();
 

Controllers/AsusAuraUSBController/AsusROGStrixLCController/RGBController_AsusROGStrixLC.cpp

@@ -1,5 +1,5 @@
 /*-------------------------------------------------------------------*\
-|  RGBController_ROGStrixLC_Controller.cpp                            |
+|  RGBController_AsusROGStrixLC.cpp                                   |
 |                                                                     |
 |  Driver for the ASUS Aura Liquid Cooler (LC) series                 |
 |    of lighting controllers                                          |
@@ -9,7 +9,7 @@
 \*-------------------------------------------------------------------*/
 
 #include "RGBControllerKeyNames.h"
-#include "RGBController_ROGStrixLC_Controller.h"
+#include "RGBController_AsusROGStrixLC.h"
 
 /**------------------------------------------------------------------*\
     @name Asus ROG Strix Liquid Cooler
@@ -22,7 +22,7 @@
     @comment
 \*-------------------------------------------------------------------*/
 
-RGBController_ROGStrixLC_Controller::RGBController_ROGStrixLC_Controller(ROGStrixLC_Controller *controller_ptr)
+RGBController_AsusROGStrixLC::RGBController_AsusROGStrixLC(AsusROGStrixLCController *controller_ptr)
 {
     controller                  = controller_ptr;
     uint8_t speed               = ROGSTRIXLC_CONTROLLER_SPEED_NORMAL;
@@ -126,12 +126,12 @@ RGBController_ROGStrixLC_Controller::RGBController_ROGStrixLC_Controller(ROGStri
     SetupZones();
 }
 
-RGBController_ROGStrixLC_Controller::~RGBController_ROGStrixLC_Controller()
+RGBController_AsusROGStrixLC::~RGBController_AsusROGStrixLC()
 {
     delete controller;
 }
 
-void RGBController_ROGStrixLC_Controller::SetupZones()
+void RGBController_AsusROGStrixLC::SetupZones()
 {
     /*-------------------------------------------------*\
     | Set up zones                                      |
@@ -171,14 +171,14 @@ void RGBController_ROGStrixLC_Controller::SetupZones()
     SetupColors();
 }
 
-void RGBController_ROGStrixLC_Controller::ResizeZone(int /*zone*/, int /*new_size*/)
+void RGBController_AsusROGStrixLC::ResizeZone(int /*zone*/, int /*new_size*/)
 {
     /*---------------------------------------------------------*\
     | This device does not support resizing zones               |
     \*---------------------------------------------------------*/
 }
 
-void RGBController_ROGStrixLC_Controller::DeviceUpdateLEDs()
+void RGBController_AsusROGStrixLC::DeviceUpdateLEDs()
 {
     for(int zone_idx = 0; zone_idx < zones.size(); zone_idx++)
     {
@@ -186,24 +186,24 @@ void RGBController_ROGStrixLC_Controller::DeviceUpdateLEDs()
     }
 }
 
-void RGBController_ROGStrixLC_Controller::UpdateZoneLEDs(int zone)
+void RGBController_AsusROGStrixLC::UpdateZoneLEDs(int zone)
 {
     controller->SetLedsDirect( zones[zone].colors, zones[zone].leds_count );
 }
 
-void RGBController_ROGStrixLC_Controller::UpdateSingleLED(int led)
+void RGBController_AsusROGStrixLC::UpdateSingleLED(int led)
 {
     UpdateZoneLEDs(GetLED_Zone(led));
 }
 
-void RGBController_ROGStrixLC_Controller::DeviceUpdateMode()
+void RGBController_AsusROGStrixLC::DeviceUpdateMode()
 {
     RGBColor colour         = (modes[active_mode].color_mode == MODE_COLORS_MODE_SPECIFIC) ? modes[active_mode].colors[0] : 0;
 
     controller->SetMode( modes[active_mode].value, modes[active_mode].speed, modes[active_mode].direction, colour );
 }
 
-int RGBController_ROGStrixLC_Controller::GetLED_Zone(int led_idx)
+int RGBController_AsusROGStrixLC::GetLED_Zone(int led_idx)
 {
     for(int zone_idx = 0; zone_idx < zones.size(); zone_idx++)
     {

Controllers/AsusAuraUSBController/AsusROGStrixLCController/RGBController_AsusROGStrixLC.h

@@ -1,5 +1,5 @@
 /*-------------------------------------------------------------------*\
-|  RGBController_ROGStrixLC_Controller.h                              |
+|  RGBController_AsusROGStrixLC.h                                     |
 |                                                                     |
 |  Driver for the ASUS Aura Liquid Cooler (LC) series                 |
 |    of lighting controllers                                          |
@@ -11,14 +11,14 @@
 #pragma once
 #include "LogManager.h"
 #include "RGBController.h"
-#include "ROGStrixLC_Controller.h"
+#include "AsusROGStrixLCController.h"
 #include <vector>
 
-class RGBController_ROGStrixLC_Controller : public RGBController
+class RGBController_AsusROGStrixLC : public RGBController
 {
 public:
-    RGBController_ROGStrixLC_Controller(ROGStrixLC_Controller* controller_ptr);
-    ~RGBController_ROGStrixLC_Controller();
+    RGBController_AsusROGStrixLC(AsusROGStrixLCController* controller_ptr);
+    ~RGBController_AsusROGStrixLC();
 
     void                SetupZones();
     void                ResizeZone(int zone, int new_size);
@@ -32,5 +32,5 @@ private:
     int                 GetDeviceMode();
     int                 GetLED_Zone(int led_idx);
 
-    ROGStrixLC_Controller* controller;
+    AsusROGStrixLCController* controller;
 };