diff --git a/Controllers/RGBFusion2Controller/RGBFusion2Controller.cpp b/Controllers/RGBFusion2USBController/RGBFusion2USBController.cpp similarity index 84% rename from Controllers/RGBFusion2Controller/RGBFusion2Controller.cpp rename to Controllers/RGBFusion2USBController/RGBFusion2USBController.cpp index afccf581..ab76225c 100644 --- a/Controllers/RGBFusion2Controller/RGBFusion2Controller.cpp +++ b/Controllers/RGBFusion2USBController/RGBFusion2USBController.cpp @@ -1,13 +1,13 @@ /*-----------------------------------------*\ -| RGBFusion2Controller.cpp | +| RGBFusion2USBController.cpp | | | | Driver for Gigabyte Aorus RGB Fusion 2.0 | -| lighting controller | +| USB lighting controller | | | | jackun 1/8/2020 | \*-----------------------------------------*/ -#include "RGBFusion2Controller.h" +#include "RGBFusion2USBController.h" #include #include #include @@ -27,7 +27,7 @@ static LEDCount LedCountToEnum(unsigned int c) return(LEDS_1024); } -RGBFusion2Controller::RGBFusion2Controller(hid_device* handle, const char *path) : dev(handle) +RGBFusion2USBController::RGBFusion2USBController(hid_device* handle, const char *path) : dev(handle) { int res = 0; char text[64] {}; @@ -62,14 +62,14 @@ RGBFusion2Controller::RGBFusion2Controller(hid_device* handle, const char *path) } } -RGBFusion2Controller::~RGBFusion2Controller() +RGBFusion2USBController::~RGBFusion2USBController() { if( dev ) { hid_close(dev); } } -void RGBFusion2Controller::SetMode(int m) +void RGBFusion2USBController::SetMode(int m) { mode = m; } @@ -78,7 +78,7 @@ void RGBFusion2Controller::SetMode(int m) // "Custom" RGB packets don't seem to get remapped so use report.byteorderN and do it manually. // Of course it all depends how we send data to the controller, but bios/rgb fusion 2 itself // set it up like this. -void RGBFusion2Controller::SetCalibration() +void RGBFusion2USBController::SetCalibration() { uint8_t buffer[64] {}; buffer[0] = report_id; @@ -105,14 +105,14 @@ void RGBFusion2Controller::SetCalibration() SendPacket(buffer); } -void RGBFusion2Controller::SetLedCount(unsigned int count) +void RGBFusion2USBController::SetLedCount(unsigned int count) { led_count = count; LEDCount s0 = LedCountToEnum(count); SendPacket(0x34, s0 | (s0 << 4)); // D_LED1 | D_LED2 } -bool RGBFusion2Controller::DisableBuiltinEffect(int enable_bit, int mask) +bool RGBFusion2USBController::DisableBuiltinEffect(int enable_bit, int mask) { if(effect_disabled & enable_bit) return(true); @@ -126,32 +126,32 @@ bool RGBFusion2Controller::DisableBuiltinEffect(int enable_bit, int mask) return res; } -bool RGBFusion2Controller::EnableBeat(bool e) +bool RGBFusion2USBController::EnableBeat(bool e) { return SendPacket(0x31, e ? 1 : 0); } -std::string RGBFusion2Controller::GetDeviceName() +std::string RGBFusion2USBController::GetDeviceName() { return(name); } -std::string RGBFusion2Controller::GetFWVersion() +std::string RGBFusion2USBController::GetFWVersion() { return(version); } -std::string RGBFusion2Controller::GetDeviceLocation() +std::string RGBFusion2USBController::GetDeviceLocation() { return(loc); } -std::string RGBFusion2Controller::GetSerial() +std::string RGBFusion2USBController::GetSerial() { return(chip_id); } -void RGBFusion2Controller::SetStripColors +void RGBFusion2USBController::SetStripColors ( unsigned int hdr, RGBColor * colors, @@ -228,7 +228,7 @@ static const std::array< std::array, 5> speeds = { }, }; -void RGBFusion2Controller::SetLEDEffect(unsigned int led, int mode, unsigned int speed, bool random, unsigned char r, unsigned char g, unsigned char b) +void RGBFusion2USBController::SetLEDEffect(unsigned int led, int mode, unsigned int speed, bool random, unsigned char r, unsigned char g, unsigned char b) { PktEffect pkt; pkt.Init(led, report_id); @@ -270,12 +270,12 @@ void RGBFusion2Controller::SetLEDEffect(unsigned int led, int mode, unsigned int SendPacket(pkt.buffer); } -bool RGBFusion2Controller::ApplyEffect() +bool RGBFusion2USBController::ApplyEffect() { return SendPacket(0x28, 0xFF); } -bool RGBFusion2Controller::SendPacket(uint8_t a, uint8_t b, uint8_t c) +bool RGBFusion2USBController::SendPacket(uint8_t a, uint8_t b, uint8_t c) { unsigned char buffer[64] {}; buffer[0] = report_id; @@ -285,7 +285,7 @@ bool RGBFusion2Controller::SendPacket(uint8_t a, uint8_t b, uint8_t c) return (SendPacket(buffer) == 64); } -int RGBFusion2Controller::SendPacket(unsigned char* packet) +int RGBFusion2USBController::SendPacket(unsigned char* packet) { return hid_send_feature_report(dev, packet, 64); } diff --git a/Controllers/RGBFusion2Controller/RGBFusion2Controller.h b/Controllers/RGBFusion2USBController/RGBFusion2USBController.h similarity index 95% rename from Controllers/RGBFusion2Controller/RGBFusion2Controller.h rename to Controllers/RGBFusion2USBController/RGBFusion2USBController.h index 576c580d..8ac3e592 100644 --- a/Controllers/RGBFusion2Controller/RGBFusion2Controller.h +++ b/Controllers/RGBFusion2USBController/RGBFusion2USBController.h @@ -1,8 +1,8 @@ /*-----------------------------------------*\ -| RGBFusion2Controller.h | +| RGBFusion2USBController.h | | | | Definitions and types for Gigabyte Aorus | -| RGB Fusion 2.0 lighting controller | +| RGB Fusion 2.0 USB lighting controller | | | | jackun 1/8/2020 | \*-----------------------------------------*/ @@ -154,11 +154,11 @@ struct IT8297Report #pragma pack(pop) -class RGBFusion2Controller +class RGBFusion2USBController { public: - RGBFusion2Controller(hid_device* handle, const char *path); - ~RGBFusion2Controller(); + RGBFusion2USBController(hid_device* handle, const char *path); + ~RGBFusion2USBController(); void SetStripColors ( diff --git a/Controllers/RGBFusion2Controller/RGBFusion2ControllerDetect.cpp b/Controllers/RGBFusion2USBController/RGBFusion2USBControllerDetect.cpp similarity index 71% rename from Controllers/RGBFusion2Controller/RGBFusion2ControllerDetect.cpp rename to Controllers/RGBFusion2USBController/RGBFusion2USBControllerDetect.cpp index 3f8caa18..3a40e3a0 100644 --- a/Controllers/RGBFusion2Controller/RGBFusion2ControllerDetect.cpp +++ b/Controllers/RGBFusion2USBController/RGBFusion2USBControllerDetect.cpp @@ -1,18 +1,18 @@ -#include "RGBFusion2Controller.h" -#include "RGBController_RGBFusion2.h" +#include "RGBFusion2USBController.h" +#include "RGBController_RGBFusion2USB.h" #define IT8297_VID 0x048D #define IT8297_PID 0x8297 /******************************************************************************************\ * * -* DetectRGBFusion2Controllers * +* DetectRGBFusion2USBControllers * * * * Detect RGB Fusion 2 devices that use IT8297 RGB controller * * * \******************************************************************************************/ -void DetectRGBFusion2Controllers(std::vector &rgb_controllers) +void DetectRGBFusion2USBControllers(std::vector &rgb_controllers) { if (hid_init() < 0) return; @@ -26,8 +26,8 @@ void DetectRGBFusion2Controllers(std::vector &rgb_controllers) { hid_device * dev = hid_open_path(device->path); if (dev) { - RGBFusion2Controller * controller = new RGBFusion2Controller(dev, device_list->path); - RGBController_RGBFusion2 * rgb_controller = new RGBController_RGBFusion2(controller); + RGBFusion2USBController * controller = new RGBFusion2USBController(dev, device_list->path); + RGBController_RGBFusion2USB * rgb_controller = new RGBController_RGBFusion2USB(controller); rgb_controllers.push_back(rgb_controller); } device = device->next; diff --git a/OpenRGB.cpp b/OpenRGB.cpp index c5ddff1c..6f0db23a 100644 --- a/OpenRGB.cpp +++ b/OpenRGB.cpp @@ -300,7 +300,7 @@ void DetectCorsairLightingNodeControllers(std::vector &rgb_contr void DetectFaustusControllers(std::vector &rgb_controllers); void DetectHyperXKeyboardControllers(std::vector& rgb_controllers); void DetectThermaltakeRiingControllers(std::vector& rgb_controllers); -void DetectRGBFusion2Controllers(std::vector &rgb_controllers); +void DetectRGBFusion2USBControllers(std::vector &rgb_controllers); /******************************************************************************************\ * * @@ -338,7 +338,7 @@ void DetectRGBControllers(void) DetectCorsairPeripheralControllers(rgb_controllers); DetectCorsairLightingNodeControllers(rgb_controllers); DetectThermaltakeRiingControllers(rgb_controllers); - DetectRGBFusion2Controllers(rgb_controllers); + DetectRGBFusion2USBControllers(rgb_controllers); DetectE131Controllers(rgb_controllers); diff --git a/OpenRGB.pro b/OpenRGB.pro index f31719a3..5ab8a7d0 100644 --- a/OpenRGB.pro +++ b/OpenRGB.pro @@ -48,7 +48,7 @@ INCLUDEPATH += \ Controllers/PolychromeController/ \ Controllers/PoseidonZRGBController/ \ Controllers/RGBFusionController/ \ - Controllers/RGBFusion2Controller/ \ + Controllers/RGBFusion2USBController/ \ Controllers/RGBFusionGPUController/ \ Controllers/ThermaltakeRiingController/ \ RGBController/ \ @@ -113,8 +113,8 @@ SOURCES += \ Controllers/PoseidonZRGBController/PoseidonZRGBControllerDetect.cpp \ Controllers/RGBFusionController/RGBFusionController.cpp \ Controllers/RGBFusionController/RGBFusionControllerDetect.cpp \ - Controllers/RGBFusion2Controller/RGBFusion2Controller.cpp \ - Controllers/RGBFusion2Controller/RGBFusion2ControllerDetect.cpp \ + Controllers/RGBFusion2USBController/RGBFusion2USBController.cpp \ + Controllers/RGBFusion2USBController/RGBFusion2USBControllerDetect.cpp \ Controllers/RGBFusionGPUController/RGBFusionGPUController.cpp \ Controllers/RGBFusionGPUController/RGBFusionGPUControllerDetect.cpp \ Controllers/ThermaltakeRiingController/ThermaltakeRiingController.cpp \ @@ -142,7 +142,7 @@ SOURCES += \ RGBController/RGBController_Polychrome.cpp \ RGBController/RGBController_PoseidonZRGB.cpp \ RGBController/RGBController_RGBFusion.cpp \ - RGBController/RGBController_RGBFusion2.cpp \ + RGBController/RGBController_RGBFusion2USB.cpp \ RGBController/RGBController_RGBFusionGPU.cpp \ RGBController/RGBController_ThermaltakeRiing.cpp \ @@ -181,7 +181,7 @@ HEADERS += \ Controllers/PolychromeController/PolychromeController.h \ Controllers/PoseidonZRGBController/PoseidonZRGBController.h \ Controllers/RGBFusionController/RGBFusionController.h \ - Controllers/RGBFusion2Controller/RGBFusion2Controller.h \ + Controllers/RGBFusion2USBController/RGBFusion2USBController.h \ Controllers/RGBFusionGPUController/RGBFusionGPUController.h \ Controllers/ThermaltakeRiingController/ThermaltakeRiingController.h \ RGBController/RGBController.h \ @@ -206,7 +206,7 @@ HEADERS += \ RGBController/RGBController_Polychrome.h \ RGBController/RGBController_PoseidonZRGB.h \ RGBController/RGBController_RGBFusion.h \ - RGBController/RGBController_RGBFusion2.h \ + RGBController/RGBController_RGBFusion2USB.h \ RGBController/RGBController_RGBFusionGPU.h \ RGBController/RGBController_ThermaltakeRiing.h \ diff --git a/RGBController/RGBController_RGBFusion2.cpp b/RGBController/RGBController_RGBFusion2USB.cpp similarity index 95% rename from RGBController/RGBController_RGBFusion2.cpp rename to RGBController/RGBController_RGBFusion2USB.cpp index 2979a613..9f3d5838 100644 --- a/RGBController/RGBController_RGBFusion2.cpp +++ b/RGBController/RGBController_RGBFusion2USB.cpp @@ -1,13 +1,13 @@ /*-----------------------------------------*\ -| RGBController_RGBFusion2.cpp | +| RGBController_RGBFusion2USB.cpp | | | | Generic RGB Interface for OpenRGB | -| Gigabyte RGB Fusion 2.0 Driver | +| Gigabyte RGB Fusion 2.0 USB Driver | | | | jackun 1/8/2020 | \*-----------------------------------------*/ -#include "RGBController_RGBFusion2.h" +#include "RGBController_RGBFusion2USB.h" #include #include @@ -72,7 +72,7 @@ static const KnownChannels known_channels }, }; -RGBController_RGBFusion2::RGBController_RGBFusion2(RGBFusion2Controller* controller_ptr) +RGBController_RGBFusion2USB::RGBController_RGBFusion2USB(RGBFusion2Controller* controller_ptr) { controller = controller_ptr; @@ -140,7 +140,7 @@ RGBController_RGBFusion2::RGBController_RGBFusion2(RGBFusion2Controller* control SetupZones(); } -void RGBController_RGBFusion2::SetupZones() +void RGBController_RGBFusion2USB::SetupZones() { /*---------------------------------------------------------*\ | Look up channel map based on device name | @@ -216,17 +216,17 @@ void RGBController_RGBFusion2::SetupZones() SetupColors(); } -void RGBController_RGBFusion2::ResizeZone(int zone, int new_size) +void RGBController_RGBFusion2USB::ResizeZone(int zone, int new_size) { } -void RGBController_RGBFusion2::SetCustomMode() +void RGBController_RGBFusion2USB::SetCustomMode() { active_mode = 0; } -void RGBController_RGBFusion2::UpdateLEDs() +void RGBController_RGBFusion2USB::UpdateLEDs() { for(size_t zone_idx = 0; zone_idx < zones.size(); zone_idx++) { @@ -234,7 +234,7 @@ void RGBController_RGBFusion2::UpdateLEDs() } } -void RGBController_RGBFusion2::UpdateZoneLEDs(int zone) +void RGBController_RGBFusion2USB::UpdateZoneLEDs(int zone) { /*---------------------------------------------------------*\ | Get mode parameters | @@ -327,7 +327,7 @@ void RGBController_RGBFusion2::UpdateZoneLEDs(int zone) } } -void RGBController_RGBFusion2::UpdateSingleLED(int led) +void RGBController_RGBFusion2USB::UpdateSingleLED(int led) { /*---------------------------------------------------------*\ | Get mode parameters | @@ -371,7 +371,7 @@ void RGBController_RGBFusion2::UpdateSingleLED(int led) } } -void RGBController_RGBFusion2::UpdateMode() +void RGBController_RGBFusion2USB::UpdateMode() { // XXX Comment out to allow each zone or motherboard LED have different modes UpdateLEDs(); diff --git a/RGBController/RGBController_RGBFusion2.h b/RGBController/RGBController_RGBFusion2USB.h similarity index 74% rename from RGBController/RGBController_RGBFusion2.h rename to RGBController/RGBController_RGBFusion2USB.h index f330db53..e0068367 100644 --- a/RGBController/RGBController_RGBFusion2.h +++ b/RGBController/RGBController_RGBFusion2USB.h @@ -1,15 +1,15 @@ /*-----------------------------------------*\ -| RGBController_RGBFusion2.h | +| RGBController_RGBFusion2USB.h | | | | Generic RGB Interface for OpenRGB | -| Gigabyte RGB Fusion 2.0 Driver | +| Gigabyte RGB Fusion 2.0 USB Driver | | | | jackun 1/8/2020 | \*-----------------------------------------*/ #pragma once #include "RGBController.h" -#include "RGBFusion2Controller.h" +#include "RGBFusion2USBController.h" #include #include @@ -22,10 +22,10 @@ struct LedPort typedef std::vector< std::vector > ZoneLeds; typedef std::map< std::string, ZoneLeds > KnownChannels; -class RGBController_RGBFusion2: public RGBController +class RGBController_RGBFusion2USB: public RGBController { public: - RGBController_RGBFusion2(RGBFusion2Controller* controller_ptr); + RGBController_RGBFusion2USB(RGBFusion2USBController* controller_ptr); void SetupZones(); @@ -39,7 +39,7 @@ public: void UpdateMode(); private: - RGBFusion2Controller* controller; + RGBFusion2USBController* controller; IT8297Report report; unsigned int per_strip_led_cnt; };