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

Remove unnecessary implementations of SetCustomMode

Browse source
This commit is contained in:
Adam Honse 2025-07-31 17:35:20 -05:00
parent 43b97bca75
commit 6a472437bb
48 changed files with 33 additions and 231 deletions
Download patch file Download diff file Expand all files Collapse all files

29
Controllers/AMBXController/RGBController_AMBX.cpp
View file

@ -58,7 +58,7 @@ void RGBController_AMBX::SetupZones()
side_lights_zone.leds_count = 2;
side_lights_zone.matrix_map = NULL;
zones.push_back(side_lights_zone);
zone wallwasher_zone;
wallwasher_zone.name = "Wallwasher";
wallwasher_zone.type = ZONE_TYPE_LINEAR;
@ -108,16 +108,16 @@ void RGBController_AMBX::DeviceUpdateLEDs()
{
return;
}
unsigned int led_values[5];
RGBColor led_colors[5];
for(unsigned int led_idx = 0; led_idx < leds.size(); led_idx++)
{
led_values[led_idx] = leds[led_idx].value;
led_colors[led_idx] = colors[led_idx];
}
controller->SetLEDColors(led_values, led_colors, static_cast<unsigned int>(leds.size()));
}
@ -127,10 +127,10 @@ void RGBController_AMBX::UpdateZoneLEDs(int zone)
{
return;
}
unsigned int start_idx = 0;
unsigned int zone_size = 0;
// Calculate start index and size
for(unsigned int z_idx = 0; z_idx < zones.size(); z_idx++)
{
@ -139,20 +139,20 @@ void RGBController_AMBX::UpdateZoneLEDs(int zone)
zone_size = zones[z_idx].leds_count;
break;
}
start_idx += zones[z_idx].leds_count;
}
unsigned int led_values[5];
RGBColor led_colors[5];
for(unsigned int led_idx = 0; led_idx < zone_size; led_idx++)
{
unsigned int current_idx = start_idx + led_idx;
led_values[led_idx] = leds[current_idx].value;
led_colors[led_idx] = colors[current_idx];
}
controller->SetLEDColors(led_values, led_colors, zone_size);
}
@ -162,7 +162,7 @@ void RGBController_AMBX::UpdateSingleLED(int led)
{
return;
}
unsigned int led_value = leds[led].value;
RGBColor color = colors[led];
controller->SetLEDColor(led_value, color);
@ -174,11 +174,6 @@ void RGBController_AMBX::DeviceUpdateMode()
{
return;
}
DeviceUpdateLEDs();
}
void RGBController_AMBX::SetCustomMode()
{
active_mode = 0;
}

5
Controllers/AMBXController/RGBController_AMBX.h
View file

@ -20,13 +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:
AMBXController* controller;

5
Controllers/CherryKeyboardController/RGBController_CherryKeyboard.cpp
View file

