Skip to content

Commit 126e5f4

Browse files
CalcProgrammer1CalcProgrammer1
committed
Remove SetCustomMode from all controllers beginning with the letter S
1 parent 66c856f commit 126e5f4

38 files changed

+129
-283
lines changed

‎Controllers/SRGBmodsController/RGBController_SRGBmodsPico.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -146,11 +146,6 @@ void RGBController_SRGBmodsPico::UpdateSingleLED(int led)
146146
controller->SetChannelLEDs(channel, zones[channel].colors, zones[channel].leds_count);
147147
}
148148

149-
void RGBController_SRGBmodsPico::SetCustomMode()
150-
{
151-
active_mode = 0;
152-
}
153-
154149
void RGBController_SRGBmodsPico::DeviceUpdateMode()
155150
{
156151
DeviceUpdateLEDs();

‎Controllers/SRGBmodsController/RGBController_SRGBmodsPico.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,12 @@ class RGBController_SRGBmodsPico : public RGBController
2121
~RGBController_SRGBmodsPico();
2222

2323
void SetupZones();
24-
2524
void ResizeZone(int zone, int new_size);
2625

2726
void DeviceUpdateLEDs();
2827
void UpdateZoneLEDs(int zone);
2928
void UpdateSingleLED(int led);
3029

31-
void SetCustomMode();
3230
void DeviceUpdateMode();
3331

3432
private:

‎Controllers/SapphireGPUController/RGBController_SapphireNitroGlowV1.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -145,11 +145,6 @@ void RGBController_SapphireNitroGlowV1::UpdateSingleLED(int /*led*/)
145145
DeviceUpdateLEDs();
146146
}
147147

148-
void RGBController_SapphireNitroGlowV1::SetCustomMode()
149-
{
150-
active_mode = 0;
151-
}
152-
153148
void RGBController_SapphireNitroGlowV1::DeviceUpdateMode()
154149
{
155150
controller->SetMode((unsigned char)modes[(unsigned int)active_mode].value);

‎Controllers/SapphireGPUController/RGBController_SapphireNitroGlowV1.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,12 @@ class RGBController_SapphireNitroGlowV1 : public RGBController
1919
~RGBController_SapphireNitroGlowV1();
2020

2121
void SetupZones();
22-
2322
void ResizeZone(int zone, int new_size);
2423

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

29-
void SetCustomMode();
3028
void DeviceUpdateMode();
3129

3230
private:

‎Controllers/SapphireGPUController/RGBController_SapphireNitroGlowV3.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -196,11 +196,6 @@ void RGBController_SapphireNitroGlowV3::UpdateSingleLED(int /*led*/)
196196
DeviceUpdateLEDs();
197197
}
198198

