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

28
Controllers/TecknetController/RGBController_Tecknet.cpp
View file

@ -20,17 +20,16 @@
@comment
\*-------------------------------------------------------------------*/
RGBController_Tecknet::RGBController_Tecknet(TecknetController *_dev)
RGBController_Tecknet::RGBController_Tecknet(TecknetController* controller_ptr)
{
Tecknet_dev = _dev;
controller = controller_ptr;
name = Tecknet_dev->GetDeviceName();
name = controller->GetDeviceName();
vendor = "Tecknet";
type = DEVICE_TYPE_MOUSE;
description = Tecknet_dev->GetDeviceName();
version = "1.0";
serial = Tecknet_dev->GetSerial();
location = Tecknet_dev->GetLocation();
description = controller->GetDeviceName();
serial = controller->GetSerial();
location = controller->GetLocation();
mode Direct;
Direct.name = "Direct";
@ -66,7 +65,7 @@ RGBController_Tecknet::RGBController_Tecknet(TecknetController *_dev)
RGBController_Tecknet::~RGBController_Tecknet()
{
delete Tecknet_dev;
delete controller;
}
void RGBController_Tecknet::SetupZones()
@ -90,7 +89,7 @@ void RGBController_Tecknet::SetupZones()
void RGBController_Tecknet::ResizeZone(int /*zone*/, int /*new_size*/)
{
/*---------------------------------------------------------*\
| Not implemented for thiis device |
| Not implemented for this device |
\*---------------------------------------------------------*/
}
@ -99,7 +98,7 @@ void RGBController_Tecknet::DeviceUpdateLEDs()
unsigned char red = RGBGetRValue(colors[0]);
unsigned char grn = RGBGetGValue(colors[0]);
unsigned char blu = RGBGetBValue(colors[0]);
Tecknet_dev->SetColor(red, grn, blu);
controller->SetColor(red, grn, blu);
}
void RGBController_Tecknet::UpdateZoneLEDs(int zone)
@ -108,7 +107,7 @@ void RGBController_Tecknet::UpdateZoneLEDs(int zone)
unsigned char red = RGBGetRValue(color);
unsigned char grn = RGBGetGValue(color);
unsigned char blu = RGBGetBValue(color);
Tecknet_dev->SetColor(red, grn, blu);
controller->SetColor(red, grn, blu);
}
void RGBController_Tecknet::UpdateSingleLED(int led)
@ -116,15 +115,10 @@ void RGBController_Tecknet::UpdateSingleLED(int led)
UpdateZoneLEDs(led);
}
void RGBController_Tecknet::SetCustomMode()
{
active_mode = 0;
}
void RGBController_Tecknet::DeviceUpdateMode()
{
//If active_mode is "Off" then set brightness to off otherwise high
unsigned char brightness = (active_mode == TECKNET_MODE_OFF) ? TECKNET_BRIGHTNESS_OFF : TECKNET_BRIGHTNESS_HIGH;
Tecknet_dev->SetMode(modes[active_mode].value, modes[active_mode].speed, brightness);
controller->SetMode(modes[active_mode].value, modes[active_mode].speed, brightness);
}

6
Controllers/TecknetController/RGBController_Tecknet.h
View file

@ -16,7 +16,7 @@
class RGBController_Tecknet : public RGBController
{
public:
RGBController_Tecknet(TecknetController *_dev);
RGBController_Tecknet(TecknetController* controller_ptr);
~RGBController_Tecknet();
void SetupZones();
@ -26,10 +26,10 @@ public:
void UpdateZoneLEDs(int zone);
void UpdateSingleLED(int led);
void SetCustomMode();
void DeviceUpdateMode();
private:
TecknetController* Tecknet_dev;
TecknetController* controller;
};
#endif // RGBCONTROLLER_TECKNET_H

21
Controllers/ThermaltakePoseidonZRGBController/RGBController_ThermaltakePoseidonZRGB.cpp
View file

@ -155,16 +155,16 @@ static const char* led_names[] =
@comment
\*-------------------------------------------------------------------*/
RGBController_PoseidonZRGB::RGBController_PoseidonZRGB(PoseidonZRGBController* poseidon_ptr)
RGBController_PoseidonZRGB::RGBController_PoseidonZRGB(PoseidonZRGBController* controller_ptr)
{
poseidon = poseidon_ptr;
controller = controller_ptr;
name = "Thermaltake Poseidon Z RGB";
vendor = "Thermaltake";
type = DEVICE_TYPE_KEYBOARD;
description = "Thermaltake Poseidon Z RGB Device";
location = poseidon->GetDeviceLocation();
serial = poseidon->GetSerialString();
location = controller->GetDeviceLocation();
serial = controller->GetSerialString();
mode Direct;
Direct.name = "Direct";
@ -221,7 +221,7 @@ RGBController_PoseidonZRGB::~RGBController_PoseidonZRGB()
}
}
delete poseidon;
delete controller;
}
void RGBController_PoseidonZRGB::SetupZones()
@ -268,11 +268,11 @@ void RGBController_PoseidonZRGB::DeviceUpdateLEDs()
{
if(active_mode == 0)
{
poseidon->SetLEDsDirect(colors);
controller->SetLEDsDirect(colors);
}
else
{
poseidon->SetLEDs(colors);
controller->SetLEDs(colors);
}
}
@ -286,12 +286,7 @@ void RGBController_PoseidonZRGB::UpdateSingleLED(int /*led*/)
DeviceUpdateLEDs();
}
void RGBController_PoseidonZRGB::SetCustomMode()
{
active_mode = 0;
}
void RGBController_PoseidonZRGB::DeviceUpdateMode()
{
poseidon->SetMode(modes[active_mode].value, modes[active_mode].direction, modes[active_mode].speed);
controller->SetMode(modes[active_mode].value, modes[active_mode].direction, modes[active_mode].speed);
}