@ -390,11 +390,6 @@ void RGBController_CherryKeyboard::UpdateSingleLED(int /*led*/)
DeviceUpdateLEDs();
}
void RGBController_CherryKeyboard::SetCustomMode()
{
}
void RGBController_CherryKeyboard::DeviceUpdateMode()
{
unsigned char red = 0x00;

1
Controllers/CherryKeyboardController/RGBController_CherryKeyboard.h
View file

@ -28,7 +28,6 @@ public:
void UpdateZoneLEDs(int zone);
void UpdateSingleLED(int led);
void SetCustomMode();
void DeviceUpdateMode();
private:

12
Controllers/CoolerMasterController/CMARGBController/RGBController_CMARGBController.cpp
View file

@ -400,18 +400,6 @@ void RGBController_CMARGBController::UpdateSingleLED(int led)
UpdateZoneLEDs(GetLED_Zone(led));
}
void RGBController_CMARGBController::SetCustomMode()
{
for(int mode_idx = 0; mode_idx < (int)modes.size() ; mode_idx++)
{
if (modes[mode_idx].value == CM_ARGB_MODE_DIRECT)
{
active_mode = mode_idx;
break;
}
}
}
void RGBController_CMARGBController::DeviceUpdateMode()
{
bool random_colours = (modes[active_mode].color_mode == MODE_COLORS_RANDOM);

1
Controllers/CoolerMasterController/CMARGBController/RGBController_CMARGBController.h
View file

@ -31,7 +31,6 @@ public:
void UpdateZoneLEDs(int zone);
void UpdateSingleLED(int led);
void SetCustomMode();
void DeviceUpdateMode();
private:

5
Controllers/CoolerMasterController/CMARGBGen2A1Controller/RGBController_CMARGBGen2A1Controller.cpp
View file

@ -309,11 +309,6 @@ void RGBController_CMARGBGen2A1Controller::UpdateSingleLED(int /*led*/)
DeviceUpdateLEDs();
}
void RGBController_CMARGBGen2A1Controller::SetCustomMode()
{
active_mode = 0;
}
void RGBController_CMARGBGen2A1Controller::DeviceUpdateMode()
{
const mode& active = modes[active_mode];

1
Controllers/CoolerMasterController/CMARGBGen2A1Controller/RGBController_CMARGBGen2A1Controller.h
View file

@ -28,7 +28,6 @@ public:
void UpdateZoneLEDs(int zone);
void UpdateSegmentLEDs(int zone, int subchannel);
void UpdateSingleLED(int led);
void SetCustomMode();
void DeviceUpdateMode();
void DeviceSaveMode();

12
Controllers/CoolerMasterController/CMMM711Controller/RGBController_CMMM711Controller.cpp
View file

@ -184,18 +184,6 @@ void RGBController_CMMM711Controller::UpdateSingleLED(int /*led*/)
DeviceUpdateLEDs();
}
void RGBController_CMMM711Controller::SetCustomMode()
{
for(int mode_index = 0; mode_index < (int)modes.size(); mode_index++)
{
if(modes[mode_index].value == CM_MM711_MODE_CUSTOM)
{
active_mode = mode_index;
break;
}
}
}
void RGBController_CMMM711Controller::DeviceUpdateMode()
{
RGBColor colour = 0;

1
Controllers/CoolerMasterController/CMMM711Controller/RGBController_CMMM711Controller.h
View file

@ -32,7 +32,6 @@ public:
void UpdateZoneLEDs(int zone);
void UpdateSingleLED(int led);
void SetCustomMode();
void DeviceUpdateMode();
void DeviceSaveMode();
private:

12
Controllers/CoolerMasterController/CMMMController/RGBController_CMMMController.cpp
View file

@ -249,18 +249,6 @@ void RGBController_CMMMController::UpdateSingleLED(int /*led*/)
DeviceUpdateLEDs();
}
void RGBController_CMMMController::SetCustomMode()
{
for(int mode_index = 0; mode_index < (int)modes.size(); mode_index++)
{
if(modes[mode_index].value == CM_MM_MODE_CUSTOM)
{
active_mode = mode_index;
break;
}
}
}
void RGBController_CMMMController::DeviceUpdateMode()
{
RGBColor mode_one = 0;

2
Controllers/CoolerMasterController/CMMMController/RGBController_CMMMController.h
View file

@ -33,9 +33,9 @@ public:
void UpdateZoneLEDs(int zone);
void UpdateSingleLED(int led);
void SetCustomMode();
void DeviceUpdateMode();
void DeviceSaveMode();
private:
void Init_Controller();
int GetDeviceMode();

5
Controllers/CoolerMasterController/CMMP750Controller/RGBController_CMMP750Controller.cpp
View file

@ -175,11 +175,6 @@ void RGBController_CMMP750Controller::UpdateSingleLED(int led)
UpdateZoneLEDs(led);
}
void RGBController_CMMP750Controller::SetCustomMode()
{
active_mode = 0;
}
void RGBController_CMMP750Controller::DeviceUpdateMode()
{
controller->SetMode(modes[active_mode].value, modes[active_mode].speed);

2
Controllers/CoolerMasterController/CMMP750Controller/RGBController_CMMP750Controller.h
View file

@ -27,8 +27,8 @@ public:
void UpdateZoneLEDs(int zone);
void UpdateSingleLED(int led);
void SetCustomMode();
void DeviceUpdateMode();
private:
CMMP750Controller* controller;

5
Controllers/CoolerMasterController/CMMonitorController/RGBController_CMMonitorController.cpp
View file

@ -197,11 +197,6 @@ void RGBController_CMMonitorController::UpdateSingleLED(int /*led*/)
DeviceUpdateLEDs();
}
void RGBController_CMMonitorController::SetCustomMode()
{
active_mode = 0;
}
void RGBController_CMMonitorController::DeviceUpdateMode()
{
switch(modes[active_mode].value)

4
Controllers/CoolerMasterController/CMMonitorController/RGBController_CMMonitorController.h
View file

@ -21,11 +21,13 @@ public:
~RGBController_CMMonitorController();
void SetupZones();
void ResizeZone(int zone, int new_size);
void DeviceUpdateLEDs();
void UpdateZoneLEDs(int zone);
void UpdateSingleLED(int led);
void SetCustomMode();
void DeviceUpdateMode();
private:

5
Controllers/CoolerMasterController/CMR6000Controller/RGBController_CMR6000Controller.cpp
View file

@ -222,11 +222,6 @@ void RGBController_CMR6000Controller::UpdateSingleLED(int /*led*/)
DeviceUpdateLEDs();
}
void RGBController_CMR6000Controller::SetCustomMode()
{
active_mode = 1;
}
void RGBController_CMR6000Controller::DeviceUpdateMode()
{
DeviceUpdateLEDs();

1
Controllers/CoolerMasterController/CMR6000Controller/RGBController_CMR6000Controller.h
View file

@ -28,7 +28,6 @@ public:
void UpdateZoneLEDs(int zone);
void UpdateSingleLED(int led);
void SetCustomMode();
void DeviceUpdateMode();
private:
CMR6000Controller* controller;

12
Controllers/CoolerMasterController/CMRGBController/RGBController_CMRGBController.cpp
View file

@ -265,18 +265,6 @@ void RGBController_CMRGBController::UpdateSingleLED(int /*led*/)
{
}
void RGBController_CMRGBController::SetCustomMode()
{
for(int mode_idx = 0; mode_idx < (int)modes.size() ; mode_idx++)
{
if(modes[mode_idx].value == CM_RGBC_MODE_MULTIPLE)
{
active_mode = mode_idx;
break;
}
}
}
void RGBController_CMRGBController::DeviceUpdateMode()
{
RGBColor color_1 = (modes[active_mode].color_mode == MODE_COLORS_MODE_SPECIFIC) ? modes[active_mode].colors[0] : 0;

1
Controllers/CoolerMasterController/CMRGBController/RGBController_CMRGBController.h
View file

@ -28,7 +28,6 @@ public:
void UpdateZoneLEDs(int zone);
void UpdateSingleLED(int led);
void SetCustomMode();
void DeviceUpdateMode();
private:

5
Controllers/CryorigH7QuadLumiController/RGBController_CryorigH7QuadLumi.cpp
View file

@ -207,11 +207,6 @@ void RGBController_CryorigH7QuadLumi::UpdateSingleLED(int led)
controller->SetChannelLEDs(zone_idx, zones[zone_idx].colors, zones[zone_idx].leds_count);
}
void RGBController_CryorigH7QuadLumi::SetCustomMode()
{
active_mode = 0;
}
void RGBController_CryorigH7QuadLumi::DeviceUpdateMode()
{
if(modes[active_mode].value == CRYORIG_H7_QUAD_LUMI_MODE_FIXED)

1
Controllers/CryorigH7QuadLumiController/RGBController_CryorigH7QuadLumi.h
View file

@ -28,7 +28,6 @@ public:
void UpdateZoneLEDs(int zone);
void UpdateSingleLED(int led);
void SetCustomMode();
void DeviceUpdateMode();
private:

7
Controllers/DDPController/RGBController_DDP.cpp
View file

@ -91,7 +91,7 @@ void RGBController_DDP::DeviceUpdateLEDs()
std::vector<unsigned int> brightness_adjusted_colors;
brightness_adjusted_colors.reserve(colors.size());
float brightness_scale = (float)modes[active_mode].brightness / 100.0f;
for(unsigned int color_idx = 0; color_idx < colors.size(); color_idx++)
{
unsigned int color = colors[color_idx];
@ -122,11 +122,6 @@ void RGBController_DDP::DeviceUpdateMode()
{
}
void RGBController_DDP::SetCustomMode()
{
active_mode = 0;
}
void RGBController_DDP::SetKeepaliveTime(unsigned int time_ms)
{
if(controller != nullptr)

4
Controllers/DDPController/RGBController_DDP.h
View file

@ -21,11 +21,13 @@ public:
void SetupZones();
void ResizeZone(int zone, int new_size);
void DeviceUpdateLEDs();
void UpdateZoneLEDs(int zone);
void UpdateSingleLED(int led);
void DeviceUpdateMode();
void SetCustomMode();
void SetKeepaliveTime(unsigned int time_ms);
private:

5
Controllers/DebugController/RGBController_Debug.cpp
View file

@ -627,11 +627,6 @@ void RGBController_Debug::UpdateSingleLED(int /*led*/)
}
void RGBController_Debug::SetCustomMode()
{
}
void RGBController_Debug::DeviceUpdateMode()
{

1
Controllers/DebugController/RGBController_Debug.h
View file

@ -31,6 +31,5 @@ public:
void UpdateZoneLEDs(int zone);
void UpdateSingleLED(int led);
void SetCustomMode();
void DeviceUpdateMode();
};

12
Controllers/EVisionKeyboardController/RGBController_EVisionV2Keyboard.cpp
View file

@ -933,18 +933,6 @@ void RGBController_EVisionV2Keyboard::UpdateSingleLED(int led)
last_update_time = std::chrono::steady_clock::now();
}
void RGBController_EVisionV2Keyboard::SetCustomMode()
{
if(part == EVISION_V2_KEYBOARD_PART_KEYBOARD)
{
active_mode = EVISION_V2_MODE_DIRECT;
}
else
{
active_mode = EVISION_V2_MODE2_STATIC;
}
}
void RGBController_EVisionV2Keyboard::DeviceUpdateMode()
{
mode set_mode = modes[active_mode];

1
Controllers/EVisionKeyboardController/RGBController_EVisionV2Keyboard.h
View file

@ -24,7 +24,6 @@ public:
void SetupZones() override;
void ResizeZone(int zone, int new_size) override;
void SetCustomMode() override;
void DeviceUpdateLEDs() override;
void UpdateZoneLEDs(int zone) override;

5
Controllers/GainwardGPUController/GainwardGPUv2Controller/RGBController_GainwardGPUv2.cpp
View file

@ -148,11 +148,6 @@ void RGBController_GainwardGPUv2::UpdateSingleLED(int /*led*/)
DeviceUpdateLEDs();
}
void RGBController_GainwardGPUv2::SetCustomMode()
{
active_mode = 0;
}
void RGBController_GainwardGPUv2::DeviceUpdateMode()
{
mode current_mode = modes[(unsigned int)active_mode];

1
Controllers/GainwardGPUController/GainwardGPUv2Controller/RGBController_GainwardGPUv2.h
View file

@ -28,7 +28,6 @@ public:
void UpdateZoneLEDs(int zone);
void UpdateSingleLED(int led);
void SetCustomMode();
void DeviceUpdateMode();
private:

6
Controllers/LianLiController/LianLiGAIITrinityController/RGBController_LianLiGAIITrinity.cpp
View file

@ -415,9 +415,3 @@ void RGBController_LianLiGAIITrinity::DeviceUpdateMode()
{
DeviceUpdateLEDs();
}
void RGBController_LianLiGAIITrinity::SetCustomMode()
{
}

2
Controllers/LianLiController/LianLiGAIITrinityController/RGBController_LianLiGAIITrinity.h
View file

@ -30,8 +30,6 @@ public:
void DeviceUpdateMode();
void SetCustomMode();
LianLiGAIITrinityController::GAII_Direction OpenRGBDirection2GAIIDirection(unsigned int openrgb_direction)
{
if(openrgb_direction == MODE_DIRECTION_LEFT)

9
Controllers/LianLiController/LianLiUniHubALController/RGBController_LianLiUniHubAL.cpp
View file

@ -522,12 +522,3 @@ void RGBController_LianLiUniHubAL::DeviceUpdateMode()
controller->SetChannelMode((unsigned char)zone_idx, modes[active_mode].value,modes[active_mode].colors, (unsigned int)modes[active_mode].colors.size(), (fan_idx >= 0 ? fan_idx : 0), upd_both_fan_edge, modes[active_mode].brightness, modes[active_mode].speed, modes[active_mode].direction);
}
}
void RGBController_LianLiUniHubAL::SetCustomMode()
{
/*-------------------------------------------------*\
| Set mode to Static Color |
\*-------------------------------------------------*/
active_mode = 0;
}

2
Controllers/LianLiController/LianLiUniHubALController/RGBController_LianLiUniHubAL.h
View file

@ -33,8 +33,6 @@ public:
void DeviceUpdateMode();
void SetCustomMode();
private:
LianLiUniHubALController* controller;
bool initializedMode;

9
Controllers/LianLiController/LianLiUniHubSLInfinityController/RGBController_LianLiUniHubSLInfinity.cpp
View file

@ -443,12 +443,3 @@ void RGBController_LianLiUniHubSLInfinity::DeviceUpdateMode()
}
}
void RGBController_LianLiUniHubSLInfinity::SetCustomMode()
{
/*-------------------------------------------------*\
| Set mode to Static Color |
\*-------------------------------------------------*/
active_mode = 0;
}

