Skip to content

Commit 9d7fef5

Browse files
CalcProgrammer1CalcProgrammer1
committed
Remove SetCustomMode from all controllers beginning with the letter T
1 parent 126e5f4 commit 9d7fef5

14 files changed

+63
-105
lines changed

‎Controllers/TecknetController/RGBController_Tecknet.cpp

Lines changed: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,16 @@
2020
@comment
2121
\*-------------------------------------------------------------------*/
2222

23-
RGBController_Tecknet::RGBController_Tecknet(TecknetController *_dev)
23+
RGBController_Tecknet::RGBController_Tecknet(TecknetController* controller_ptr)
2424
{
25-
Tecknet_dev = _dev;
25+
controller = controller_ptr;
2626

27-
name = Tecknet_dev->GetDeviceName();
27+
name = controller->GetDeviceName();
2828
vendor = "Tecknet";
2929
type = DEVICE_TYPE_MOUSE;
30-
description = Tecknet_dev->GetDeviceName();
31-
version = "1.0";
32-
serial = Tecknet_dev->GetSerial();
33-
location = Tecknet_dev->GetLocation();
30+
description = controller->GetDeviceName();
31+
serial = controller->GetSerial();
32+
location = controller->GetLocation();
3433

3534
mode Direct;
3635
Direct.name = "Direct";
@@ -66,7 +65,7 @@ RGBController_Tecknet::RGBController_Tecknet(TecknetController *_dev)
6665

6766
RGBController_Tecknet::~RGBController_Tecknet()
6867
{
69-
delete Tecknet_dev;
68+
delete controller;
7069
}
7170

7271
void RGBController_Tecknet::SetupZones()
@@ -90,7 +89,7 @@ void RGBController_Tecknet::SetupZones()
9089
void RGBController_Tecknet::ResizeZone(int /*zone*/, int /*new_size*/)
9190
{
9291
/*---------------------------------------------------------*\
93-
| Not implemented for thiis device |
92+
| Not implemented for this device |
9493
\*---------------------------------------------------------*/
9594
}
9695

@@ -99,7 +98,7 @@ void RGBController_Tecknet::DeviceUpdateLEDs()
9998
unsigned char red = RGBGetRValue(colors[0]);
10099
unsigned char grn = RGBGetGValue(colors[0]);
101100
unsigned char blu = RGBGetBValue(colors[0]);
102-
Tecknet_dev->SetColor(red, grn, blu);
101+
controller->SetColor(red, grn, blu);
103102
}
104103

105104
void RGBController_Tecknet::UpdateZoneLEDs(int zone)
@@ -108,23 +107,18 @@ void RGBController_Tecknet::UpdateZoneLEDs(int zone)
108107
unsigned char red = RGBGetRValue(color);
109108
unsigned char grn = RGBGetGValue(color);
110109
unsigned char blu = RGBGetBValue(color);
111-
Tecknet_dev->SetColor(red, grn, blu);
110+
controller->SetColor(red, grn, blu);
112111
}
113112

114113
void RGBController_Tecknet::UpdateSingleLED(int led)
115114
{
116115
UpdateZoneLEDs(led);
117116
}
118117

119-
void RGBController_Tecknet::SetCustomMode()
120-
{
121-
active_mode = 0;
122-
}
123-
124118
void RGBController_Tecknet::DeviceUpdateMode()
125119
{
126120
//If active_mode is "Off" then set brightness to off otherwise high
127121
unsigned char brightness = (active_mode == TECKNET_MODE_OFF) ? TECKNET_BRIGHTNESS_OFF : TECKNET_BRIGHTNESS_HIGH;
128122

129-
Tecknet_dev->SetMode(modes[active_mode].value, modes[active_mode].speed, brightness);
123+
controller->SetMode(modes[active_mode].value, modes[active_mode].speed, brightness);
130124
}

‎Controllers/TecknetController/RGBController_Tecknet.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
class RGBController_Tecknet : public RGBController
1717
{
1818
public:
19-
RGBController_Tecknet(TecknetController *_dev);
19+
RGBController_Tecknet(TecknetController* controller_ptr);
2020
~RGBController_Tecknet();
2121

2222
void SetupZones();
@@ -26,10 +26,10 @@ class RGBController_Tecknet : public RGBController
2626
void UpdateZoneLEDs(int zone);
2727
void UpdateSingleLED(int led);
2828

29-
void SetCustomMode();
3029
void DeviceUpdateMode();
30+
3131
private:
32-
TecknetController* Tecknet_dev;
32+
TecknetController* controller;
3333
};
3434

