mirror of
https://github.com/CalcProgrammer1/OpenRGB.git
synced 2026-01-24 06:57:58 -05:00
RGBController API Overhaul
* Reorganize and clean up RGBController API functions
* Add functions to get protected RGBController member values
* Make NetworkClient, ProfileManager, and ResourceManager friend classes so they can access protected members
* Protected previously-public RGBController members
* Information strings (name, vendor, description, version, serial location)
* Device type
* Active mode
* Flags
* LEDs vector
* LED alternate names vector
* Modes vector
* Colors vector
* Zones vector
* Add CONTROLLER_FLAG_HIDDEN to allow plugins to hide controllers from control GUI
* Add update reason codes to RGBController update callback and signal updates on more RGBController events
* Add loop zone types and segmented zone type
* Add matrix map field to segments
* Rework matrix_map_type from using pointers to vector to prevent memory leaks
* Rework KeyboardLayoutManager to return new matrix_map_type
* Add access mutex to RGBController API
* Add per-zone modes ot RGBController API
* Add JSON description functions to RGBController API
This commit is contained in:
@@ -197,7 +197,6 @@ void RGBController_PowerColorRedDevilV1::SetupZones()
|
||||
new_zone->leds_min = 1;
|
||||
new_zone->leds_max = 1;
|
||||
new_zone->leds_count = 1;
|
||||
new_zone->matrix_map = NULL;
|
||||
zones.push_back(*new_zone);
|
||||
|
||||
/*---------------------------------------------------------*\
|
||||
@@ -212,24 +211,17 @@ void RGBController_PowerColorRedDevilV1::SetupZones()
|
||||
SetupColors();
|
||||
}
|
||||
|
||||
void RGBController_PowerColorRedDevilV1::ResizeZone(int /*zone*/, int /*new_size*/)
|
||||
{
|
||||
/*---------------------------------------------------------*\
|
||||
| This device does not support resizing zones |
|
||||
\*---------------------------------------------------------*/
|
||||
}
|
||||
|
||||
void RGBController_PowerColorRedDevilV1::DeviceUpdateLEDs()
|
||||
{
|
||||
controller->SetLEDColorAll(colors[0]);
|
||||
}
|
||||
|
||||
void RGBController_PowerColorRedDevilV1::UpdateZoneLEDs(int /*zone*/)
|
||||
void RGBController_PowerColorRedDevilV1::DeviceUpdateZoneLEDs(int /*zone*/)
|
||||
{
|
||||
DeviceUpdateLEDs();
|
||||
}
|
||||
|
||||
void RGBController_PowerColorRedDevilV1::UpdateSingleLED(int led)
|
||||
void RGBController_PowerColorRedDevilV1::DeviceUpdateSingleLED(int led)
|
||||
{
|
||||
controller->SetLEDColor(led, colors[led]);
|
||||
}
|
||||
|
||||
@@ -22,11 +22,9 @@ public:
|
||||
|
||||
void SetupZones();
|
||||
|
||||
void ResizeZone(int zone, int new_size);
|
||||
|
||||
void DeviceUpdateLEDs();
|
||||
void UpdateZoneLEDs(int zone);
|
||||
void UpdateSingleLED(int led);
|
||||
void DeviceUpdateZoneLEDs(int zone);
|
||||
void DeviceUpdateSingleLED(int led);
|
||||
|
||||
void DeviceUpdateMode();
|
||||
|
||||
|
||||
@@ -173,7 +173,6 @@ void RGBController_PowerColorRedDevilV2::SetupZones()
|
||||
stripe1.leds_min = 3;
|
||||
stripe1.leds_max = 3;
|
||||
stripe1.leds_count = 3;
|
||||
stripe1.matrix_map = NULL;
|
||||
zones.push_back(stripe1);
|
||||
|
||||
zone stripe2;
|
||||
@@ -182,7 +181,6 @@ void RGBController_PowerColorRedDevilV2::SetupZones()
|
||||
stripe2.leds_min = 3;
|
||||
stripe2.leds_max = 3;
|
||||
stripe2.leds_count = 3;
|
||||
stripe2.matrix_map = NULL;
|
||||
zones.push_back(stripe2);
|
||||
|
||||
static unsigned int hellstone_map[2][7] =
|
||||
@@ -197,10 +195,7 @@ void RGBController_PowerColorRedDevilV2::SetupZones()
|
||||
hellstone.leds_min = 14;
|
||||
hellstone.leds_max = 14;
|
||||
hellstone.leds_count = 14;
|
||||
hellstone.matrix_map = new matrix_map_type;
|
||||
hellstone.matrix_map->height = 2;
|
||||
hellstone.matrix_map->width = 7;
|
||||
hellstone.matrix_map->map = (unsigned int *)hellstone_map;
|
||||
hellstone.matrix_map.Set(2, 7, (unsigned int *)hellstone_map);
|
||||
zones.push_back(hellstone);
|
||||
|
||||
zone devil;
|
||||
@@ -209,7 +204,6 @@ void RGBController_PowerColorRedDevilV2::SetupZones()
|
||||
devil.leds_min = 4;
|
||||
devil.leds_max = 4;
|
||||
devil.leds_count = 4;
|
||||
devil.matrix_map = NULL;
|
||||
zones.push_back(devil);
|
||||
|
||||
/*------------------------------------------------------------------*\
|
||||
@@ -246,13 +240,6 @@ void RGBController_PowerColorRedDevilV2::SetupZones()
|
||||
SetupColors();
|
||||
}
|
||||
|
||||
void RGBController_PowerColorRedDevilV2::ResizeZone(int, int)
|
||||
{
|
||||
/*---------------------------------------------------------*\
|
||||
| This device does not support resizing zones |
|
||||
\*---------------------------------------------------------*/
|
||||
}
|
||||
|
||||
void RGBController_PowerColorRedDevilV2::DeviceUpdateLEDs()
|
||||
{
|
||||
/*---------------------------------------------------------*\
|
||||
@@ -298,12 +285,12 @@ void RGBController_PowerColorRedDevilV2::DeviceUpdateLEDs()
|
||||
colors_copy = colors;
|
||||
}
|
||||
|
||||
void RGBController_PowerColorRedDevilV2::UpdateZoneLEDs(int)
|
||||
void RGBController_PowerColorRedDevilV2::DeviceUpdateZoneLEDs(int)
|
||||
{
|
||||
DeviceUpdateLEDs();
|
||||
}
|
||||
|
||||
void RGBController_PowerColorRedDevilV2::UpdateSingleLED(int)
|
||||
void RGBController_PowerColorRedDevilV2::DeviceUpdateSingleLED(int)
|
||||
{
|
||||
DeviceUpdateLEDs();
|
||||
}
|
||||
|
||||
@@ -22,11 +22,9 @@ public:
|
||||
|
||||
void SetupZones();
|
||||
|
||||
void ResizeZone(int, int);
|
||||
|
||||
void DeviceUpdateLEDs();
|
||||
void UpdateZoneLEDs(int);
|
||||
void UpdateSingleLED(int);
|
||||
void DeviceUpdateZoneLEDs(int);
|
||||
void DeviceUpdateSingleLED(int);
|
||||
|
||||
void DeviceUpdateMode();
|
||||
|
||||
|
||||
Reference in New Issue
Block a user