From 1eb2a68a16192bce152fed23dd3e0a31300eff30 Mon Sep 17 00:00:00 2001 From: Adam Honse Date: Wed, 15 May 2024 11:38:36 -0500 Subject: [PATCH] Update Crucial controller files to new standardized header comment --- .../CrucialController/CrucialController.cpp | 24 ++++++++-------- .../CrucialController/CrucialController.h | 28 ++++++++++--------- .../CrucialControllerDetect.cpp | 17 +++++++++-- .../RGBController_Crucial.cpp | 18 ++++++------ .../CrucialController/RGBController_Crucial.h | 20 +++++++------ 5 files changed, 63 insertions(+), 44 deletions(-) diff --git a/Controllers/CrucialController/CrucialController.cpp b/Controllers/CrucialController/CrucialController.cpp index 1adc682b..93e3297e 100644 --- a/Controllers/CrucialController/CrucialController.cpp +++ b/Controllers/CrucialController/CrucialController.cpp @@ -1,15 +1,17 @@ -/*-----------------------------------------*\ -| CrucialController.cpp | -| | -| Driver for Crucial Ballistix RGB lighting| -| controller | -| | -| Adam Honse (CalcProgrammer1) 1/19/2020 | -\*-----------------------------------------*/ +/*---------------------------------------------------------*\ +| CrucialController.cpp | +| | +| Driver for Crucial Ballistix RAM | +| | +| Adam Honse (CalcProgrammer1) 19 Jan 2020 | +| | +| This file is part of the OpenRGB project | +| SPDX-License-Identifier: GPL-2.0-only | +\*---------------------------------------------------------*/ +#include #include "RGBController.h" #include "CrucialController.h" -#include CrucialController::CrucialController(i2c_smbus_interface* bus, crucial_dev_id dev) { @@ -94,7 +96,7 @@ void CrucialController::SendDirectColors(RGBColor* color_buf) { color_blk[led] = RGBGetGValue(color_buf[led]); } - + //Green Channels CrucialRegisterWriteBlock(0x8340, color_blk, 8); @@ -102,7 +104,7 @@ void CrucialController::SendDirectColors(RGBColor* color_buf) { color_blk[led] = RGBGetBValue(color_buf[led]); } - + //Blue Channels CrucialRegisterWriteBlock(0x8380, color_blk, 8); } diff --git a/Controllers/CrucialController/CrucialController.h b/Controllers/CrucialController/CrucialController.h index 8550016f..7d7ef957 100644 --- a/Controllers/CrucialController/CrucialController.h +++ b/Controllers/CrucialController/CrucialController.h @@ -1,18 +1,20 @@ -/*-----------------------------------------*\ -| CrucialController.h | -| | -| Definitions and types for Crucial | -| Ballistix RGB lighting controller | -| | -| Adam Honse (CalcProgrammer1) 1/19/2020 | -\*-----------------------------------------*/ - -#include "RGBController.h" -#include -#include "i2c_smbus.h" +/*---------------------------------------------------------*\ +| CrucialController.h | +| | +| Driver for Crucial Ballistix RAM | +| | +| Adam Honse (CalcProgrammer1) 19 Jan 2020 | +| | +| This file is part of the OpenRGB project | +| SPDX-License-Identifier: GPL-2.0-only | +\*---------------------------------------------------------*/ #pragma once +#include +#include "RGBController.h" +#include "i2c_smbus.h" + typedef unsigned char crucial_dev_id; typedef unsigned short crucial_register; @@ -68,7 +70,7 @@ private: unsigned int green, unsigned int blue ); - + void SendDirectColors(RGBColor* color_buf); void SendBrightness(unsigned char brightness); void SendEffectMode(unsigned char mode, unsigned char speed); diff --git a/Controllers/CrucialController/CrucialControllerDetect.cpp b/Controllers/CrucialController/CrucialControllerDetect.cpp index 51b97431..6f382234 100644 --- a/Controllers/CrucialController/CrucialControllerDetect.cpp +++ b/Controllers/CrucialController/CrucialControllerDetect.cpp @@ -1,3 +1,17 @@ +/*---------------------------------------------------------*\ +| CrucialControllerDetect.cpp | +| | +| Detector for Crucial Ballistix RAM | +| | +| Adam Honse (CalcProgrammer1) 19 Jan 2020 | +| | +| This file is part of the OpenRGB project | +| SPDX-License-Identifier: GPL-2.0-only | +\*---------------------------------------------------------*/ + +#include +#include +#include #include "Detector.h" #include "CrucialController.h" #include "LogManager.h" @@ -5,9 +19,6 @@ #include "RGBController_Crucial.h" #include "i2c_smbus.h" #include "pci_ids.h" -#include -#include -#include using namespace std::chrono_literals; diff --git a/Controllers/CrucialController/RGBController_Crucial.cpp b/Controllers/CrucialController/RGBController_Crucial.cpp index 1b881112..195c5b1c 100644 --- a/Controllers/CrucialController/RGBController_Crucial.cpp +++ b/Controllers/CrucialController/RGBController_Crucial.cpp @@ -1,11 +1,13 @@ -/*-----------------------------------------*\ -| RGBController_Crucial.cpp | -| | -| Generic RGB Interface for Crucial | -| Ballistix RGB controller | -| | -| Adam Honse (CalcProgrammer1) 1/19/2020 | -\*-----------------------------------------*/ +/*---------------------------------------------------------*\ +| RGBController_Crucial.cpp | +| | +| RGBController for Crucial Ballistix RAM | +| | +| Adam Honse (CalcProgrammer1) 19 Jan 2020 | +| | +| This file is part of the OpenRGB project | +| SPDX-License-Identifier: GPL-2.0-only | +\*---------------------------------------------------------*/ #include "RGBController_Crucial.h" diff --git a/Controllers/CrucialController/RGBController_Crucial.h b/Controllers/CrucialController/RGBController_Crucial.h index 8ab523ef..703b6e71 100644 --- a/Controllers/CrucialController/RGBController_Crucial.h +++ b/Controllers/CrucialController/RGBController_Crucial.h @@ -1,11 +1,13 @@ -/*-----------------------------------------*\ -| RGBController_Crucial.h | -| | -| Generic RGB Interface for Crucial | -| Ballistix RGB controller | -| | -| Adam Honse (CalcProgrammer1) 1/19/2020 | -\*-----------------------------------------*/ +/*---------------------------------------------------------*\ +| RGBController_Crucial.h | +| | +| RGBController for Crucial Ballistix RAM | +| | +| Adam Honse (CalcProgrammer1) 19 Jan 2020 | +| | +| This file is part of the OpenRGB project | +| SPDX-License-Identifier: GPL-2.0-only | +\*---------------------------------------------------------*/ #pragma once @@ -21,7 +23,7 @@ public: void SetupZones(); void ResizeZone(int zone, int new_size); - + void DeviceUpdateLEDs(); void UpdateZoneLEDs(int zone); void UpdateSingleLED(int led);