From 3c08177b5808075927fff1aed53a49b673a4af59 Mon Sep 17 00:00:00 2001 From: Adam Honse Date: Fri, 31 May 2024 11:08:11 -0500 Subject: [PATCH] Move and update Logitech G Pro keyboard controller files to new standardized header comment --- .../LogitechGProKeyboardController.cpp | 20 ++++++----- .../LogitechGProKeyboardController.h | 23 ++++++------ .../RGBController_LogitechGProKeyboard.cpp | 18 +++++----- .../RGBController_LogitechGProKeyboard.h | 35 +++++++++++++++++++ .../RGBController_LogitechGProKeyboard.h | 32 ----------------- 5 files changed, 68 insertions(+), 60 deletions(-) rename Controllers/LogitechController/{ => LogitechGProKeyboardController}/LogitechGProKeyboardController.cpp (90%) rename Controllers/LogitechController/{ => LogitechGProKeyboardController}/LogitechGProKeyboardController.h (81%) rename Controllers/LogitechController/{ => LogitechGProKeyboardController}/RGBController_LogitechGProKeyboard.cpp (96%) create mode 100644 Controllers/LogitechController/LogitechGProKeyboardController/RGBController_LogitechGProKeyboard.h delete mode 100644 Controllers/LogitechController/RGBController_LogitechGProKeyboard.h diff --git a/Controllers/LogitechController/LogitechGProKeyboardController.cpp b/Controllers/LogitechController/LogitechGProKeyboardController/LogitechGProKeyboardController.cpp similarity index 90% rename from Controllers/LogitechController/LogitechGProKeyboardController.cpp rename to Controllers/LogitechController/LogitechGProKeyboardController/LogitechGProKeyboardController.cpp index cfba6e6c..434519b2 100644 --- a/Controllers/LogitechController/LogitechGProKeyboardController.cpp +++ b/Controllers/LogitechController/LogitechGProKeyboardController/LogitechGProKeyboardController.cpp @@ -1,14 +1,16 @@ -/*-----------------------------------------*\ -| LogitechGProController.cpp | -| | -| Driver for Logitech G Pro | -| keyboard light controller | -| | -| sanchezzzs 20/10/2021 | -\*-----------------------------------------*/ +/*---------------------------------------------------------*\ +| LogitechGProController.cpp | +| | +| Driver for Logitech G Pro keyboard | +| | +| sanchezzzs 20 Oct 2021 | +| | +| This file is part of the OpenRGB project | +| SPDX-License-Identifier: GPL-2.0-only | +\*---------------------------------------------------------*/ -#include "LogitechGProKeyboardController.h" #include +#include "LogitechGProKeyboardController.h" LogitechGProKeyboardController::LogitechGProKeyboardController(hid_device* dev_handle_0x11, hid_device* dev_handle_0x12) { diff --git a/Controllers/LogitechController/LogitechGProKeyboardController.h b/Controllers/LogitechController/LogitechGProKeyboardController/LogitechGProKeyboardController.h similarity index 81% rename from Controllers/LogitechController/LogitechGProKeyboardController.h rename to Controllers/LogitechController/LogitechGProKeyboardController/LogitechGProKeyboardController.h index 8d336171..74e5c0d5 100644 --- a/Controllers/LogitechController/LogitechGProKeyboardController.h +++ b/Controllers/LogitechController/LogitechGProKeyboardController/LogitechGProKeyboardController.h @@ -1,18 +1,19 @@ -/*-----------------------------------------*\ -| LogitechGProController.h | -| | -| Definitions and types for Logitech G Pro | -| keyboard light controller | -| | -| sanchezzzs 20/10/2021 | -\*-----------------------------------------*/ +/*---------------------------------------------------------*\ +| LogitechGProController.h | +| | +| Driver for Logitech G Pro keyboard | +| | +| sanchezzzs 20 Oct 2021 | +| | +| This file is part of the OpenRGB project | +| SPDX-License-Identifier: GPL-2.0-only | +\*---------------------------------------------------------*/ -#include "RGBController.h" +#pragma once #include #include - -#pragma once +#include "RGBController.h" enum { diff --git a/Controllers/LogitechController/RGBController_LogitechGProKeyboard.cpp b/Controllers/LogitechController/LogitechGProKeyboardController/RGBController_LogitechGProKeyboard.cpp similarity index 96% rename from Controllers/LogitechController/RGBController_LogitechGProKeyboard.cpp rename to Controllers/LogitechController/LogitechGProKeyboardController/RGBController_LogitechGProKeyboard.cpp index 65308064..c79a435b 100644 --- a/Controllers/LogitechController/RGBController_LogitechGProKeyboard.cpp +++ b/Controllers/LogitechController/LogitechGProKeyboardController/RGBController_LogitechGProKeyboard.cpp @@ -1,11 +1,13 @@ -/*-----------------------------------------*\ -| RGBController_LogitechGPro.cpp | -| | -| Generic RGB Interface for Logitech G Pro | -| Keyboard | -| | -| sanchezzzs 20/10/2021 | -\*-----------------------------------------*/ +/*---------------------------------------------------------*\ +| RGBController_LogitechGPro.cpp | +| | +| RGBController for Logitech G Pro keyboard | +| | +| sanchezzzs 20 Oct 2021 | +| | +| This file is part of the OpenRGB project | +| SPDX-License-Identifier: GPL-2.0-only | +\*---------------------------------------------------------*/ #include "RGBControllerKeyNames.h" #include "RGBController_LogitechGProKeyboard.h" diff --git a/Controllers/LogitechController/LogitechGProKeyboardController/RGBController_LogitechGProKeyboard.h b/Controllers/LogitechController/LogitechGProKeyboardController/RGBController_LogitechGProKeyboard.h new file mode 100644 index 00000000..492d8f93 --- /dev/null +++ b/Controllers/LogitechController/LogitechGProKeyboardController/RGBController_LogitechGProKeyboard.h @@ -0,0 +1,35 @@ +/*---------------------------------------------------------*\ +| RGBController_LogitechGPro.h | +| | +| RGBController for Logitech G Pro keyboard | +| | +| sanchezzzs 20 Oct 2021 | +| | +| This file is part of the OpenRGB project | +| SPDX-License-Identifier: GPL-2.0-only | +\*---------------------------------------------------------*/ + +#pragma once + +#include "RGBController.h" +#include "LogitechGProKeyboardController.h" + +class RGBController_LogitechGProKeyboard : public RGBController +{ +public: + RGBController_LogitechGProKeyboard(LogitechGProKeyboardController* controller_ptr); + ~RGBController_LogitechGProKeyboard(); + + void SetupZones(); + + void ResizeZone(int zone, int new_size); + + void DeviceUpdateLEDs(); + void UpdateZoneLEDs(int zone); + void UpdateSingleLED(int led); + + void DeviceUpdateMode(); + +private: + LogitechGProKeyboardController* controller; +}; diff --git a/Controllers/LogitechController/RGBController_LogitechGProKeyboard.h b/Controllers/LogitechController/RGBController_LogitechGProKeyboard.h deleted file mode 100644 index 5b2cdd74..00000000 --- a/Controllers/LogitechController/RGBController_LogitechGProKeyboard.h +++ /dev/null @@ -1,32 +0,0 @@ -/*-----------------------------------------*\ -| RGBController_LogitechGPro.h | -| | -| Generic RGB Interface for Logitech G Pro | -| keyboard | -| | -| sanchezzzs 20/10/2021 | -\*-----------------------------------------*/ - -#pragma once -#include "RGBController.h" -#include "LogitechGProKeyboardController.h" - -class RGBController_LogitechGProKeyboard : public RGBController -{ -public: - RGBController_LogitechGProKeyboard(LogitechGProKeyboardController* controller_ptr); - ~RGBController_LogitechGProKeyboard(); - - void SetupZones(); - - void ResizeZone(int zone, int new_size); - - void DeviceUpdateLEDs(); - void UpdateZoneLEDs(int zone); - void UpdateSingleLED(int led); - - void DeviceUpdateMode(); - -private: - LogitechGProKeyboardController* controller; -};