3535
#endif // RGBCONTROLLER_TECKNET_H

‎Controllers/ThermaltakePoseidonZRGBController/RGBController_ThermaltakePoseidonZRGB.cpp

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -155,16 +155,16 @@ static const char* led_names[] =
155155
@comment
156156
\*-------------------------------------------------------------------*/
157157

158-
RGBController_PoseidonZRGB::RGBController_PoseidonZRGB(PoseidonZRGBController* poseidon_ptr)
158+
RGBController_PoseidonZRGB::RGBController_PoseidonZRGB(PoseidonZRGBController* controller_ptr)
159159
{
160-
poseidon = poseidon_ptr;
160+
controller = controller_ptr;
161161

162162
name = "Thermaltake Poseidon Z RGB";
163163
vendor = "Thermaltake";
164164
type = DEVICE_TYPE_KEYBOARD;
165165
description = "Thermaltake Poseidon Z RGB Device";
166-
location = poseidon->GetDeviceLocation();
167-
serial = poseidon->GetSerialString();
166+
location = controller->GetDeviceLocation();
167+
serial = controller->GetSerialString();
168168

169169
mode Direct;
170170
Direct.name = "Direct";
@@ -221,7 +221,7 @@ RGBController_PoseidonZRGB::~RGBController_PoseidonZRGB()
221221
}
222222
}
223223

224-
delete poseidon;
224+
delete controller;
225225
}
226226

227227
void RGBController_PoseidonZRGB::SetupZones()
@@ -268,11 +268,11 @@ void RGBController_PoseidonZRGB::DeviceUpdateLEDs()
268268
{
269269
if(active_mode == 0)
270270
{
271-
poseidon->SetLEDsDirect(colors);
271+
controller->SetLEDsDirect(colors);
272272
}
273273
else
274274
{
275-
poseidon->SetLEDs(colors);
275+
controller->SetLEDs(colors);
276276
}
277277
}
278278

@@ -286,12 +286,7 @@ void RGBController_PoseidonZRGB::UpdateSingleLED(int /*led*/)
286286
DeviceUpdateLEDs();
287287
}
288288

289-
void RGBController_PoseidonZRGB::SetCustomMode()
290-
{
291-
active_mode = 0;
292-
}
293-
294289
void RGBController_PoseidonZRGB::DeviceUpdateMode()
295290
{
296-
poseidon->SetMode(modes[active_mode].value, modes[active_mode].direction, modes[active_mode].speed);
291+
controller->SetMode(modes[active_mode].value, modes[active_mode].direction, modes[active_mode].speed);
297292
}

‎Controllers/ThermaltakePoseidonZRGBController/RGBController_ThermaltakePoseidonZRGB.h

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,20 +14,18 @@
1414
class RGBController_PoseidonZRGB : public RGBController
1515
{
1616
public:
17-
RGBController_PoseidonZRGB(PoseidonZRGBController* poseidon_ptr);
17+
RGBController_PoseidonZRGB(PoseidonZRGBController* controller_ptr);
1818
~RGBController_PoseidonZRGB();
1919

2020
void SetupZones();
21-
2221
void ResizeZone(int zone, int new_size);
2322

2423
void DeviceUpdateLEDs();
2524
void UpdateZoneLEDs(int zone);
2625
void UpdateSingleLED(int led);
2726

28-
void SetCustomMode();
2927
void DeviceUpdateMode();
3028

3129
private:
32-
PoseidonZRGBController* poseidon;
30+
PoseidonZRGBController* controller;
3331
};

‎Controllers/ThermaltakeRiingController/RGBController_ThermaltakeRiing.cpp

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,16 @@
2020
@comment
2121
\*-------------------------------------------------------------------*/
2222

