From 94ccb0a3bafeb30776c59d4c9a62fa40faffa77f Mon Sep 17 00:00:00 2001 From: Adam Honse Date: Thu, 30 May 2024 11:45:30 -0500 Subject: [PATCH] Move and update Logitech G933 controller files to new standardized header comment --- .../LogitechG933Controller.cpp | 22 ++++++------ .../LogitechG933Controller.h | 27 +++++++------- .../RGBController_LogitechG933.cpp | 21 +++++------ .../RGBController_LogitechG933.h | 35 +++++++++++++++++++ .../RGBController_LogitechG933.h | 33 ----------------- 5 files changed, 72 insertions(+), 66 deletions(-) rename Controllers/LogitechController/{ => LogitechG933Controller}/LogitechG933Controller.cpp (84%) rename Controllers/LogitechController/{ => LogitechG933Controller}/LogitechG933Controller.h (61%) rename Controllers/LogitechController/{ => LogitechG933Controller}/RGBController_LogitechG933.cpp (81%) create mode 100644 Controllers/LogitechController/LogitechG933Controller/RGBController_LogitechG933.h delete mode 100644 Controllers/LogitechController/RGBController_LogitechG933.h diff --git a/Controllers/LogitechController/LogitechG933Controller.cpp b/Controllers/LogitechController/LogitechG933Controller/LogitechG933Controller.cpp similarity index 84% rename from Controllers/LogitechController/LogitechG933Controller.cpp rename to Controllers/LogitechController/LogitechG933Controller/LogitechG933Controller.cpp index 3b9a5ddd..3568909f 100644 --- a/Controllers/LogitechController/LogitechG933Controller.cpp +++ b/Controllers/LogitechController/LogitechG933Controller/LogitechG933Controller.cpp @@ -1,17 +1,19 @@ -/*-----------------------------------------*\ -| LogitechG933Controller.cpp | -| | -| Driver for Logitech G933 RGB Headset | -| | -| Edbgon 06/21/2021 | -| Based on | -| TheRogueZeta 8/31/2020 | -\*-----------------------------------------*/ +/*---------------------------------------------------------*\ +| LogitechG933Controller.cpp | +| | +| Driver for Logitech G933 | +| | +| Edbgon 21 Jun 2021 | +| Based on TheRogueZeta 31 Aug 2020 | +| | +| This file is part of the OpenRGB project | +| SPDX-License-Identifier: GPL-2.0-only | +\*---------------------------------------------------------*/ -#include "LogitechG933Controller.h" #include #include #include +#include "LogitechG933Controller.h" using namespace std::chrono_literals; diff --git a/Controllers/LogitechController/LogitechG933Controller.h b/Controllers/LogitechController/LogitechG933Controller/LogitechG933Controller.h similarity index 61% rename from Controllers/LogitechController/LogitechG933Controller.h rename to Controllers/LogitechController/LogitechG933Controller/LogitechG933Controller.h index 9981ca4d..a1071e7e 100644 --- a/Controllers/LogitechController/LogitechG933Controller.h +++ b/Controllers/LogitechController/LogitechG933Controller/LogitechG933Controller.h @@ -1,19 +1,20 @@ -/*-----------------------------------------*\ -| LogitechG933Controller.h | -| | -| Definitions and types for | -| Logitech G933 RGB Headset | -| | -| Edbgon 06/21/2021 | -| Based on | -| TheRogueZeta 8/31/2020 | -\*-----------------------------------------*/ -#include "RGBController.h" +/*---------------------------------------------------------*\ +| LogitechG933Controller.h | +| | +| Driver for Logitech G933 | +| | +| Edbgon 21 Jun 2021 | +| Based on TheRogueZeta 31 Aug 2020 | +| | +| This file is part of the OpenRGB project | +| SPDX-License-Identifier: GPL-2.0-only | +\*---------------------------------------------------------*/ + +#pragma once #include #include - -#pragma once +#include "RGBController.h" #define LOGI_G933_LED_PACKET_SIZE 20 #define LOGI_G933_LED_COMMAND_SEND_RETRIES 3 diff --git a/Controllers/LogitechController/RGBController_LogitechG933.cpp b/Controllers/LogitechController/LogitechG933Controller/RGBController_LogitechG933.cpp similarity index 81% rename from Controllers/LogitechController/RGBController_LogitechG933.cpp rename to Controllers/LogitechController/LogitechG933Controller/RGBController_LogitechG933.cpp index b2777106..2cad8aea 100644 --- a/Controllers/LogitechController/RGBController_LogitechG933.cpp +++ b/Controllers/LogitechController/LogitechG933Controller/RGBController_LogitechG933.cpp @@ -1,13 +1,14 @@ -/*-----------------------------------------*\ -| RGBController_LogitechG933.cpp | -| | -| Generic RGB Interface for | -| Logitech G933 RGB Headset | -| | -| Edbgon 06/21/2021 | -| Based on | -| TheRogueZeta 8/31/2020 | -\*-----------------------------------------*/ +/*---------------------------------------------------------*\ +| RGBController_LogitechG933.cpp | +| | +| RGBController for Logitech G933 | +| | +| Edbgon 21 Jun 2021 | +| Based on TheRogueZeta 31 Aug 2020 | +| | +| This file is part of the OpenRGB project | +| SPDX-License-Identifier: GPL-2.0-only | +\*---------------------------------------------------------*/ #include "RGBController_LogitechG933.h" diff --git a/Controllers/LogitechController/LogitechG933Controller/RGBController_LogitechG933.h b/Controllers/LogitechController/LogitechG933Controller/RGBController_LogitechG933.h new file mode 100644 index 00000000..1e3b7db4 --- /dev/null +++ b/Controllers/LogitechController/LogitechG933Controller/RGBController_LogitechG933.h @@ -0,0 +1,35 @@ +/*---------------------------------------------------------*\ +| RGBController_LogitechG933.h | +| | +| RGBController for Logitech G933 | +| | +| Edbgon 21 Jun 2021 | +| 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 "LogitechG933Controller.h" + +class RGBController_LogitechG933 : public RGBController +{ +public: + RGBController_LogitechG933(LogitechG933Controller* controller_ptr); + + void SetupZones(); + + void ResizeZone(int zone, int new_size); + + void DeviceUpdateLEDs(); + void UpdateZoneLEDs(int zone); + void UpdateSingleLED(int led); + + void DeviceUpdateMode(); + +private: + LogitechG933Controller* controller; +}; diff --git a/Controllers/LogitechController/RGBController_LogitechG933.h b/Controllers/LogitechController/RGBController_LogitechG933.h deleted file mode 100644 index 6a36e1a9..00000000 --- a/Controllers/LogitechController/RGBController_LogitechG933.h +++ /dev/null @@ -1,33 +0,0 @@ -/*-----------------------------------------*\ -| RGBController_LogitechG933.h | -| | -| Generic RGB Interface for | -| G933 RGB Headset | -| | -| Edbgon 06/21/2021 | -| Based on | -| TheRogueZeta 8/31/2020 | -\*-----------------------------------------*/ - -#pragma once -#include "RGBController.h" -#include "LogitechG933Controller.h" - -class RGBController_LogitechG933 : public RGBController -{ -public: - RGBController_LogitechG933(LogitechG933Controller* controller_ptr); - - void SetupZones(); - - void ResizeZone(int zone, int new_size); - - void DeviceUpdateLEDs(); - void UpdateZoneLEDs(int zone); - void UpdateSingleLED(int led); - - void DeviceUpdateMode(); - -private: - LogitechG933Controller* controller; -};