From 433ac0b8ce8069198e22a366f2b6cb323859b5df Mon Sep 17 00:00:00 2001 From: Adam Honse Date: Thu, 30 May 2024 11:23:44 -0500 Subject: [PATCH] Move and update Logitech G560 controller files to new standardized header comment --- .../LogitechG560Controller.cpp | 23 ++++++------ .../LogitechG560Controller.h | 26 +++++++------- .../RGBController_LogitechG560.cpp | 21 +++++------ .../RGBController_LogitechG560.h | 35 +++++++++++++++++++ .../RGBController_LogitechG560.h | 33 ----------------- 5 files changed, 71 insertions(+), 67 deletions(-) rename Controllers/LogitechController/{ => LogitechG560Controller}/LogitechG560Controller.cpp (84%) rename Controllers/LogitechController/{ => LogitechG560Controller}/LogitechG560Controller.h (61%) rename Controllers/LogitechController/{ => LogitechG560Controller}/RGBController_LogitechG560.cpp (85%) create mode 100644 Controllers/LogitechController/LogitechG560Controller/RGBController_LogitechG560.h delete mode 100644 Controllers/LogitechController/RGBController_LogitechG560.h diff --git a/Controllers/LogitechController/LogitechG560Controller.cpp b/Controllers/LogitechController/LogitechG560Controller/LogitechG560Controller.cpp similarity index 84% rename from Controllers/LogitechController/LogitechG560Controller.cpp rename to Controllers/LogitechController/LogitechG560Controller/LogitechG560Controller.cpp index 8cf23f30..b19e74d6 100644 --- a/Controllers/LogitechController/LogitechG560Controller.cpp +++ b/Controllers/LogitechController/LogitechG560Controller/LogitechG560Controller.cpp @@ -1,18 +1,19 @@ -/*-----------------------------------------*\ -| LogitechG560Controller.cpp | -| | -| Driver for Logitech G560 RGB Speaker | -| Charging System | -| | -| Cheerpipe 10/28/2020 | -| Based on | -| TheRogueZeta 8/31/2020 | -\*-----------------------------------------*/ +/*---------------------------------------------------------*\ +| LogitechG560Controller.cpp | +| | +| Driver for Logitech G560 | +| | +| Cheerpipe 28 Oct 2020 | +| based on TheRogueZeta 31 Aug 2020 | +| | +| This file is part of the OpenRGB project | +| SPDX-License-Identifier: GPL-2.0-only | +\*---------------------------------------------------------*/ -#include "LogitechG560Controller.h" #include #include #include +#include "LogitechG560Controller.h" using namespace std::chrono_literals; diff --git a/Controllers/LogitechController/LogitechG560Controller.h b/Controllers/LogitechController/LogitechG560Controller/LogitechG560Controller.h similarity index 61% rename from Controllers/LogitechController/LogitechG560Controller.h rename to Controllers/LogitechController/LogitechG560Controller/LogitechG560Controller.h index 3259d929..b95582e3 100644 --- a/Controllers/LogitechController/LogitechG560Controller.h +++ b/Controllers/LogitechController/LogitechG560Controller/LogitechG560Controller.h @@ -1,20 +1,20 @@ -/*-----------------------------------------*\ -| LogitechG560Controller.h | -| | -| Definitions and types for Logitech G560 | -| RGB Speaker | -| | -| Cheerpipe 10/28/2020 | -| Based on | -| TheRogueZeta 8/31/2020 | -\*-----------------------------------------*/ +/*---------------------------------------------------------*\ +| LogitechG560Controller.h | +| | +| Driver for Logitech G560 | +| | +| Cheerpipe 28 Oct 2020 | +| based on TheRogueZeta 31 Aug 2020 | +| | +| 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" #define LOGI_G560_LED_PACKET_SIZE 20 #define LOGI_G560_LED_COMMAND_SEND_RETRIES 3 diff --git a/Controllers/LogitechController/RGBController_LogitechG560.cpp b/Controllers/LogitechController/LogitechG560Controller/RGBController_LogitechG560.cpp similarity index 85% rename from Controllers/LogitechController/RGBController_LogitechG560.cpp rename to Controllers/LogitechController/LogitechG560Controller/RGBController_LogitechG560.cpp index d690c09f..b0b622e3 100644 --- a/Controllers/LogitechController/RGBController_LogitechG560.cpp +++ b/Controllers/LogitechController/LogitechG560Controller/RGBController_LogitechG560.cpp @@ -1,13 +1,14 @@ -/*-----------------------------------------*\ -| RGBController_LogitechG560.cpp | -| | -| Generic RGB Interface for | -| Logitech G560 RGB Speaker | -| | -| Cheerpipe 10/28/2020 | -| Based on | -| TheRogueZeta 8/31/2020 | -\*-----------------------------------------*/ +/*---------------------------------------------------------*\ +| RGBController_LogitechG560.cpp | +| | +| RGBController for Logitech G560 | +| | +| Cheerpipe 28 Oct 2020 | +| based on TheRogueZeta 31 Aug 2020 | +| | +| This file is part of the OpenRGB project | +| SPDX-License-Identifier: GPL-2.0-only | +\*---------------------------------------------------------*/ #include "RGBController_LogitechG560.h" diff --git a/Controllers/LogitechController/LogitechG560Controller/RGBController_LogitechG560.h b/Controllers/LogitechController/LogitechG560Controller/RGBController_LogitechG560.h new file mode 100644 index 00000000..b28e7f1a --- /dev/null +++ b/Controllers/LogitechController/LogitechG560Controller/RGBController_LogitechG560.h @@ -0,0 +1,35 @@ +/*---------------------------------------------------------*\ +| RGBController_LogitechG560.h | +| | +| RGBController for Logitech G560 | +| | +| Cheerpipe 28 Oct 2020 | +| based on TheRogueZeta 31 Aug 2020 | +| | +| This file is part of the OpenRGB project | +| SPDX-License-Identifier: GPL-2.0-only | +\*---------------------------------------------------------*/ + +#pragma once + +#include "RGBController.h" +#include "LogitechG560Controller.h" + +class RGBController_LogitechG560 : public RGBController +{ +public: + RGBController_LogitechG560(LogitechG560Controller* controller_ptr); + + void SetupZones(); + + void ResizeZone(int zone, int new_size); + + void DeviceUpdateLEDs(); + void UpdateZoneLEDs(int zone); + void UpdateSingleLED(int led); + + void DeviceUpdateMode(); + +private: + LogitechG560Controller* controller; +}; diff --git a/Controllers/LogitechController/RGBController_LogitechG560.h b/Controllers/LogitechController/RGBController_LogitechG560.h deleted file mode 100644 index 54f3e726..00000000 --- a/Controllers/LogitechController/RGBController_LogitechG560.h +++ /dev/null @@ -1,33 +0,0 @@ -/*-----------------------------------------*\ -| RGBController_LogitechG560.h | -| | -| Generic RGB Interface for | -| G560 RGB Speaker | -| | -| Cheerpipe 10/28/2020 | -| Based on | -| TheRogueZeta 8/31/2020 | -\*-----------------------------------------*/ - -#pragma once -#include "RGBController.h" -#include "LogitechG560Controller.h" - -class RGBController_LogitechG560 : public RGBController -{ -public: - RGBController_LogitechG560(LogitechG560Controller* controller_ptr); - - void SetupZones(); - - void ResizeZone(int zone, int new_size); - - void DeviceUpdateLEDs(); - void UpdateZoneLEDs(int zone); - void UpdateSingleLED(int led); - - void DeviceUpdateMode(); - -private: - LogitechG560Controller* controller; -};