23-
RGBController_ThermaltakeRiing::RGBController_ThermaltakeRiing(ThermaltakeRiingController* riing_ptr)
23+
RGBController_ThermaltakeRiing::RGBController_ThermaltakeRiing(ThermaltakeRiingController* controller_ptr)
2424
{
25-
riing = riing_ptr;
25+
controller = controller_ptr;
2626

2727
name = "Thermaltake Riing";
2828
vendor = "Thermaltake";
2929
type = DEVICE_TYPE_COOLER;
3030
description = "Thermaltake Riing Device";
31-
location = riing->GetDeviceLocation();
32-
serial = riing->GetSerialString();
31+
location = controller->GetDeviceLocation();
32+
serial = controller->GetSerialString();
3333

3434
mode Direct;
3535
Direct.name = "Direct";
@@ -119,7 +119,7 @@ RGBController_ThermaltakeRiing::RGBController_ThermaltakeRiing(ThermaltakeRiingC
119119

120120
RGBController_ThermaltakeRiing::~RGBController_ThermaltakeRiing()
121121
{
122-
delete riing;
122+
delete controller;
123123
}
124124

125125
void RGBController_ThermaltakeRiing::SetupZones()
@@ -205,32 +205,27 @@ void RGBController_ThermaltakeRiing::DeviceUpdateLEDs()
205205
{
206206
for(std::size_t zone_idx = 0; zone_idx < zones.size(); zone_idx++)
207207
{
208-
riing->SetChannelLEDs(zone_idx, zones[zone_idx].colors, zones[zone_idx].leds_count);
208+
controller->SetChannelLEDs(zone_idx, zones[zone_idx].colors, zones[zone_idx].leds_count);
209209
}
210210
}
211211

212212
void RGBController_ThermaltakeRiing::UpdateZoneLEDs(int zone)
213213
{
214-
riing->SetChannelLEDs(zone, zones[zone].colors, zones[zone].leds_count);
214+
controller->SetChannelLEDs(zone, zones[zone].colors, zones[zone].leds_count);
215215
}
216216

217217
void RGBController_ThermaltakeRiing::UpdateSingleLED(int led)
218218
{
219219
unsigned int channel = leds_channel[led];
220220

221-
riing->SetChannelLEDs(channel, zones[channel].colors, zones[channel].leds_count);
222-
}
223-
224-
void RGBController_ThermaltakeRiing::SetCustomMode()
225-
{
226-
active_mode = 0;
221+
controller->SetChannelLEDs(channel, zones[channel].colors, zones[channel].leds_count);
227222
}
228223

229224
void RGBController_ThermaltakeRiing::DeviceUpdateMode()
230225
{
231226
for(std::size_t zone_idx = 0; zone_idx < zones.size(); zone_idx++)
232227
{
233-
riing->SetMode(modes[active_mode].value, modes[active_mode].speed);
234-
riing->SetChannelLEDs(zone_idx, zones[zone_idx].colors, zones[zone_idx].leds_count);
228+
controller->SetMode(modes[active_mode].value, modes[active_mode].speed);
229+
controller->SetChannelLEDs(zone_idx, zones[zone_idx].colors, zones[zone_idx].leds_count);
235230
}
236231
}

‎Controllers/ThermaltakeRiingController/RGBController_ThermaltakeRiing.h

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,22 +14,20 @@
1414
class RGBController_ThermaltakeRiing : public RGBController
1515
{
1616
public:
17-
RGBController_ThermaltakeRiing(ThermaltakeRiingController* riing_ptr);
17+
RGBController_ThermaltakeRiing(ThermaltakeRiingController* controller_ptr);
1818
~RGBController_ThermaltakeRiing();
1919

2020
void SetupZones();
21-
2221
void ResizeZone(int zone, int new_size);
2322

2423
void DeviceUpdateLEDs();
2524
void UpdateZoneLEDs(int zone);
2625
void UpdateSingleLED(int led);
2726

28-
void SetCustomMode();
2927
void DeviceUpdateMode();
3028

3129
private:
32-
ThermaltakeRiingController* riing;
30+
ThermaltakeRiingController* controller;
3331
std::vector<unsigned int> leds_channel;
3432
std::vector<unsigned int> zones_channel;
3533
};

‎Controllers/ThermaltakeRiingController/RGBController_ThermaltakeRiingQuad.cpp

Lines changed: 11 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,16 @@
2020
@comment
2121
\*-------------------------------------------------------------------*/
2222

23-
RGBController_ThermaltakeRiingQuad::RGBController_ThermaltakeRiingQuad(ThermaltakeRiingQuadController* quad_ptr)
23+
RGBController_ThermaltakeRiingQuad::RGBController_ThermaltakeRiingQuad(ThermaltakeRiingQuadController* controller_ptr)
2424
{
25-
quad = quad_ptr;
25+
controller = controller_ptr;
2626

27-
name = quad->GetDeviceName();
27+
name = controller->GetDeviceName();
2828
vendor = "Thermaltake";
2929
type = DEVICE_TYPE_COOLER;
3030
description = "Thermaltake Riing Quad Device";
31-
location = quad->GetDeviceLocation();
32-
serial = quad->GetSerial();
31+
location = controller->GetDeviceLocation();
32+
serial = controller->GetSerial();
3333

3434
mode Direct;
3535
Direct.name = "Direct";
@@ -46,7 +46,7 @@ RGBController_ThermaltakeRiingQuad::RGBController_ThermaltakeRiingQuad(Thermalta
4646

4747
RGBController_ThermaltakeRiingQuad::~RGBController_ThermaltakeRiingQuad()
4848
{
49-
delete quad;
49+
delete controller;
5050
}
5151

5252
void RGBController_ThermaltakeRiingQuad::SetupZones()
@@ -132,32 +132,27 @@ void RGBController_ThermaltakeRiingQuad::DeviceUpdateLEDs()
132132
{
133133
for(std::size_t zone_idx = 0; zone_idx < zones.size(); zone_idx++)
134134
{
135-
quad->SetChannelLEDs(zone_idx, zones[zone_idx].colors, zones[zone_idx].leds_count);
135+
controller->SetChannelLEDs(zone_idx, zones[zone_idx].colors, zones[zone_idx].leds_count);
136136
}
137137
}
138138

139139
void RGBController_ThermaltakeRiingQuad::UpdateZoneLEDs(int zone)
140140
{
141-
quad->SetChannelLEDs(zone, zones[zone].colors, zones[zone].leds_count);
141+
controller->SetChannelLEDs(zone, zones[zone].colors, zones[zone].leds_count);
142142
}
143143

144144
void RGBController_ThermaltakeRiingQuad::UpdateSingleLED(int led)
145145
{
146146
unsigned int channel = leds_channel[led];
147147

148-
quad->SetChannelLEDs(channel, zones[channel].colors, zones[channel].leds_count);
149-
}
150-
151-
void RGBController_ThermaltakeRiingQuad::SetCustomMode()
152-
{
153-
active_mode = 0;
148+
controller->SetChannelLEDs(channel, zones[channel].colors, zones[channel].leds_count);
154149
}
155150

156151
void RGBController_ThermaltakeRiingQuad::DeviceUpdateMode()
157152
{
158153
for(std::size_t zone_idx = 0; zone_idx < zones.size(); zone_idx++)
159154
{
160-
quad->SetMode(modes[active_mode].value, modes[active_mode].speed);
161-
quad->SetChannelLEDs(zone_idx, zones[zone_idx].colors, zones[zone_idx].leds_count);
155+
controller->SetMode(modes[active_mode].value, modes[active_mode].speed);
156+
controller->SetChannelLEDs(zone_idx, zones[zone_idx].colors, zones[zone_idx].leds_count);
162157
}
163158
}

‎Controllers/ThermaltakeRiingController/RGBController_ThermaltakeRiingQuad.h

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
class RGBController_ThermaltakeRiingQuad : public RGBController
1515
{
1616
public:
17-
RGBController_ThermaltakeRiingQuad(ThermaltakeRiingQuadController* quad_ptr);
17+
RGBController_ThermaltakeRiingQuad(ThermaltakeRiingQuadController* controller_ptr);
1818
~RGBController_ThermaltakeRiingQuad();
1919

2020
void SetupZones();
@@ -24,11 +24,10 @@ class RGBController_ThermaltakeRiingQuad : public RGBController
2424
void UpdateZoneLEDs(int zone);
2525
void UpdateSingleLED(int led);
2626

27-
void SetCustomMode();
2827
void DeviceUpdateMode();
2928

3029
private:
31-
ThermaltakeRiingQuadController* quad;
30+
ThermaltakeRiingQuadController* controller;
3231
std::vector<unsigned int> leds_channel;
3332
std::vector<unsigned int> zones_channel;
3433
};

0 commit comments

Comments
 (0)