diff --git a/Controllers/LGMonitorController/LGMonitorController.cpp b/Controllers/LGMonitorController/LGMonitorController.cpp index 03e586c3..dfecf659 100644 --- a/Controllers/LGMonitorController/LGMonitorController.cpp +++ b/Controllers/LGMonitorController/LGMonitorController.cpp @@ -13,11 +13,11 @@ #include "LGMonitorController.h" #include "StringUtils.h" -LGMonitorController::LGMonitorController(hid_device* dev_handle, const hid_device_info& info) +LGMonitorController::LGMonitorController(hid_device* dev_handle, const hid_device_info& info, std::string dev_name) { dev = dev_handle; location = info.path; - version = ""; + name = dev_name; } LGMonitorController::~LGMonitorController() @@ -30,6 +30,11 @@ std::string LGMonitorController::GetDeviceLocation() return("HID: " + location); } +std::string LGMonitorController::GetNameString() +{ + return(name); +} + std::string LGMonitorController::GetSerialString() { wchar_t serial_string[128]; @@ -43,11 +48,6 @@ std::string LGMonitorController::GetSerialString() return(StringUtils::wstring_to_string(serial_string)); } -std::string LGMonitorController::GetFirmwareVersion() -{ - return(version); -} - void LGMonitorController::SetDirect(const std::vector colors) { /*---------------------------------------------------------*\ diff --git a/Controllers/LGMonitorController/LGMonitorController.h b/Controllers/LGMonitorController/LGMonitorController.h index 1189d64c..eef95e2e 100644 --- a/Controllers/LGMonitorController/LGMonitorController.h +++ b/Controllers/LGMonitorController/LGMonitorController.h @@ -44,12 +44,13 @@ enum class LGMonitorController { public: - LGMonitorController(hid_device* dev_handle, const hid_device_info& info); + LGMonitorController(hid_device* dev_handle, const hid_device_info& info, std::string dev_name); ~LGMonitorController(); - std::string GetSerialString(); std::string GetDeviceLocation(); std::string GetFirmwareVersion(); + std::string GetNameString(); + std::string GetSerialString(); void SetDirect(const std::vector colors); void SetMode(uint8_t mode_value, uint8_t brightness, const std::vector colors); @@ -58,6 +59,7 @@ private: hid_device* dev; std::string description; std::string location; + std::string name; std::string version; bool on = false; bool direct_mode_enabled = false; diff --git a/Controllers/LGMonitorController/LGMonitorControllerDetect.cpp b/Controllers/LGMonitorController/LGMonitorControllerDetect.cpp index 7f785ede..9b8f4e72 100644 --- a/Controllers/LGMonitorController/LGMonitorControllerDetect.cpp +++ b/Controllers/LGMonitorController/LGMonitorControllerDetect.cpp @@ -12,7 +12,6 @@ #include "Detector.h" #include "LGMonitorController.h" #include "RGBController_LGMonitor.h" -#include "dmiinfo.h" /*---------------------------------------------------------*\ | vendor ID | @@ -31,11 +30,8 @@ static void DetectLGMonitorControllers(hid_device_info* info, const std::string& if(dev) { - DMIInfo dmi; - - LGMonitorController* controller = new LGMonitorController(dev, *info); + LGMonitorController* controller = new LGMonitorController(dev, *info, name); RGBController_LGMonitor* rgb_controller = new RGBController_LGMonitor(controller); - rgb_controller->name = name; ResourceManager::get()->RegisterRGBController(rgb_controller); } diff --git a/Controllers/LGMonitorController/RGBController_LGMonitor.cpp b/Controllers/LGMonitorController/RGBController_LGMonitor.cpp index 4b4a60a0..91c5f199 100644 --- a/Controllers/LGMonitorController/RGBController_LGMonitor.cpp +++ b/Controllers/LGMonitorController/RGBController_LGMonitor.cpp @@ -28,12 +28,13 @@ using namespace std::chrono_literals; RGBController_LGMonitor::RGBController_LGMonitor(LGMonitorController* controller_ptr) { controller = controller_ptr; + + name = controller->GetNameString(); vendor = "LG"; type = DEVICE_TYPE_MONITOR; description = "LG Monitor"; location = controller->GetDeviceLocation(); serial = controller->GetSerialString(); - version = controller->GetFirmwareVersion(); mode Direct; Direct.name = "Direct";