From 62488cbc1e5e5ea19522d2335f6227e0c2848307 Mon Sep 17 00:00:00 2001 From: Adam Honse Date: Sun, 13 Sep 2020 19:43:07 -0500 Subject: [PATCH] Rename EVGAGPU to EVGAGPUv1 before writing a controller for EVGA RGB V2 --- .../EVGAGPUControllerDetect.cpp | 18 +++++++-------- ...Controller.cpp => EVGAGPUv1Controller.cpp} | 22 +++++++++---------- ...AGPUController.h => EVGAGPUv1Controller.h} | 10 ++++----- OpenRGB.pro | 8 +++---- ...VGAGPU.cpp => RGBController_EVGAGPUv1.cpp} | 22 +++++++++---------- ...er_EVGAGPU.h => RGBController_EVGAGPUv1.h} | 12 +++++----- 6 files changed, 46 insertions(+), 46 deletions(-) rename Controllers/EVGAGPUController/{EVGAGPUController.cpp => EVGAGPUv1Controller.cpp} (63%) rename Controllers/EVGAGPUController/{EVGAGPUController.h => EVGAGPUv1Controller.h} (84%) rename RGBController/{RGBController_EVGAGPU.cpp => RGBController_EVGAGPUv1.cpp} (82%) rename RGBController/{RGBController_EVGAGPU.h => RGBController_EVGAGPUv1.h} (69%) diff --git a/Controllers/EVGAGPUController/EVGAGPUControllerDetect.cpp b/Controllers/EVGAGPUController/EVGAGPUControllerDetect.cpp index 43f92a352..476e19d9e 100644 --- a/Controllers/EVGAGPUController/EVGAGPUControllerDetect.cpp +++ b/Controllers/EVGAGPUController/EVGAGPUControllerDetect.cpp @@ -1,7 +1,7 @@ #include "Detector.h" -#include "EVGAGPUController.h" +#include "EVGAGPUv1Controller.h" #include "RGBController.h" -#include "RGBController_EVGAGPU.h" +#include "RGBController_EVGAGPUv1.h" #include "i2c_smbus.h" #include #include @@ -56,9 +56,6 @@ static const gpu_pci_device device_list[] = void DetectEVGAGPUControllers(std::vector& busses, std::vector& rgb_controllers) { - EVGAGPUController* new_evga_gpu; - RGBController_EVGAGPU* new_controller; - for (unsigned int bus = 0; bus < busses.size(); bus++) { for(unsigned int dev_idx = 0; dev_idx < GPU_NUM_DEVICES; dev_idx++) @@ -73,10 +70,13 @@ void DetectEVGAGPUControllers(std::vector& busses, std::ve busses[bus]->pci_subsystem_vendor == device_list[dev_idx].pci_subsystem_vendor && busses[bus]->pci_subsystem_device == device_list[dev_idx].pci_subsystem_device) { - new_evga_gpu = new EVGAGPUController(busses[bus], 0x49); - new_controller = new RGBController_EVGAGPU(new_evga_gpu); - new_controller->name = device_list[dev_idx].name; - rgb_controllers.push_back(new_controller); + EVGAGPUv1Controller* new_controller; + RGBController_EVGAGPUv1* new_rgbcontroller; + + new_controller = new EVGAGPUv1Controller(busses[bus], 0x49); + new_rgbcontroller = new RGBController_EVGAGPUv1(new_controller); + new_rgbcontroller->name = device_list[dev_idx].name; + rgb_controllers.push_back(new_rgbcontroller); } } } diff --git a/Controllers/EVGAGPUController/EVGAGPUController.cpp b/Controllers/EVGAGPUController/EVGAGPUv1Controller.cpp similarity index 63% rename from Controllers/EVGAGPUController/EVGAGPUController.cpp rename to Controllers/EVGAGPUController/EVGAGPUv1Controller.cpp index 877d558cc..7b2dbd8bb 100644 --- a/Controllers/EVGAGPUController/EVGAGPUController.cpp +++ b/Controllers/EVGAGPUController/EVGAGPUv1Controller.cpp @@ -1,26 +1,26 @@ /*-----------------------------------------*\ | EVGAGPUController.cpp | | | -| Driver for EVGA GPU RGB lighting | -| controller | +| Driver for EVGA GPU RGB V1 (Pascal) | +| lighting controller | | | | Adam Honse (CalcProgrammer1) 9/11/2020 | \*-----------------------------------------*/ -#include "EVGAGPUController.h" +#include "EVGAGPUv1Controller.h" -EVGAGPUController::EVGAGPUController(i2c_smbus_interface* bus, evga_dev_id dev) +EVGAGPUv1Controller::EVGAGPUv1Controller(i2c_smbus_interface* bus, evga_dev_id dev) { this->bus = bus; this->dev = dev; } -EVGAGPUController::~EVGAGPUController() +EVGAGPUv1Controller::~EVGAGPUv1Controller() { } -std::string EVGAGPUController::GetDeviceLocation() +std::string EVGAGPUv1Controller::GetDeviceLocation() { std::string return_string(bus->device_name); char addr[5]; @@ -30,29 +30,29 @@ std::string EVGAGPUController::GetDeviceLocation() return(return_string); } -unsigned char EVGAGPUController::GetRed() +unsigned char EVGAGPUv1Controller::GetRed() { return(bus->i2c_smbus_read_byte_data(dev, EVGA_GPU_REG_RED)); } -unsigned char EVGAGPUController::GetGreen() +unsigned char EVGAGPUv1Controller::GetGreen() { return(bus->i2c_smbus_read_byte_data(dev, EVGA_GPU_REG_GREEN)); } -unsigned char EVGAGPUController::GetBlue() +unsigned char EVGAGPUv1Controller::GetBlue() { return(bus->i2c_smbus_read_byte_data(dev, EVGA_GPU_REG_BLUE)); } -void EVGAGPUController::SetColor(unsigned char red, unsigned char green, unsigned char blue) +void EVGAGPUv1Controller::SetColor(unsigned char red, unsigned char green, unsigned char blue) { bus->i2c_smbus_write_byte_data(dev, EVGA_GPU_REG_RED, red); bus->i2c_smbus_write_byte_data(dev, EVGA_GPU_REG_GREEN, green); bus->i2c_smbus_write_byte_data(dev, EVGA_GPU_REG_BLUE, blue); } -void EVGAGPUController::SetMode(unsigned char mode) +void EVGAGPUv1Controller::SetMode(unsigned char mode) { bus->i2c_smbus_write_byte_data(dev, EVGA_GPU_REG_MODE, mode); } diff --git a/Controllers/EVGAGPUController/EVGAGPUController.h b/Controllers/EVGAGPUController/EVGAGPUv1Controller.h similarity index 84% rename from Controllers/EVGAGPUController/EVGAGPUController.h rename to Controllers/EVGAGPUController/EVGAGPUv1Controller.h index 074eefea7..2b9bc9520 100644 --- a/Controllers/EVGAGPUController/EVGAGPUController.h +++ b/Controllers/EVGAGPUController/EVGAGPUv1Controller.h @@ -1,8 +1,8 @@ /*-----------------------------------------*\ -| EVGAGPUController.h | +| EVGAGPUv1Controller.h | | | | Definitions and types for EVGA GPU RGB | -| lighting controller | +| V1 (Pascal) lighting controller | | | | Adam Honse (CalcProgrammer1) 9/11/2020 | \*-----------------------------------------*/ @@ -30,11 +30,11 @@ enum EVGA_GPU_MODE_BREATHING = 0x05, }; -class EVGAGPUController +class EVGAGPUv1Controller { public: - EVGAGPUController(i2c_smbus_interface* bus, evga_dev_id dev); - ~EVGAGPUController(); + EVGAGPUv1Controller(i2c_smbus_interface* bus, evga_dev_id dev); + ~EVGAGPUv1Controller(); std::string GetDeviceLocation(); diff --git a/OpenRGB.pro b/OpenRGB.pro index fe5dd031b..5a0028099 100644 --- a/OpenRGB.pro +++ b/OpenRGB.pro @@ -139,7 +139,7 @@ HEADERS += \ Controllers/DuckyKeyboardController/DuckyKeyboardController.h \ Controllers/EKController/EKController.h \ Controllers/EspurnaController/EspurnaController.h \ - Controllers/EVGAGPUController/EVGAGPUController.h \ + Controllers/EVGAGPUController/EVGAGPUv1Controller.h \ Controllers/GalaxGPUController/GalaxGPUController.h \ Controllers/GloriousModelOController/GloriousModelOController.h \ Controllers/HoltekController/HoltekA070Controller.h \ @@ -197,7 +197,7 @@ HEADERS += \ RGBController/RGBController_E131.h \ RGBController/RGBController_EKController.h \ RGBController/RGBController_Espurna.h \ - RGBController/RGBController_EVGAGPU.h \ + RGBController/RGBController_EVGAGPUv1.h \ RGBController/RGBController_GalaxGPU.h \ RGBController/RGBController_GloriousModelO.h \ RGBController/RGBController_HoltekA070.h \ @@ -301,7 +301,7 @@ SOURCES += \ Controllers/EKController/EKController.cpp \ Controllers/EspurnaController/EspurnaController.cpp \ Controllers/EspurnaController/EspurnaControllerDetect.cpp \ - Controllers/EVGAGPUController/EVGAGPUController.cpp \ + Controllers/EVGAGPUController/EVGAGPUv1Controller.cpp \ Controllers/EVGAGPUController/EVGAGPUControllerDetect.cpp \ Controllers/GalaxGPUController/GalaxGPUController.cpp \ Controllers/GalaxGPUController/GalaxGPUControllerDetect.cpp \ @@ -390,7 +390,7 @@ SOURCES += \ RGBController/RGBController_E131.cpp \ RGBController/RGBController_EKController.cpp \ RGBController/RGBController_Espurna.cpp \ - RGBController/RGBController_EVGAGPU.cpp \ + RGBController/RGBController_EVGAGPUv1.cpp \ RGBController/RGBController_GalaxGPU.cpp \ RGBController/RGBController_GloriousModelO.cpp \ RGBController/RGBController_HoltekA070.cpp \ diff --git a/RGBController/RGBController_EVGAGPU.cpp b/RGBController/RGBController_EVGAGPUv1.cpp similarity index 82% rename from RGBController/RGBController_EVGAGPU.cpp rename to RGBController/RGBController_EVGAGPUv1.cpp index 2b909f70d..210f0b7db 100644 --- a/RGBController/RGBController_EVGAGPU.cpp +++ b/RGBController/RGBController_EVGAGPUv1.cpp @@ -2,19 +2,19 @@ | RGBController_EVGAGPU.cpp | | | | Generic RGB Interface for OpenRGB EVGA | -| GPU Driver | +| GPU V1 (Pascal) Driver | | | | Adam Honse (CalcProgrammer1) 9/11/2020 | \*-----------------------------------------*/ -#include "RGBController_EVGAGPU.h" +#include "RGBController_EVGAGPUv1.h" -RGBController_EVGAGPU::RGBController_EVGAGPU(EVGAGPUController* evga_ptr) +RGBController_EVGAGPUv1::RGBController_EVGAGPUv1(EVGAGPUv1Controller* evga_ptr) { evga = evga_ptr; name = "EVGA GPU"; - description = "EVGA GPU"; + description = "EVGA RGB v1 GPU Device"; location = evga->GetDeviceLocation(); type = DEVICE_TYPE_GPU; @@ -53,7 +53,7 @@ RGBController_EVGAGPU::RGBController_EVGAGPU(EVGAGPUController* evga_ptr) active_mode = 0; } -void RGBController_EVGAGPU::SetupZones() +void RGBController_EVGAGPUv1::SetupZones() { /*---------------------------------------------------------*\ | This device only has one LED, so create a single zone and | @@ -80,14 +80,14 @@ void RGBController_EVGAGPU::SetupZones() SetupColors(); } -void RGBController_EVGAGPU::ResizeZone(int /*zone*/, int /*new_size*/) +void RGBController_EVGAGPUv1::ResizeZone(int /*zone*/, int /*new_size*/) { /*---------------------------------------------------------*\ | This device does not support resizing zones | \*---------------------------------------------------------*/ } -void RGBController_EVGAGPU::DeviceUpdateLEDs() +void RGBController_EVGAGPUv1::DeviceUpdateLEDs() { RGBColor color = colors[0]; unsigned char red = RGBGetRValue(color); @@ -97,22 +97,22 @@ void RGBController_EVGAGPU::DeviceUpdateLEDs() evga->SetColor(red, grn, blu); } -void RGBController_EVGAGPU::UpdateZoneLEDs(int /*zone*/) +void RGBController_EVGAGPUv1::UpdateZoneLEDs(int /*zone*/) { DeviceUpdateLEDs(); } -void RGBController_EVGAGPU::UpdateSingleLED(int /*led*/) +void RGBController_EVGAGPUv1::UpdateSingleLED(int /*led*/) { DeviceUpdateLEDs(); } -void RGBController_EVGAGPU::SetCustomMode() +void RGBController_EVGAGPUv1::SetCustomMode() { active_mode = 1; } -void RGBController_EVGAGPU::DeviceUpdateMode() +void RGBController_EVGAGPUv1::DeviceUpdateMode() { evga->SetMode((unsigned char)modes[(unsigned int)active_mode].value); } diff --git a/RGBController/RGBController_EVGAGPU.h b/RGBController/RGBController_EVGAGPUv1.h similarity index 69% rename from RGBController/RGBController_EVGAGPU.h rename to RGBController/RGBController_EVGAGPUv1.h index 3b317b75c..a59f6b6ea 100644 --- a/RGBController/RGBController_EVGAGPU.h +++ b/RGBController/RGBController_EVGAGPUv1.h @@ -1,8 +1,8 @@ /*-----------------------------------------*\ -| RGBController_EVGAGPU.h | +| RGBController_EVGAv1GPU.h | | | | Generic RGB Interface for OpenRGB | -| EVGA GPU RGB Driver | +| EVGA GPU RGB V1 (Pascal) Driver | | | | Adam Honse (CalcProgrammer1) 9/11/2020 | \*-----------------------------------------*/ @@ -10,12 +10,12 @@ #pragma once #include "RGBController.h" -#include "EVGAGPUController.h" +#include "EVGAGPUv1Controller.h" -class RGBController_EVGAGPU : public RGBController +class RGBController_EVGAGPUv1 : public RGBController { public: - RGBController_EVGAGPU(EVGAGPUController* evga_ptr); + RGBController_EVGAGPUv1(EVGAGPUv1Controller* evga_ptr); void SetupZones(); @@ -29,5 +29,5 @@ public: void DeviceUpdateMode(); private: - EVGAGPUController* evga; + EVGAGPUv1Controller* evga; };