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

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