2
Controllers/LianLiController/LianLiUniHubSLInfinityController/RGBController_LianLiUniHubSLInfinity.h
View file

@ -35,8 +35,6 @@ public:
void DeviceUpdateMode();
void SetCustomMode();
private:
LianLiUniHubSLInfinityController* controller;
bool initializedMode;

9
Controllers/LianLiController/LianLiUniHubSLV2Controller/RGBController_LianLiUniHubSLV2.cpp
View file

@ -442,12 +442,3 @@ void RGBController_LianLiUniHubSLV2::DeviceUpdateMode()
}
}
void RGBController_LianLiUniHubSLV2::SetCustomMode()
{
/*-------------------------------------------------*\
| Set mode to Static Color |
\*-------------------------------------------------*/
active_mode = 0;
}

2
Controllers/LianLiController/LianLiUniHubSLV2Controller/RGBController_LianLiUniHubSLV2.h
View file

@ -34,8 +34,6 @@ public:
void DeviceUpdateMode();
void SetCustomMode();
private:
LianLiUniHubSLV2Controller* controller;
bool initializedMode;

8
Controllers/LianLiController/LianLiUniHub_AL10Controller/RGBController_LianLiUniHub_AL10.cpp
View file

@ -544,14 +544,6 @@ void RGBController_LianLiUniHub_AL10::DeviceUpdateMode()
controller->Synchronize();
}
void RGBController_LianLiUniHub_AL10::SetCustomMode()
{
/*-------------------------------------------------*\
| Set mode to Static Color |
\*-------------------------------------------------*/
active_mode = 0;
}
uint8_t RGBController_LianLiUniHub_AL10::convertAnyFanCount(uint8_t count)
{
switch (count)

2
Controllers/LianLiController/LianLiUniHub_AL10Controller/RGBController_LianLiUniHub_AL10.h
View file

@ -32,8 +32,6 @@ public:
void DeviceUpdateMode();
void SetCustomMode();
private:
uint8_t convertAnyFanCount(uint8_t count);
uint8_t convertLedSpeed(uint8_t speed);

21
Controllers/MadCatzCyborgController/RGBController_MadCatzCyborg.cpp
View file

@ -23,14 +23,14 @@
RGBController_MadCatzCyborg::RGBController_MadCatzCyborg(MadCatzCyborgController* controller_ptr)
{
controller = controller_ptr;
name = "MadCatz Cyborg Gaming Light";
vendor = "MadCatz";
type = DEVICE_TYPE_ACCESSORY;
description = "MadCatz Cyborg Gaming Light";
location = controller->GetDeviceLocation();
serial = controller->GetSerialString();
mode Direct;
Direct.name = "Direct";
Direct.value = 0;
@ -40,9 +40,9 @@ RGBController_MadCatzCyborg::RGBController_MadCatzCyborg(MadCatzCyborgController
Direct.brightness_max = 100;
Direct.brightness = 100;
modes.push_back(Direct);
SetupZones();
controller->SetIntensity(modes[active_mode].brightness);
}
@ -54,20 +54,20 @@ RGBController_MadCatzCyborg::~RGBController_MadCatzCyborg()
void RGBController_MadCatzCyborg::SetupZones()
{
zone cyborg_zone;
cyborg_zone.name = "Cyborg";
cyborg_zone.type = ZONE_TYPE_SINGLE;
cyborg_zone.leds_min = 1;
cyborg_zone.leds_max = 1;
cyborg_zone.leds_count = 1;
cyborg_zone.matrix_map = NULL;
zones.push_back(cyborg_zone);
led cyborg_led;
cyborg_led.name = "LED";
leds.push_back(cyborg_led);
SetupColors();
}
@ -102,8 +102,3 @@ void RGBController_MadCatzCyborg::DeviceUpdateMode()
controller->SetIntensity(modes[active_mode].brightness);
}
}
void RGBController_MadCatzCyborg::SetCustomMode()
{
active_mode = 0;
}

