From 6e9fd99e0e86b6f41af7e181c954b6ad9a402a8a Mon Sep 17 00:00:00 2001 From: Adam Honse Date: Thu, 30 May 2024 11:42:39 -0500 Subject: [PATCH] Move and update Logitech G915 controller files to new standardized header comment --- .../LogitechG915Controller.cpp | 20 +++++----- .../LogitechG915Controller.h | 23 +++++------ .../RGBController_LogitechG915.cpp | 22 ++++++----- .../RGBController_LogitechG915.h | 38 +++++++++++++++++++ .../RGBController_LogitechG915.h | 35 ----------------- 5 files changed, 73 insertions(+), 65 deletions(-) rename Controllers/LogitechController/{ => LogitechG915Controller}/LogitechG915Controller.cpp (96%) rename Controllers/LogitechController/{ => LogitechG915Controller}/LogitechG915Controller.h (87%) rename Controllers/LogitechController/{ => LogitechG915Controller}/RGBController_LogitechG915.cpp (97%) create mode 100644 Controllers/LogitechController/LogitechG915Controller/RGBController_LogitechG915.h delete mode 100644 Controllers/LogitechController/RGBController_LogitechG915.h diff --git a/Controllers/LogitechController/LogitechG915Controller.cpp b/Controllers/LogitechController/LogitechG915Controller/LogitechG915Controller.cpp similarity index 96% rename from Controllers/LogitechController/LogitechG915Controller.cpp rename to Controllers/LogitechController/LogitechG915Controller/LogitechG915Controller.cpp index cf48a605..7e1833e5 100644 --- a/Controllers/LogitechController/LogitechG915Controller.cpp +++ b/Controllers/LogitechController/LogitechG915Controller/LogitechG915Controller.cpp @@ -1,14 +1,16 @@ -/*-----------------------------------------*\ -| LogitechG915Controller.cpp | -| | -| Generic RGB Interface for Logitech G915 | -| RGB Mechanical Gaming Keyboard | -| | -| Cheerpipe 3/20/2021 | -\*-----------------------------------------*/ +/*---------------------------------------------------------*\ +| LogitechG915Controller.cpp | +| | +| Driver for Logitech G915 | +| | +| Cheerpipe 20 Mar 2021 | +| | +| This file is part of the OpenRGB project | +| SPDX-License-Identifier: GPL-2.0-only | +\*---------------------------------------------------------*/ -#include "LogitechG915Controller.h" #include +#include "LogitechG915Controller.h" LogitechG915Controller::LogitechG915Controller(hid_device* dev_handle, bool wired) { diff --git a/Controllers/LogitechController/LogitechG915Controller.h b/Controllers/LogitechController/LogitechG915Controller/LogitechG915Controller.h similarity index 87% rename from Controllers/LogitechController/LogitechG915Controller.h rename to Controllers/LogitechController/LogitechG915Controller/LogitechG915Controller.h index 9bbad50f..df46ffd1 100644 --- a/Controllers/LogitechController/LogitechG915Controller.h +++ b/Controllers/LogitechController/LogitechG915Controller/LogitechG915Controller.h @@ -1,22 +1,23 @@ -/*-----------------------------------------*\ -| LogitechG915Controller.h | -| | -| Generic RGB Interface for Logitech G915 | -| RGB Mechanical Gaming Keyboard | -| | -| Cheerpipe 3/20/2021 | -\*-----------------------------------------*/ +/*---------------------------------------------------------*\ +| LogitechG915Controller.h | +| | +| Driver for Logitech G915 | +| | +| Cheerpipe 20 Mar 2021 | +| | +| This file is part of the OpenRGB project | +| SPDX-License-Identifier: GPL-2.0-only | +\*---------------------------------------------------------*/ -#include "RGBController.h" +#pragma once #include #include +#include "RGBController.h" #define LOGITECH_G915_COMMIT_BYTE 0x7F #define LOGITECH_READ_TIMEOUT 300 //Timeout in ms -#pragma once - enum { LOGITECH_G915_ZONE_MODE_KEYBOARD = 0x01, diff --git a/Controllers/LogitechController/RGBController_LogitechG915.cpp b/Controllers/LogitechController/LogitechG915Controller/RGBController_LogitechG915.cpp similarity index 97% rename from Controllers/LogitechController/RGBController_LogitechG915.cpp rename to Controllers/LogitechController/LogitechG915Controller/RGBController_LogitechG915.cpp index 2177ae3d..37e5408a 100644 --- a/Controllers/LogitechController/RGBController_LogitechG915.cpp +++ b/Controllers/LogitechController/LogitechG915Controller/RGBController_LogitechG915.cpp @@ -1,17 +1,19 @@ -/*-----------------------------------------*\ -| RGBController_LogitechG915.cpp | -| | -| Generic RGB Interface for Logitech G915 | -| RGB Mechanical Gaming Keyboard | -| | -| Cheerpipe 3/20/2021 | -\*-----------------------------------------*/ +/*---------------------------------------------------------*\ +| RGBController_LogitechG915.cpp | +| | +| RGBController for Logitech G915 | +| | +| Cheerpipe 20 Mar 2021 | +| | +| This file is part of the OpenRGB project | +| SPDX-License-Identifier: GPL-2.0-only | +\*---------------------------------------------------------*/ -#include "RGBControllerKeyNames.h" -#include "RGBController_LogitechG915.h" #include #include #include +#include "RGBControllerKeyNames.h" +#include "RGBController_LogitechG915.h" #define NA 0xFFFFFFFF const size_t max_key_per_color = 13; diff --git a/Controllers/LogitechController/LogitechG915Controller/RGBController_LogitechG915.h b/Controllers/LogitechController/LogitechG915Controller/RGBController_LogitechG915.h new file mode 100644 index 00000000..73ff2a99 --- /dev/null +++ b/Controllers/LogitechController/LogitechG915Controller/RGBController_LogitechG915.h @@ -0,0 +1,38 @@ +/*---------------------------------------------------------*\ +| RGBController_LogitechG915.h | +| | +| RGBController for Logitech G915 | +| | +| Cheerpipe 20 Mar 2021 | +| | +| This file is part of the OpenRGB project | +| SPDX-License-Identifier: GPL-2.0-only | +\*---------------------------------------------------------*/ + +#pragma once + +#include "RGBController.h" +#include "LogitechG915Controller.h" + +class RGBController_LogitechG915 : public RGBController +{ +public: + RGBController_LogitechG915(LogitechG915Controller* controller_ptr, bool tkl); + ~RGBController_LogitechG915(); + + void SetupZones(); + + void ResizeZone(int zone, int new_size); + + void DeviceUpdateLEDs(); + void UpdateZoneLEDs(int zone); + void UpdateSingleLED(int led); + + void DeviceUpdateMode(); + +private: + bool is_tkl; + + LogitechG915Controller* controller; + std::vector current_colors; +}; diff --git a/Controllers/LogitechController/RGBController_LogitechG915.h b/Controllers/LogitechController/RGBController_LogitechG915.h deleted file mode 100644 index fa74ce92..00000000 --- a/Controllers/LogitechController/RGBController_LogitechG915.h +++ /dev/null @@ -1,35 +0,0 @@ -/*-----------------------------------------*\ -| RGBController_LogitechG915.h | -| | -| Generic RGB Interface for Logitech G915 | -| RGB Mechanical Gaming Keyboard | -| | -| Cheerpipe 3/20/2021 | -\*-----------------------------------------*/ - -#pragma once -#include "RGBController.h" -#include "LogitechG915Controller.h" - -class RGBController_LogitechG915 : public RGBController -{ -public: - RGBController_LogitechG915(LogitechG915Controller* controller_ptr, bool tkl); - ~RGBController_LogitechG915(); - - void SetupZones(); - - void ResizeZone(int zone, int new_size); - - void DeviceUpdateLEDs(); - void UpdateZoneLEDs(int zone); - void UpdateSingleLED(int led); - - void DeviceUpdateMode(); - -private: - bool is_tkl; - - LogitechG915Controller* controller; - std::vector current_colors; -};