mirror/OpenRGB
1
0
Fork 0
mirror of https://github.com/CalcProgrammer1/OpenRGB.git synced 2026-01-26 07:58:16 -05:00
Code Issues Packages Projects Releases Wiki Activity

[WIP] UpdateLEDsInternal to prevent signaling RGBController update callback from internal updates/keepalive threads

Browse Source
This commit is contained in:
Adam Honse
2026-01-07 12:01:36 -06:00
parent 0e674dcbf8
commit c7ebc68642
27 changed files with 40 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Controllers/AlienwareKeyboardController/AlienwareAW410KController/RGBController_AlienwareAW410K.cpp
View File

@@ -381,7 +381,7 @@ void RGBController_AlienwareAW410K::DeviceUpdateMode()
{
if(active_mode == 0xFFFF)
{
UpdateLEDs();
UpdateLEDsInternal();
return;
}

2
Controllers/AlienwareKeyboardController/AlienwareAW510KController/RGBController_AlienwareAW510K.cpp
View File

@@ -402,7 +402,7 @@ void RGBController_AlienwareAW510K::DeviceUpdateMode()
{
if(active_mode == 0xFFFF)
{
UpdateLEDs();
UpdateLEDsInternal();
return;
}

2
Controllers/ArcticController/RGBController_Arctic.cpp
View File

@@ -116,7 +116,7 @@ void RGBController_Arctic::KeepaliveThreadFunction()
sleep_time = ARCTIC_KEEPALIVE_PERIOD - (std::chrono::steady_clock::now() - last_update_time);
if(sleep_time <= ARCTIC_SLEEP_THRESHOLD)
{
UpdateLEDs(); // Already protected thru a device update thread
UpdateLEDsInternal(); // Already protected thru a device update thread
std::this_thread::sleep_for(ARCTIC_KEEPALIVE_PERIOD);
}
else

2
Controllers/DMXController/RGBController_DMX.cpp
View File

@@ -218,7 +218,7 @@ void RGBController_DMX::KeepaliveThreadFunction()
{
if((std::chrono::steady_clock::now() - last_update_time) > ( keepalive_delay * 0.95f ) )
{
UpdateLEDs();
UpdateLEDsInternal();
}
std::this_thread::sleep_for(keepalive_delay / 2);
}

2
Controllers/E131Controller/RGBController_E131.cpp
View File

@@ -456,7 +456,7 @@ void RGBController_E131::KeepaliveThreadFunction()
{
if((std::chrono::steady_clock::now() - last_update_time) > ( keepalive_delay * 0.95f ) )
{
UpdateLEDs();
UpdateLEDsInternal();
}
std::this_thread::sleep_for(keepalive_delay / 2);
}

2
Controllers/HyperXKeyboardController/HyperXAlloyElite2Controller/RGBController_HyperXAlloyElite2.cpp
View File

@@ -331,7 +331,7 @@ void RGBController_HyperXAlloyElite2::KeepaliveThreadFunction()
{
if((std::chrono::steady_clock::now() - last_update_time) > std::chrono::milliseconds(1000))
{
UpdateLEDs();
UpdateLEDsInternal();
}
}
std::this_thread::sleep_for(50ms);

2
Controllers/HyperXKeyboardController/HyperXAlloyEliteController/RGBController_HyperXAlloyElite.cpp
View File

@@ -356,7 +356,7 @@ void RGBController_HyperXAlloyElite::KeepaliveThreadFunction()
{
if((std::chrono::steady_clock::now() - last_update_time) > std::chrono::milliseconds(50))
{
UpdateLEDs();
UpdateLEDsInternal();
}
}
std::this_thread::sleep_for(10ms);;

2
Controllers/HyperXKeyboardController/HyperXAlloyFPSController/RGBController_HyperXAlloyFPS.cpp
View File

@@ -285,7 +285,7 @@ void RGBController_HyperXAlloyFPS::KeepaliveThreadFunction()
{
if((std::chrono::steady_clock::now() - last_update_time) > std::chrono::milliseconds(50))
{
UpdateLEDs();
UpdateLEDsInternal();
}
}
std::this_thread::sleep_for(10ms);;

2
Controllers/HyperXKeyboardController/HyperXAlloyOrigins60and65Controller/RGBController_HyperXAlloyOrigins60and65.cpp
View File

@@ -347,7 +347,7 @@ void RGBController_HyperXAlloyOrigins60and65::KeepaliveThread()
{
if((std::chrono::steady_clock::now() - last_update_time) > std::chrono::milliseconds(50))
{
UpdateLEDs();
UpdateLEDsInternal();
}
}
std::this_thread::sleep_for(10ms);;

2
Controllers/HyperXKeyboardController/HyperXAlloyOriginsController/RGBController_HyperXAlloyOrigins.cpp
View File

@@ -301,7 +301,7 @@ void RGBController_HyperXAlloyOrigins::KeepaliveThread()
{
if((std::chrono::steady_clock::now() - last_update_time) > std::chrono::milliseconds(50))
{
UpdateLEDs();
UpdateLEDsInternal();
}
}
std::this_thread::sleep_for(10ms);;

2
Controllers/HyperXMicrophoneController/RGBController_HyperXMicrophone.cpp
View File

@@ -144,7 +144,7 @@ void RGBController_HyperXMicrophone::KeepaliveThread()
{
if((std::chrono::steady_clock::now() - last_update_time) > std::chrono::milliseconds(50))
{
UpdateLEDs();
UpdateLEDsInternal();
}
std::this_thread::sleep_for(15ms);
}

2
Controllers/HyperXMicrophoneV2Controller/RGBController_HyperXMicrophoneV2.cpp
View File

@@ -133,7 +133,7 @@ void RGBController_HyperXMicrophoneV2::KeepaliveThread()
{
if(!controller->ShouldPauseUpdates() && (std::chrono::steady_clock::now() - last_update_time) > std::chrono::milliseconds(1000))
{
UpdateLEDs();
UpdateLEDsInternal();
}
std::this_thread::sleep_for(250ms);
}

2
Controllers/HyperXMouseController/HyperXPulsefireFPSProController/RGBController_HyperXPulsefireFPSPro.cpp
View File

@@ -132,7 +132,7 @@ void RGBController_HyperXPulsefireFPSPro::KeepaliveThread()
{
if((std::chrono::steady_clock::now() - last_update_time) > std::chrono::milliseconds(50))
{
UpdateLEDs();
UpdateLEDsInternal();
}
}
std::this_thread::sleep_for(10ms);

2
Controllers/HyperXMouseController/HyperXPulsefireHasteController/RGBController_HyperXPulsefireHaste.cpp
View File

@@ -132,7 +132,7 @@ void RGBController_HyperXPulsefireHaste::KeepaliveThread()
{
if((std::chrono::steady_clock::now() - last_update_time) > std::chrono::milliseconds(50))
{
UpdateLEDs();
UpdateLEDsInternal();
}
}
std::this_thread::sleep_for(10ms);

2
Controllers/HyperXMouseController/HyperXPulsefireRaidController/RGBController_HyperXPulsefireRaid.cpp
View File

@@ -121,7 +121,7 @@ void RGBController_HyperXPulsefireRaid::KeepaliveThread()
{
if((std::chrono::steady_clock::now() - last_update_time) > 1s)
{
UpdateLEDs();
UpdateLEDsInternal();
}
}

2
Controllers/HyperXMouseController/HyperXPulsefireSurgeController/RGBController_HyperXPulsefireSurge.cpp
View File

@@ -141,7 +141,7 @@ void RGBController_HyperXPulsefireSurge::KeepaliveThread()
{
if((std::chrono::steady_clock::now() - last_update_time) > std::chrono::milliseconds(50))
{
UpdateLEDs();
UpdateLEDsInternal();
}
}
std::this_thread::sleep_for(10ms);

2
Controllers/HyperXMousematController/RGBController_HyperXMousemat.cpp
View File

@@ -143,7 +143,7 @@ void RGBController_HyperXMousemat::KeepaliveThread()
{
if((std::chrono::steady_clock::now() - last_update_time) > std::chrono::milliseconds(50))
{
UpdateLEDs();
UpdateLEDsInternal();
}
}
std::this_thread::sleep_for(10ms);

2
Controllers/LGMonitorController/RGBController_LGMonitor.cpp
View File

@@ -148,7 +148,7 @@ void RGBController_LGMonitor::KeepaliveThread()
{
if((modes[active_mode].value == LG_MONITOR_DIRECT_MODE_VALUE) && (std::chrono::steady_clock::now() - last_update_time) > std::chrono::milliseconds(500))
{
UpdateLEDs();
UpdateLEDsInternal();
}
std::this_thread::sleep_for(15ms);

2
Controllers/LogitechController/LogitechG213Controller/RGBController_LogitechG213.cpp
View File

@@ -162,7 +162,7 @@ void RGBController_LogitechG213::DeviceUpdateMode()
\*---------------------------------------------------------*/
if(active_mode == 0xFFFF)
{
UpdateLEDs();
UpdateLEDsInternal();
return;
}

2
Controllers/LogitechController/LogitechG810Controller/RGBController_LogitechG810.cpp
View File

@@ -376,7 +376,7 @@ void RGBController_LogitechG810::DeviceUpdateMode()
\*---------------------------------------------------------*/
if(active_mode == 0xFFFF)
{
UpdateLEDs();
UpdateLEDsInternal();
return;
}

2
Controllers/LogitechController/LogitechG910Controller/RGBController_LogitechG910.cpp
View File

@@ -377,7 +377,7 @@ void RGBController_LogitechG910::DeviceUpdateMode()
\*---------------------------------------------------------*/
if(active_mode == 0xFFFF)
{
UpdateLEDs();
UpdateLEDsInternal();
return;
}

2
Controllers/LogitechController/LogitechGProKeyboardController/RGBController_LogitechGProKeyboard.cpp
View File

@@ -353,7 +353,7 @@ void RGBController_LogitechGProKeyboard::DeviceUpdateMode()
\*---------------------------------------------------------*/
if(active_mode == 0xFFFF)
{
UpdateLEDs();
UpdateLEDsInternal();
return;
}

2
Controllers/PhilipsHueController/RGBController_PhilipsHueEntertainment.cpp
View File

@@ -141,7 +141,7 @@ void RGBController_PhilipsHueEntertainment::KeepaliveThreadFunction()
{
if((std::chrono::steady_clock::now() - last_update_time) > std::chrono::seconds(5))
{
UpdateLEDs();
UpdateLEDsInternal();
}
}
std::this_thread::sleep_for(1s);

2
Controllers/SinowealthController/SinowealthKeyboard10cController/RGBController_SinowealthKeyboard10c.cpp
View File

@@ -164,7 +164,7 @@ void RGBController_SinowealthKeyboard10c::KeepaliveThreadFunction()
{
if(active_mode == MODE_DIRECT && (std::chrono::steady_clock::now() - last_update_time) > 1s)
{
UpdateLEDs();
UpdateLEDsInternal();
}
std::this_thread::sleep_for(500ms);
}

11
NetworkServer.cpp
View File

@@ -178,11 +178,20 @@ unsigned int NetworkServer::GetClientProtocolVersion(unsigned int client_num)
\*---------------------------------------------------------*/
void NetworkServer::DeviceListChanged()
{
/*-----------------------------------------------------*\
| Register the server's RGBController update handler |
| for each RGBController in the controllers list |
\*-----------------------------------------------------*/
//for(std::size_t controller_idx = 0; controller_idx < controllers.size(); controller_idx++)
//{
// controllers[controller_idx]->RegisterUpdateCallback();
//}
/*-----------------------------------------------------*\
| Indicate to the clients that the controller list has |
| changed |
\*-----------------------------------------------------*/
for(unsigned int client_idx = 0; client_idx < ServerClients.size(); client_idx++)
for(std::size_t client_idx = 0; client_idx < ServerClients.size(); client_idx++)
{
SendRequest_DeviceListChanged(ServerClients[client_idx]->client_sock);
}

5
RGBController/RGBController.cpp
View File

@@ -3752,6 +3752,11 @@ void RGBController::SetupColors()
}
}
void RGBController::UpdateLEDsInternal()
{
CallFlag_UpdateLEDs = true;
}
/*---------------------------------------------------------*\
| Functions to be implemented in device implementation |
\*---------------------------------------------------------*/

1
RGBController/RGBController.h
View File

@@ -727,6 +727,7 @@ protected:
\*-----------------------------------------------------*/
unsigned int LEDsInZone(unsigned int zone);
void SetupColors();
void UpdateLEDsInternal();
private:
/*-----------------------------------------------------*\