5
Controllers/MadCatzCyborgController/RGBController_MadCatzCyborg.h
View file

@ -20,13 +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:
MadCatzCyborgController* controller;

5
Controllers/OKSController/RGBController_OKSKeyboard.cpp
View file

@ -281,11 +281,6 @@ void RGBController_OKSKeyboard::UpdateSingleLED(int led)
UpdateZoneLEDs(led);
}
void RGBController_OKSKeyboard::SetCustomMode()
{
active_mode = 0;
}
void RGBController_OKSKeyboard::DeviceUpdateMode()
{
mode m = modes[active_mode];

1
Controllers/OKSController/RGBController_OKSKeyboard.h
View file

@ -66,7 +66,6 @@ public:
void UpdateZoneLEDs(int zone);
void UpdateSingleLED(int led);
void SetCustomMode();
void DeviceUpdateMode();
private:

7
Controllers/SinowealthController/GenesisXenon200Controller/RGBController_GenesisXenon200.cpp
View file

@ -143,10 +143,3 @@ void RGBController_GenesisXenon200::UpdateSingleLED(int /*led*/)
{
}
void RGBController_GenesisXenon200::SetCustomMode()
{
}

2
Controllers/SinowealthController/GenesisXenon200Controller/RGBController_GenesisXenon200.h
View file

@ -40,8 +40,6 @@ public:
void DeviceUpdateMode();
void DeviceSaveMode();
void SetCustomMode();
private:
GenesisXenon200Controller* controller;
};

8
Controllers/SinowealthController/SinowealthKeyboard90Controller/RGBController_SinowealthKeyboard90.cpp
View file

@ -156,14 +156,6 @@ void RGBController_SinowealthKeyboard90::UpdateSingleLED(int /*key*/)
DeviceUpdateLEDs();
}
void RGBController_SinowealthKeyboard90::SetCustomMode()
{
/*---------------------------------------------------------*\
| In our case, custom mode is on index MODE_CUSTOM |
\*---------------------------------------------------------*/
active_mode = MODE_CUSTOM;
}
void RGBController_SinowealthKeyboard90::DeviceUpdateMode()
{
if (modes[active_mode].value == MODE_CUSTOM)

1
Controllers/SinowealthController/SinowealthKeyboard90Controller/RGBController_SinowealthKeyboard90.h
View file

@ -26,7 +26,6 @@ public:
void UpdateZoneLEDs(int zone);
void UpdateSingleLED(int led);
void SetCustomMode();
void DeviceUpdateMode();
private: