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 R

Browse source
This commit is contained in:
Adam Honse 2022-08-21 18:22:38 -05:00
parent 933370537d
commit 66c856f49a
10 changed files with 28 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

25
Controllers/RedragonController/RGBController_RedragonM711.cpp
View file

@ -20,16 +20,16 @@
@comment
\*-------------------------------------------------------------------*/
RGBController_RedragonM711::RGBController_RedragonM711(RedragonM711Controller* redragon_ptr)
RGBController_RedragonM711::RGBController_RedragonM711(RedragonM711Controller* controller_ptr)
{
redragon = redragon_ptr;
controller = controller_ptr;
name = "Redragon Mouse Device";
vendor = "Redragon";
type = DEVICE_TYPE_MOUSE;
description = "Redragon Mouse Device";
location = redragon->GetDeviceLocation();
serial = redragon->GetSerialString();
location = controller->GetDeviceLocation();
serial = controller->GetSerialString();
mode Static;
Static.name = "Static";
@ -71,7 +71,7 @@ RGBController_RedragonM711::RGBController_RedragonM711(RedragonM711Controller* r
RGBController_RedragonM711::~RGBController_RedragonM711()
{
delete redragon;
delete controller;
}
void RGBController_RedragonM711::SetupZones()
@ -105,8 +105,8 @@ void RGBController_RedragonM711::DeviceUpdateLEDs()
unsigned char grn = RGBGetGValue(colors[0]);
unsigned char blu = RGBGetBValue(colors[0]);
redragon->SendMouseColor(red, grn, blu);
redragon->SendMouseApply();
controller->SendMouseColor(red, grn, blu);
controller->SendMouseApply();
}
void RGBController_RedragonM711::UpdateZoneLEDs(int /*zone*/)
@ -119,11 +119,6 @@ void RGBController_RedragonM711::UpdateSingleLED(int /*led*/)
DeviceUpdateLEDs();
}
void RGBController_RedragonM711::SetCustomMode()
{
active_mode = 0;
}
void RGBController_RedragonM711::DeviceUpdateMode()
{
bool random = (modes[active_mode].color_mode == MODE_COLORS_RANDOM);
@ -133,12 +128,12 @@ void RGBController_RedragonM711::DeviceUpdateMode()
if((modes[active_mode].value == REDRAGON_M711_MODE_BREATHING) && random)
{
redragon->SendMouseMode(REDRAGON_M711_MODE_RANDOM_BREATHING, 0, red, grn, blu);
controller->SendMouseMode(REDRAGON_M711_MODE_RANDOM_BREATHING, 0, red, grn, blu);
}
else
{
redragon->SendMouseMode(modes[active_mode].value, 0, red, grn, blu);
controller->SendMouseMode(modes[active_mode].value, 0, red, grn, blu);
}
redragon->SendMouseApply();
controller->SendMouseApply();
}

6
Controllers/RedragonController/RGBController_RedragonM711.h
View file

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