From e27c7e8d6465deea16c05b86e0b2067bd60e4ec5 Mon Sep 17 00:00:00 2001 From: Adam Honse Date: Sun, 19 May 2024 17:56:19 -0500 Subject: [PATCH] Update Gigabyte Aorus RGB Fusion 2 motherboard controller files to new standardized header comment --- .../GigabyteRGBFusion2SMBusController.cpp | 41 ++++++------------- .../GigabyteRGBFusion2SMBusController.h | 26 +++++++----- ...igabyteRGBFusion2SMBusControllerDetect.cpp | 21 +++++++--- .../RGBController_GigabyteRGBFusion2SMBus.cpp | 19 +++++---- .../RGBController_GigabyteRGBFusion2SMBus.h | 20 +++++---- 5 files changed, 66 insertions(+), 61 deletions(-) diff --git a/Controllers/GigabyteRGBFusion2SMBusController/GigabyteRGBFusion2SMBusController.cpp b/Controllers/GigabyteRGBFusion2SMBusController/GigabyteRGBFusion2SMBusController.cpp index 954dca6c..fe88e004 100644 --- a/Controllers/GigabyteRGBFusion2SMBusController/GigabyteRGBFusion2SMBusController.cpp +++ b/Controllers/GigabyteRGBFusion2SMBusController/GigabyteRGBFusion2SMBusController.cpp @@ -1,22 +1,20 @@ -/*-----------------------------------------*\ -| GigabyteRGBFusion2SMBusController.cpp | -| | -| Driver for Gigabyte Aorus RGB Fusion 2 | -| SMBus lighting controller | -| | -| Adam Honse (CalcProgrammer1) 3/12/2020 | -| Matt Harper 5/5/2020 | -\*-----------------------------------------*/ +/*---------------------------------------------------------*\ +| GigabyteRGBFusion2SMBusController.cpp | +| | +| Driver for Gigabyte Aorus RGB Fusion 2 SMBus | +| motherboard | +| | +| Adam Honse (CalcProgrammer1) 12 Mar 2020 | +| Matt Harper 05 May 2020 | +| | +| This file is part of the OpenRGB project | +| SPDX-License-Identifier: GPL-2.0-only | +\*---------------------------------------------------------*/ -#include "GigabyteRGBFusion2SMBusController.h" #include #include #include - -#ifdef DEBUG -#include -#include -#endif +#include "GigabyteRGBFusion2SMBusController.h" RGBFusion2SMBusController::RGBFusion2SMBusController(i2c_smbus_interface* bus, rgb_fusion_dev_id dev, std::string mb_name) { @@ -71,19 +69,6 @@ void RGBFusion2SMBusController::WriteLED(int led) led -= 1; } - #ifdef DEBUG - std::cout << std::hex << write_register << "\t"; - for(int i = 0; i < 2; i++) - { - for(int j = 0; j < 16; j++) - { - std::cout << std::setw(2) << std::setfill('0') << std::hex << (int)led_data[led+i][j] << " "; - } - std::cout << " "; - } - std::cout << std::endl; - #endif - bus->i2c_smbus_write_block_data(RGB_FUSION_2_SMBUS_ADDR, (u8)write_register, 32, led_data[led]); } diff --git a/Controllers/GigabyteRGBFusion2SMBusController/GigabyteRGBFusion2SMBusController.h b/Controllers/GigabyteRGBFusion2SMBusController/GigabyteRGBFusion2SMBusController.h index 9403d79b..2bdd868e 100644 --- a/Controllers/GigabyteRGBFusion2SMBusController/GigabyteRGBFusion2SMBusController.h +++ b/Controllers/GigabyteRGBFusion2SMBusController/GigabyteRGBFusion2SMBusController.h @@ -1,17 +1,21 @@ -/*-----------------------------------------*\ -| GigabyteRGBFusion2SMBusController.h | -| | -| Definitions and types for Gigabyte Aorus | -| RGB Fusion 2 SMBus lighting controller | -| | -| Adam Honse (CalcProgrammer1) 3/12/2020 | -\*-----------------------------------------*/ +/*---------------------------------------------------------*\ +| GigabyteRGBFusion2SMBusController.h | +| | +| Driver for Gigabyte Aorus RGB Fusion 2 SMBus | +| motherboard | +| | +| Adam Honse (CalcProgrammer1) 12 Mar 2020 | +| Matt Harper 05 May 2020 | +| | +| This file is part of the OpenRGB project | +| SPDX-License-Identifier: GPL-2.0-only | +\*---------------------------------------------------------*/ + +#pragma once #include #include "i2c_smbus.h" -#pragma once - typedef unsigned char rgb_fusion_dev_id; enum @@ -92,7 +96,7 @@ public: std::string GetDeviceLocation(); unsigned int GetLEDCount(); void Apply(); - + void SetLEDEffect ( unsigned int led, diff --git a/Controllers/GigabyteRGBFusion2SMBusController/GigabyteRGBFusion2SMBusControllerDetect.cpp b/Controllers/GigabyteRGBFusion2SMBusController/GigabyteRGBFusion2SMBusControllerDetect.cpp index 3085a21b..ab69a834 100644 --- a/Controllers/GigabyteRGBFusion2SMBusController/GigabyteRGBFusion2SMBusControllerDetect.cpp +++ b/Controllers/GigabyteRGBFusion2SMBusController/GigabyteRGBFusion2SMBusControllerDetect.cpp @@ -1,16 +1,27 @@ +/*---------------------------------------------------------*\ +| GigabyteRGBFusion2SMBusControllerDetect.cpp | +| | +| Detector for Gigabyte Aorus RGB Fusion 2 SMBus | +| motherboard | +| | +| Matt Harper 05 May 2020 | +| | +| This file is part of the OpenRGB project | +| SPDX-License-Identifier: GPL-2.0-only | +\*---------------------------------------------------------*/ + +#include +#include +#include +#include #include "Detector.h" #include "GigabyteRGBFusion2SMBusController.h" #include "LogManager.h" #include "RGBController.h" #include "RGBController_GigabyteRGBFusion2SMBus.h" #include "SettingsManager.h" - #include "i2c_smbus.h" #include "pci_ids.h" -#include -#include -#include -#include #include "dmiinfo.h" #define DETECTOR_NAME "Gigabyte RGB Fusion 2 SMBus" diff --git a/Controllers/GigabyteRGBFusion2SMBusController/RGBController_GigabyteRGBFusion2SMBus.cpp b/Controllers/GigabyteRGBFusion2SMBusController/RGBController_GigabyteRGBFusion2SMBus.cpp index 548fc251..dfa10e15 100644 --- a/Controllers/GigabyteRGBFusion2SMBusController/RGBController_GigabyteRGBFusion2SMBus.cpp +++ b/Controllers/GigabyteRGBFusion2SMBusController/RGBController_GigabyteRGBFusion2SMBus.cpp @@ -1,11 +1,14 @@ -/*-----------------------------------------*\ -| RGBController_GigabyteRGBFusion2SMBus.cpp| -| | -| Generic RGB Interface for OpenRGB | -| Gigabyte RGB Fusion 2 SMBUS Driver | -| | -| Matt Harper (5/5/2020) | -\*-----------------------------------------*/ +/*---------------------------------------------------------*\ +| RGBController_GigabyteRGBFusion2SMBus.cpp | +| | +| RGBController for Gigabyte Aorus RGB Fusion 2 SMBus | +| motherboard | +| | +| Matt Harper 05 May 2020 | +| | +| This file is part of the OpenRGB project | +| SPDX-License-Identifier: GPL-2.0-only | +\*---------------------------------------------------------*/ #include "RGBController_GigabyteRGBFusion2SMBus.h" diff --git a/Controllers/GigabyteRGBFusion2SMBusController/RGBController_GigabyteRGBFusion2SMBus.h b/Controllers/GigabyteRGBFusion2SMBusController/RGBController_GigabyteRGBFusion2SMBus.h index 96f52f56..37b33166 100644 --- a/Controllers/GigabyteRGBFusion2SMBusController/RGBController_GigabyteRGBFusion2SMBus.h +++ b/Controllers/GigabyteRGBFusion2SMBusController/RGBController_GigabyteRGBFusion2SMBus.h @@ -1,12 +1,14 @@ - -/*-----------------------------------------*\ -| RGBController_GigabyteRGBFusion2SMBus.h | -| | -| Generic RGB Interface for OpenRGB | -| Gigabyte RGB Fusion 2 SMBUS Driver | -| | -| Matt Harper (5/5/2020) | -\*-----------------------------------------*/ +/*---------------------------------------------------------*\ +| RGBController_GigabyteRGBFusion2SMBus.h | +| | +| RGBController for Gigabyte Aorus RGB Fusion 2 SMBus | +| motherboard | +| | +| Matt Harper 05 May 2020 | +| | +| This file is part of the OpenRGB project | +| SPDX-License-Identifier: GPL-2.0-only | +\*---------------------------------------------------------*/ #pragma once