mirror/OpenRGB
1
0
Fork 0
mirror of https://github.com/CalcProgrammer1/OpenRGB.git synced 2026-02-06 13:21:16 -05:00
Code Issues Packages Projects Releases Wiki Activity

RGBController API Overhaul

Browse Source 
* 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:
Adam Honse
2025-09-23 20:38:37 -05:00
parent 6deaf2f4fd
commit fdaf2eee6c
657 changed files with 9060 additions and 8801 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
Controllers/EVisionKeyboardController/RGBController_EVisionKeyboard.cpp
View File

@@ -302,17 +302,6 @@ RGBController_EVisionKeyboard::RGBController_EVisionKeyboard(EVisionKeyboardCont
RGBController_EVisionKeyboard::~RGBController_EVisionKeyboard()
{
/*---------------------------------------------------------*\
| Delete the matrix map |
\*---------------------------------------------------------*/
for(unsigned int zone_index = 0; zone_index < zones.size(); zone_index++)
{
if(zones[zone_index].matrix_map != NULL)
{
delete zones[zone_index].matrix_map;
}
}
delete controller;
}
@@ -325,10 +314,7 @@ void RGBController_EVisionKeyboard::SetupZones()
new_zone.leds_min = 126;
new_zone.leds_max = 126;
new_zone.leds_count = 126;
new_zone.matrix_map = new matrix_map_type;
new_zone.matrix_map->height = 6;
new_zone.matrix_map->width = 23;
new_zone.matrix_map->map = (unsigned int *)&matrix_map;
new_zone.matrix_map.Set(6, 23, (unsigned int *)&matrix_map);
zones.push_back(new_zone);
@@ -345,13 +331,6 @@ void RGBController_EVisionKeyboard::SetupZones()
SetupColors();
}
void RGBController_EVisionKeyboard::ResizeZone(int /*zone*/, int /*new_size*/)
{
/*---------------------------------------------------------*\
| This device does not support resizing zones |
\*---------------------------------------------------------*/
}
void RGBController_EVisionKeyboard::DeviceUpdateLEDs()
{
unsigned char color_data[7*0x36];
@@ -370,12 +349,12 @@ void RGBController_EVisionKeyboard::DeviceUpdateLEDs()
);
}
void RGBController_EVisionKeyboard::UpdateZoneLEDs(int /*zone*/)
void RGBController_EVisionKeyboard::DeviceUpdateZoneLEDs(int /*zone*/)
{
DeviceUpdateLEDs();
}
void RGBController_EVisionKeyboard::UpdateSingleLED(int /*led*/)
void RGBController_EVisionKeyboard::DeviceUpdateSingleLED(int /*led*/)
{
DeviceUpdateLEDs();
}

6
Controllers/EVisionKeyboardController/RGBController_EVisionKeyboard.h
View File

@@ -23,11 +23,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();

18
Controllers/EVisionKeyboardController/RGBController_EVisionV2Keyboard.cpp
View File

@@ -786,11 +786,7 @@ void RGBController_EVisionV2Keyboard::SetupZones()
KB_zone.leds_count = leds_count;
KB_zone.leds_min = KB_zone.leds_count;
KB_zone.leds_max = KB_zone.leds_count;
KB_zone.matrix_map = new matrix_map_type;
KB_zone.matrix_map->height = EVISION_V2_MATRIX_HEIGHT;
KB_zone.matrix_map->width = EVISION_V2_MATRIX_WIDTH;
KB_zone.matrix_map->map = matrix_map;
KB_zone.matrix_map.Set(EVISION_V2_MATRIX_HEIGHT, EVISION_V2_MATRIX_WIDTH, matrix_map);
zones.push_back(KB_zone);
/*-------------------------------------------------*\
@@ -904,13 +900,6 @@ void RGBController_EVisionV2Keyboard::LoadConfig()
}
}
void RGBController_EVisionV2Keyboard::ResizeZone(int /*zone*/, int /*new_size*/)
{
/*---------------------------------------------------------*\
| This device does not support resizing zones |
\*---------------------------------------------------------*/
}
void RGBController_EVisionV2Keyboard::DeviceUpdateLEDs()
{
if(part != EVISION_V2_KEYBOARD_PART_KEYBOARD)
@@ -923,12 +912,12 @@ void RGBController_EVisionV2Keyboard::DeviceUpdateLEDs()
last_update_time = std::chrono::steady_clock::now();
}
void RGBController_EVisionV2Keyboard::UpdateZoneLEDs(int /*zone*/)
void RGBController_EVisionV2Keyboard::DeviceUpdateZoneLEDs(int /*zone*/)
{
DeviceUpdateLEDs();
}
void RGBController_EVisionV2Keyboard::UpdateSingleLED(int led)
void RGBController_EVisionV2Keyboard::DeviceUpdateSingleLED(int led)
{
if(part != EVISION_V2_KEYBOARD_PART_KEYBOARD)
{
@@ -999,7 +988,6 @@ void RGBController_EVisionV2Keyboard::DeviceUpdateMode()
if((part == EVISION_V2_KEYBOARD_PART_KEYBOARD) && (config.mode == EVISION_V2_MODE_CUSTOM))
{
controller->GetLedsCustom(config.ledmode, colors);
SignalUpdate();
}
}

13
Controllers/EVisionKeyboardController/RGBController_EVisionV2Keyboard.h
View File

@@ -22,15 +22,14 @@ public:
RGBController_EVisionV2Keyboard(EVisionV2KeyboardController* controller_ptr, EVisionV2KeyboardPart kb_part);
~RGBController_EVisionV2Keyboard();
void SetupZones() override;
void ResizeZone(int zone, int new_size) override;
void SetupZones();
void DeviceUpdateLEDs() override;
void UpdateZoneLEDs(int zone) override;
void UpdateSingleLED(int led) override;
void DeviceUpdateLEDs();
void DeviceUpdateZoneLEDs(int zone);
void DeviceUpdateSingleLED(int led);
void DeviceUpdateMode() override;
void DeviceSaveMode() override;
void DeviceUpdateMode();
void DeviceSaveMode();
private:
void SetupKeyboardModes();