From c030157ffb9075c1e555847a851b2e7d9997d3bf Mon Sep 17 00:00:00 2001 From: TheRogueZeta <6479694-TheRogueZeta@users.noreply.gitlab.com> Date: Wed, 2 Dec 2020 19:26:59 -0800 Subject: [PATCH] Retrive motherboard DMI name info and use it --- .../ASRockPolychromeSMBusController.cpp | 9 ++++++--- .../RGBController_ASRockPolychromeSMBus.cpp | 7 ++++++- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/Controllers/ASRockPolychromeSMBusController/ASRockPolychromeSMBusController.cpp b/Controllers/ASRockPolychromeSMBusController/ASRockPolychromeSMBusController.cpp index e2367e48..43b6c5c5 100644 --- a/Controllers/ASRockPolychromeSMBusController/ASRockPolychromeSMBusController.cpp +++ b/Controllers/ASRockPolychromeSMBusController/ASRockPolychromeSMBusController.cpp @@ -9,6 +9,7 @@ #include "ASRockPolychromeSMBusController.h" #include +#include "dependencies/dmiinfo.h" using namespace std::chrono_literals; @@ -17,6 +18,8 @@ PolychromeController::PolychromeController(i2c_smbus_interface* bus, polychrome_ this->bus = bus; this->dev = dev; + DMIInfo dmi; + unsigned short fw_version = ReadFirmwareVersion(); unsigned char major_version = fw_version >> 8; @@ -29,19 +32,19 @@ PolychromeController::PolychromeController(i2c_smbus_interface* bus, polychrome_ switch(major_version) { case ASROCK_TYPE_ASRLED: - device_name = "ASRock ASR LED"; + device_name = "ASRock " + dmi.getMainboard(); asrock_type = ASROCK_TYPE_ASRLED; memset(zone_led_count, 0, sizeof(zone_led_count)); break; case ASROCK_TYPE_POLYCHROME_V1: - device_name = "ASRock Polychrome V1"; + device_name = "ASRock " + dmi.getMainboard(); asrock_type = ASROCK_TYPE_POLYCHROME_V1; ReadLEDConfiguration(); break; case ASROCK_TYPE_POLYCHROME_V2: - device_name = "ASRock Polychrome V2"; + device_name = "ASRock " + dmi.getMainboard(); asrock_type = ASROCK_TYPE_POLYCHROME_V2; ReadLEDConfiguration(); break; diff --git a/Controllers/ASRockPolychromeSMBusController/RGBController_ASRockPolychromeSMBus.cpp b/Controllers/ASRockPolychromeSMBusController/RGBController_ASRockPolychromeSMBus.cpp index 321746a7..19b892f6 100644 --- a/Controllers/ASRockPolychromeSMBusController/RGBController_ASRockPolychromeSMBus.cpp +++ b/Controllers/ASRockPolychromeSMBusController/RGBController_ASRockPolychromeSMBus.cpp @@ -40,13 +40,14 @@ RGBController_Polychrome::RGBController_Polychrome(PolychromeController* polychr vendor = "ASRock"; version = polychrome->GetFirmwareVersion(); type = DEVICE_TYPE_MOTHERBOARD; - description = "ASRock ASR LED/Polychrome Device"; location = polychrome->GetDeviceLocation(); switch(polychrome->GetASRockType()) { case ASROCK_TYPE_ASRLED: { + description = "ASRock ASR LED Device"; + mode Off; Off.name = "Off"; Off.value = ASRLED_MODE_OFF; @@ -122,6 +123,8 @@ RGBController_Polychrome::RGBController_Polychrome(PolychromeController* polychr case ASROCK_TYPE_POLYCHROME_V1: { + description = "ASRock Polychrome v1 Device"; + mode Off; Off.name = "Off"; Off.value = POLYCHROME_V1_MODE_OFF; @@ -270,6 +273,8 @@ RGBController_Polychrome::RGBController_Polychrome(PolychromeController* polychr case ASROCK_TYPE_POLYCHROME_V2: { + description = "ASRock Polychrome v2 Device"; + mode Off; Off.name = "Off"; Off.value = POLYCHROME_V2_MODE_OFF;