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

6
Controllers/NZXTHue2Controller/NZXTHue2ControllerDetect.cpp
View file

@ -19,11 +19,13 @@
static void spawn_hue(hid_device_info* info, const std::string& name, int rgb_channels, int fan_channels)
{
hid_device* dev = hid_open_path(info->path);
if(dev)
{
NZXTHue2Controller* controller = new NZXTHue2Controller(dev, rgb_channels, fan_channels, info->path);
NZXTHue2Controller* controller = new NZXTHue2Controller(dev, rgb_channels, fan_channels, info->path);
RGBController_NZXTHue2* rgb_controller = new RGBController_NZXTHue2(controller);
rgb_controller->name = name;
rgb_controller->name = name;
ResourceManager::get()->RegisterRGBController(rgb_controller);
}
}

24
Controllers/NZXTHue2Controller/RGBController_NZXTHue2.cpp
View file

@ -9,17 +9,17 @@
#include "RGBController_NZXTHue2.h"
RGBController_NZXTHue2::RGBController_NZXTHue2(NZXTHue2Controller* hue2_ptr)
RGBController_NZXTHue2::RGBController_NZXTHue2(NZXTHue2Controller* controller_ptr)
{
hue2 = hue2_ptr;
controller = controller_ptr;
name = "NZXT Hue 2";
vendor = "NZXT";
type = DEVICE_TYPE_LEDSTRIP;
description = "NZXT Hue 2 Device";
version = hue2->GetFirmwareVersion();
location = hue2->GetLocation();
serial = hue2->GetSerialString();
version = controller->GetFirmwareVersion();
location = controller->GetLocation();
serial = controller->GetSerialString();
mode Direct;
Direct.name = "Direct";
@ -194,7 +194,7 @@ RGBController_NZXTHue2::RGBController_NZXTHue2(NZXTHue2Controller* hue2_ptr)
RGBController_NZXTHue2::~RGBController_NZXTHue2()
{
delete hue2;
delete controller;
}
void RGBController_NZXTHue2::SetupZones()
@ -202,7 +202,7 @@ void RGBController_NZXTHue2::SetupZones()
/*-------------------------------------------------*\
| Set up zones |
\*-------------------------------------------------*/
for(unsigned int zone_idx = 0; zone_idx < hue2->GetNumRGBChannels(); zone_idx++)
for(unsigned int zone_idx = 0; zone_idx < controller->GetNumRGBChannels(); zone_idx++)
{
zone* new_zone = new zone;
@ -211,7 +211,7 @@ void RGBController_NZXTHue2::SetupZones()
new_zone->type = ZONE_TYPE_LINEAR;
new_zone->leds_min = 0;
new_zone->leds_max = 40;
new_zone->leds_count = hue2->channel_leds[zone_idx];
new_zone->leds_count = controller->channel_leds[zone_idx];
new_zone->matrix_map = NULL;
zones.push_back(*new_zone);
@ -247,20 +247,20 @@ void RGBController_NZXTHue2::DeviceUpdateLEDs()
{
for(std::size_t zone_idx = 0; zone_idx < zones.size(); zone_idx++)
{
hue2->SetChannelLEDs(zone_idx, zones[zone_idx].colors, zones[zone_idx].leds_count);
controller->SetChannelLEDs(zone_idx, zones[zone_idx].colors, zones[zone_idx].leds_count);
}
}
void RGBController_NZXTHue2::UpdateZoneLEDs(int zone)
{
hue2->SetChannelLEDs(zone, zones[zone].colors, zones[zone].leds_count);
controller->SetChannelLEDs(zone, zones[zone].colors, zones[zone].leds_count);
}
void RGBController_NZXTHue2::UpdateSingleLED(int led)
{
unsigned int zone_idx = leds[led].value;
hue2->SetChannelLEDs(zone_idx, zones[zone_idx].colors, zones[zone_idx].leds_count);
controller->SetChannelLEDs(zone_idx, zones[zone_idx].colors, zones[zone_idx].leds_count);
}
void RGBController_NZXTHue2::SetCustomMode()
@ -291,7 +291,7 @@ void RGBController_NZXTHue2::DeviceUpdateMode()
colors = &modes[active_mode].colors[0];
}
hue2->SetChannelEffect
controller->SetChannelEffect
(
zone_idx,
modes[active_mode].value,

4
Controllers/NZXTHue2Controller/RGBController_NZXTHue2.h
View file

@ -13,7 +13,7 @@
class RGBController_NZXTHue2 : public RGBController
{
public:
RGBController_NZXTHue2(NZXTHue2Controller* hue2_ptr);
RGBController_NZXTHue2(NZXTHue2Controller* controller_ptr);
~RGBController_NZXTHue2();
void SetupZones();
@ -28,7 +28,7 @@ public:
void DeviceUpdateMode();
private:
NZXTHue2Controller* hue2;
NZXTHue2Controller* controller;
std::vector<unsigned int> leds_channel;
std::vector<unsigned int> zones_channel;
};

16
Controllers/NZXTHuePlusController/NZXTHuePlusControllerDetect.cpp
View file

@ -18,21 +18,17 @@
void DetectNZXTHuePlusControllers(std::vector<RGBController*> &rgb_controllers)
{
size_t i;
HuePlusController* new_hueplus;
RGBController_HuePlus* new_controller;
std::vector<std::string *> ports = find_usb_serial_port(NZXT_HUE_PLUS_VID, NZXT_HUE_PLUS_PID);
for (i = 0; i < ports.size(); i++)
for(unsigned int i = 0; i < ports.size(); i++)
{
if( *ports[i] != "" )
if(*ports[i] != "")
{
new_hueplus = new HuePlusController();
new_hueplus->Initialize((char *)ports[i]->c_str());
HuePlusController* controller = new HuePlusController();
controller->Initialize((char *)ports[i]->c_str());
RGBController_HuePlus* rgb_controller = new RGBController_HuePlus(controller);
new_controller = new RGBController_HuePlus(new_hueplus);
rgb_controllers.push_back(new_controller);
ResourceManager::get()->RegisterRGBController(rgb_controller);
}
}
} /* DetectHuePlusControllers() */

16
Controllers/NZXTHuePlusController/RGBController_NZXTHuePlus.cpp
View file

@ -9,15 +9,15 @@
#include "RGBController_NZXTHuePlus.h"
RGBController_HuePlus::RGBController_HuePlus(HuePlusController* hueplus_ptr)
RGBController_HuePlus::RGBController_HuePlus(HuePlusController* controller_ptr)
{
hueplus = hueplus_ptr;
controller = controller_ptr;
name = "NZXT Hue+";
vendor = "NZXT";
type = DEVICE_TYPE_LEDSTRIP;
description = "NZXT Hue+ Device";
location = hueplus->GetLocation();
location = controller->GetLocation();
mode Direct;
Direct.name = "Direct";
@ -163,7 +163,7 @@ RGBController_HuePlus::RGBController_HuePlus(HuePlusController* hueplus_ptr)
RGBController_HuePlus::~RGBController_HuePlus()
{
delete hueplus;
delete controller;
}
void RGBController_HuePlus::SetupZones()
@ -243,20 +243,20 @@ void RGBController_HuePlus::DeviceUpdateLEDs()
{
for(std::size_t zone_idx = 0; zone_idx < zones.size(); zone_idx++)
{
hueplus->SetChannelLEDs(zone_idx, zones[zone_idx].colors, zones[zone_idx].leds_count);
controller->SetChannelLEDs(zone_idx, zones[zone_idx].colors, zones[zone_idx].leds_count);
}
}
void RGBController_HuePlus::UpdateZoneLEDs(int zone)
{
hueplus->SetChannelLEDs(zone, zones[zone].colors, zones[zone].leds_count);
controller->SetChannelLEDs(zone, zones[zone].colors, zones[zone].leds_count);
}
void RGBController_HuePlus::UpdateSingleLED(int led)
{
unsigned int zone_idx = leds[led].value;
hueplus->SetChannelLEDs(zone_idx, zones[zone_idx].colors, zones[zone_idx].leds_count);
controller->SetChannelLEDs(zone_idx, zones[zone_idx].colors, zones[zone_idx].leds_count);
}
void RGBController_HuePlus::SetCustomMode()
@ -287,7 +287,7 @@ void RGBController_HuePlus::DeviceUpdateMode()
colors = &modes[active_mode].colors[0];
}
hueplus->SetChannelEffect
controller->SetChannelEffect
(
zone_idx,
modes[active_mode].value,

4
Controllers/NZXTHuePlusController/RGBController_NZXTHuePlus.h
View file

@ -14,7 +14,7 @@
class RGBController_HuePlus : public RGBController
{
public:
RGBController_HuePlus(HuePlusController* hueplus_ptr);
RGBController_HuePlus(HuePlusController* controller_ptr);
~RGBController_HuePlus();
void SetupZones();
@ -29,7 +29,7 @@ public:
void DeviceUpdateMode();
private:
HuePlusController* hueplus;
HuePlusController* controller;
std::vector<unsigned int> leds_channel;
std::vector<unsigned int> zones_channel;
};

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;
};