From d13d54fcfd765a0975ede64ccdd4698ca788db64 Mon Sep 17 00:00:00 2001 From: Adam Honse Date: Mon, 2 Aug 2021 12:41:24 -0500 Subject: [PATCH] Fix access conflicts in HyperX controllers where keepalive thread was directly accessing hardware --- .../RGBController_HyperXAlloyElite2.cpp | 2 +- .../RGBController_HyperXAlloyOrigins.cpp | 2 +- .../RGBController_HyperXAlloyOriginsCore.cpp | 2 +- .../HyperXKeyboardController/RGBController_HyperXKeyboard.cpp | 2 +- .../RGBController_HyperXPulsefireFPSPro.cpp | 2 +- .../RGBController_HyperXPulsefireSurge.cpp | 2 +- .../HyperXMousematController/RGBController_HyperXMousemat.cpp | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Controllers/HyperXKeyboardController/RGBController_HyperXAlloyElite2.cpp b/Controllers/HyperXKeyboardController/RGBController_HyperXAlloyElite2.cpp index f7baa048..1b4ca038 100644 --- a/Controllers/HyperXKeyboardController/RGBController_HyperXAlloyElite2.cpp +++ b/Controllers/HyperXKeyboardController/RGBController_HyperXAlloyElite2.cpp @@ -329,7 +329,7 @@ void RGBController_HyperXAlloyElite2::KeepaliveThreadFunction() { if((std::chrono::steady_clock::now() - last_update_time) > std::chrono::milliseconds(1000)) { - DeviceUpdateLEDs(); + UpdateLEDs(); } } std::this_thread::sleep_for(50ms); diff --git a/Controllers/HyperXKeyboardController/RGBController_HyperXAlloyOrigins.cpp b/Controllers/HyperXKeyboardController/RGBController_HyperXAlloyOrigins.cpp index f7f5547b..ce029cff 100644 --- a/Controllers/HyperXKeyboardController/RGBController_HyperXAlloyOrigins.cpp +++ b/Controllers/HyperXKeyboardController/RGBController_HyperXAlloyOrigins.cpp @@ -299,7 +299,7 @@ void RGBController_HyperXAlloyOrigins::KeepaliveThread() { if((std::chrono::steady_clock::now() - last_update_time) > std::chrono::milliseconds(50)) { - DeviceUpdateLEDs(); + UpdateLEDs(); } } std::this_thread::sleep_for(10ms);; diff --git a/Controllers/HyperXKeyboardController/RGBController_HyperXAlloyOriginsCore.cpp b/Controllers/HyperXKeyboardController/RGBController_HyperXAlloyOriginsCore.cpp index 5fd509e6..bf4ea368 100644 --- a/Controllers/HyperXKeyboardController/RGBController_HyperXAlloyOriginsCore.cpp +++ b/Controllers/HyperXKeyboardController/RGBController_HyperXAlloyOriginsCore.cpp @@ -275,7 +275,7 @@ void RGBController_HyperXAlloyOriginsCore::KeepaliveThread() { if((std::chrono::steady_clock::now() - last_update_time) > std::chrono::milliseconds(50)) { - DeviceUpdateLEDs(); + UpdateLEDs(); } } std::this_thread::sleep_for(10ms); diff --git a/Controllers/HyperXKeyboardController/RGBController_HyperXKeyboard.cpp b/Controllers/HyperXKeyboardController/RGBController_HyperXKeyboard.cpp index 1b138f1e..739df83a 100644 --- a/Controllers/HyperXKeyboardController/RGBController_HyperXKeyboard.cpp +++ b/Controllers/HyperXKeyboardController/RGBController_HyperXKeyboard.cpp @@ -355,7 +355,7 @@ void RGBController_HyperXKeyboard::KeepaliveThreadFunction() { if((std::chrono::steady_clock::now() - last_update_time) > std::chrono::milliseconds(50)) { - DeviceUpdateLEDs(); + UpdateLEDs(); } } std::this_thread::sleep_for(10ms);; diff --git a/Controllers/HyperXMouseController/RGBController_HyperXPulsefireFPSPro.cpp b/Controllers/HyperXMouseController/RGBController_HyperXPulsefireFPSPro.cpp index f111a51d..3ef37327 100644 --- a/Controllers/HyperXMouseController/RGBController_HyperXPulsefireFPSPro.cpp +++ b/Controllers/HyperXMouseController/RGBController_HyperXPulsefireFPSPro.cpp @@ -131,7 +131,7 @@ void RGBController_HyperXPulsefireFPSPro::KeepaliveThread() { if((std::chrono::steady_clock::now() - last_update_time) > std::chrono::milliseconds(50)) { - DeviceUpdateLEDs(); + UpdateLEDs(); } } std::this_thread::sleep_for(10ms); diff --git a/Controllers/HyperXMouseController/RGBController_HyperXPulsefireSurge.cpp b/Controllers/HyperXMouseController/RGBController_HyperXPulsefireSurge.cpp index 8da04e89..7163fabe 100644 --- a/Controllers/HyperXMouseController/RGBController_HyperXPulsefireSurge.cpp +++ b/Controllers/HyperXMouseController/RGBController_HyperXPulsefireSurge.cpp @@ -140,7 +140,7 @@ void RGBController_HyperXPulsefireSurge::KeepaliveThread() { if((std::chrono::steady_clock::now() - last_update_time) > std::chrono::milliseconds(50)) { - DeviceUpdateLEDs(); + UpdateLEDs(); } } std::this_thread::sleep_for(10ms); diff --git a/Controllers/HyperXMousematController/RGBController_HyperXMousemat.cpp b/Controllers/HyperXMousematController/RGBController_HyperXMousemat.cpp index 2901bfc6..33371c8e 100644 --- a/Controllers/HyperXMousematController/RGBController_HyperXMousemat.cpp +++ b/Controllers/HyperXMousematController/RGBController_HyperXMousemat.cpp @@ -140,7 +140,7 @@ void RGBController_HyperXMousemat::KeepaliveThread() { if((std::chrono::steady_clock::now() - last_update_time) > std::chrono::milliseconds(50)) { - DeviceUpdateLEDs(); + UpdateLEDs(); } } std::this_thread::sleep_for(10ms);