mirror/OpenRGB
1
0
Fork 0
mirror of https://github.com/CalcProgrammer1/OpenRGB.git synced 2026-05-14 17:44:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

Code cleanup round 6

Browse Source
This commit is contained in:
Adam Honse
2022-01-19 23:08:09 -06:00
parent f11f242ded
commit f1ed2abe53
46 changed files with 2616 additions and 2584 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
Controllers/LogitechController/RGBController_LogitechG915.cpp
View File

@@ -181,9 +181,10 @@ static const led_type led_names[] =
{ "Key: G5", LOGITECH_G915_ZONE_MODE_GKEYS, 0x05 },
};
RGBController_LogitechG915::RGBController_LogitechG915(LogitechG915Controller* logitech_ptr, bool tkl)
RGBController_LogitechG915::RGBController_LogitechG915(LogitechG915Controller* controller_ptr, bool tkl)
{
is_tkl = tkl;
controller = controller_ptr;
is_tkl = tkl;
if(is_tkl)
{
@@ -195,10 +196,9 @@ RGBController_LogitechG915::RGBController_LogitechG915(LogitechG915Controller* l
}
description = name;
logitech = logitech_ptr;
vendor = "Logitech";
type = DEVICE_TYPE_KEYBOARD;
serial = logitech->GetSerialString();
serial = controller->GetSerialString();
mode Direct;
Direct.name = "Direct";
@@ -263,6 +263,8 @@ RGBController_LogitechG915::~RGBController_LogitechG915()
delete zones[zone_index].matrix_map;
}
}
delete controller;
}
void RGBController_LogitechG915::SetupZones()
@@ -440,7 +442,7 @@ void RGBController_LogitechG915::DeviceUpdateLEDs()
/*-----------------------------------------------------*\
| Zeroing just what is needed |
\*-----------------------------------------------------*/
logitech->SetDirect(LOGITECH_G915_ZONE_FRAME_TYPE_BIG, frame_buffer_big_mode);
controller->SetDirect(LOGITECH_G915_ZONE_FRAME_TYPE_BIG, frame_buffer_big_mode);
bi = bi + max_key_per_color;
}
}
@@ -466,7 +468,7 @@ void RGBController_LogitechG915::DeviceUpdateLEDs()
/*-----------------------------------------*\
| No End of Data byte if the packet is full |
\*-----------------------------------------*/
logitech->SetDirect(LOGITECH_G915_ZONE_FRAME_TYPE_LITTLE, frame_buffer_little_mode);
controller->SetDirect(LOGITECH_G915_ZONE_FRAME_TYPE_LITTLE, frame_buffer_little_mode);
led_in_little_frame=0;
}
}
@@ -492,7 +494,7 @@ void RGBController_LogitechG915::DeviceUpdateLEDs()
/*-----------------------------------------------------*\
| Send little frame and clear little frame buffer |
\*-----------------------------------------------------*/
logitech->SetDirect(LOGITECH_G915_ZONE_FRAME_TYPE_LITTLE, frame_buffer_little_mode);
controller->SetDirect(LOGITECH_G915_ZONE_FRAME_TYPE_LITTLE, frame_buffer_little_mode);
}
if(ledsByColors.size() > 0)
{
@@ -500,7 +502,7 @@ void RGBController_LogitechG915::DeviceUpdateLEDs()
| Copy the current color vector to avoid set keys that |
| has not being |
\*-----------------------------------------------------*/
logitech->Commit();
controller->Commit();
std::copy(new_colors.begin(), new_colors.end(),current_colors.begin());
}
}
@@ -532,13 +534,13 @@ void RGBController_LogitechG915::DeviceUpdateMode()
| Send real direct mode initialization. I used same |
| sequence as GHUB for screen capture. |
\*-----------------------------------------------------*/
logitech->InitializeDirect();
controller->InitializeDirect();
/*-----------------------------------------------------*\
| Set one key to get direct mode engaged. |
\*-----------------------------------------------------*/
logitech->SendSingleLed(0x29,0,0,0);
logitech->Commit();
controller->SendSingleLed(0x29,0,0,0);
controller->Commit();
return;
}
@@ -553,5 +555,5 @@ void RGBController_LogitechG915::DeviceUpdateMode()
blu = RGBGetBValue(modes[active_mode].colors[0]);
}
logitech->SetMode(modes[active_mode].value, modes[active_mode].speed, red, grn, blu);
controller->SetMode(modes[active_mode].value, modes[active_mode].speed, red, grn, blu);
}