From a87803ff26a9722838d0647505fd0814342cd0d8 Mon Sep 17 00:00:00 2001 From: Adam Honse Date: Mon, 3 Jun 2024 11:36:47 -0500 Subject: [PATCH] Update Patriot Viper controller files to new standardized header comment --- .../PatriotViperController.cpp | 20 ++++++----- .../PatriotViperController.h | 34 ++++++++++--------- .../PatriotViperControllerDetect.cpp | 17 ++++++++-- .../RGBController_PatriotViper.cpp | 18 +++++----- .../RGBController_PatriotViper.h | 20 ++++++----- 5 files changed, 64 insertions(+), 45 deletions(-) diff --git a/Controllers/PatriotViperController/PatriotViperController.cpp b/Controllers/PatriotViperController/PatriotViperController.cpp index 5eff69fc..f12b7529 100644 --- a/Controllers/PatriotViperController/PatriotViperController.cpp +++ b/Controllers/PatriotViperController/PatriotViperController.cpp @@ -1,14 +1,16 @@ -/*-----------------------------------------*\ -| PatriotViperController.cpp | -| | -| Definitions and types for Patriot Viper | -| RGB RAM lighting controller | -| | -| Adam Honse (CalcProgrammer1) 1/1/2020 | -\*-----------------------------------------*/ +/*---------------------------------------------------------*\ +| PatriotViperController.cpp | +| | +| Driver for Patriot Viper RAM | +| | +| Adam Honse (CalcProgrammer1) 01 Jan 2020 | +| | +| This file is part of the OpenRGB project | +| SPDX-License-Identifier: GPL-2.0-only | +\*---------------------------------------------------------*/ -#include "PatriotViperController.h" #include +#include "PatriotViperController.h" PatriotViperController::PatriotViperController(i2c_smbus_interface* bus, viper_dev_id dev, unsigned char slots) { diff --git a/Controllers/PatriotViperController/PatriotViperController.h b/Controllers/PatriotViperController/PatriotViperController.h index 57d8dcc0..a49811ad 100644 --- a/Controllers/PatriotViperController/PatriotViperController.h +++ b/Controllers/PatriotViperController/PatriotViperController.h @@ -1,18 +1,20 @@ -/*-----------------------------------------*\ -| PatriotViperController.h | -| | -| Definitions and types for Patriot Viper | -| RGB RAM lighting controller | -| | -| Adam Honse (CalcProgrammer1) 1/1/2020 | -\*-----------------------------------------*/ - -#include -#include -#include "i2c_smbus.h" +/*---------------------------------------------------------*\ +| PatriotViperController.h | +| | +| Driver for Patriot Viper RAM | +| | +| Adam Honse (CalcProgrammer1) 01 Jan 2020 | +| | +| This file is part of the OpenRGB project | +| SPDX-License-Identifier: GPL-2.0-only | +\*---------------------------------------------------------*/ #pragma once +#include +#include +#include "i2c_smbus.h" + typedef unsigned char viper_dev_id; typedef unsigned short viper_register; @@ -94,7 +96,7 @@ private: viper_dev_id dev; unsigned char mode; unsigned char speed; - + std::thread* keepalive_thread; std::atomic keepalive_thread_run; std::atomic step; @@ -108,7 +110,7 @@ private: | and the Keepalive thread is not needed | \*-------------------------------------------------------*/ - std::map mode_steps = + std::map mode_steps = { {VIPER_MODE_DARK, -1}, {VIPER_MODE_BREATHING, 4}, @@ -120,7 +122,7 @@ private: {VIPER_MODE_NEON, 0}, }; - std::map mode_sub_steps = + std::map mode_sub_steps = { {VIPER_MODE_DARK, -1}, {VIPER_MODE_BREATHING, 1}, @@ -132,7 +134,7 @@ private: {VIPER_MODE_NEON, 5}, }; - std::map mode_speed = + std::map mode_speed = { {VIPER_MODE_DARK, -1}, {VIPER_MODE_BREATHING, 0x06}, diff --git a/Controllers/PatriotViperController/PatriotViperControllerDetect.cpp b/Controllers/PatriotViperController/PatriotViperControllerDetect.cpp index 21a6171d..2452a06a 100644 --- a/Controllers/PatriotViperController/PatriotViperControllerDetect.cpp +++ b/Controllers/PatriotViperController/PatriotViperControllerDetect.cpp @@ -1,3 +1,17 @@ +/*---------------------------------------------------------*\ +| PatriotViperControllerDetect.cpp | +| | +| Detector for Patriot Viper RAM | +| | +| Adam Honse (CalcProgrammer1) 01 Jan 2020 | +| | +| This file is part of the OpenRGB project | +| SPDX-License-Identifier: GPL-2.0-only | +\*---------------------------------------------------------*/ + +#include +#include +#include #include "Detector.h" #include "PatriotViperController.h" #include "LogManager.h" @@ -5,9 +19,6 @@ #include "RGBController_PatriotViper.h" #include "i2c_smbus.h" #include "pci_ids.h" -#include -#include -#include using namespace std::chrono_literals; #define PATRIOT_CONTROLLER_NAME "Patriot Viper" diff --git a/Controllers/PatriotViperController/RGBController_PatriotViper.cpp b/Controllers/PatriotViperController/RGBController_PatriotViper.cpp index 9d11c8f8..e154f0b8 100644 --- a/Controllers/PatriotViperController/RGBController_PatriotViper.cpp +++ b/Controllers/PatriotViperController/RGBController_PatriotViper.cpp @@ -1,11 +1,13 @@ -/*-----------------------------------------*\ -| RGBController_PatriotViper.cpp | -| | -| Generic RGB Interface for OpenRGB | -| Patriot Viper RGB interface | -| | -| Adam Honse (CalcProgrammer1) 1/1/2020 | -\*-----------------------------------------*/ +/*---------------------------------------------------------*\ +| RGBController_PatriotViper.cpp | +| | +| RGBController for Patriot Viper RAM | +| | +| Adam Honse (CalcProgrammer1) 01 Jan 2020 | +| | +| This file is part of the OpenRGB project | +| SPDX-License-Identifier: GPL-2.0-only | +\*---------------------------------------------------------*/ #include "RGBController_PatriotViper.h" diff --git a/Controllers/PatriotViperController/RGBController_PatriotViper.h b/Controllers/PatriotViperController/RGBController_PatriotViper.h index f1dd766d..6896c14a 100644 --- a/Controllers/PatriotViperController/RGBController_PatriotViper.h +++ b/Controllers/PatriotViperController/RGBController_PatriotViper.h @@ -1,11 +1,13 @@ -/*-----------------------------------------*\ -| RGBController_PatriotViper.h | -| | -| Generic RGB Interface for OpenRGB | -| Patriot Viper RGB interface | -| | -| Adam Honse (CalcProgrammer1) 1/1/2020 | -\*-----------------------------------------*/ +/*---------------------------------------------------------*\ +| RGBController_PatriotViper.h | +| | +| RGBController for Patriot Viper RAM | +| | +| Adam Honse (CalcProgrammer1) 01 Jan 2020 | +| | +| This file is part of the OpenRGB project | +| SPDX-License-Identifier: GPL-2.0-only | +\*---------------------------------------------------------*/ #pragma once @@ -20,7 +22,7 @@ public: void SetupZones(); void ResizeZone(int zone, int new_size); - + void DeviceUpdateLEDs(); void UpdateZoneLEDs(int zone); void UpdateSingleLED(int led);