From 9fcc8dd573892a27bec42aefb325510f43574ede Mon Sep 17 00:00:00 2001 From: Adam Honse Date: Tue, 20 Oct 2020 23:42:20 -0500 Subject: [PATCH] Add I2C: label to location string for I2C devices --- Controllers/AuraSMBusController/AuraSMBusController.cpp | 2 +- .../CorsairDominatorPlatinumController.cpp | 9 ++++++--- .../CorsairVengeanceController.cpp | 2 +- .../CorsairVengeanceProController.cpp | 2 +- Controllers/CrucialController/CrucialController.cpp | 2 +- Controllers/EVGAGPUController/EVGAGPUv1Controller.cpp | 2 +- Controllers/EVGAGPUController/EVGAGPUv2Controller.cpp | 2 +- Controllers/GalaxGPUController/GalaxGPUController.cpp | 2 +- .../HyperXDRAMController/HyperXDRAMController.cpp | 2 +- Controllers/MSIGPUController/MSIGPUController.cpp | 2 +- .../PatriotViperController/PatriotViperController.cpp | 2 +- .../PolychromeController/PolychromeController.cpp | 2 +- .../RGBFusion2DRAMController.cpp | 2 +- .../RGBFusion2SMBusController.cpp | 2 +- Controllers/RGBFusionController/RGBFusionController.cpp | 2 +- .../RGBFusionGPUController/RGBFusionGPUController.cpp | 2 +- .../SapphireGPUController/SapphireGPUController.cpp | 2 +- 17 files changed, 22 insertions(+), 19 deletions(-) diff --git a/Controllers/AuraSMBusController/AuraSMBusController.cpp b/Controllers/AuraSMBusController/AuraSMBusController.cpp index 48610e68..073902da 100644 --- a/Controllers/AuraSMBusController/AuraSMBusController.cpp +++ b/Controllers/AuraSMBusController/AuraSMBusController.cpp @@ -116,7 +116,7 @@ std::string AuraSMBusController::GetDeviceLocation() snprintf(addr, 5, "0x%02X", dev); return_string.append(", address "); return_string.append(addr); - return(return_string); + return("I2C: " + return_string); } unsigned char AuraSMBusController::GetChannel(unsigned int led) diff --git a/Controllers/CorsairDominatorPlatinumController/CorsairDominatorPlatinumController.cpp b/Controllers/CorsairDominatorPlatinumController/CorsairDominatorPlatinumController.cpp index a82d4971..af421e37 100644 --- a/Controllers/CorsairDominatorPlatinumController/CorsairDominatorPlatinumController.cpp +++ b/Controllers/CorsairDominatorPlatinumController/CorsairDominatorPlatinumController.cpp @@ -33,9 +33,12 @@ std::string CorsairDominatorPlatinumController::GetDeviceName() std::string CorsairDominatorPlatinumController::GetDeviceLocation() { - char loc[128]; - snprintf(loc, sizeof(loc), "%s, address 0x%02X", bus->device_name, dev); - return std::string(loc); + std::string return_string(bus->device_name); + char addr[5]; + snprintf(addr, 5, "0x%02X", dev); + return_string.append(", address "); + return_string.append(addr); + return("I2C: " + return_string); } void CorsairDominatorPlatinumController::SetAllColors diff --git a/Controllers/CorsairVengeanceController/CorsairVengeanceController.cpp b/Controllers/CorsairVengeanceController/CorsairVengeanceController.cpp index 99e36d18..600afebf 100644 --- a/Controllers/CorsairVengeanceController/CorsairVengeanceController.cpp +++ b/Controllers/CorsairVengeanceController/CorsairVengeanceController.cpp @@ -36,7 +36,7 @@ std::string CorsairVengeanceController::GetDeviceLocation() snprintf(addr, 5, "0x%02X", dev); return_string.append(", address "); return_string.append(addr); - return(return_string); + return("I2C: " + return_string); } unsigned int CorsairVengeanceController::GetLEDCount() diff --git a/Controllers/CorsairVengeanceProController/CorsairVengeanceProController.cpp b/Controllers/CorsairVengeanceProController/CorsairVengeanceProController.cpp index 292b6e34..90b54a0e 100644 --- a/Controllers/CorsairVengeanceProController/CorsairVengeanceProController.cpp +++ b/Controllers/CorsairVengeanceProController/CorsairVengeanceProController.cpp @@ -47,7 +47,7 @@ std::string CorsairVengeanceProController::GetDeviceLocation() snprintf(addr, 5, "0x%02X", dev); return_string.append(", address "); return_string.append(addr); - return(return_string); + return("I2C: " + return_string); } unsigned int CorsairVengeanceProController::GetLEDCount() diff --git a/Controllers/CrucialController/CrucialController.cpp b/Controllers/CrucialController/CrucialController.cpp index fd589933..09e67dcb 100644 --- a/Controllers/CrucialController/CrucialController.cpp +++ b/Controllers/CrucialController/CrucialController.cpp @@ -34,7 +34,7 @@ std::string CrucialController::GetDeviceLocation() snprintf(addr, 5, "0x%02X", dev); return_string.append(", address "); return_string.append(addr); - return(return_string); + return("I2C: " + return_string); } unsigned int CrucialController::GetLEDCount() diff --git a/Controllers/EVGAGPUController/EVGAGPUv1Controller.cpp b/Controllers/EVGAGPUController/EVGAGPUv1Controller.cpp index 9e06680b..9e175a1f 100644 --- a/Controllers/EVGAGPUController/EVGAGPUv1Controller.cpp +++ b/Controllers/EVGAGPUController/EVGAGPUv1Controller.cpp @@ -27,7 +27,7 @@ std::string EVGAGPUv1Controller::GetDeviceLocation() snprintf(addr, 5, "0x%02X", dev); return_string.append(", address "); return_string.append(addr); - return(return_string); + return("I2C: " + return_string); } unsigned char EVGAGPUv1Controller::GetRed() diff --git a/Controllers/EVGAGPUController/EVGAGPUv2Controller.cpp b/Controllers/EVGAGPUController/EVGAGPUv2Controller.cpp index 78e5c952..b75f2b4a 100644 --- a/Controllers/EVGAGPUController/EVGAGPUv2Controller.cpp +++ b/Controllers/EVGAGPUController/EVGAGPUv2Controller.cpp @@ -27,7 +27,7 @@ std::string EVGAGPUv2Controller::GetDeviceLocation() snprintf(addr, 5, "0x%02X", dev); return_string.append(", address "); return_string.append(addr); - return(return_string); + return("I2C: " + return_string); } unsigned char EVGAGPUv2Controller::GetRed() diff --git a/Controllers/GalaxGPUController/GalaxGPUController.cpp b/Controllers/GalaxGPUController/GalaxGPUController.cpp index cbcd81b9..106e2879 100644 --- a/Controllers/GalaxGPUController/GalaxGPUController.cpp +++ b/Controllers/GalaxGPUController/GalaxGPUController.cpp @@ -34,7 +34,7 @@ std::string GalaxGPUController::GetDeviceLocation() snprintf(addr, 5, "0x%02X", dev); return_string.append(", address "); return_string.append(addr); - return(return_string); + return("I2C: " + return_string); } unsigned char GalaxGPUController::GetLEDRed() diff --git a/Controllers/HyperXDRAMController/HyperXDRAMController.cpp b/Controllers/HyperXDRAMController/HyperXDRAMController.cpp index 8ea27625..dfabbf2d 100644 --- a/Controllers/HyperXDRAMController/HyperXDRAMController.cpp +++ b/Controllers/HyperXDRAMController/HyperXDRAMController.cpp @@ -48,7 +48,7 @@ std::string HyperXDRAMController::GetDeviceLocation() snprintf(addr, 5, "0x%02X", dev); return_string.append(", address "); return_string.append(addr); - return(return_string); + return("I2C: " + return_string); } unsigned int HyperXDRAMController::GetLEDCount() diff --git a/Controllers/MSIGPUController/MSIGPUController.cpp b/Controllers/MSIGPUController/MSIGPUController.cpp index ff6b40cb..c3d78d3a 100644 --- a/Controllers/MSIGPUController/MSIGPUController.cpp +++ b/Controllers/MSIGPUController/MSIGPUController.cpp @@ -26,7 +26,7 @@ std::string MSIGPUController::GetDeviceLocation() snprintf(addr, 5, "0x%02X", dev); return_string.append(", address "); return_string.append(addr); - return(return_string); + return("I2C: " + return_string); } void MSIGPUController::SetRGB1(unsigned char red, unsigned char green, unsigned char blue) diff --git a/Controllers/PatriotViperController/PatriotViperController.cpp b/Controllers/PatriotViperController/PatriotViperController.cpp index d66c647f..2bb204cb 100644 --- a/Controllers/PatriotViperController/PatriotViperController.cpp +++ b/Controllers/PatriotViperController/PatriotViperController.cpp @@ -46,7 +46,7 @@ std::string PatriotViperController::GetDeviceLocation() snprintf(addr, 5, "0x%02X", dev); return_string.append(", address "); return_string.append(addr); - return(return_string); + return("I2C: " + return_string); } unsigned int PatriotViperController::GetLEDCount() diff --git a/Controllers/PolychromeController/PolychromeController.cpp b/Controllers/PolychromeController/PolychromeController.cpp index 2082de8a..617cec31 100644 --- a/Controllers/PolychromeController/PolychromeController.cpp +++ b/Controllers/PolychromeController/PolychromeController.cpp @@ -69,7 +69,7 @@ std::string PolychromeController::GetDeviceLocation() snprintf(addr, 5, "0x%02X", dev); return_string.append(", address "); return_string.append(addr); - return(return_string); + return("I2C: " + return_string); } std::string PolychromeController::GetDeviceName() diff --git a/Controllers/RGBFusion2DRAMController/RGBFusion2DRAMController.cpp b/Controllers/RGBFusion2DRAMController/RGBFusion2DRAMController.cpp index 85a64807..d8848fe7 100644 --- a/Controllers/RGBFusion2DRAMController/RGBFusion2DRAMController.cpp +++ b/Controllers/RGBFusion2DRAMController/RGBFusion2DRAMController.cpp @@ -51,7 +51,7 @@ std::string RGBFusion2DRAMController::GetDeviceLocation() snprintf(addr, 5, "0x%02X", dev); return_string.append(", address "); return_string.append(addr); - return(return_string); + return("I2C: " + return_string); } void RGBFusion2DRAMController::Apply() diff --git a/Controllers/RGBFusion2SMBusController/RGBFusion2SMBusController.cpp b/Controllers/RGBFusion2SMBusController/RGBFusion2SMBusController.cpp index a88656e3..bddf6f32 100644 --- a/Controllers/RGBFusion2SMBusController/RGBFusion2SMBusController.cpp +++ b/Controllers/RGBFusion2SMBusController/RGBFusion2SMBusController.cpp @@ -40,7 +40,7 @@ std::string RGBFusion2SMBusController::GetDeviceLocation() snprintf(addr, 5, "0x%02X", dev); return_string.append(", address "); return_string.append(addr); - return(return_string); + return("I2C: " + return_string); } /* Writes are performed in 32 byte chunks. If we need to write the second 16 bytes, diff --git a/Controllers/RGBFusionController/RGBFusionController.cpp b/Controllers/RGBFusionController/RGBFusionController.cpp index 3903c8ba..9e1d2844 100644 --- a/Controllers/RGBFusionController/RGBFusionController.cpp +++ b/Controllers/RGBFusionController/RGBFusionController.cpp @@ -45,7 +45,7 @@ std::string RGBFusionController::GetDeviceLocation() snprintf(addr, 5, "0x%02X", dev); return_string.append(", address "); return_string.append(addr); - return(return_string); + return("I2C: " + return_string); } unsigned int RGBFusionController::GetLEDCount() diff --git a/Controllers/RGBFusionGPUController/RGBFusionGPUController.cpp b/Controllers/RGBFusionGPUController/RGBFusionGPUController.cpp index 82a3eb2c..90b20063 100644 --- a/Controllers/RGBFusionGPUController/RGBFusionGPUController.cpp +++ b/Controllers/RGBFusionGPUController/RGBFusionGPUController.cpp @@ -27,7 +27,7 @@ std::string RGBFusionGPUController::GetDeviceLocation() snprintf(addr, 5, "0x%02X", dev); return_string.append(", address "); return_string.append(addr); - return(return_string); + return("I2C: " + return_string); } void RGBFusionGPUController::SetColor(unsigned char red, unsigned char green, unsigned char blue) diff --git a/Controllers/SapphireGPUController/SapphireGPUController.cpp b/Controllers/SapphireGPUController/SapphireGPUController.cpp index a1328868..7435db7c 100644 --- a/Controllers/SapphireGPUController/SapphireGPUController.cpp +++ b/Controllers/SapphireGPUController/SapphireGPUController.cpp @@ -27,7 +27,7 @@ std::string SapphireGPUController::GetDeviceLocation() snprintf(addr, 5, "0x%02X", dev); return_string.append(", address "); return_string.append(addr); - return(return_string); + return("I2C: " + return_string); } unsigned char SapphireGPUController::GetRed()