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

Add detection message for reading SPD information and rework IsAnyDimmDetectorEnabled so that it doesn't overwrite the detection string before the GUI can read it

Browse source
This commit is contained in:
Adam Honse 2025-06-27 01:26:29 -05:00
parent ad7a6e60f2
commit d796fcba8f
1 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
ResourceManager.cpp
View file

@ -1175,6 +1175,10 @@ void ResourceManager::DetectDevicesCoroutine()
LOG_INFO("------------------------------------------------------"); LOG_INFO("------------------------------------------------------");
LOG_INFO("| Detecting I2C DIMM modules |"); LOG_INFO("| Detecting I2C DIMM modules |");
LOG_INFO("------------------------------------------------------"); LOG_INFO("------------------------------------------------------");
detection_string = "Reading DRAM SPD Information";
DetectionProgressChanged();
for(unsigned int bus = 0; bus < busses.size() && IsAnyDimmDetectorEnabled(detector_settings); bus++) for(unsigned int bus = 0; bus < busses.size() && IsAnyDimmDetectorEnabled(detector_settings); bus++)
{ {
IF_DRAM_SMBUS(busses[bus]->pci_vendor, busses[bus]->pci_device) IF_DRAM_SMBUS(busses[bus]->pci_vendor, busses[bus]->pci_device)
@ -1938,12 +1942,12 @@ bool ResourceManager::IsAnyDimmDetectorEnabled(json &detector_settings)
{ {
for(unsigned int i2c_detector_idx = 0; i2c_detector_idx < i2c_dimm_device_detectors.size() && detection_is_required.load(); i2c_detector_idx++) for(unsigned int i2c_detector_idx = 0; i2c_detector_idx < i2c_dimm_device_detectors.size() && detection_is_required.load(); i2c_detector_idx++)
{ {
detection_string = i2c_dimm_device_detectors[i2c_detector_idx].name.c_str(); std::string detector_name_string = i2c_dimm_device_detectors[i2c_detector_idx].name.c_str();
/*-------------------------------------------------*\ /*-------------------------------------------------*\
| Check if this detector is enabled | | Check if this detector is enabled |
\*-------------------------------------------------*/ \*-------------------------------------------------*/
if(detector_settings.contains("detectors") && detector_settings["detectors"].contains(detection_string) && if(detector_settings.contains("detectors") && detector_settings["detectors"].contains(detector_name_string) &&
detector_settings["detectors"][detection_string] == true) detector_settings["detectors"][detector_name_string] == true)
{ {
return true; return true;
} }