6
Controllers/ThermaltakePoseidonZRGBController/RGBController_ThermaltakePoseidonZRGB.h
View file

@ -14,20 +14,18 @@
class RGBController_PoseidonZRGB : public RGBController
{
public:
RGBController_PoseidonZRGB(PoseidonZRGBController* poseidon_ptr);
RGBController_PoseidonZRGB(PoseidonZRGBController* controller_ptr);
~RGBController_PoseidonZRGB();
void SetupZones();
void ResizeZone(int zone, int new_size);
void DeviceUpdateLEDs();
void UpdateZoneLEDs(int zone);
void UpdateSingleLED(int led);
void SetCustomMode();
void DeviceUpdateMode();
private:
PoseidonZRGBController* poseidon;
PoseidonZRGBController* controller;
};

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

20
Controllers/ThingMController/RGBController_BlinkController.cpp
View file

@ -19,17 +19,16 @@
@comment
\*-------------------------------------------------------------------*/
RGBController_BlinkController::RGBController_BlinkController(BlinkController* blink_ptr)
RGBController_BlinkController::RGBController_BlinkController(BlinkController* controller_ptr)
{
Blink = blink_ptr;
controller = controller_ptr;
name = "Blink";
vendor = "ThingM";
type = DEVICE_TYPE_LEDSTRIP;
description = Blink->GetDeviceName();
version = "1.0";
serial = Blink->GetSerial();
location = Blink->GetLocation();
description = controller->GetDeviceName();
serial = controller->GetSerial();
location = controller->GetLocation();
mode Off;
Off.name = "Off";
@ -67,7 +66,7 @@ RGBController_BlinkController::RGBController_BlinkController(BlinkController* bl
RGBController_BlinkController::~RGBController_BlinkController()
{
delete Blink;
delete controller;
}
void RGBController_BlinkController::SetupZones()
@ -120,12 +119,7 @@ void RGBController_BlinkController::UpdateSingleLED(int led)
unsigned char grn = RGBGetGValue(colors[led]);
unsigned char blu = RGBGetBValue(colors[led]);
Blink->SendUpdate(leds[led].value, red, grn, blu, modes[active_mode].speed);
}
void RGBController_BlinkController::SetCustomMode()
{
active_mode = 1;
controller->SendUpdate(leds[led].value, red, grn, blu, modes[active_mode].speed);
}
void RGBController_BlinkController::DeviceUpdateMode()

8
Controllers/ThingMController/RGBController_BlinkController.h
View file

@ -13,7 +13,7 @@
class RGBController_BlinkController : public RGBController
{
public:
RGBController_BlinkController(BlinkController* blink_ptr);
RGBController_BlinkController(BlinkController* controller_ptr);
~RGBController_BlinkController();
void SetupZones();
@ -23,10 +23,8 @@ public:
void UpdateZoneLEDs(int zone);
void UpdateSingleLED(int led);
void SetCustomMode();
void DeviceUpdateMode();
private:
BlinkController* Blink;
int GetDeviceMode();
private:
BlinkController* controller;
};

5
Controllers/TrustController/RGBController_TrustGXT114.cpp
View file

@ -126,11 +126,6 @@ void RGBController_TrustGXT114::UpdateSingleLED(int /*led*/)
DeviceUpdateMode();
}
void RGBController_TrustGXT114::SetCustomMode()
{
active_mode = 0;
}
void RGBController_TrustGXT114::DeviceUpdateMode()
{
controller->SetMode(modes[active_mode].colors[0], modes[active_mode].brightness, modes[active_mode].speed, modes[active_mode].value);

3
Controllers/TrustController/RGBController_TrustGXT114.h
View file

@ -20,11 +20,12 @@ public:
void SetupZones();
void ResizeZone(int zone, int new_size);
void DeviceUpdateLEDs();
void UpdateZoneLEDs(int zone);
void UpdateSingleLED(int led);
void DeviceUpdateMode();
void SetCustomMode();
private:
TrustGXT114Controller* controller;

5
Controllers/TrustController/RGBController_TrustGXT180.cpp
View file

@ -130,11 +130,6 @@ void RGBController_TrustGXT180::UpdateSingleLED(int /*led*/)
DeviceUpdateMode();
}
void RGBController_TrustGXT180::SetCustomMode()
{
active_mode = 0;
}
void RGBController_TrustGXT180::DeviceUpdateMode()
{
controller->SetMode(colors[0], modes[active_mode].brightness, modes[active_mode].speed, modes[active_mode].value);

3
Controllers/TrustController/RGBController_TrustGXT180.h
View file

@ -20,11 +20,12 @@ public:
void SetupZones();
void ResizeZone(int zone, int new_size);
void DeviceUpdateLEDs();
void UpdateZoneLEDs(int zone);
void UpdateSingleLED(int led);
void DeviceUpdateMode();
void SetCustomMode();
private:
TrustGXT180Controller* controller;