jalr/OpenRGB
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add a mutex and remove a timeout to reduce flicker on HYTE Q60 logo LEDs

Browse source
This commit is contained in:
Adam Honse 2025-08-12 13:10:36 -05:00
parent 03d5dd6008
commit 2967ccb1cb
2 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Controllers/HYTENexusController/HYTENexusController.cpp
View file

@ -228,14 +228,11 @@ void HYTENexusController::LEDStreaming(unsigned char channel, unsigned short led
bytes_to_send = 750; bytes_to_send = 750;
} }
port_mutex.lock();
serialport->serial_write((char *)command_buf, bytes_to_send); serialport->serial_write((char *)command_buf, bytes_to_send);
serialport->serial_flush_tx(); serialport->serial_flush_tx();
serialport->serial_flush_rx(); serialport->serial_flush_rx();
port_mutex.unlock();
/*-----------------------------------------------------*\
| Wait 10ms for device process command |
\*-----------------------------------------------------*/
std::this_thread::sleep_for(5ms);
} }
void HYTENexusController::ReadChannelInfo(unsigned char channel) void HYTENexusController::ReadChannelInfo(unsigned char channel)
@ -254,6 +251,7 @@ void HYTENexusController::ReadChannelInfo(unsigned char channel)
command_buf[2] = 0x01; command_buf[2] = 0x01;
command_buf[3] = (channel + 1); command_buf[3] = (channel + 1);
port_mutex.lock();
serialport->serial_write((char *)command_buf, sizeof(command_buf)); serialport->serial_write((char *)command_buf, sizeof(command_buf));
serialport->serial_flush_tx(); serialport->serial_flush_tx();
@ -286,6 +284,7 @@ void HYTENexusController::ReadChannelInfo(unsigned char channel)
serialport->serial_read((char *)receive_buf, sizeof(receive_buf)); serialport->serial_read((char *)receive_buf, sizeof(receive_buf));
serialport->serial_flush_rx(); serialport->serial_flush_rx();
port_mutex.unlock();
channels[channel].num_devices = 0; channels[channel].num_devices = 0;
memset(&channels[channel].devices, 0, sizeof(channels[channel].devices)); memset(&channels[channel].devices, 0, sizeof(channels[channel].devices));
@ -321,6 +320,7 @@ void HYTENexusController::ReadDeviceInfo()
command_buf[2] = 0x01; command_buf[2] = 0x01;
command_buf[3] = 0x00; command_buf[3] = 0x00;
port_mutex.lock();
serialport->serial_write((char *)command_buf, sizeof(command_buf)); serialport->serial_write((char *)command_buf, sizeof(command_buf));
serialport->serial_flush_tx(); serialport->serial_flush_tx();
@ -351,6 +351,7 @@ void HYTENexusController::ReadDeviceInfo()
serialport->serial_read((char *)receive_buf, sizeof(receive_buf)); serialport->serial_read((char *)receive_buf, sizeof(receive_buf));
serialport->serial_flush_rx(); serialport->serial_flush_rx();
port_mutex.unlock();
/*-----------------------------------------------------*\ /*-----------------------------------------------------*\
| Update last update time | | Update last update time |
@ -374,6 +375,7 @@ void HYTENexusController::ReadFirmwareVersion()
command_buf[2] = 0x02; command_buf[2] = 0x02;
command_buf[3] = 0x00; command_buf[3] = 0x00;
port_mutex.lock();
serialport->serial_write((char *)command_buf, sizeof(command_buf)); serialport->serial_write((char *)command_buf, sizeof(command_buf));
serialport->serial_flush_tx(); serialport->serial_flush_tx();
@ -396,6 +398,7 @@ void HYTENexusController::ReadFirmwareVersion()
serialport->serial_read((char *)receive_buf, sizeof(receive_buf)); serialport->serial_read((char *)receive_buf, sizeof(receive_buf));
serialport->serial_flush_rx(); serialport->serial_flush_rx();
port_mutex.unlock();
/*-----------------------------------------------------*\ /*-----------------------------------------------------*\
| Format Firmware Version string | | Format Firmware Version string |

2
Controllers/HYTENexusController/HYTENexusController.h
View file

@ -13,6 +13,7 @@
#include <atomic> #include <atomic>
#include <chrono> #include <chrono>
#include <mutex>
#include <string> #include <string>
#include <thread> #include <thread>
#include "RGBController.h" #include "RGBController.h"
@ -70,6 +71,7 @@ private:
std::string firmware_version; std::string firmware_version;
std::string name; std::string name;
std::string port_name; std::string port_name;
std::mutex port_mutex;
serial_port * serialport = nullptr; serial_port * serialport = nullptr;
std::chrono::time_point<std::chrono::steady_clock> last_update_time; std::chrono::time_point<std::chrono::steady_clock> last_update_time;
std::atomic<bool> keepalive_thread_run; std::atomic<bool> keepalive_thread_run;