jalr/OpenRGB
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Code cleanup for NZXT controllers

Browse source
This commit is contained in:
Adam Honse 2022-02-24 16:59:07 -06:00
parent 2bb5cfcab8
commit c226e2c4fb
8 changed files with 43 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Controllers/NZXTKrakenController/RGBController_NZXTKraken.cpp
View file

@ -10,17 +10,17 @@
#include <iostream>
RGBController_NZXTKraken::RGBController_NZXTKraken(NZXTKrakenController* nzxtkraken_ptr)
RGBController_NZXTKraken::RGBController_NZXTKraken(NZXTKrakenController* controller_ptr)
{
nzxtkraken = nzxtkraken_ptr;
controller = controller_ptr;
name = "NZXT Kraken X/M";
vendor = "NZXT";
type = DEVICE_TYPE_COOLER;
description = "NZXT Kraken X42/X52/X62/X72/M22";
version = nzxtkraken->GetFirmwareVersion();
location = nzxtkraken->GetLocation();
serial = nzxtkraken->GetSerialString();
version = controller->GetFirmwareVersion();
location = controller->GetLocation();
serial = controller->GetSerialString();
mode Direct;
Direct.name = "Direct";
@ -190,7 +190,7 @@ RGBController_NZXTKraken::RGBController_NZXTKraken(NZXTKrakenController* nzxtkra
RGBController_NZXTKraken::~RGBController_NZXTKraken()
{
delete nzxtkraken;
delete controller;
}
void RGBController_NZXTKraken::SetupZones()
@ -295,7 +295,7 @@ void RGBController_NZXTKraken::UpdateChannel(NZXTKrakenChannel_t channel, int zo
std::vector<std::vector<RGBColor>> update_colors = GetColors(zone, channel_mode);
for(std::size_t idx = 0; idx < update_colors.size(); ++idx)
{
nzxtkraken->UpdateEffect(
controller->UpdateEffect(
channel,
channel_mode.value,
direction,

4
Controllers/NZXTKrakenController/RGBController_NZXTKraken.h
View file

@ -15,7 +15,7 @@
class RGBController_NZXTKraken : public RGBController
{
public:
RGBController_NZXTKraken(NZXTKrakenController* nzxtkraken_ptr);
RGBController_NZXTKraken(NZXTKrakenController* controller_ptr);
~RGBController_NZXTKraken();
void SetupZones();
@ -43,7 +43,7 @@ private:
const mode& channel_mode
);
NZXTKrakenController* nzxtkraken;
NZXTKrakenController* controller;
std::set<unsigned int> logo_modes;
int default_mode;
};