diff --git a/Controllers/AMDWraithPrismController/RGBController_AMDWraithPrism.cpp b/Controllers/AMDWraithPrismController/RGBController_AMDWraithPrism.cpp index 8e1cb336..ec21d982 100644 --- a/Controllers/AMDWraithPrismController/RGBController_AMDWraithPrism.cpp +++ b/Controllers/AMDWraithPrismController/RGBController_AMDWraithPrism.cpp @@ -14,6 +14,7 @@ RGBController_AMDWraithPrism::RGBController_AMDWraithPrism(AMDWraithPrismControl wraith = wraith_ptr; name = "AMD Wraith Prism"; + vendor = "Cooler Master"; type = DEVICE_TYPE_COOLER; description = "AMD Wraith Prism Device"; version = wraith->GetFirmwareVersionString(); diff --git a/Controllers/ASRockPolychromeSMBusController/RGBController_ASRockPolychromeSMBus.cpp b/Controllers/ASRockPolychromeSMBusController/RGBController_ASRockPolychromeSMBus.cpp index c5043db1..321746a7 100644 --- a/Controllers/ASRockPolychromeSMBusController/RGBController_ASRockPolychromeSMBus.cpp +++ b/Controllers/ASRockPolychromeSMBusController/RGBController_ASRockPolychromeSMBus.cpp @@ -37,6 +37,7 @@ RGBController_Polychrome::RGBController_Polychrome(PolychromeController* polychr polychrome = polychrome_ptr; name = polychrome->GetDeviceName(); + vendor = "ASRock"; version = polychrome->GetFirmwareVersion(); type = DEVICE_TYPE_MOTHERBOARD; description = "ASRock ASR LED/Polychrome Device"; diff --git a/Controllers/AsusAuraCoreController/RGBController_AsusAuraCore.cpp b/Controllers/AsusAuraCoreController/RGBController_AsusAuraCore.cpp index d101b55c..1a971db6 100644 --- a/Controllers/AsusAuraCoreController/RGBController_AsusAuraCore.cpp +++ b/Controllers/AsusAuraCoreController/RGBController_AsusAuraCore.cpp @@ -13,6 +13,7 @@ RGBController_AuraCore::RGBController_AuraCore(AuraCoreController* aura_ptr) aura = aura_ptr; name = "ASUS Aura Core"; + vendor = "ASUS"; type = DEVICE_TYPE_KEYBOARD; description = "ASUS Aura Core Device"; diff --git a/Controllers/AsusAuraGPUController/RGBController_AsusAuraGPU.cpp b/Controllers/AsusAuraGPUController/RGBController_AsusAuraGPU.cpp index a3dbc52f..6fa0541c 100644 --- a/Controllers/AsusAuraGPUController/RGBController_AsusAuraGPU.cpp +++ b/Controllers/AsusAuraGPUController/RGBController_AsusAuraGPU.cpp @@ -47,6 +47,7 @@ RGBController_AuraGPU::RGBController_AuraGPU(AuraGPUController * aura_gpu_ptr) name = aura_gpu->GetDeviceName(); + vendor = "ASUS"; type = DEVICE_TYPE_GPU; description = "ASUS Aura GPU Device"; version = "0.00.1"; diff --git a/Controllers/AsusAuraSMBusController/RGBController_AsusAuraSMBus.cpp b/Controllers/AsusAuraSMBusController/RGBController_AsusAuraSMBus.cpp index 5b31d6f1..a3a0d0a4 100644 --- a/Controllers/AsusAuraSMBusController/RGBController_AsusAuraSMBus.cpp +++ b/Controllers/AsusAuraSMBusController/RGBController_AsusAuraSMBus.cpp @@ -129,6 +129,7 @@ RGBController_AuraSMBus::RGBController_AuraSMBus(AuraSMBusController * aura_ptr) type = DEVICE_TYPE_MOTHERBOARD; name = "ASUS Aura Motherboard"; } + vendor = "ASUS"; description = "ASUS Aura SMBus Device"; mode Direct; diff --git a/Controllers/AsusAuraUSBController/RGBController_AsusAuraMouse.cpp b/Controllers/AsusAuraUSBController/RGBController_AsusAuraMouse.cpp index 22eeca20..1b831513 100644 --- a/Controllers/AsusAuraUSBController/RGBController_AsusAuraMouse.cpp +++ b/Controllers/AsusAuraUSBController/RGBController_AsusAuraMouse.cpp @@ -14,6 +14,7 @@ RGBController_AuraMouse::RGBController_AuraMouse(AuraMouseController* aura_ptr) aura = aura_ptr; name = "ASUS Aura Mouse"; + vendor = "ASUS"; type = DEVICE_TYPE_MOUSE; description = "ASUS Aura Mouse Device"; location = aura->GetDeviceLocation(); diff --git a/Controllers/AsusAuraUSBController/RGBController_AsusAuraUSB.cpp b/Controllers/AsusAuraUSBController/RGBController_AsusAuraUSB.cpp index 1bb60df0..c436fcee 100644 --- a/Controllers/AsusAuraUSBController/RGBController_AsusAuraUSB.cpp +++ b/Controllers/AsusAuraUSBController/RGBController_AsusAuraUSB.cpp @@ -14,6 +14,7 @@ RGBController_AuraUSB::RGBController_AuraUSB(AuraUSBController* aura_ptr) aura = aura_ptr; name = "ASUS Aura USB"; + vendor = "ASUS"; version = aura->GetDeviceName(); type = DEVICE_TYPE_MOTHERBOARD; description = "ASUS Aura USB Device"; diff --git a/Controllers/AsusTUFLaptopController/RGBController_AsusTUFLaptopWMI.cpp b/Controllers/AsusTUFLaptopController/RGBController_AsusTUFLaptopWMI.cpp index 272da4c9..5e3bc5b9 100644 --- a/Controllers/AsusTUFLaptopController/RGBController_AsusTUFLaptopWMI.cpp +++ b/Controllers/AsusTUFLaptopController/RGBController_AsusTUFLaptopWMI.cpp @@ -13,6 +13,7 @@ using namespace std::chrono_literals; RGBController_AsusTUFLaptopWMI::RGBController_AsusTUFLaptopWMI() { name = "ASUS TUF Keyboard"; + vendor = "ASUS"; type = DEVICE_TYPE_KEYBOARD; description = "WMI Device"; location = "\\\\.\\ATKACPI"; diff --git a/Controllers/CoolerMasterController/RGBController_CMARGBController.cpp b/Controllers/CoolerMasterController/RGBController_CMARGBController.cpp index 57e46f58..81306030 100644 --- a/Controllers/CoolerMasterController/RGBController_CMARGBController.cpp +++ b/Controllers/CoolerMasterController/RGBController_CMARGBController.cpp @@ -15,6 +15,7 @@ RGBController_CMARGBController::RGBController_CMARGBController(CMARGBController unsigned char speed = cmargb->GetLedSpeed(); name = argb_header_data[cmargb->GetZoneIndex()].name; + vendor = "Cooler Master"; type = DEVICE_TYPE_LEDSTRIP; description = cmargb->GetDeviceName(); version = "1.0"; diff --git a/Controllers/CoolerMasterController/RGBController_CMMP750Controller.cpp b/Controllers/CoolerMasterController/RGBController_CMMP750Controller.cpp index 54a4a888..dac9a793 100644 --- a/Controllers/CoolerMasterController/RGBController_CMMP750Controller.cpp +++ b/Controllers/CoolerMasterController/RGBController_CMMP750Controller.cpp @@ -15,6 +15,7 @@ RGBController_CMMP750Controller::RGBController_CMMP750Controller(CMMP750Controll unsigned char speed = cmmp750->GetLedSpeed(); name = cmmp750->GetDeviceName(); + vendor = "Cooler Master"; type = DEVICE_TYPE_MOUSEMAT; description = cmmp750->GetDeviceName(); version = "1.0"; diff --git a/Controllers/CorsairDominatorPlatinumController/RGBController_CorsairDominatorPlatinum.cpp b/Controllers/CorsairDominatorPlatinumController/RGBController_CorsairDominatorPlatinum.cpp index 68ba717b..c4c0be6e 100644 --- a/Controllers/CorsairDominatorPlatinumController/RGBController_CorsairDominatorPlatinum.cpp +++ b/Controllers/CorsairDominatorPlatinumController/RGBController_CorsairDominatorPlatinum.cpp @@ -13,6 +13,7 @@ RGBController_CorsairDominatorPlatinum::RGBController_CorsairDominatorPlatinum(C corsair = corsair_ptr; name = corsair->GetDeviceName(); + vendor = "Corsair"; type = DEVICE_TYPE_DRAM; description = "Corsair Dominator Platinum RGB Device"; location = corsair->GetDeviceLocation(); diff --git a/Controllers/CorsairHydroController/RGBController_CorsairHydro.cpp b/Controllers/CorsairHydroController/RGBController_CorsairHydro.cpp index a4baf117..6f8b198c 100644 --- a/Controllers/CorsairHydroController/RGBController_CorsairHydro.cpp +++ b/Controllers/CorsairHydroController/RGBController_CorsairHydro.cpp @@ -13,6 +13,7 @@ RGBController_CorsairHydro::RGBController_CorsairHydro(CorsairHydroController* c { corsair = corsair_ptr; + vendor = "Corsair"; description = "Corsair Hydro Series Device"; version = corsair->GetFirmwareString(); type = DEVICE_TYPE_COOLER; diff --git a/Controllers/CorsairLightingNodeController/RGBController_CorsairLightingNode.cpp b/Controllers/CorsairLightingNodeController/RGBController_CorsairLightingNode.cpp index f4a6d1b3..6e25d46b 100644 --- a/Controllers/CorsairLightingNodeController/RGBController_CorsairLightingNode.cpp +++ b/Controllers/CorsairLightingNodeController/RGBController_CorsairLightingNode.cpp @@ -15,6 +15,7 @@ RGBController_CorsairLightingNode::RGBController_CorsairLightingNode(CorsairLigh corsair = corsair_ptr; name = "Corsair Lighting Node Device"; + vendor = "Corsair"; description = "Corsair Lighting Node Device"; type = DEVICE_TYPE_LEDSTRIP; version = corsair->GetFirmwareString(); diff --git a/Controllers/CorsairPeripheralController/RGBController_CorsairPeripheral.cpp b/Controllers/CorsairPeripheralController/RGBController_CorsairPeripheral.cpp index 9007e293..75b585b4 100644 --- a/Controllers/CorsairPeripheralController/RGBController_CorsairPeripheral.cpp +++ b/Controllers/CorsairPeripheralController/RGBController_CorsairPeripheral.cpp @@ -556,6 +556,7 @@ RGBController_CorsairPeripheral::RGBController_CorsairPeripheral(CorsairPeripher corsair = corsair_ptr; name = "Corsair RGB Peripheral Device"; + vendor = "Corsair"; description = "Corsair RGB Peripheral Device"; type = corsair->GetDeviceType(); version = corsair->GetFirmwareString(); diff --git a/Controllers/CorsairVengeanceController/RGBController_CorsairVengeance.cpp b/Controllers/CorsairVengeanceController/RGBController_CorsairVengeance.cpp index a8c72160..ff504a01 100644 --- a/Controllers/CorsairVengeanceController/RGBController_CorsairVengeance.cpp +++ b/Controllers/CorsairVengeanceController/RGBController_CorsairVengeance.cpp @@ -14,6 +14,7 @@ RGBController_CorsairVengeance::RGBController_CorsairVengeance(CorsairVengeanceC corsair = corsair_ptr; name = corsair->GetDeviceName(); + vendor = "Corsair"; type = DEVICE_TYPE_DRAM; description = "Corsair Vengeance RGB Device"; location = corsair->GetDeviceLocation(); diff --git a/Controllers/CorsairVengeanceProController/RGBController_CorsairVengeancePro.cpp b/Controllers/CorsairVengeanceProController/RGBController_CorsairVengeancePro.cpp index b9acfa88..54b3029f 100644 --- a/Controllers/CorsairVengeanceProController/RGBController_CorsairVengeancePro.cpp +++ b/Controllers/CorsairVengeanceProController/RGBController_CorsairVengeancePro.cpp @@ -14,6 +14,7 @@ RGBController_CorsairVengeancePro::RGBController_CorsairVengeancePro(CorsairVeng corsair = corsair_ptr; name = corsair->GetDeviceName(); + vendor = "Corsair"; type = DEVICE_TYPE_DRAM; description = "Corsair Vengeance Pro RGB Device"; location = corsair->GetDeviceLocation(); diff --git a/Controllers/CrucialController/RGBController_Crucial.cpp b/Controllers/CrucialController/RGBController_Crucial.cpp index 91eae0a8..7502d93d 100644 --- a/Controllers/CrucialController/RGBController_Crucial.cpp +++ b/Controllers/CrucialController/RGBController_Crucial.cpp @@ -14,6 +14,7 @@ RGBController_Crucial::RGBController_Crucial(CrucialController * crucial_ptr) crucial = crucial_ptr; name = "Crucial DRAM"; + vendor = "Crucial"; type = DEVICE_TYPE_DRAM; description = "Crucial DRAM Device"; location = crucial->GetDeviceLocation(); diff --git a/Controllers/DuckyKeyboardController/RGBController_DuckyKeyboard.cpp b/Controllers/DuckyKeyboardController/RGBController_DuckyKeyboard.cpp index 0d72588b..f3578522 100644 --- a/Controllers/DuckyKeyboardController/RGBController_DuckyKeyboard.cpp +++ b/Controllers/DuckyKeyboardController/RGBController_DuckyKeyboard.cpp @@ -176,6 +176,7 @@ RGBController_DuckyKeyboard::RGBController_DuckyKeyboard(DuckyKeyboardController ducky = ducky_ptr; name = "Ducky Keyboard Device"; + vendor = "Ducky"; type = DEVICE_TYPE_KEYBOARD; description = "Ducky Keyboard Device"; location = ducky->GetDeviceLocation(); diff --git a/Controllers/EKController/RGBController_EKController.cpp b/Controllers/EKController/RGBController_EKController.cpp index 3d6fda4f..aeefd7da 100644 --- a/Controllers/EKController/RGBController_EKController.cpp +++ b/Controllers/EKController/RGBController_EKController.cpp @@ -14,6 +14,7 @@ RGBController_EKController::RGBController_EKController(EKController* _dev) EK_dev = _dev; name = EK_dev->GetDeviceName(); + vendor = "EK"; type = DEVICE_TYPE_LEDSTRIP; description = EK_dev->GetDeviceName(); version = "1.0"; diff --git a/Controllers/EVGAGPUController/RGBController_EVGAGPUv1.cpp b/Controllers/EVGAGPUController/RGBController_EVGAGPUv1.cpp index f8a2f019..95ef2135 100644 --- a/Controllers/EVGAGPUController/RGBController_EVGAGPUv1.cpp +++ b/Controllers/EVGAGPUController/RGBController_EVGAGPUv1.cpp @@ -14,6 +14,7 @@ RGBController_EVGAGPUv1::RGBController_EVGAGPUv1(EVGAGPUv1Controller* evga_ptr) evga = evga_ptr; name = "EVGA GPU"; + vendor = "EVGA"; description = "EVGA RGB v1 GPU Device"; location = evga->GetDeviceLocation(); diff --git a/Controllers/EVGAGPUController/RGBController_EVGAGPUv2.cpp b/Controllers/EVGAGPUController/RGBController_EVGAGPUv2.cpp index 78e37e1f..146611f0 100644 --- a/Controllers/EVGAGPUController/RGBController_EVGAGPUv2.cpp +++ b/Controllers/EVGAGPUController/RGBController_EVGAGPUv2.cpp @@ -14,6 +14,7 @@ RGBController_EVGAGPUv2::RGBController_EVGAGPUv2(EVGAGPUv2Controller* evga_ptr) evga = evga_ptr; name = "EVGA GPU"; + vendor = "EVGA"; description = "EVGA RGB v2 GPU Device"; location = evga->GetDeviceLocation(); diff --git a/Controllers/FaustusController/RGBController_Faustus.cpp b/Controllers/FaustusController/RGBController_Faustus.cpp index a6874735..4b4e727c 100644 --- a/Controllers/FaustusController/RGBController_Faustus.cpp +++ b/Controllers/FaustusController/RGBController_Faustus.cpp @@ -6,6 +6,7 @@ RGBController_Faustus::RGBController_Faustus(const std::string& dev_path) { name = "ASUS TUF Keyboard"; + vendor = "ASUS"; type = DEVICE_TYPE_KEYBOARD; description = "Faustus Device"; diff --git a/Controllers/GalaxGPUController/RGBController_GalaxGPU.cpp b/Controllers/GalaxGPUController/RGBController_GalaxGPU.cpp index 31d415f7..f29fe07a 100644 --- a/Controllers/GalaxGPUController/RGBController_GalaxGPU.cpp +++ b/Controllers/GalaxGPUController/RGBController_GalaxGPU.cpp @@ -45,6 +45,7 @@ RGBController_GalaxGPU::RGBController_GalaxGPU(GalaxGPUController * galax_gpu_pt galax_gpu = galax_gpu_ptr; name = galax_gpu->GetDeviceName(); + vendor = "GALAX"; type = DEVICE_TYPE_GPU; description = "GALAX / KFA2 RTX GPU"; version = "1.0"; diff --git a/Controllers/GigabyteAorusCPUCoolerController/RGBController_AorusATC800.cpp b/Controllers/GigabyteAorusCPUCoolerController/RGBController_AorusATC800.cpp index 141e44a9..595c3520 100644 --- a/Controllers/GigabyteAorusCPUCoolerController/RGBController_AorusATC800.cpp +++ b/Controllers/GigabyteAorusCPUCoolerController/RGBController_AorusATC800.cpp @@ -14,6 +14,7 @@ RGBController_AorusATC800::RGBController_AorusATC800(ATC800Controller* cooler_pt cooler = cooler_ptr; name = "Aorus ATC800 CPU Cooler"; + vendor = "Gigabyte"; type = DEVICE_TYPE_COOLER; description = "Aorus ATC800 CPU Cooler"; location = cooler->GetDeviceLocation(); diff --git a/Controllers/GigabyteRGBFusion2DRAMController/RGBController_GigabyteRGBFusion2DRAM.cpp b/Controllers/GigabyteRGBFusion2DRAMController/RGBController_GigabyteRGBFusion2DRAM.cpp index fa2499de..71a408d3 100644 --- a/Controllers/GigabyteRGBFusion2DRAMController/RGBController_GigabyteRGBFusion2DRAM.cpp +++ b/Controllers/GigabyteRGBFusion2DRAMController/RGBController_GigabyteRGBFusion2DRAM.cpp @@ -14,6 +14,7 @@ RGBController_RGBFusion2DRAM::RGBController_RGBFusion2DRAM(RGBFusion2DRAMControl rgb_fusion = rgb_fusion_ptr; name = "RGB Fusion 2 DRAM"; + vendor = "Gigabyte"; description = "RGB Fusion 2 DRAM Device"; location = rgb_fusion->GetDeviceLocation(); diff --git a/Controllers/GigabyteRGBFusion2SMBusController/RGBController_GigabyteRGBFusion2SMBus.cpp b/Controllers/GigabyteRGBFusion2SMBusController/RGBController_GigabyteRGBFusion2SMBus.cpp index 9cdd20f5..ae7784b6 100644 --- a/Controllers/GigabyteRGBFusion2SMBusController/RGBController_GigabyteRGBFusion2SMBus.cpp +++ b/Controllers/GigabyteRGBFusion2SMBusController/RGBController_GigabyteRGBFusion2SMBus.cpp @@ -42,6 +42,7 @@ RGBController_RGBFusion2SMBus::RGBController_RGBFusion2SMBus(RGBFusion2SMBusCont rgb_fusion = rgb_fusion_ptr; name = rgb_fusion->GetDeviceName(); + vendor = "Gigabyte"; description = "RGB Fusion 2 SMBus"; location = rgb_fusion->GetDeviceLocation(); diff --git a/Controllers/GigabyteRGBFusion2USBController/RGBController_GigabyteRGBFusion2USB.cpp b/Controllers/GigabyteRGBFusion2USBController/RGBController_GigabyteRGBFusion2USB.cpp index 2112352c..2b592c19 100644 --- a/Controllers/GigabyteRGBFusion2USBController/RGBController_GigabyteRGBFusion2USB.cpp +++ b/Controllers/GigabyteRGBFusion2USBController/RGBController_GigabyteRGBFusion2USB.cpp @@ -108,6 +108,7 @@ RGBController_RGBFusion2USB::RGBController_RGBFusion2USB(RGBFusion2USBController controller = controller_ptr; name = controller->GetDeviceName(); + vendor = "Gigabyte"; type = DEVICE_TYPE_MOTHERBOARD; description = controller->GetDeviceDescription(); version = controller->GetFWVersion(); diff --git a/Controllers/GigabyteRGBFusionController/RGBController_GigabyteRGBFusion.cpp b/Controllers/GigabyteRGBFusionController/RGBController_GigabyteRGBFusion.cpp index fee35e72..b3139fe7 100644 --- a/Controllers/GigabyteRGBFusionController/RGBController_GigabyteRGBFusion.cpp +++ b/Controllers/GigabyteRGBFusionController/RGBController_GigabyteRGBFusion.cpp @@ -20,6 +20,7 @@ RGBController_RGBFusion::RGBController_RGBFusion(RGBFusionController* rgb_fusion rgb_fusion = rgb_fusion_ptr; name = rgb_fusion->GetDeviceName(); + vendor = "Gigabyte"; description = "RGB Fusion 1.0"; location = rgb_fusion->GetDeviceLocation(); diff --git a/Controllers/GigabyteRGBFusionGPUController/RGBController_GigabyteRGBFusionGPU.cpp b/Controllers/GigabyteRGBFusionGPUController/RGBController_GigabyteRGBFusionGPU.cpp index 9f706354..b2daa5ce 100644 --- a/Controllers/GigabyteRGBFusionGPUController/RGBController_GigabyteRGBFusionGPU.cpp +++ b/Controllers/GigabyteRGBFusionGPUController/RGBController_GigabyteRGBFusionGPU.cpp @@ -14,6 +14,7 @@ RGBController_RGBFusionGPU::RGBController_RGBFusionGPU(RGBFusionGPUController* r rgb_fusion = rgb_fusion_ptr; name = "Gigabyte GPU"; + vendor = "Gigabyte"; description = "RGB Fusion GPU"; location = rgb_fusion->GetDeviceLocation(); diff --git a/Controllers/HoltekController/RGBController_HoltekA070.cpp b/Controllers/HoltekController/RGBController_HoltekA070.cpp index 8c090817..75b14344 100644 --- a/Controllers/HoltekController/RGBController_HoltekA070.cpp +++ b/Controllers/HoltekController/RGBController_HoltekA070.cpp @@ -13,6 +13,7 @@ RGBController_HoltekA070::RGBController_HoltekA070(HoltekA070Controller* holtek_ holtek = holtek_ptr; name = "Holtek USB Gaming Mouse Device"; + vendor = "Holtek"; type = DEVICE_TYPE_MOUSE; description = "Holtek USB Gaming Mouse Device"; location = holtek->GetDeviceLocation(); diff --git a/Controllers/HyperXDRAMController/RGBController_HyperXDRAM.cpp b/Controllers/HyperXDRAMController/RGBController_HyperXDRAM.cpp index cfa2a955..7eaed359 100644 --- a/Controllers/HyperXDRAMController/RGBController_HyperXDRAM.cpp +++ b/Controllers/HyperXDRAMController/RGBController_HyperXDRAM.cpp @@ -15,6 +15,7 @@ RGBController_HyperXDRAM::RGBController_HyperXDRAM(HyperXDRAMController* hyperx_ hyperx = hyperx_ptr; name = hyperx->GetDeviceName(); + vendor = "HyperX"; type = DEVICE_TYPE_DRAM; description = "HyperX DRAM Device"; location = hyperx->GetDeviceLocation(); diff --git a/Controllers/HyperXKeyboardController/RGBController_HyperXAlloyOrigins.cpp b/Controllers/HyperXKeyboardController/RGBController_HyperXAlloyOrigins.cpp index 49cd85be..e8dff75b 100644 --- a/Controllers/HyperXKeyboardController/RGBController_HyperXAlloyOrigins.cpp +++ b/Controllers/HyperXKeyboardController/RGBController_HyperXAlloyOrigins.cpp @@ -172,6 +172,7 @@ RGBController_HyperXAlloyOrigins::RGBController_HyperXAlloyOrigins(HyperXAlloyOr hyperx = hyperx_ptr; name = "HyperX Alloy Origins Keyboard Device"; + vendor = "HyperX"; type = DEVICE_TYPE_KEYBOARD; description = "HyperX Alloy Origins Keyboard Device"; location = hyperx->GetDeviceLocation(); diff --git a/Controllers/HyperXKeyboardController/RGBController_HyperXKeyboard.cpp b/Controllers/HyperXKeyboardController/RGBController_HyperXKeyboard.cpp index 0bf9aada..d10ae696 100644 --- a/Controllers/HyperXKeyboardController/RGBController_HyperXKeyboard.cpp +++ b/Controllers/HyperXKeyboardController/RGBController_HyperXKeyboard.cpp @@ -180,6 +180,7 @@ RGBController_HyperXKeyboard::RGBController_HyperXKeyboard(HyperXKeyboardControl hyperx = hyperx_ptr; name = "HyperX RGB Keyboard"; + vendor = "HyperX"; type = DEVICE_TYPE_KEYBOARD; description = "HyperX RGB Keyboard Device"; location = hyperx->GetDeviceLocation(); diff --git a/Controllers/HyperXMouseController/RGBController_HyperXPulsefireSurge.cpp b/Controllers/HyperXMouseController/RGBController_HyperXPulsefireSurge.cpp index 56757d0e..fe5b3481 100644 --- a/Controllers/HyperXMouseController/RGBController_HyperXPulsefireSurge.cpp +++ b/Controllers/HyperXMouseController/RGBController_HyperXPulsefireSurge.cpp @@ -16,6 +16,7 @@ RGBController_HyperXPulsefireSurge::RGBController_HyperXPulsefireSurge(HyperXPul hyperx = hyperx_ptr; name = "HyperX Pulsefire Surge Device"; + vendor = "HyperX"; type = DEVICE_TYPE_MOUSE; description = "HyperX Pulsefire Surge Device"; location = hyperx->GetDeviceLocation(); diff --git a/Controllers/HyperXMousematController/RGBController_HyperXMousemat.cpp b/Controllers/HyperXMousematController/RGBController_HyperXMousemat.cpp index 095d8866..d9354b70 100644 --- a/Controllers/HyperXMousematController/RGBController_HyperXMousemat.cpp +++ b/Controllers/HyperXMousematController/RGBController_HyperXMousemat.cpp @@ -16,6 +16,7 @@ RGBController_HyperXMousemat::RGBController_HyperXMousemat(HyperXMousematControl hyperx = hyperx_ptr; name = "HyperX Mousemat Device"; + vendor = "HyperX"; type = DEVICE_TYPE_MOUSEMAT; description = "HyperX Mousemat Device"; location = hyperx->GetDeviceLocation(); diff --git a/Controllers/LogitechController/RGBController_LogitechG203.cpp b/Controllers/LogitechController/RGBController_LogitechG203.cpp index b984cbaf..c5b299cc 100644 --- a/Controllers/LogitechController/RGBController_LogitechG203.cpp +++ b/Controllers/LogitechController/RGBController_LogitechG203.cpp @@ -14,6 +14,7 @@ RGBController_LogitechG203::RGBController_LogitechG203(LogitechG203Controller* l logitech = logitech_ptr; name = "Logitech Mouse Device"; + vendor = "Logitech"; type = DEVICE_TYPE_MOUSE; description = "Logitech Mouse Device"; location = logitech->GetDeviceLocation(); diff --git a/Controllers/LogitechController/RGBController_LogitechG203L.cpp b/Controllers/LogitechController/RGBController_LogitechG203L.cpp index 6cecda02..08750bc8 100644 --- a/Controllers/LogitechController/RGBController_LogitechG203L.cpp +++ b/Controllers/LogitechController/RGBController_LogitechG203L.cpp @@ -5,6 +5,7 @@ RGBController_LogitechG203L::RGBController_LogitechG203L(LogitechG203LController logitech = logitech_ptr; name = "Logitech Mouse Device"; + vendor = "Logitech"; type = DEVICE_TYPE_MOUSE; description = "Logitech Mouse Device"; location = logitech->GetDeviceLocation(); diff --git a/Controllers/LogitechController/RGBController_LogitechG213.cpp b/Controllers/LogitechController/RGBController_LogitechG213.cpp index df6095fc..fb61c05e 100644 --- a/Controllers/LogitechController/RGBController_LogitechG213.cpp +++ b/Controllers/LogitechController/RGBController_LogitechG213.cpp @@ -33,6 +33,7 @@ RGBController_LogitechG213::RGBController_LogitechG213(LogitechG213Controller* l logitechG213 = logitech_ptr; name = "Logitech G213 Keyboard Device"; + vendor = "Logitech"; type = DEVICE_TYPE_KEYBOARD; description = "Logitech G213 Keyboard Device"; diff --git a/Controllers/LogitechController/RGBController_LogitechG403.cpp b/Controllers/LogitechController/RGBController_LogitechG403.cpp index 2e7a1fc8..fb578ca6 100644 --- a/Controllers/LogitechController/RGBController_LogitechG403.cpp +++ b/Controllers/LogitechController/RGBController_LogitechG403.cpp @@ -14,6 +14,7 @@ RGBController_LogitechG403::RGBController_LogitechG403(LogitechG403Controller* l logitech = logitech_ptr; name = "Logitech Mouse Device"; + vendor = "Logitech"; type = DEVICE_TYPE_MOUSE; description = "Logitech Mouse Device"; location = logitech->GetDeviceLocation(); diff --git a/Controllers/LogitechController/RGBController_LogitechG502PS.cpp b/Controllers/LogitechController/RGBController_LogitechG502PS.cpp index 561944db..bffd15cb 100644 --- a/Controllers/LogitechController/RGBController_LogitechG502PS.cpp +++ b/Controllers/LogitechController/RGBController_LogitechG502PS.cpp @@ -14,6 +14,7 @@ RGBController_LogitechG502PS::RGBController_LogitechG502PS(LogitechG502PSControl logitech = logitech_ptr; name = "Logitech Mouse Device"; + vendor = "Logitech"; type = DEVICE_TYPE_MOUSE; description = "Logitech Mouse Device"; location = logitech->GetDeviceLocation(); diff --git a/Controllers/LogitechController/RGBController_LogitechG810.cpp b/Controllers/LogitechController/RGBController_LogitechG810.cpp index 613b85be..f1a5ee16 100644 --- a/Controllers/LogitechController/RGBController_LogitechG810.cpp +++ b/Controllers/LogitechController/RGBController_LogitechG810.cpp @@ -170,6 +170,7 @@ RGBController_LogitechG810::RGBController_LogitechG810(LogitechG810Controller* l logitech = logitech_ptr; name = "Logitech Keyboard Device"; + vendor = "Logitech"; type = DEVICE_TYPE_KEYBOARD; description = "Logitech Keyboard Device"; diff --git a/Controllers/LogitechController/RGBController_LogitechGPowerPlay.cpp b/Controllers/LogitechController/RGBController_LogitechGPowerPlay.cpp index 8d8179b0..679a3849 100644 --- a/Controllers/LogitechController/RGBController_LogitechGPowerPlay.cpp +++ b/Controllers/LogitechController/RGBController_LogitechGPowerPlay.cpp @@ -14,6 +14,7 @@ RGBController_LogitechGPowerPlay::RGBController_LogitechGPowerPlay(LogitechGPowe logitech = logitech_ptr; name = "Logitech G PowerPlay Wireless Charging System"; + vendor = "Logitech"; type = DEVICE_TYPE_MOUSEMAT; description = "Logitech G PowerPlay Wireless Charging System"; diff --git a/Controllers/LogitechController/RGBController_LogitechGProWireless.cpp b/Controllers/LogitechController/RGBController_LogitechGProWireless.cpp index ce053cbf..9a3ee7b2 100644 --- a/Controllers/LogitechController/RGBController_LogitechGProWireless.cpp +++ b/Controllers/LogitechController/RGBController_LogitechGProWireless.cpp @@ -14,6 +14,7 @@ RGBController_LogitechGProWireless::RGBController_LogitechGProWireless(LogitechG logitech = logitech_ptr; name = "Logitech G Pro Wireless Gaming Mouse"; + vendor = "Logitech"; type = DEVICE_TYPE_MOUSE; description = "Logitech G Pro Wireless Gaming Mouse"; location = logitech->GetDeviceLocation(); diff --git a/Controllers/MSI3ZoneController/RGBController_MSI3Zone.cpp b/Controllers/MSI3ZoneController/RGBController_MSI3Zone.cpp index 3c2455d6..91750bac 100644 --- a/Controllers/MSI3ZoneController/RGBController_MSI3Zone.cpp +++ b/Controllers/MSI3ZoneController/RGBController_MSI3Zone.cpp @@ -14,6 +14,7 @@ RGBController_MSI3Zone::RGBController_MSI3Zone(MSI3ZoneController* msi_ptr) msi = msi_ptr; name = "MSI 3-Zone Keyboard"; + vendor = "MSI"; type = DEVICE_TYPE_KEYBOARD; description = "MSI 3-Zone Keyboard Device"; location = msi->GetDeviceLocation(); diff --git a/Controllers/MSIGPUController/RGBController_MSIGPU.cpp b/Controllers/MSIGPUController/RGBController_MSIGPU.cpp index dd8a8162..29651f99 100644 --- a/Controllers/MSIGPUController/RGBController_MSIGPU.cpp +++ b/Controllers/MSIGPUController/RGBController_MSIGPU.cpp @@ -31,6 +31,7 @@ RGBController_MSIGPU::RGBController_MSIGPU(MSIGPUController * msi_gpu_ptr) msi_gpu = msi_gpu_ptr; name = "MSI GPU Device"; + vendor = "MSI"; type = DEVICE_TYPE_GPU; description = "MSI GPU Device"; location = msi_gpu->GetDeviceLocation(); diff --git a/Controllers/MSIMysticLightController/RGBController_MSIMysticLight.cpp b/Controllers/MSIMysticLightController/RGBController_MSIMysticLight.cpp index ec4c89e5..9e7ce6ee 100644 --- a/Controllers/MSIMysticLightController/RGBController_MSIMysticLight.cpp +++ b/Controllers/MSIMysticLightController/RGBController_MSIMysticLight.cpp @@ -37,6 +37,7 @@ RGBController_MSIMysticLight::RGBController_MSIMysticLight(MSIMysticLightControl controller = controller_ptr; name = "MSI Mystic Light Controller"; + vendor = "MSI"; type = DEVICE_TYPE_MOTHERBOARD; description = controller->GetDeviceName(); version = controller->GetFWVersion(); diff --git a/Controllers/MSIRGBController/RGBController_MSIRGB.cpp b/Controllers/MSIRGBController/RGBController_MSIRGB.cpp index 1c96bb73..dda82fb5 100644 --- a/Controllers/MSIRGBController/RGBController_MSIRGB.cpp +++ b/Controllers/MSIRGBController/RGBController_MSIRGB.cpp @@ -13,6 +13,7 @@ RGBController_MSIRGB::RGBController_MSIRGB(MSIRGBController* msi_ptr) msi = msi_ptr; name = "MSI Motherboard"; + vendor = "MSI"; type = DEVICE_TYPE_MOTHERBOARD; description = "MSI-RGB Device"; diff --git a/Controllers/NZXTHue2Controller/RGBController_NZXTHue2.cpp b/Controllers/NZXTHue2Controller/RGBController_NZXTHue2.cpp index e1cbd227..8b8f80d7 100644 --- a/Controllers/NZXTHue2Controller/RGBController_NZXTHue2.cpp +++ b/Controllers/NZXTHue2Controller/RGBController_NZXTHue2.cpp @@ -14,6 +14,7 @@ RGBController_NZXTHue2::RGBController_NZXTHue2(NZXTHue2Controller* hue2_ptr) hue2 = hue2_ptr; name = "NZXT Hue 2"; + vendor = "NZXT"; type = DEVICE_TYPE_LEDSTRIP; description = "NZXT Hue 2 Device"; version = hue2->GetFirmwareVersion(); diff --git a/Controllers/NZXTHuePlusController/RGBController_NZXTHuePlus.cpp b/Controllers/NZXTHuePlusController/RGBController_NZXTHuePlus.cpp index d20dfa12..88400b18 100644 --- a/Controllers/NZXTHuePlusController/RGBController_NZXTHuePlus.cpp +++ b/Controllers/NZXTHuePlusController/RGBController_NZXTHuePlus.cpp @@ -14,6 +14,7 @@ RGBController_HuePlus::RGBController_HuePlus(HuePlusController* hueplus_ptr) hueplus = hueplus_ptr; name = "NZXT Hue+"; + vendor = "NZXT"; type = DEVICE_TYPE_LEDSTRIP; description = "NZXT Hue+ Device"; location = hueplus->GetLocation(); diff --git a/Controllers/NZXTKrakenController/RGBController_NZXTKraken.cpp b/Controllers/NZXTKrakenController/RGBController_NZXTKraken.cpp index d68e8a43..2b4694e0 100644 --- a/Controllers/NZXTKrakenController/RGBController_NZXTKraken.cpp +++ b/Controllers/NZXTKrakenController/RGBController_NZXTKraken.cpp @@ -15,6 +15,7 @@ RGBController_NZXTKraken::RGBController_NZXTKraken(NZXTKrakenController* nzxtkra nzxtkraken = nzxtkraken_ptr; name = "NZXT Kraken X/M"; + vendor = "NZXT"; type = DEVICE_TYPE_COOLER; description = "NZXT Kraken X42/X52/X62/X72/M22"; version = nzxtkraken->GetFirmwareVersion(); diff --git a/Controllers/OpenRazerController/RGBController_OpenRazer.cpp b/Controllers/OpenRazerController/RGBController_OpenRazer.cpp index c5af7939..a710f9a0 100644 --- a/Controllers/OpenRazerController/RGBController_OpenRazer.cpp +++ b/Controllers/OpenRazerController/RGBController_OpenRazer.cpp @@ -247,6 +247,11 @@ RGBController_OpenRazer::RGBController_OpenRazer(std::string dev_path) \*-----------------------------------------------------------------*/ std::getline(firmware_version, version); + /*-----------------------------------------------------------------*\ + | Vendor is always Razer | + \*-----------------------------------------------------------------*/ + vendor = "Razer"; + /*-----------------------------------------------------------------*\ | Loop through all known devices to look for a name match | \*-----------------------------------------------------------------*/ diff --git a/Controllers/OpenRazerController/RGBController_OpenRazerWindows.cpp b/Controllers/OpenRazerController/RGBController_OpenRazerWindows.cpp index ad0e87ff..d026f234 100644 --- a/Controllers/OpenRazerController/RGBController_OpenRazerWindows.cpp +++ b/Controllers/OpenRazerController/RGBController_OpenRazerWindows.cpp @@ -177,6 +177,11 @@ RGBController_OpenRazer::RGBController_OpenRazer(device * razer_device, device_f razer_functions->firmware_version->show(razer_device, NULL, string_buf); version = string_buf; + /*-----------------------------------------------------------------*\ + | Vendor is always Razer | + \*-----------------------------------------------------------------*/ + vendor = "Razer"; + /*-----------------------------------------------------------------*\ | Loop through all known devices to look for a name match | \*-----------------------------------------------------------------*/ diff --git a/Controllers/PatriotViperController/RGBController_PatriotViper.cpp b/Controllers/PatriotViperController/RGBController_PatriotViper.cpp index c108cb79..2ca2174b 100644 --- a/Controllers/PatriotViperController/RGBController_PatriotViper.cpp +++ b/Controllers/PatriotViperController/RGBController_PatriotViper.cpp @@ -14,6 +14,7 @@ RGBController_PatriotViper::RGBController_PatriotViper(PatriotViperController* v viper = viper_ptr; name = viper->GetDeviceName(); + vendor = "Patriot"; type = DEVICE_TYPE_DRAM; description = "Patriot Viper Device"; location = viper->GetDeviceLocation(); diff --git a/Controllers/PhilipsWizController/RGBController_PhilipsWiz.cpp b/Controllers/PhilipsWizController/RGBController_PhilipsWiz.cpp index b4e75c44..e3a4ba78 100644 --- a/Controllers/PhilipsWizController/RGBController_PhilipsWiz.cpp +++ b/Controllers/PhilipsWizController/RGBController_PhilipsWiz.cpp @@ -13,6 +13,7 @@ RGBController_PhilipsWiz::RGBController_PhilipsWiz(PhilipsWizController* light_p light = light_ptr; name = light->GetManufacturer() + " " + light->GetName(); + vendor = light->GetManufacturer(); type = DEVICE_TYPE_LIGHT; version = light->GetVersion(); description = "Philips Wiz Device"; diff --git a/Controllers/RedragonController/RGBController_RedragonK556.cpp b/Controllers/RedragonController/RGBController_RedragonK556.cpp index 94108058..6fd85fc3 100644 --- a/Controllers/RedragonController/RGBController_RedragonK556.cpp +++ b/Controllers/RedragonController/RGBController_RedragonK556.cpp @@ -25,6 +25,7 @@ RGBController_RedragonK556::RGBController_RedragonK556(RedragonK556Controller* r redragon = redragon_ptr; name = "Redragon Keyboard Device"; + vendor = "Redragon"; type = DEVICE_TYPE_KEYBOARD; description = "Redragon Keyboard Device"; diff --git a/Controllers/RedragonController/RGBController_RedragonM711.cpp b/Controllers/RedragonController/RGBController_RedragonM711.cpp index e5f57221..c733a7b1 100644 --- a/Controllers/RedragonController/RGBController_RedragonM711.cpp +++ b/Controllers/RedragonController/RGBController_RedragonM711.cpp @@ -14,6 +14,7 @@ RGBController_RedragonM711::RGBController_RedragonM711(RedragonM711Controller* r redragon = redragon_ptr; name = "Redragon Mouse Device"; + vendor = "Redragon"; type = DEVICE_TYPE_MOUSE; description = "Redragon Mouse Device"; location = redragon->GetDeviceLocation(); diff --git a/Controllers/RoccatController/RGBController_RoccatKoneAimo.cpp b/Controllers/RoccatController/RGBController_RoccatKoneAimo.cpp index e9327cb2..c83aa9d2 100644 --- a/Controllers/RoccatController/RGBController_RoccatKoneAimo.cpp +++ b/Controllers/RoccatController/RGBController_RoccatKoneAimo.cpp @@ -12,6 +12,7 @@ RGBController_RoccatKoneAimo::RGBController_RoccatKoneAimo(RoccatKoneAimoController* mouse_ptr) { name = "Roccat Kone Aimo"; + vendor = "Roccat"; type = DEVICE_TYPE_MOUSE; description = "Roccat Kone Aimo Mouse"; mouse = mouse_ptr; diff --git a/Controllers/SapphireGPUController/RGBController_SapphireGPU.cpp b/Controllers/SapphireGPUController/RGBController_SapphireGPU.cpp index 8d779702..0a490d5c 100644 --- a/Controllers/SapphireGPUController/RGBController_SapphireGPU.cpp +++ b/Controllers/SapphireGPUController/RGBController_SapphireGPU.cpp @@ -14,6 +14,7 @@ RGBController_SapphireGPU::RGBController_SapphireGPU(SapphireGPUController* sapp sapphire = sapphire_ptr; name = "Sapphire GPU"; + vendor = "Sapphire"; description = "Sapphire GPU"; location = sapphire->GetDeviceLocation(); diff --git a/Controllers/SonyDS4Controller/RGBController_SonyDS4.cpp b/Controllers/SonyDS4Controller/RGBController_SonyDS4.cpp index 179181ce..87272302 100644 --- a/Controllers/SonyDS4Controller/RGBController_SonyDS4.cpp +++ b/Controllers/SonyDS4Controller/RGBController_SonyDS4.cpp @@ -15,6 +15,7 @@ RGBController_SonyDS4::RGBController_SonyDS4(SonyDS4Controller* dualshock) this->dualshock = dualshock; name = "Sony DualShock 4"; + vendor = "Sony"; type = DEVICE_TYPE_GAMEPAD; description = "Sony DualShock 4 Device"; location = dualshock->GetLocation(); diff --git a/Controllers/SteelSeriesController/RGBController_SteelSeriesApex.cpp b/Controllers/SteelSeriesController/RGBController_SteelSeriesApex.cpp index 9e7f4ffb..17fcfa5a 100644 --- a/Controllers/SteelSeriesController/RGBController_SteelSeriesApex.cpp +++ b/Controllers/SteelSeriesController/RGBController_SteelSeriesApex.cpp @@ -258,6 +258,7 @@ RGBController_SteelSeriesApex::RGBController_SteelSeriesApex(SteelSeriesApexBase steelseries = steelseries_ptr; name = "SteelSeries Apex RGB Keyboard"; + vendor = "SteelSeries"; type = DEVICE_TYPE_KEYBOARD; description = "SteelSeries Apex RGB Device"; location = steelseries->GetDeviceLocation(); diff --git a/Controllers/SteelSeriesController/RGBController_SteelSeriesOldApex.cpp b/Controllers/SteelSeriesController/RGBController_SteelSeriesOldApex.cpp index e4f40037..de2db5c4 100644 --- a/Controllers/SteelSeriesController/RGBController_SteelSeriesOldApex.cpp +++ b/Controllers/SteelSeriesController/RGBController_SteelSeriesOldApex.cpp @@ -23,6 +23,7 @@ RGBController_SteelSeriesOldApex::RGBController_SteelSeriesOldApex(SteelSeriesOl OldApex = old_apex_ptr; name = OldApex->GetDeviceName(); + vendor = "SteelSeries"; type = DEVICE_TYPE_KEYBOARD; description = "SteelSeries old Apex device"; location = OldApex->GetDeviceLocation(); diff --git a/Controllers/SteelSeriesController/RGBController_SteelSeriesRival.cpp b/Controllers/SteelSeriesController/RGBController_SteelSeriesRival.cpp index 83cc01c4..0a26e055 100644 --- a/Controllers/SteelSeriesController/RGBController_SteelSeriesRival.cpp +++ b/Controllers/SteelSeriesController/RGBController_SteelSeriesRival.cpp @@ -14,6 +14,7 @@ RGBController_SteelSeriesRival::RGBController_SteelSeriesRival(SteelSeriesRivalC rival = rival_ptr; name = rival->GetDeviceName(); + vendor = "SteelSeries"; type = DEVICE_TYPE_MOUSE; description = "SteelSeries Rival Device"; location = rival->GetDeviceLocation(); diff --git a/Controllers/SteelSeriesController/RGBController_SteelSeriesSiberia.cpp b/Controllers/SteelSeriesController/RGBController_SteelSeriesSiberia.cpp index 29ffb7f1..c9aca15f 100644 --- a/Controllers/SteelSeriesController/RGBController_SteelSeriesSiberia.cpp +++ b/Controllers/SteelSeriesController/RGBController_SteelSeriesSiberia.cpp @@ -14,6 +14,7 @@ RGBController_SteelSeriesSiberia::RGBController_SteelSeriesSiberia(SteelSeriesSi siberia = siberia_ptr; name = siberia->GetDeviceName(); + vendor = "SteelSeries"; type = DEVICE_TYPE_HEADSET; description = "SteelSeries Siberia Device"; location = siberia->GetDeviceLocation(); diff --git a/Controllers/TecknetController/RGBController_Tecknet.cpp b/Controllers/TecknetController/RGBController_Tecknet.cpp index 5e0642f2..9a3d450a 100644 --- a/Controllers/TecknetController/RGBController_Tecknet.cpp +++ b/Controllers/TecknetController/RGBController_Tecknet.cpp @@ -14,6 +14,7 @@ RGBController_Tecknet::RGBController_Tecknet(TecknetController *_dev) Tecknet_dev = _dev; name = Tecknet_dev->GetDeviceName(); + vendor = "Tecknet"; type = DEVICE_TYPE_MOUSE; description = Tecknet_dev->GetDeviceName(); version = "1.0"; diff --git a/Controllers/ThermaltakePoseidonZRGBController/RGBController_ThermaltakePoseidonZRGB.cpp b/Controllers/ThermaltakePoseidonZRGBController/RGBController_ThermaltakePoseidonZRGB.cpp index 878980f8..d43b7f9b 100644 --- a/Controllers/ThermaltakePoseidonZRGBController/RGBController_ThermaltakePoseidonZRGB.cpp +++ b/Controllers/ThermaltakePoseidonZRGBController/RGBController_ThermaltakePoseidonZRGB.cpp @@ -148,6 +148,7 @@ RGBController_PoseidonZRGB::RGBController_PoseidonZRGB(PoseidonZRGBController* p poseidon = poseidon_ptr; name = "Thermaltake Poseidon Z RGB"; + vendor = "Thermaltake"; type = DEVICE_TYPE_KEYBOARD; description = "Thermaltake Poseidon Z RGB Device"; location = poseidon->GetDeviceLocation(); diff --git a/Controllers/ThermaltakeRiingController/RGBController_ThermaltakeRiing.cpp b/Controllers/ThermaltakeRiingController/RGBController_ThermaltakeRiing.cpp index 0c1f845b..3ccd823c 100644 --- a/Controllers/ThermaltakeRiingController/RGBController_ThermaltakeRiing.cpp +++ b/Controllers/ThermaltakeRiingController/RGBController_ThermaltakeRiing.cpp @@ -15,6 +15,7 @@ RGBController_ThermaltakeRiing::RGBController_ThermaltakeRiing(ThermaltakeRiingC riing = riing_ptr; name = "Thermaltake Riing"; + vendor = "Thermaltake"; type = DEVICE_TYPE_COOLER; description = "Thermaltake Riing Device"; location = riing->GetDeviceLocation(); diff --git a/RGBController/RGBController.h b/RGBController/RGBController.h index 56c36bb0..601f8c9f 100644 --- a/RGBController/RGBController.h +++ b/RGBController/RGBController.h @@ -148,6 +148,7 @@ class RGBController { public: std::string name; /* controller name */ + std::string vendor; /* controller vendor */ std::string description; /* controller description */ std::string version; /* controller version */ std::string serial; /* controller serial number */ diff --git a/qt/OpenRGBDeviceInfoPage.cpp b/qt/OpenRGBDeviceInfoPage.cpp index ecf348b2..895acbcf 100644 --- a/qt/OpenRGBDeviceInfoPage.cpp +++ b/qt/OpenRGBDeviceInfoPage.cpp @@ -13,6 +13,7 @@ OpenRGBDeviceInfoPage::OpenRGBDeviceInfoPage(RGBController *dev, QWidget *parent ui->TypeValue->setText(device_type_to_str(dev->type).c_str()); ui->NameValue->setText(QString::fromStdString(dev->name)); + ui->VendorValue->setText(QString::fromStdString(dev->vendor)); ui->DescriptionValue->setText(QString::fromStdString(dev->description)); ui->VersionValue->setText(QString::fromStdString(dev->version)); ui->LocationValue->setText(QString::fromStdString(dev->location)); diff --git a/qt/OpenRGBDeviceInfoPage.ui b/qt/OpenRGBDeviceInfoPage.ui index aedfc448..4a7fcffa 100644 --- a/qt/OpenRGBDeviceInfoPage.ui +++ b/qt/OpenRGBDeviceInfoPage.ui @@ -22,41 +22,27 @@ + + + Vendor: + + + + Type: - - - - Description Value - - - - - - - Version Value - - - - - - - Location Value - - - - - - - Type Value - - - + + + Description: + + + + Version: @@ -64,23 +50,16 @@ - - - Serial: - - - - Location: - - + + - Serial Value + Serial: @@ -91,10 +70,45 @@ - - + + - Description: + Vendor Value + + + + + + + Type Value + + + + + + + Description Value + + + + + + + Version Value + + + + + + + Location Value + + + + + + + Serial Value