Fix warnings and code cleanup in RGBController_JGINYUEInternalUSBV2.cpp
This commit is contained in:
parent
01d9655781
commit
540f785e90
1 changed files with 54 additions and 53 deletions
|
|
@ -328,10 +328,7 @@ RGBController_JGINYUEInternalUSBV2::RGBController_JGINYUEInternalUSBV2(JGINYUEIn
|
|||
Hourglass.colors.resize(8);
|
||||
//modes.push_back(Hourglass);
|
||||
|
||||
|
||||
|
||||
InitZones();
|
||||
|
||||
}
|
||||
|
||||
void RGBController_JGINYUEInternalUSBV2::SetupZones()
|
||||
|
|
@ -389,6 +386,7 @@ void RGBController_JGINYUEInternalUSBV2::ResizeZone(int zone, int new_size)
|
|||
void RGBController_JGINYUEInternalUSBV2::DeviceUpdateLEDs()
|
||||
{
|
||||
unsigned char normal_zone_count = controller->GetZoneCount();
|
||||
|
||||
if((controller->support_Global_zone == true) && (normal_zone_count > 1))
|
||||
{
|
||||
normal_zone_count--;
|
||||
|
|
@ -405,6 +403,7 @@ void RGBController_JGINYUEInternalUSBV2::UpdateZoneLEDs(int zone)
|
|||
{
|
||||
unsigned char area;
|
||||
area = controller->device_config[zone].Area_ID;
|
||||
|
||||
controller->DirectLEDControl(zones[zone].colors, zones[zone].leds_count, area);
|
||||
}
|
||||
|
||||
|
|
@ -412,13 +411,12 @@ void RGBController_JGINYUEInternalUSBV2::UpdateSingleLED(int led)
|
|||
{
|
||||
int zone;
|
||||
zone = leds[led].value;
|
||||
|
||||
UpdateZoneLEDs(zone);
|
||||
}
|
||||
|
||||
void RGBController_JGINYUEInternalUSBV2::DeviceUpdateMode()
|
||||
{
|
||||
unsigned char area;
|
||||
|
||||
if(modes[active_mode].value == JGINYUE_USB_V2_MODE_DIRECT)
|
||||
{
|
||||
DeviceUpdateLEDs();
|
||||
|
|
@ -464,15 +462,18 @@ void RGBController_JGINYUEInternalUSBV2::InitZones()
|
|||
normal_zone_count--;
|
||||
//TODO support_Global_zone
|
||||
}
|
||||
|
||||
for(size_t i = 0; i < normal_zone_count; i++)
|
||||
{
|
||||
zone * zone_to_init = &(zones[i]);
|
||||
AreaConfigurationV2 * cfg = &(controller->device_config[i]);
|
||||
|
||||
zone_to_init->leds_min = 0;
|
||||
zone_to_init->leds_max = cfg->Max_LED_numbers;
|
||||
zone_to_init->leds_count = 0;
|
||||
zone_to_init->type = ZONE_TYPE_LINEAR;
|
||||
zone_to_init->matrix_map = NULL;
|
||||
|
||||
switch(cfg->Area_ID)
|
||||
{
|
||||
case JGINYUE_USB_V2_ARGB_STRIP_1:
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue