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

Remove SetCustomMode from all controllers beginning with the letter T

Browse source
This commit is contained in:
Adam Honse 2022-08-21 21:26:41 -05:00
parent 126e5f4341
commit 9d7fef5bbc
14 changed files with 63 additions and 105 deletions
Download patch file Download diff file Expand all files Collapse all files

25
Controllers/ThermaltakeRiingController/RGBController_ThermaltakeRiing.cpp
View file

@ -20,16 +20,16 @@
@comment
\*-------------------------------------------------------------------*/
RGBController_ThermaltakeRiing::RGBController_ThermaltakeRiing(ThermaltakeRiingController* riing_ptr)
RGBController_ThermaltakeRiing::RGBController_ThermaltakeRiing(ThermaltakeRiingController* controller_ptr)
{
riing = riing_ptr;
controller = controller_ptr;
name = "Thermaltake Riing";
vendor = "Thermaltake";
type = DEVICE_TYPE_COOLER;
description = "Thermaltake Riing Device";
location = riing->GetDeviceLocation();
serial = riing->GetSerialString();
location = controller->GetDeviceLocation();
serial = controller->GetSerialString();
mode Direct;
Direct.name = "Direct";
@ -119,7 +119,7 @@ RGBController_ThermaltakeRiing::RGBController_ThermaltakeRiing(ThermaltakeRiingC
RGBController_ThermaltakeRiing::~RGBController_ThermaltakeRiing()
{
delete riing;
delete controller;
}
void RGBController_ThermaltakeRiing::SetupZones()
@ -205,32 +205,27 @@ void RGBController_ThermaltakeRiing::DeviceUpdateLEDs()
{
for(std::size_t zone_idx = 0; zone_idx < zones.size(); zone_idx++)
{
riing->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_ThermaltakeRiing::UpdateZoneLEDs(int zone)
{
riing->SetChannelLEDs(zone, zones[zone].colors, zones[zone].leds_count);
controller->SetChannelLEDs(zone, zones[zone].colors, zones[zone].leds_count);
}
void RGBController_ThermaltakeRiing::UpdateSingleLED(int led)
{
unsigned int channel = leds_channel[led];
riing->SetChannelLEDs(channel, zones[channel].colors, zones[channel].leds_count);
}
void RGBController_ThermaltakeRiing::SetCustomMode()
{
active_mode = 0;
controller->SetChannelLEDs(channel, zones[channel].colors, zones[channel].leds_count);
}
void RGBController_ThermaltakeRiing::DeviceUpdateMode()
{
for(std::size_t zone_idx = 0; zone_idx < zones.size(); zone_idx++)
{
riing->SetMode(modes[active_mode].value, modes[active_mode].speed);
riing->SetChannelLEDs(zone_idx, zones[zone_idx].colors, zones[zone_idx].leds_count);
controller->SetMode(modes[active_mode].value, modes[active_mode].speed);
controller->SetChannelLEDs(zone_idx, zones[zone_idx].colors, zones[zone_idx].leds_count);
}
}

6
Controllers/ThermaltakeRiingController/RGBController_ThermaltakeRiing.h
View file

@ -14,22 +14,20 @@
class RGBController_ThermaltakeRiing : public RGBController
{
public:
RGBController_ThermaltakeRiing(ThermaltakeRiingController* riing_ptr);
RGBController_ThermaltakeRiing(ThermaltakeRiingController* controller_ptr);
~RGBController_ThermaltakeRiing();
void SetupZones();
void ResizeZone(int zone, int new_size);
void DeviceUpdateLEDs();
void UpdateZoneLEDs(int zone);
void UpdateSingleLED(int led);
void SetCustomMode();
void DeviceUpdateMode();
private:
ThermaltakeRiingController* riing;
ThermaltakeRiingController* controller;
std::vector<unsigned int> leds_channel;
std::vector<unsigned int> zones_channel;
};

27
Controllers/ThermaltakeRiingController/RGBController_ThermaltakeRiingQuad.cpp
View file

@ -20,16 +20,16 @@
@comment
\*-------------------------------------------------------------------*/
RGBController_ThermaltakeRiingQuad::RGBController_ThermaltakeRiingQuad(ThermaltakeRiingQuadController* quad_ptr)
RGBController_ThermaltakeRiingQuad::RGBController_ThermaltakeRiingQuad(ThermaltakeRiingQuadController* controller_ptr)
{
quad = quad_ptr;
controller = controller_ptr;
name = quad->GetDeviceName();
name = controller->GetDeviceName();
vendor = "Thermaltake";
type = DEVICE_TYPE_COOLER;
description = "Thermaltake Riing Quad Device";
location = quad->GetDeviceLocation();
serial = quad->GetSerial();
location = controller->GetDeviceLocation();
serial = controller->GetSerial();
mode Direct;
Direct.name = "Direct";
@ -46,7 +46,7 @@ RGBController_ThermaltakeRiingQuad::RGBController_ThermaltakeRiingQuad(Thermalta
RGBController_ThermaltakeRiingQuad::~RGBController_ThermaltakeRiingQuad()
{
delete quad;
delete controller;
}
void RGBController_ThermaltakeRiingQuad::SetupZones()
@ -132,32 +132,27 @@ void RGBController_ThermaltakeRiingQuad::DeviceUpdateLEDs()
{
for(std::size_t zone_idx = 0; zone_idx < zones.size(); zone_idx++)
{
quad->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_ThermaltakeRiingQuad::UpdateZoneLEDs(int zone)
{
quad->SetChannelLEDs(zone, zones[zone].colors, zones[zone].leds_count);
controller->SetChannelLEDs(zone, zones[zone].colors, zones[zone].leds_count);
}
void RGBController_ThermaltakeRiingQuad::UpdateSingleLED(int led)
{
unsigned int channel = leds_channel[led];
quad->SetChannelLEDs(channel, zones[channel].colors, zones[channel].leds_count);
}
void RGBController_ThermaltakeRiingQuad::SetCustomMode()
{
active_mode = 0;
controller->SetChannelLEDs(channel, zones[channel].colors, zones[channel].leds_count);
}
void RGBController_ThermaltakeRiingQuad::DeviceUpdateMode()
{
for(std::size_t zone_idx = 0; zone_idx < zones.size(); zone_idx++)
{
quad->SetMode(modes[active_mode].value, modes[active_mode].speed);
quad->SetChannelLEDs(zone_idx, zones[zone_idx].colors, zones[zone_idx].leds_count);
controller->SetMode(modes[active_mode].value, modes[active_mode].speed);
controller->SetChannelLEDs(zone_idx, zones[zone_idx].colors, zones[zone_idx].leds_count);
}
}

5
Controllers/ThermaltakeRiingController/RGBController_ThermaltakeRiingQuad.h
View file

@ -14,7 +14,7 @@
class RGBController_ThermaltakeRiingQuad : public RGBController
{
public:
RGBController_ThermaltakeRiingQuad(ThermaltakeRiingQuadController* quad_ptr);
RGBController_ThermaltakeRiingQuad(ThermaltakeRiingQuadController* controller_ptr);
~RGBController_ThermaltakeRiingQuad();
void SetupZones();
@ -24,11 +24,10 @@ public:
void UpdateZoneLEDs(int zone);
void UpdateSingleLED(int led);
void SetCustomMode();
void DeviceUpdateMode();
private:
ThermaltakeRiingQuadController* quad;
ThermaltakeRiingQuadController* controller;
std::vector<unsigned int> leds_channel;
std::vector<unsigned int> zones_channel;
};