diff --git a/Controllers/ASRockPolychromeSMBusController/ASRockPolychromeSMBusControllerDetect.cpp b/Controllers/ASRockPolychromeSMBusController/ASRockPolychromeSMBusControllerDetect.cpp index 60cd159c..a5cd13c5 100644 --- a/Controllers/ASRockPolychromeSMBusController/ASRockPolychromeSMBusControllerDetect.cpp +++ b/Controllers/ASRockPolychromeSMBusController/ASRockPolychromeSMBusControllerDetect.cpp @@ -54,11 +54,11 @@ void DetectPolychromeSMBusControllers(std::vector& busses) { IF_MOBO_SMBUS(busses[bus]->pci_vendor, busses[bus]->pci_device) { - LOG_TRACE("%s Bus %02d is an Motherboard, checking for for a device at 0x6A", ASROCK_DETECTOR_NAME, bus); + LOG_TRACE("%s Bus %02d is a motherboard, checking for a device at 0x6A", ASROCK_DETECTOR_NAME, bus); // Check for Polychrome controller at 0x6A if (TestForPolychromeSMBusController(busses[bus], 0x6A)) { - LOG_TRACE("%s Detected a device at address 0x6A, Testing for a known controller", ASROCK_DETECTOR_NAME); + LOG_TRACE("%s Detected a device at address 0x6A, testing for a known controller", ASROCK_DETECTOR_NAME); new_polychrome = new PolychromeController(busses[bus], 0x6A); if(new_polychrome->GetASRockType() != ASROCK_TYPE_UNKNOWN) @@ -80,7 +80,7 @@ void DetectPolychromeSMBusControllers(std::vector& busses) } else { - LOG_TRACE("%s Bus %02d not a Motherboard", ASROCK_DETECTOR_NAME, bus); + LOG_TRACE("%s Bus %02d not a motherboard", ASROCK_DETECTOR_NAME, bus); } } diff --git a/LogManager.cpp b/LogManager.cpp index 3181e510..f1b10452 100644 --- a/LogManager.cpp +++ b/LogManager.cpp @@ -9,7 +9,7 @@ #include "filesystem.h" -static const char* log_codes[] = {"FATAL:", "ERROR:", "Warning:", "Info:", "[verbose]", "Debug:", "Trace:"}; +static const char* log_codes[] = {"FATAL:", "ERROR:", "Warning:", "Info:", "Verbose:", "Debug:", "Trace:"}; LogManager::LogManager() { diff --git a/ResourceManager.cpp b/ResourceManager.cpp index 4381c6e5..9af081ab 100644 --- a/ResourceManager.cpp +++ b/ResourceManager.cpp @@ -105,7 +105,7 @@ std::vector & ResourceManager::GetI2CBusses() void ResourceManager::RegisterRGBController(RGBController *rgb_controller) { - LOG_INFO("Registering RGB controller: %s", rgb_controller->name.c_str()); + LOG_INFO("[%s] Registering RGB controller", rgb_controller->name.c_str()); rgb_controllers_hw.push_back(rgb_controller); UpdateDeviceList(); @@ -113,7 +113,7 @@ void ResourceManager::RegisterRGBController(RGBController *rgb_controller) void ResourceManager::UnregisterRGBController(RGBController* rgb_controller) { - LOG_INFO("Unregistering RGB controller: %s", rgb_controller->name.c_str()); + LOG_INFO("[%s] Unregistering RGB controller", rgb_controller->name.c_str()); /*-------------------------------------------------------------------------*\ | Clear callbacks from the controller before removal | @@ -746,7 +746,7 @@ void ResourceManager::DetectDevicesThreadFunction() this_device_enabled = detector_settings["detectors"][detection_string]; } - LOG_DEBUG("[%s] is %s", detection_string, ((this_device_enabled == true) ? "Enabled" : "Disabled")); + LOG_DEBUG("[%s] is %s", detection_string, ((this_device_enabled == true) ? "enabled" : "disabled")); if(this_device_enabled) { DetectionProgressChanged(); @@ -845,7 +845,7 @@ void ResourceManager::DetectDevicesThreadFunction() this_device_enabled = detector_settings["detectors"][detection_string]; } - LOG_DEBUG("[%s] is %s", detection_string, ((this_device_enabled == true) ? "Enabled" : "Disabled")); + LOG_DEBUG("[%s] is %s", detection_string, ((this_device_enabled == true) ? "enabled" : "disabled")); if(this_device_enabled) { @@ -940,7 +940,7 @@ void ResourceManager::DetectDevicesThreadFunction() this_device_enabled = detector_settings["detectors"][detection_string]; } - LOG_DEBUG("[%s] is %s", detection_string, ((this_device_enabled == true) ? "Enabled" : "Disabled")); + LOG_DEBUG("[%s] is %s", detection_string, ((this_device_enabled == true) ? "enabled" : "disabled")); if(this_device_enabled) { @@ -1001,7 +1001,7 @@ void ResourceManager::DetectDevicesThreadFunction() this_device_enabled = detector_settings["detectors"][detection_string]; } - LOG_DEBUG("[%s] is %s", detection_string, ((this_device_enabled == true) ? "Enabled" : "Disabled")); + LOG_DEBUG("[%s] is %s", detection_string, ((this_device_enabled == true) ? "enabled" : "disabled")); if(this_device_enabled) {