199-
void RGBController_SapphireNitroGlowV3::SetCustomMode()
200-
{
201-
active_mode = 0;
202-
}
203-
204199
void RGBController_SapphireNitroGlowV3::DeviceUpdateMode()
205200
{
206201
auto mode = modes[active_mode];

‎Controllers/SapphireGPUController/RGBController_SapphireNitroGlowV3.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,12 @@ class RGBController_SapphireNitroGlowV3 : public RGBController
1919
~RGBController_SapphireNitroGlowV3();
2020

2121
void SetupZones();
22-
2322
void ResizeZone(int zone, int new_size);
2423

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

29-
void SetCustomMode();
3028
void DeviceUpdateMode();
3129

3230
private:

‎Controllers/SinowealthController/RGBController_Sinowealth.cpp

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

23-
RGBController_Sinowealth::RGBController_Sinowealth(SinowealthController* sinowealth_ptr)
23+
RGBController_Sinowealth::RGBController_Sinowealth(SinowealthController* controller_ptr)
2424
{
25-
sinowealth = sinowealth_ptr;
25+
controller = controller_ptr;
2626

2727
name = "Sinowealth Device";
2828
type = DEVICE_TYPE_MOUSE;
2929
description = "Sinowealth Device";
30-
location = sinowealth->GetLocation();
31-
serial = sinowealth->GetSerialString();
32-
version = sinowealth->GetFirmwareVersion();
30+
location = controller->GetLocation();
31+
serial = controller->GetSerialString();
32+
version = controller->GetFirmwareVersion();
3333

3434
mode Static;
3535
Static.name = "Static";
@@ -137,7 +137,7 @@ RGBController_Sinowealth::RGBController_Sinowealth(SinowealthController* sinowea
137137

138138
RGBController_Sinowealth::~RGBController_Sinowealth()
139139
{
140-
delete sinowealth;
140+
delete controller;
141141
}
142142

143143
void RGBController_Sinowealth::SetupZones()
@@ -148,9 +148,9 @@ void RGBController_Sinowealth::SetupZones()
148148
zone new_zone;
149149
new_zone.name = "Mouse";
150150
new_zone.type = ZONE_TYPE_SINGLE;
151-
new_zone.leds_min = sinowealth->GetLEDCount();
152-
new_zone.leds_max = sinowealth->GetLEDCount();
153-
new_zone.leds_count = sinowealth->GetLEDCount();
151+
new_zone.leds_min = controller->GetLEDCount();
152+
new_zone.leds_max = controller->GetLEDCount();
153+
new_zone.leds_count = controller->GetLEDCount();
154154
new_zone.matrix_map = NULL;
155155
zones.push_back(new_zone);
156156

@@ -176,7 +176,7 @@ void RGBController_Sinowealth::ResizeZone(int /*zone*/, int /*new_size*/)
176176

177177
void RGBController_Sinowealth::DeviceUpdateLEDs()
178178
{
179-
sinowealth->SetLEDColor(&colors[0]);
179+
controller->SetLEDColor(&colors[0]);
180180
}
181181

182182
void RGBController_Sinowealth::UpdateZoneLEDs(int /*zone*/)
@@ -188,14 +188,8 @@ void RGBController_Sinowealth::UpdateSingleLED(int /*led*/)
188188
{
189189
DeviceUpdateLEDs();
190190
}
191-
void RGBController_Sinowealth::SetCustomMode()
192-
{
193-
active_mode = 0;
194-
}
195-
196191

197192
void RGBController_Sinowealth::DeviceUpdateMode()
198-
199193
{
200194
unsigned int direction = 0;
201195
unsigned int speed = GLORIOUS_SPEED_NORMAL;
@@ -237,13 +231,12 @@ void RGBController_Sinowealth::DeviceUpdateMode()
237231

238232
if (modes[active_mode].color_mode == MODE_COLORS_NONE)
239233
{
240-
sinowealth->SetMode(modes[active_mode].value, speed, direction, 0);
234+
controller->SetMode(modes[active_mode].value, speed, direction, 0);
241235
}
242236
else
243237
{
244-
sinowealth->SetMode(modes[active_mode].value, speed, direction, &modes[active_mode].colors[0]);
238+
controller->SetMode(modes[active_mode].value, speed, direction, &modes[active_mode].colors[0]);
245239
}
246240
}
247241
}
248-
//wave, epilepsy, spectrum cycle, tail, glorious mode, off
249242

‎Controllers/SinowealthController/RGBController_Sinowealth.h

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,22 +15,19 @@
1515
class RGBController_Sinowealth : public RGBController
1616
{
1717
public:
18-
RGBController_Sinowealth(SinowealthController* sinowealth_ptr);
18+
RGBController_Sinowealth(SinowealthController* controller_ptr);
1919
~RGBController_Sinowealth();
2020

2121
void SetupZones();
22-
2322
void ResizeZone(int zone, int new_size);
2423

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

29-
void SetCustomMode();
30-
3128
void DeviceUpdateMode();
3229

3330

3431
private:
35-
SinowealthController* sinowealth;
32+
SinowealthController* controller;
3633
};

‎Controllers/SinowealthController/RGBController_Sinowealth1007.cpp

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ static const char *led_names[] =
3333

3434
RGBController_Sinowealth1007::RGBController_Sinowealth1007(SinowealthController1007* controller_ptr)
3535
{
36-
controller = controller_ptr;
36+
controller = controller_ptr;
3737

3838
name = "ZET Fury Pro Mouse Device";
3939
vendor = "ZET";
@@ -227,13 +227,7 @@ void RGBController_Sinowealth1007::UpdateSingleLED(int /*led*/)
227227
DeviceUpdateLEDs();
228228
}
229229

230-
void RGBController_Sinowealth1007::SetCustomMode()
231-
{
232-
active_mode = 0;
233-
}
234-
235230
void RGBController_Sinowealth1007::DeviceUpdateMode()
236-
237231
{
238232
unsigned char random = (modes[active_mode].flags & MODE_FLAG_HAS_RANDOM_COLOR) ? ZET_FURY_PRO_SUBMODE_SET_COLOR : 0x00;
239233
random = (modes[active_mode].color_mode == MODE_COLORS_RANDOM) ? ZET_FURY_PRO_SUBMODE_RANDOM : random;

‎Controllers/SinowealthController/RGBController_Sinowealth1007.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,12 @@ class RGBController_Sinowealth1007 : public RGBController
1919
~RGBController_Sinowealth1007();
2020

2121
void SetupZones();
22-
2322
void ResizeZone(int zone, int new_size);
2423

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

29-
void SetCustomMode();
30-
3128
void DeviceUpdateMode();
3229

3330

0 commit comments

Comments
 (0)