From 4723c646662aae864e6991925831e48a2d224510 Mon Sep 17 00:00:00 2001 From: Adam Honse Date: Sat, 25 May 2024 12:46:23 -0500 Subject: [PATCH] Update Lenovo USB Gen7/Gen8 controller files to new standardized header comment --- Controllers/LenovoControllers/LenovoDevices.h | 32 ++++++++++------- ...tect.cpp => LenovoUSBControllerDetect.cpp} | 21 ++++++------ .../LenovoUSBController_Gen7_8.cpp | 9 +++++ .../LenovoUSBController_Gen7_8.h | 34 ++++++++----------- .../RGBController_Lenovo_Gen7_8.cpp | 11 +++++- .../RGBController_Lenovo_Gen7_8.h | 12 ++++--- 6 files changed, 72 insertions(+), 47 deletions(-) rename Controllers/LenovoControllers/{LenovoUSBDetect.cpp => LenovoUSBControllerDetect.cpp} (81%) diff --git a/Controllers/LenovoControllers/LenovoDevices.h b/Controllers/LenovoControllers/LenovoDevices.h index b9514066..22e47159 100644 --- a/Controllers/LenovoControllers/LenovoDevices.h +++ b/Controllers/LenovoControllers/LenovoDevices.h @@ -1,21 +1,28 @@ +/*---------------------------------------------------------*\ +| LenovoDevices.h | +| | +| Device list for Lenovo USB devices | +| | +| Cooper Hall (geobot19) 17 Apr 2022 | +| | +| This file is part of the OpenRGB project | +| SPDX-License-Identifier: GPL-2.0-only | +\*---------------------------------------------------------*/ + +#pragma once + +#include +#include "RGBControllerKeyNames.h" +#include "RGBController.h" + +#define NA 0xFFFFFFFF + /*-------------------------------------------------------------------*\ -| LenovoDevices.h | -| | -| Describes zones for various Lenovo Legion Devices | -| | -| Cooper Hall (geobot19) 17 Apr 2022 | -| | | Note: additions here must be adeed to RGBController_LenovoUSB.cpp in| | the switch statements which are on lines 28 and 60 at time of | | writing | \*-------------------------------------------------------------------*/ - #include - #include "RGBControllerKeyNames.h" - #include "RGBController.h" -#define NA 0xFFFFFFFF -#ifndef LENOVODEVICES_H -#define LENOVODEVICES_H /*-----------------------------------------------------*\ | Keyboard product IDs | \*-----------------------------------------------------*/ @@ -1935,4 +1942,3 @@ static lenovo_zone legion7_gen7and8_neon 0, 9, }; -#endif diff --git a/Controllers/LenovoControllers/LenovoUSBDetect.cpp b/Controllers/LenovoControllers/LenovoUSBControllerDetect.cpp similarity index 81% rename from Controllers/LenovoControllers/LenovoUSBDetect.cpp rename to Controllers/LenovoControllers/LenovoUSBControllerDetect.cpp index 09c97d94..c3b0e275 100644 --- a/Controllers/LenovoControllers/LenovoUSBDetect.cpp +++ b/Controllers/LenovoControllers/LenovoUSBControllerDetect.cpp @@ -1,20 +1,21 @@ -/*-------------------------------------------------------------------*\ -| LenovoUSBDetect.h | -| | -| Describes zones for various Lenovo Legion Devices | -| | -| Cooper Hall (geobot19) 17 Apr 2022 | -| | -\*-------------------------------------------------------------------*/ +/*---------------------------------------------------------*\ +| LenovoUSBControllerDetect.cpp | +| | +| Detector for Lenovo USB devices | +| | +| Cooper Hall (geobot19) 17 Apr 2022 | +| | +| This file is part of the OpenRGB project | +| SPDX-License-Identifier: GPL-2.0-only | +\*---------------------------------------------------------*/ +#include #include "Detector.h" #include "LogManager.h" #include "RGBController.h" - #include "LenovoDevices.h" #include "RGBController_LenovoUSB.h" #include "RGBController_Lenovo_Gen7_8.h" -#include /*-----------------------------------------------------*\ | vendor IDs | diff --git a/Controllers/LenovoControllers/LenovoUSBController_Gen7_8/LenovoUSBController_Gen7_8.cpp b/Controllers/LenovoControllers/LenovoUSBController_Gen7_8/LenovoUSBController_Gen7_8.cpp index 4287b254..9bd90c4c 100644 --- a/Controllers/LenovoControllers/LenovoUSBController_Gen7_8/LenovoUSBController_Gen7_8.cpp +++ b/Controllers/LenovoControllers/LenovoUSBController_Gen7_8/LenovoUSBController_Gen7_8.cpp @@ -1,3 +1,12 @@ +/*---------------------------------------------------------*\ +| LenovoUSBController_Gen7_8.cpp | +| | +| Driver for Lenovo Gen7 and Gen8 devices | +| | +| This file is part of the OpenRGB project | +| SPDX-License-Identifier: GPL-2.0-only | +\*---------------------------------------------------------*/ + #include #include #include "LenovoUSBController_Gen7_8.h" diff --git a/Controllers/LenovoControllers/LenovoUSBController_Gen7_8/LenovoUSBController_Gen7_8.h b/Controllers/LenovoControllers/LenovoUSBController_Gen7_8/LenovoUSBController_Gen7_8.h index a2d2dda9..93304e52 100644 --- a/Controllers/LenovoControllers/LenovoUSBController_Gen7_8/LenovoUSBController_Gen7_8.h +++ b/Controllers/LenovoControllers/LenovoUSBController_Gen7_8/LenovoUSBController_Gen7_8.h @@ -1,28 +1,26 @@ -/*-------------------------------------------------------------------*\ -| LenovoGen7And8USBController.h | -| | -| Driver for Lenovo Legion 7 Gen 7 | -| | -| Peter Vazny 15 Nov 2022 | -| | -\*-------------------------------------------------------------------*/ +/*---------------------------------------------------------*\ +| LenovoUSBController_Gen7_8.h | +| | +| Driver for Lenovo Gen7 and Gen8 devices | +| | +| This file is part of the OpenRGB project | +| SPDX-License-Identifier: GPL-2.0-only | +\*---------------------------------------------------------*/ +#pragma once + +#include +#include +#include +#include +#include #include "RGBController.h" #include "LogManager.h" -#include -#include -#include -#include -#include - #ifndef HID_MAX_STR #define HID_MAX_STR 255 #endif -#ifndef LENOVOGEN7AND8USBCONTROLLER_H -#define LENOVOGEN7AND8USBCONTROLLER_H - #define PACKET_SIZE 960 #define REPORT_ID 0x07 #define DIRECT_MODE 0xA1 @@ -92,5 +90,3 @@ class LenovoGen7And8USBController std::string ConvertBytesToHex(uint8_t packet[], size_t packet_size); std::string ConvertBytesToHex(const std::vector &input); }; - -#endif // LENOVOGEN7AND8USBCONTROLLER_H diff --git a/Controllers/LenovoControllers/LenovoUSBController_Gen7_8/RGBController_Lenovo_Gen7_8.cpp b/Controllers/LenovoControllers/LenovoUSBController_Gen7_8/RGBController_Lenovo_Gen7_8.cpp index f9a83441..eebc20d0 100644 --- a/Controllers/LenovoControllers/LenovoUSBController_Gen7_8/RGBController_Lenovo_Gen7_8.cpp +++ b/Controllers/LenovoControllers/LenovoUSBController_Gen7_8/RGBController_Lenovo_Gen7_8.cpp @@ -1,6 +1,15 @@ +/*---------------------------------------------------------*\ +| RGBController_Lenovo_Gen7_8.cpp | +| | +| RGBController for Lenovo Gen7 and Gen8 devices | +| | +| This file is part of the OpenRGB project | +| SPDX-License-Identifier: GPL-2.0-only | +\*---------------------------------------------------------*/ + +#include #include "RGBController_Lenovo_Gen7_8.h" #include "LenovoDevices.h" -#include using namespace std; diff --git a/Controllers/LenovoControllers/LenovoUSBController_Gen7_8/RGBController_Lenovo_Gen7_8.h b/Controllers/LenovoControllers/LenovoUSBController_Gen7_8/RGBController_Lenovo_Gen7_8.h index bb65afe3..e39ff727 100644 --- a/Controllers/LenovoControllers/LenovoUSBController_Gen7_8/RGBController_Lenovo_Gen7_8.h +++ b/Controllers/LenovoControllers/LenovoUSBController_Gen7_8/RGBController_Lenovo_Gen7_8.h @@ -1,5 +1,11 @@ -#ifndef RGBCONTROLLER_LENOVO_GEN7USB_H -#define RGBCONTROLLER_LENOVO_GEN7USB_H +/*---------------------------------------------------------*\ +| RGBController_Lenovo_Gen7_8.h | +| | +| RGBController for Lenovo Gen7 and Gen8 devices | +| | +| This file is part of the OpenRGB project | +| SPDX-License-Identifier: GPL-2.0-only | +\*---------------------------------------------------------*/ #pragma once @@ -48,5 +54,3 @@ private: uint8_t brightness = 0x00; uint8_t profile_id = 0x01; }; - -#endif // RGBCONTROLLER_LENOVO_GEN7USB_H