From da8469f478b5916a29e70c4aaa2c6cbc2637ec7b Mon Sep 17 00:00:00 2001 From: Adam Honse Date: Tue, 14 May 2024 19:14:09 -0500 Subject: [PATCH] Update all Corsair controller files to use new standardized file header comment --- .../CorsairCommanderCoreController.cpp | 16 +++++++----- .../CorsairCommanderCoreController.h | 22 ++++++++-------- .../CorsairCommanderCoreControllerDetect.cpp | 15 +++++++++-- .../RGBController_CorsairCommanderCore.cpp | 18 +++++++------ .../RGBController_CorsairCommanderCore.h | 19 ++++++++------ .../CorsairController/CorsairDeviceGuard.cpp | 10 +++---- .../CorsairController/CorsairDeviceGuard.h | 10 +++---- .../CorsairDominatorPlatinumController.cpp | 21 ++++++++------- .../CorsairDominatorPlatinumController.h | 24 +++++++++-------- ...rsairDominatorPlatinumControllerDetect.cpp | 18 ++++++++++--- ...RGBController_CorsairDominatorPlatinum.cpp | 17 +++++++----- .../RGBController_CorsairDominatorPlatinum.h | 17 +++++++----- .../CorsairHydro2Controller.cpp | 19 ++++++++------ .../CorsairHydro2Controller.h | 23 +++++++++------- .../CorsairHydro2ControllerDetect.cpp | 25 ++++++++++-------- .../RGBController_CorsairHydro2.cpp | 17 +++++++----- .../RGBController_CorsairHydro2.h | 18 ++++++++----- .../CorsairHydroController.cpp | 12 ++++++--- .../CorsairHydroController.h | 17 +++++++----- .../CorsairHydroControllerDetect.cpp | 19 +++++++++++--- .../RGBController_CorsairHydro.cpp | 18 +++++++------ .../RGBController_CorsairHydro.h | 19 ++++++++------ .../CorsairHydroPlatinumController.cpp | 20 +++++++------- .../CorsairHydroPlatinumController.h | 25 +++++++++--------- .../CorsairHydroPlatinumControllerDetect.cpp | 20 +++++++------- .../RGBController_CorsairHydroPlatinum.cpp | 18 +++++++------ .../RGBController_CorsairHydroPlatinum.h | 19 ++++++++------ .../CorsairLightingNodeController.cpp | 16 +++++++----- .../CorsairLightingNodeController.h | 16 +++++++----- .../CorsairLightingNodeControllerDetect.cpp | 17 +++++++++--- .../RGBController_CorsairLightingNode.cpp | 18 +++++++------ .../RGBController_CorsairLightingNode.h | 19 ++++++++------ .../CorsairK55RGBPROXTController.cpp | 15 ++++++----- .../CorsairK55RGBPROXTController.h | 22 +++++++--------- .../CorsairK65MiniController.cpp | 15 ++++++----- .../CorsairK65MiniController.h | 12 +++++++-- .../CorsairK95PlatinumXTController.cpp | 20 ++++++++------ .../CorsairK95PlatinumXTController.h | 21 ++++++++------- .../CorsairPeripheralController.cpp | 23 ++++++++-------- .../CorsairPeripheralController.h | 26 +++++++++---------- .../CorsairPeripheralControllerDetect.cpp | 9 +++++++ .../RGBController_CorsairK55RGBPROXT.cpp | 13 ++++++---- .../RGBController_CorsairK55RGBPROXT.h | 18 ++++++------- .../RGBController_CorsairK65Mini.cpp | 15 ++++++----- .../RGBController_CorsairK65Mini.h | 9 +++++++ .../RGBController_CorsairK95PlatinumXT.cpp | 18 ++++++++----- .../RGBController_CorsairK95PlatinumXT.h | 19 +++++++++----- .../RGBController_CorsairPeripheral.cpp | 18 +++++++------ .../RGBController_CorsairPeripheral.h | 21 ++++++++------- .../CorsairPeripheralV2Controller.cpp | 18 +++++++------ .../CorsairPeripheralV2Controller.h | 18 +++++++------ .../CorsairPeripheralV2ControllerDetect.cpp | 9 +++++++ .../CorsairPeripheralV2Devices.cpp | 9 +++++++ .../CorsairPeripheralV2Devices.h | 9 +++++++ .../CorsairPeripheralV2HardwareController.cpp | 18 +++++++------ .../CorsairPeripheralV2HardwareController.h | 19 ++++++++------ .../CorsairPeripheralV2SoftwareController.cpp | 18 +++++++------ .../CorsairPeripheralV2SoftwareController.h | 19 ++++++++------ .../RGBController_CorsairV2Hardware.cpp | 20 ++++++++------ .../RGBController_CorsairV2Hardware.h | 20 ++++++++------ .../RGBController_CorsairV2Software.cpp | 19 ++++++++------ .../RGBController_CorsairV2Software.h | 20 ++++++++------ .../CorsairVengeanceController.cpp | 20 +++++++------- .../CorsairVengeanceController.h | 22 +++++++++------- .../CorsairVengeanceControllerDetect.cpp | 21 +++++++++++---- .../RGBController_CorsairVengeance.cpp | 18 +++++++------ .../RGBController_CorsairVengeance.h | 18 +++++++------ .../CorsairVengeanceProController.cpp | 22 +++++++++------- .../CorsairVengeanceProController.h | 22 +++++++++------- .../CorsairVengeanceProControllerDetect.cpp | 17 +++++++++--- .../RGBController_CorsairVengeancePro.cpp | 18 +++++++------ .../RGBController_CorsairVengeancePro.h | 18 +++++++------ .../CorsairWirelessController.cpp | 21 ++++++++------- .../CorsairWirelessController.h | 23 ++++++++-------- .../CorsairWirelessControllerDetect.cpp | 13 +++++++++- .../RGBController_CorsairWireless.cpp | 18 +++++++------ .../RGBController_CorsairWireless.h | 19 ++++++++------ 77 files changed, 831 insertions(+), 551 deletions(-) diff --git a/Controllers/CorsairCommanderCoreController/CorsairCommanderCoreController.cpp b/Controllers/CorsairCommanderCoreController/CorsairCommanderCoreController.cpp index 8315c222..63f130e6 100644 --- a/Controllers/CorsairCommanderCoreController/CorsairCommanderCoreController.cpp +++ b/Controllers/CorsairCommanderCoreController/CorsairCommanderCoreController.cpp @@ -1,17 +1,19 @@ /*---------------------------------------------------------*\ -| CorsairCommanderCoreController.cpp | +| CorsairCommanderCoreController.cpp | | | -| Processing Code for Corsair Commander Core | +| Driver for Corsair Commander Core | | | -| Jeff P. | +| Jeff P. | +| | +| This file is part of the OpenRGB project | +| SPDX-License-Identifier: GPL-2.0-only | \*---------------------------------------------------------*/ -#include "CorsairCommanderCoreController.h" -#include "CorsairDeviceGuard.h" - #include #include #include +#include "CorsairCommanderCoreController.h" +#include "CorsairDeviceGuard.h" using namespace std::chrono_literals; @@ -24,7 +26,7 @@ CorsairCommanderCoreController::CorsairCommanderCoreController(hid_device* dev_h packet_size = CORSAIR_COMMANDER_CORE_PACKET_SIZE_V2; command_res_size = packet_size - 4; this->pid = pid; - guard_manager_ptr = new DeviceGuardManager(new CorsairDeviceGuard()); + guard_manager_ptr = new DeviceGuardManager(new CorsairDeviceGuard()); /*-----------------------------------------------------*\ | Initialize controller | diff --git a/Controllers/CorsairCommanderCoreController/CorsairCommanderCoreController.h b/Controllers/CorsairCommanderCoreController/CorsairCommanderCoreController.h index 88151149..c0fd7a88 100644 --- a/Controllers/CorsairCommanderCoreController/CorsairCommanderCoreController.h +++ b/Controllers/CorsairCommanderCoreController/CorsairCommanderCoreController.h @@ -1,22 +1,22 @@ /*---------------------------------------------------------*\ -| CorsairCommanderCoreController.h | +| CorsairCommanderCoreController.h | | | -| Definitions for Corsair Commander Core | -| Based on code by: | -| Adam Honse (calcprogrammer1@gmail.com), 8/17/2020 | +| Driver for Corsair Commander Core | | | -| Jeff P. | +| Jeff P. | +| | +| This file is part of the OpenRGB project | +| SPDX-License-Identifier: GPL-2.0-only | \*---------------------------------------------------------*/ +#pragma once + +#include +#include +#include #include "RGBController.h" #include "DeviceGuardManager.h" -#include -#include -#include - -#pragma once - #define CORSAIR_COMMANDER_CORE_PACKET_SIZE_V1 1025 // First bit is the report bit #define CORSAIR_COMMANDER_CORE_PACKET_SIZE_V2 97 // First bit is the report bit #define CORSAIR_COMMANDER_CORE_PACKET_SIZE_V3 65 // First bit is the report bit diff --git a/Controllers/CorsairCommanderCoreController/CorsairCommanderCoreControllerDetect.cpp b/Controllers/CorsairCommanderCoreController/CorsairCommanderCoreControllerDetect.cpp index f4e08956..386dd846 100644 --- a/Controllers/CorsairCommanderCoreController/CorsairCommanderCoreControllerDetect.cpp +++ b/Controllers/CorsairCommanderCoreController/CorsairCommanderCoreControllerDetect.cpp @@ -1,9 +1,20 @@ +/*---------------------------------------------------------*\ +| CorsairCommanderCoreControllerDetect.cpp | +| | +| Detector for Corsair Commander Core | +| | +| Jeff P. | +| | +| This file is part of the OpenRGB project | +| SPDX-License-Identifier: GPL-2.0-only | +\*---------------------------------------------------------*/ + +#include +#include #include "Detector.h" #include "CorsairCommanderCoreController.h" #include "RGBController.h" #include "RGBController_CorsairCommanderCore.h" -#include -#include /*-----------------------------------------------------*\ | Corsair vendor ID | diff --git a/Controllers/CorsairCommanderCoreController/RGBController_CorsairCommanderCore.cpp b/Controllers/CorsairCommanderCoreController/RGBController_CorsairCommanderCore.cpp index f6bf92d4..d2e6c8e4 100644 --- a/Controllers/CorsairCommanderCoreController/RGBController_CorsairCommanderCore.cpp +++ b/Controllers/CorsairCommanderCoreController/RGBController_CorsairCommanderCore.cpp @@ -1,11 +1,13 @@ -/*-----------------------------------------*\ -| RGBController_CorsairCapellix.cpp | -| | -| Generic RGB Interface for Corsair | -| Commander Core | -| | -| Jeff P. | -\*-----------------------------------------*/ +/*---------------------------------------------------------*\ +| RGBController_CorsairCCommanderCore.cpp | +| | +| RGBController for Corsair Commander Core | +| | +| Jeff P. | +| | +| This file is part of the OpenRGB project | +| SPDX-License-Identifier: GPL-2.0-only | +\*---------------------------------------------------------*/ #include "RGBController_CorsairCommanderCore.h" diff --git a/Controllers/CorsairCommanderCoreController/RGBController_CorsairCommanderCore.h b/Controllers/CorsairCommanderCoreController/RGBController_CorsairCommanderCore.h index ef5c924d..43f434a1 100644 --- a/Controllers/CorsairCommanderCoreController/RGBController_CorsairCommanderCore.h +++ b/Controllers/CorsairCommanderCoreController/RGBController_CorsairCommanderCore.h @@ -1,13 +1,16 @@ -/*-----------------------------------------*\ -| RGBController_CorsairCapellix.h | -| | -| Generic RGB Interface for Corsair | -| Commander Core | -| | -| Jeff P. | -\*-----------------------------------------*/ +/*---------------------------------------------------------*\ +| RGBController_CorsairCCommanderCore.h | +| | +| RGBController for Corsair Commander Core | +| | +| Jeff P. | +| | +| This file is part of the OpenRGB project | +| SPDX-License-Identifier: GPL-2.0-only | +\*---------------------------------------------------------*/ #pragma once + #include "RGBController.h" #include "CorsairCommanderCoreController.h" diff --git a/Controllers/CorsairController/CorsairDeviceGuard.cpp b/Controllers/CorsairController/CorsairDeviceGuard.cpp index 97653431..aacf36f8 100644 --- a/Controllers/CorsairController/CorsairDeviceGuard.cpp +++ b/Controllers/CorsairController/CorsairDeviceGuard.cpp @@ -1,12 +1,12 @@ /*---------------------------------------------------------*\ -| CorsairDeviceGuard.h | +| CorsairDeviceGuard.cpp | | | -| A DeviceGuard implementation for Corsair devices. | +| DeviceGuard for Corsair devices | | | -| On Windows platforms, a global mutex is used. | -| | -| Evan Mulawski, 2023-09-04 | +| Evan Mulawski 04 Sep 2023 | | | +| This file is part of the OpenRGB project | +| SPDX-License-Identifier: GPL-2.0-only | \*---------------------------------------------------------*/ #include "CorsairDeviceGuard.h" diff --git a/Controllers/CorsairController/CorsairDeviceGuard.h b/Controllers/CorsairController/CorsairDeviceGuard.h index 8217dc12..cb048f16 100644 --- a/Controllers/CorsairController/CorsairDeviceGuard.h +++ b/Controllers/CorsairController/CorsairDeviceGuard.h @@ -1,12 +1,12 @@ /*---------------------------------------------------------*\ -| CorsairDeviceGuard.h | +| CorsairDeviceGuard.cpp | | | -| A DeviceGuard implementation for Corsair devices. | +| DeviceGuard for Corsair devices | | | -| On Windows platforms, a global mutex is used. | -| | -| Evan Mulawski, 2023-09-04 | +| Evan Mulawski 04 Sep 2023 | | | +| This file is part of the OpenRGB project | +| SPDX-License-Identifier: GPL-2.0-only | \*---------------------------------------------------------*/ #pragma once diff --git a/Controllers/CorsairDominatorPlatinumController/CorsairDominatorPlatinumController.cpp b/Controllers/CorsairDominatorPlatinumController/CorsairDominatorPlatinumController.cpp index 223b2115..1dfdc278 100644 --- a/Controllers/CorsairDominatorPlatinumController/CorsairDominatorPlatinumController.cpp +++ b/Controllers/CorsairDominatorPlatinumController/CorsairDominatorPlatinumController.cpp @@ -1,15 +1,16 @@ -/*------------------------------------------*\ -| CorsairDominatorPlatinumController.cpp | -| | -| Drover for Corsair Domintator Platinum | -| RGB RAM lighting controller | -| | -| Erik Gilling (konkers) 9/25/2020 | -\*------------------------------------------*/ - -#include "CorsairDominatorPlatinumController.h" +/*---------------------------------------------------------*\ +| CorsairDominatorPlatinumController.cpp | +| | +| Driver for Corsair Dominator Platinum RAM | +| | +| Erik Gilling (konkers) 25 Sep 2020 | +| | +| This file is part of the OpenRGB project | +| SPDX-License-Identifier: GPL-2.0-only | +\*---------------------------------------------------------*/ #include +#include "CorsairDominatorPlatinumController.h" using namespace std::chrono_literals; diff --git a/Controllers/CorsairDominatorPlatinumController/CorsairDominatorPlatinumController.h b/Controllers/CorsairDominatorPlatinumController/CorsairDominatorPlatinumController.h index 82ee1a5c..f28b4094 100644 --- a/Controllers/CorsairDominatorPlatinumController/CorsairDominatorPlatinumController.h +++ b/Controllers/CorsairDominatorPlatinumController/CorsairDominatorPlatinumController.h @@ -1,18 +1,20 @@ -/*-----------------------------------------*\ -| CorsairDominatorPlatinumController.h | -| | -| Definitions and types for Corsair | -| Domintator Platinum RGB RAM lighting | -| controller | -| | -| Erik Gilling (konkers) 9/25/2020 | -\*-----------------------------------------*/ +/*---------------------------------------------------------*\ +| CorsairDominatorPlatinumController.h | +| | +| Driver for Corsair Dominator Platinum RAM | +| | +| Erik Gilling (konkers) 25 Sep 2020 | +| | +| This file is part of the OpenRGB project | +| SPDX-License-Identifier: GPL-2.0-only | +\*---------------------------------------------------------*/ + +#pragma once #include #include "i2c_smbus.h" -#define CORSAIR_DOMINATOR_PLATINUM_DATA_SIZE 38 -#pragma once +#define CORSAIR_DOMINATOR_PLATINUM_DATA_SIZE 38 typedef unsigned char corsair_dev_id; diff --git a/Controllers/CorsairDominatorPlatinumController/CorsairDominatorPlatinumControllerDetect.cpp b/Controllers/CorsairDominatorPlatinumController/CorsairDominatorPlatinumControllerDetect.cpp index 56b4dc4a..eeb3398a 100644 --- a/Controllers/CorsairDominatorPlatinumController/CorsairDominatorPlatinumControllerDetect.cpp +++ b/Controllers/CorsairDominatorPlatinumController/CorsairDominatorPlatinumControllerDetect.cpp @@ -1,15 +1,25 @@ +/*---------------------------------------------------------*\ +| CorsairDominatorPlatinumControllerDetect.cpp | +| | +| Detector for Corsair Dominator Platinum RAM | +| | +| Erik Gilling (konkers) 25 Sep 2020 | +| | +| This file is part of the OpenRGB project | +| SPDX-License-Identifier: GPL-2.0-only | +\*---------------------------------------------------------*/ + +#include +#include +#include #include "Detector.h" #include "CorsairDominatorPlatinumController.h" #include "RGBController.h" #include "RGBController_CorsairDominatorPlatinum.h" #include "SettingsManager.h" #include "LogManager.h" - #include "i2c_smbus.h" #include "pci_ids.h" -#include -#include -#include using namespace std::chrono_literals; diff --git a/Controllers/CorsairDominatorPlatinumController/RGBController_CorsairDominatorPlatinum.cpp b/Controllers/CorsairDominatorPlatinumController/RGBController_CorsairDominatorPlatinum.cpp index b47a35e7..cd2d6110 100644 --- a/Controllers/CorsairDominatorPlatinumController/RGBController_CorsairDominatorPlatinum.cpp +++ b/Controllers/CorsairDominatorPlatinumController/RGBController_CorsairDominatorPlatinum.cpp @@ -1,10 +1,13 @@ -/*-------------------------------------------------*\ -| RGBController_CorsairDominatorPlatinum.cpp | -| | -| Corsair Vengeance Pro RGB driver | -| | -| Erik Gilling (konkers) 9/25/2020 | -\*-------------------------------------------------*/ +/*---------------------------------------------------------*\ +| RGBController_CorsairDominatorPlatinum.cpp | +| | +| RGBController for Corsair Dominator Platinum RAM | +| | +| Erik Gilling (konkers) 25 Sep 2020 | +| | +| This file is part of the OpenRGB project | +| SPDX-License-Identifier: GPL-2.0-only | +\*---------------------------------------------------------*/ #include "RGBController_CorsairDominatorPlatinum.h" diff --git a/Controllers/CorsairDominatorPlatinumController/RGBController_CorsairDominatorPlatinum.h b/Controllers/CorsairDominatorPlatinumController/RGBController_CorsairDominatorPlatinum.h index 2d388598..5e2e7170 100644 --- a/Controllers/CorsairDominatorPlatinumController/RGBController_CorsairDominatorPlatinum.h +++ b/Controllers/CorsairDominatorPlatinumController/RGBController_CorsairDominatorPlatinum.h @@ -1,10 +1,13 @@ -/*--------------------------------------------*\ -| RGBController_CorsairDominatorPlatinum.h | -| | -| Corsair Dominator Platinum RGB driver | -| | -| Erik Gilling (konkers) 9/25/2020 | -\*--------------------------------------------*/ +/*---------------------------------------------------------*\ +| RGBController_CorsairDominatorPlatinum.h | +| | +| RGBController for Corsair Dominator Platinum RAM | +| | +| Erik Gilling (konkers) 25 Sep 2020 | +| | +| This file is part of the OpenRGB project | +| SPDX-License-Identifier: GPL-2.0-only | +\*---------------------------------------------------------*/ #pragma once diff --git a/Controllers/CorsairHydro2Controller/CorsairHydro2Controller.cpp b/Controllers/CorsairHydro2Controller/CorsairHydro2Controller.cpp index f1d7b1fe..fe9310d1 100644 --- a/Controllers/CorsairHydro2Controller/CorsairHydro2Controller.cpp +++ b/Controllers/CorsairHydro2Controller/CorsairHydro2Controller.cpp @@ -1,15 +1,18 @@ -/*-----------------------------------------*\ -| CorsairHydro2Controller.cpp | -| | -| Controller for Corsair H100i v2 | -| | -| Tim Demand (tim.dmd) 1/10/2023 | -\*-----------------------------------------*/ +/*---------------------------------------------------------*\ +| CorsairHydro2Controller.cpp | +| | +| Driver for Corsair H100i v2 | +| | +| Tim Demand (tim.dmd) 10 Jan 2023 | +| | +| This file is part of the OpenRGB project | +| SPDX-License-Identifier: GPL-2.0-only | +\*---------------------------------------------------------*/ -#include "CorsairHydro2Controller.h" #include #include #include +#include "CorsairHydro2Controller.h" CorsairHydro2Controller::CorsairHydro2Controller(libusb_device_handle* dev_handle) { diff --git a/Controllers/CorsairHydro2Controller/CorsairHydro2Controller.h b/Controllers/CorsairHydro2Controller/CorsairHydro2Controller.h index 7542a546..279a6ba4 100644 --- a/Controllers/CorsairHydro2Controller/CorsairHydro2Controller.h +++ b/Controllers/CorsairHydro2Controller/CorsairHydro2Controller.h @@ -1,20 +1,23 @@ -/*-----------------------------------------*\ -| CorsairHydro2Controller.h | -| | -| Controller for Corsair H100i v2 | -| | -| Tim Demand (tim.dmd) 1/10/2023 | -\*-----------------------------------------*/ +/*---------------------------------------------------------*\ +| CorsairHydro2Controller.h | +| | +| Driver for Corsair H100i v2 | +| | +| Tim Demand (tim.dmd) 10 Jan 2023 | +| | +| This file is part of the OpenRGB project | +| SPDX-License-Identifier: GPL-2.0-only | +\*---------------------------------------------------------*/ + +#pragma once -#include "RGBController.h" #include #ifdef __FreeBSD__ #include #else #include #endif - -#pragma once +#include "RGBController.h" class CorsairHydro2Controller { diff --git a/Controllers/CorsairHydro2Controller/CorsairHydro2ControllerDetect.cpp b/Controllers/CorsairHydro2Controller/CorsairHydro2ControllerDetect.cpp index 62018d67..ff6b0f9c 100644 --- a/Controllers/CorsairHydro2Controller/CorsairHydro2ControllerDetect.cpp +++ b/Controllers/CorsairHydro2Controller/CorsairHydro2ControllerDetect.cpp @@ -1,21 +1,24 @@ -/*-----------------------------------------*\ -| CorsairHydro2ControllerDetect.cpp | -| | -| Detector for Corsair H100i v2 | -| | -| Tim Demand (tim.dmd) 1/10/2023 | -\*-----------------------------------------*/ +/*---------------------------------------------------------*\ +| CorsairHydro2ControllerDetect.cpp | +| | +| Detector for Corsair H100i v2 | +| | +| Tim Demand (tim.dmd) 10 Jan 2023 | +| | +| This file is part of the OpenRGB project | +| SPDX-License-Identifier: GPL-2.0-only | +\*---------------------------------------------------------*/ -#include "Detector.h" -#include "CorsairHydro2Controller.h" -#include "RGBController.h" -#include "RGBController_CorsairHydro2.h" #include #ifdef __FreeBSD__ #include #else #include #endif +#include "Detector.h" +#include "CorsairHydro2Controller.h" +#include "RGBController.h" +#include "RGBController_CorsairHydro2.h" #define CORSAIR_VID 0x1B1C #define H100I_V2_PID 0x0C09 diff --git a/Controllers/CorsairHydro2Controller/RGBController_CorsairHydro2.cpp b/Controllers/CorsairHydro2Controller/RGBController_CorsairHydro2.cpp index 86240afb..719faeef 100644 --- a/Controllers/CorsairHydro2Controller/RGBController_CorsairHydro2.cpp +++ b/Controllers/CorsairHydro2Controller/RGBController_CorsairHydro2.cpp @@ -1,10 +1,13 @@ -/*-----------------------------------------*\ -| RGBController_CorsairHydro2.cpp | -| | -| RGB Controller for Corsair H100i v2 | -| | -| Tim Demand (tim.dmd) 1/10/2023 | -\*-----------------------------------------*/ +/*---------------------------------------------------------*\ +| RGBController_CorsairHydro2.cpp | +| | +| RGBController for Corsair H100i v2 | +| | +| Tim Demand (tim.dmd) 10 Jan 2023 | +| | +| This file is part of the OpenRGB project | +| SPDX-License-Identifier: GPL-2.0-only | +\*---------------------------------------------------------*/ #include "RGBController_CorsairHydro2.h" diff --git a/Controllers/CorsairHydro2Controller/RGBController_CorsairHydro2.h b/Controllers/CorsairHydro2Controller/RGBController_CorsairHydro2.h index 5ac8a322..80351b63 100644 --- a/Controllers/CorsairHydro2Controller/RGBController_CorsairHydro2.h +++ b/Controllers/CorsairHydro2Controller/RGBController_CorsairHydro2.h @@ -1,12 +1,16 @@ -/*-----------------------------------------*\ -| RGBController_CorsairHydro2.h | -| | -| RGB Controller for Corsair H100i v2 | -| | -| Tim Demand (tim.dmd) 1/10/2023 | -\*-----------------------------------------*/ +/*---------------------------------------------------------*\ +| RGBController_CorsairHydro2.h | +| | +| RGBController for Corsair H100i v2 | +| | +| Tim Demand (tim.dmd) 10 Jan 2023 | +| | +| This file is part of the OpenRGB project | +| SPDX-License-Identifier: GPL-2.0-only | +\*---------------------------------------------------------*/ #pragma once + #include "RGBController.h" #include "CorsairHydro2Controller.h" diff --git a/Controllers/CorsairHydroController/CorsairHydroController.cpp b/Controllers/CorsairHydroController/CorsairHydroController.cpp index 4afc64f9..3d9ed686 100644 --- a/Controllers/CorsairHydroController/CorsairHydroController.cpp +++ b/Controllers/CorsairHydroController/CorsairHydroController.cpp @@ -1,14 +1,18 @@ /*---------------------------------------------------------*\ -| Processing Code for Corsair Hydro Series | +| CorsairHydroController.cpp | | | -| Adam Honse (calcprogrammer1@gmail.com), 8/17/2020 | +| Driver for Corsair Hydro Series coolers | +| | +| Adam Honse (calcprogrammer1@gmail.com) 17 Aug 2020 | +| | +| This file is part of the OpenRGB project | +| SPDX-License-Identifier: GPL-2.0-only | \*---------------------------------------------------------*/ -#include "CorsairHydroController.h" - #include #include #include +#include "CorsairHydroController.h" CorsairHydroController::CorsairHydroController(libusb_device_handle* dev_handle) { diff --git a/Controllers/CorsairHydroController/CorsairHydroController.h b/Controllers/CorsairHydroController/CorsairHydroController.h index a6e9a98b..8a681985 100644 --- a/Controllers/CorsairHydroController/CorsairHydroController.h +++ b/Controllers/CorsairHydroController/CorsairHydroController.h @@ -1,18 +1,23 @@ /*---------------------------------------------------------*\ -| Definitions for Corsair Hydro Series | +| CorsairHydroController.h | | | -| Adam Honse (calcprogrammer1@gmail.com), 8/17/2020 | +| Driver for Corsair Hydro Series coolers | +| | +| Adam Honse (calcprogrammer1@gmail.com) 17 Aug 2020 | +| | +| This file is part of the OpenRGB project | +| SPDX-License-Identifier: GPL-2.0-only | \*---------------------------------------------------------*/ -#include "RGBController.h" +#pragma once + #include #ifdef __FreeBSD__ #include #else #include #endif - -#pragma once +#include "RGBController.h" enum { @@ -66,7 +71,7 @@ public: ( std::vector & colors, unsigned char speed - ); + ); private: libusb_device_handle* dev; diff --git a/Controllers/CorsairHydroController/CorsairHydroControllerDetect.cpp b/Controllers/CorsairHydroController/CorsairHydroControllerDetect.cpp index 0d1cf1ce..83c98d69 100644 --- a/Controllers/CorsairHydroController/CorsairHydroControllerDetect.cpp +++ b/Controllers/CorsairHydroController/CorsairHydroControllerDetect.cpp @@ -1,13 +1,24 @@ -#include "Detector.h" -#include "CorsairHydroController.h" -#include "RGBController.h" -#include "RGBController_CorsairHydro.h" +/*---------------------------------------------------------*\ +| CorsairHydroControllerDetect.cpp | +| | +| Detector for Corsair Hydro Series coolers | +| | +| Adam Honse (calcprogrammer1@gmail.com) 17 Aug 2020 | +| | +| This file is part of the OpenRGB project | +| SPDX-License-Identifier: GPL-2.0-only | +\*---------------------------------------------------------*/ + #include #ifdef __FreeBSD__ #include #else #include #endif +#include "Detector.h" +#include "CorsairHydroController.h" +#include "RGBController.h" +#include "RGBController_CorsairHydro.h" /*-----------------------------------------------------*\ | Corsair vendor ID | diff --git a/Controllers/CorsairHydroController/RGBController_CorsairHydro.cpp b/Controllers/CorsairHydroController/RGBController_CorsairHydro.cpp index b68d0b75..b8809be0 100644 --- a/Controllers/CorsairHydroController/RGBController_CorsairHydro.cpp +++ b/Controllers/CorsairHydroController/RGBController_CorsairHydro.cpp @@ -1,11 +1,13 @@ -/*-----------------------------------------*\ -| RGBController_CorsairHydro.cpp | -| | -| Generic RGB Interface for Corsair | -| Hydro Series | -| | -| Adam Honse (CalcProgrammer1) 8/18/2020 | -\*-----------------------------------------*/ +/*---------------------------------------------------------*\ +| RGBController_CorsairHydro.cpp | +| | +| RGBController for Corsair Hydro Series coolers | +| | +| Adam Honse (calcprogrammer1@gmail.com) 18 Aug 2020 | +| | +| This file is part of the OpenRGB project | +| SPDX-License-Identifier: GPL-2.0-only | +\*---------------------------------------------------------*/ #include "RGBController_CorsairHydro.h" diff --git a/Controllers/CorsairHydroController/RGBController_CorsairHydro.h b/Controllers/CorsairHydroController/RGBController_CorsairHydro.h index 3551f30b..4b405c26 100644 --- a/Controllers/CorsairHydroController/RGBController_CorsairHydro.h +++ b/Controllers/CorsairHydroController/RGBController_CorsairHydro.h @@ -1,13 +1,16 @@ -/*-----------------------------------------*\ -| RGBController_CorsairHydro.h | -| | -| Generic RGB Interface for Corsair | -| Hydro Series | -| | -| Adam Honse (CalcProgrammer1) 8/17/2020 | -\*-----------------------------------------*/ +/*---------------------------------------------------------*\ +| RGBController_CorsairHydro.h | +| | +| RGBController for Corsair Hydro Series coolers | +| | +| Adam Honse (calcprogrammer1@gmail.com) 17 Aug 2020 | +| | +| This file is part of the OpenRGB project | +| SPDX-License-Identifier: GPL-2.0-only | +\*---------------------------------------------------------*/ #pragma once + #include "RGBController.h" #include "CorsairHydroController.h" diff --git a/Controllers/CorsairHydroPlatinumController/CorsairHydroPlatinumController.cpp b/Controllers/CorsairHydroPlatinumController/CorsairHydroPlatinumController.cpp index 929f7257..0da134bc 100644 --- a/Controllers/CorsairHydroPlatinumController/CorsairHydroPlatinumController.cpp +++ b/Controllers/CorsairHydroPlatinumController/CorsairHydroPlatinumController.cpp @@ -1,15 +1,17 @@ -/*-------------------------------------------------------------------*\ -| CorsairHydroPlatinumController.cpp | -| | -| Driver for Corsair Hydro Platinum AIO Coolers | -| | -| Kasper 28th March 2021 | -| | -\*-------------------------------------------------------------------*/ +/*---------------------------------------------------------*\ +| CorsairHydroPlatinumController.cpp | +| | +| Driver for Corsair Hydro Platinum coolers | +| | +| Kasper 28 Mar 2021 | +| | +| This file is part of the OpenRGB project | +| SPDX-License-Identifier: GPL-2.0-only | +\*---------------------------------------------------------*/ +#include #include "CorsairHydroPlatinumController.h" #include "CorsairDeviceGuard.h" -#include static const uint8_t CRC_TABLE[256] = { diff --git a/Controllers/CorsairHydroPlatinumController/CorsairHydroPlatinumController.h b/Controllers/CorsairHydroPlatinumController/CorsairHydroPlatinumController.h index c15cc185..87aa6cbb 100644 --- a/Controllers/CorsairHydroPlatinumController/CorsairHydroPlatinumController.h +++ b/Controllers/CorsairHydroPlatinumController/CorsairHydroPlatinumController.h @@ -1,21 +1,22 @@ -/*-------------------------------------------------------------------*\ -| CorsairHydroPlatinumController.h | -| | -| Driver for Corsair Hydro Platinum AIO Coolers | -| | -| Kasper 28th March 2021 | -| | -\*-------------------------------------------------------------------*/ +/*---------------------------------------------------------*\ +| CorsairHydroPlatinumController.h | +| | +| Driver for Corsair Hydro Platinum coolers | +| | +| Kasper 28 Mar 2021 | +| | +| This file is part of the OpenRGB project | +| SPDX-License-Identifier: GPL-2.0-only | +\*---------------------------------------------------------*/ #pragma once +#include +#include +#include #include "RGBController.h" #include "DeviceGuardManager.h" -#include -#include -#include - #define CORSAIR_HYDRO_PLATINUM_PACKET_SIZE 65 #define CORSAIR_HYDRO_PLATINUM_PACKET_DELAY 5 diff --git a/Controllers/CorsairHydroPlatinumController/CorsairHydroPlatinumControllerDetect.cpp b/Controllers/CorsairHydroPlatinumController/CorsairHydroPlatinumControllerDetect.cpp index 58a62212..e618ec7f 100644 --- a/Controllers/CorsairHydroPlatinumController/CorsairHydroPlatinumControllerDetect.cpp +++ b/Controllers/CorsairHydroPlatinumController/CorsairHydroPlatinumControllerDetect.cpp @@ -1,17 +1,19 @@ -/*-------------------------------------------------------------------*\ -| CorsairHydroPlatinumControllerDetect.cpp | -| | -| Driver for Corsair Hydro Platinum AIO Coolers | -| | -| Kasper 28th March 2021 | -| | -\*-------------------------------------------------------------------*/ +/*---------------------------------------------------------*\ +| CorsairHydroPlatinumControllerDetect.cpp | +| | +| Detector for Corsair Hydro Platinum coolers | +| | +| Kasper 28 Mar 2021 | +| | +| This file is part of the OpenRGB project | +| SPDX-License-Identifier: GPL-2.0-only | +\*---------------------------------------------------------*/ +#include #include "Detector.h" #include "CorsairHydroPlatinumController.h" #include "RGBController.h" #include "RGBController_CorsairHydroPlatinum.h" -#include /*-----------------------------------------------------*\ | Corsair vendor ID | diff --git a/Controllers/CorsairHydroPlatinumController/RGBController_CorsairHydroPlatinum.cpp b/Controllers/CorsairHydroPlatinumController/RGBController_CorsairHydroPlatinum.cpp index ac9ba815..d946667f 100644 --- a/Controllers/CorsairHydroPlatinumController/RGBController_CorsairHydroPlatinum.cpp +++ b/Controllers/CorsairHydroPlatinumController/RGBController_CorsairHydroPlatinum.cpp @@ -1,11 +1,13 @@ -/*-------------------------------------------------------------------*\ -| RGBController_CorsairHydroPlatinum.cpp | -| | -| Driver for Corsair Hydro Platinum AIO Coolers | -| | -| Kasper 28th March 2021 | -| | -\*-------------------------------------------------------------------*/ +/*---------------------------------------------------------*\ +| RGBController_CorsairHydroPlatinum.cpp | +| | +| RGBController for Corsair Hydro Platinum coolers | +| | +| Kasper 28 Mar 2021 | +| | +| This file is part of the OpenRGB project | +| SPDX-License-Identifier: GPL-2.0-only | +\*---------------------------------------------------------*/ #include "RGBController_CorsairHydroPlatinum.h" diff --git a/Controllers/CorsairHydroPlatinumController/RGBController_CorsairHydroPlatinum.h b/Controllers/CorsairHydroPlatinumController/RGBController_CorsairHydroPlatinum.h index 664d906f..1deea7ce 100644 --- a/Controllers/CorsairHydroPlatinumController/RGBController_CorsairHydroPlatinum.h +++ b/Controllers/CorsairHydroPlatinumController/RGBController_CorsairHydroPlatinum.h @@ -1,13 +1,16 @@ -/*-------------------------------------------------------------------*\ -| RGBController_CorsairHydroPlatinum.h | -| | -| Driver for Corsair Hydro Platinum AIO Coolers | -| | -| Kasper 28th March 2021 | -| | -\*-------------------------------------------------------------------*/ +/*---------------------------------------------------------*\ +| RGBController_CorsairHydroPlatinum.h | +| | +| RGBController for Corsair Hydro Platinum coolers | +| | +| Kasper 28 Mar 2021 | +| | +| This file is part of the OpenRGB project | +| SPDX-License-Identifier: GPL-2.0-only | +\*---------------------------------------------------------*/ #pragma once + #include "RGBController.h" #include "CorsairHydroPlatinumController.h" diff --git a/Controllers/CorsairLightingNodeController/CorsairLightingNodeController.cpp b/Controllers/CorsairLightingNodeController/CorsairLightingNodeController.cpp index 1d8fb880..3b3d2c58 100644 --- a/Controllers/CorsairLightingNodeController/CorsairLightingNodeController.cpp +++ b/Controllers/CorsairLightingNodeController/CorsairLightingNodeController.cpp @@ -1,16 +1,20 @@ /*---------------------------------------------------------*\ -| Processing Code for Corsair Lighting Node Pro | +| CorsairLightingNodeController.cpp | | | -| Adam Honse (calcprogrammer1@gmail.com), 1/12/2020 | +| Driver for Corsair Lighting Node devices | +| | +| Adam Honse (calcprogrammer1@gmail.com) 12 Jan 2020 | +| | +| This file is part of the OpenRGB project | +| SPDX-License-Identifier: GPL-2.0-only | \*---------------------------------------------------------*/ -#include "CorsairLightingNodeController.h" -#include "CorsairDeviceGuard.h" - +#include #include #include #include -#include +#include "CorsairLightingNodeController.h" +#include "CorsairDeviceGuard.h" using namespace std::chrono_literals; diff --git a/Controllers/CorsairLightingNodeController/CorsairLightingNodeController.h b/Controllers/CorsairLightingNodeController/CorsairLightingNodeController.h index 04f81bb2..f7eeb5a6 100644 --- a/Controllers/CorsairLightingNodeController/CorsairLightingNodeController.h +++ b/Controllers/CorsairLightingNodeController/CorsairLightingNodeController.h @@ -1,17 +1,21 @@ /*---------------------------------------------------------*\ -| Definitions for Corsair Lighting Node Pro | +| CorsairLightingNodeController.h | | | -| Adam Honse (calcprogrammer1@gmail.com), 1/12/2020 | +| Driver for Corsair Lighting Node devices | +| | +| Adam Honse (calcprogrammer1@gmail.com) 12 Jan 2020 | +| | +| This file is part of the OpenRGB project | +| SPDX-License-Identifier: GPL-2.0-only | \*---------------------------------------------------------*/ -#include "DeviceGuardManager.h" -#include "RGBController.h" +#pragma once #include #include #include - -#pragma once +#include "DeviceGuardManager.h" +#include "RGBController.h" #define CORSAIR_LIGHTING_NODE_WRITE_PACKET_SIZE 65 /* First byte is the report number */ #define CORSAIR_LIGHTING_NODE_READ_PACKET_SIZE 17 /* First byte is the report number */ diff --git a/Controllers/CorsairLightingNodeController/CorsairLightingNodeControllerDetect.cpp b/Controllers/CorsairLightingNodeController/CorsairLightingNodeControllerDetect.cpp index 72cdbd56..f51daa4d 100644 --- a/Controllers/CorsairLightingNodeController/CorsairLightingNodeControllerDetect.cpp +++ b/Controllers/CorsairLightingNodeController/CorsairLightingNodeControllerDetect.cpp @@ -1,9 +1,20 @@ +/*---------------------------------------------------------*\ +| CorsairLightingNodeControllerDetect.cpp | +| | +| Detector for Corsair Lighting Node devices | +| | +| Adam Honse (calcprogrammer1@gmail.com) 12 Jan 2020 | +| | +| This file is part of the OpenRGB project | +| SPDX-License-Identifier: GPL-2.0-only | +\*---------------------------------------------------------*/ + +#include +#include #include "Detector.h" #include "CorsairLightingNodeController.h" #include "RGBController.h" #include "RGBController_CorsairLightingNode.h" -#include -#include #define CORSAIR_VID 0x1B1C #define CORSAIR_LIGHTING_NODE_CORE_PID 0x0C1A @@ -41,4 +52,4 @@ REGISTER_HID_DETECTOR("Corsair Commander Pro", DetectCorsairLightingNodeCon REGISTER_HID_DETECTOR("Corsair LS100 Lighting Kit", DetectCorsairLightingNodeControllers, CORSAIR_VID, CORSAIR_LS100_PID); // 1 channel REGISTER_HID_DETECTOR("Corsair 1000D Obsidian", DetectCorsairLightingNodeControllers, CORSAIR_VID, CORSAIR_1000D_OBSIDIAN_PID); // 2 channels REGISTER_HID_DETECTOR("Corsair SPEC OMEGA RGB", DetectCorsairLightingNodeControllers, CORSAIR_VID, CORSAIR_SPEC_OMEGA_RGB_PID); // 2 channels -REGISTER_HID_DETECTOR("Corsair LT100", DetectCorsairLightingNodeControllers, CORSAIR_VID, CORSAIR_LT100_PID); // 2 channels \ No newline at end of file +REGISTER_HID_DETECTOR("Corsair LT100", DetectCorsairLightingNodeControllers, CORSAIR_VID, CORSAIR_LT100_PID); // 2 channels diff --git a/Controllers/CorsairLightingNodeController/RGBController_CorsairLightingNode.cpp b/Controllers/CorsairLightingNodeController/RGBController_CorsairLightingNode.cpp index 9192d268..d4b5897d 100644 --- a/Controllers/CorsairLightingNodeController/RGBController_CorsairLightingNode.cpp +++ b/Controllers/CorsairLightingNodeController/RGBController_CorsairLightingNode.cpp @@ -1,11 +1,13 @@ -/*-----------------------------------------*\ -| RGBController_CorsairLightingNode.cpp | -| | -| Generic RGB Interface for Corsair | -| Lighting Node Pro | -| | -| Adam Honse (CalcProgrammer1) 1/12/2020 | -\*-----------------------------------------*/ +/*---------------------------------------------------------*\ +| RGBController_CorsairLightingNode.cpp | +| | +| RGBController for Corsair Lighting Node devices | +| | +| Adam Honse (calcprogrammer1@gmail.com) 12 Jan 2020 | +| | +| This file is part of the OpenRGB project | +| SPDX-License-Identifier: GPL-2.0-only | +\*---------------------------------------------------------*/ #include "RGBController_CorsairLightingNode.h" diff --git a/Controllers/CorsairLightingNodeController/RGBController_CorsairLightingNode.h b/Controllers/CorsairLightingNodeController/RGBController_CorsairLightingNode.h index 3fc7d0c8..72a0790f 100644 --- a/Controllers/CorsairLightingNodeController/RGBController_CorsairLightingNode.h +++ b/Controllers/CorsairLightingNodeController/RGBController_CorsairLightingNode.h @@ -1,13 +1,16 @@ -/*-----------------------------------------*\ -| RGBController_CorsairLightingNode.h | -| | -| Generic RGB Interface for Corsair | -| Lighting Node Pro | -| | -| Adam Honse (CalcProgrammer1) 1/12/2020 | -\*-----------------------------------------*/ +/*---------------------------------------------------------*\ +| RGBController_CorsairLightingNode.h | +| | +| RGBController for Corsair Lighting Node devices | +| | +| Adam Honse (calcprogrammer1@gmail.com) 12 Jan 2020 | +| | +| This file is part of the OpenRGB project | +| SPDX-License-Identifier: GPL-2.0-only | +\*---------------------------------------------------------*/ #pragma once + #include "RGBController.h" #include "CorsairLightingNodeController.h" diff --git a/Controllers/CorsairPeripheralController/CorsairK55RGBPROXTController.cpp b/Controllers/CorsairPeripheralController/CorsairK55RGBPROXTController.cpp index 4102294c..60737fc1 100644 --- a/Controllers/CorsairPeripheralController/CorsairK55RGBPROXTController.cpp +++ b/Controllers/CorsairPeripheralController/CorsairK55RGBPROXTController.cpp @@ -1,19 +1,20 @@ -/*--------------------------------------------*\ -| CorsairK55RGBPROXTController.cpp | -| | -| Driver for Corsair K55 RGB PRO XT Keyboard | -\*--------------------------------------------*/ +/*---------------------------------------------------------*\ +| CorsairK55RGBPROXTController.cpp | +| | +| Driver for Corsair K55 RGB PRO XT keyboard | +| | +| This file is part of the OpenRGB project | +| SPDX-License-Identifier: GPL-2.0-only | +\*---------------------------------------------------------*/ #include "CorsairK55RGBPROXTController.h" #include "LogManager.h" - #define COLOR_BANK_SIZE 137 #define HID_PACKET_LENGTH 65 #define HID_PAYLOAD_SIZE1 (HID_PACKET_LENGTH - 12) #define HID_PAYLOAD_SIZE2 (HID_PACKET_LENGTH - 4) - static const unsigned int keys[] = { 127, 128, 129, 130, 131, 132, 37, 49, 39, 53, 102, 101, 26, 96, 104, 54, 27, 16, 0, 25, 103, 55, 28, 22, 18, 23, 56, 29, 4, 3, 2, 57, 30, 17, 5, 21, 31, 58, 32, 19, diff --git a/Controllers/CorsairPeripheralController/CorsairK55RGBPROXTController.h b/Controllers/CorsairPeripheralController/CorsairK55RGBPROXTController.h index c7920a3f..1d56cfc1 100644 --- a/Controllers/CorsairPeripheralController/CorsairK55RGBPROXTController.h +++ b/Controllers/CorsairPeripheralController/CorsairK55RGBPROXTController.h @@ -1,17 +1,17 @@ -/*--------------------------------------------*\ -| CorsairK55RGBPROXTController.h | -| | -| Driver for Corsair K55 RGB PRO XT Keyboard | -\*--------------------------------------------*/ +/*---------------------------------------------------------*\ +| CorsairK55RGBPROXTController.h | +| | +| Driver for Corsair K55 RGB PRO XT keyboard | +| | +| This file is part of the OpenRGB project | +| SPDX-License-Identifier: GPL-2.0-only | +\*---------------------------------------------------------*/ -#ifndef CORSAIRK55RGBPROXTCONTROLLER_H -#define CORSAIRK55RGBPROXTCONTROLLER_H - -#include "RGBController.h" +#pragma once #include #include - +#include "RGBController.h" class CorsairK55RGBPROXTController { @@ -86,5 +86,3 @@ private: void LightingControl(); }; - -#endif // CORSAIRK55RGBPROXTCONTROLLER_H diff --git a/Controllers/CorsairPeripheralController/CorsairK65MiniController.cpp b/Controllers/CorsairPeripheralController/CorsairK65MiniController.cpp index 23864712..b7dfe3f3 100644 --- a/Controllers/CorsairPeripheralController/CorsairK65MiniController.cpp +++ b/Controllers/CorsairPeripheralController/CorsairK65MiniController.cpp @@ -1,10 +1,13 @@ -#include "CorsairK65MiniController.h" -/*-----------------------------------------*\ -| CorsairK65MiniController.cpp | -| | -| Driver for Corsair K65 Mini Keyboard | -\*-----------------------------------------*/ +/*---------------------------------------------------------*\ +| CorsairK65MiniController.cpp | +| | +| Driver for Corsair K65 Mini keyboard | +| | +| This file is part of the OpenRGB project | +| SPDX-License-Identifier: GPL-2.0-only | +\*---------------------------------------------------------*/ +#include "CorsairK65MiniController.h" #include "LogManager.h" CorsairK65MiniController::CorsairK65MiniController(hid_device* dev_handle, const char* path) diff --git a/Controllers/CorsairPeripheralController/CorsairK65MiniController.h b/Controllers/CorsairPeripheralController/CorsairK65MiniController.h index c6d7ea4f..47f73f26 100644 --- a/Controllers/CorsairPeripheralController/CorsairK65MiniController.h +++ b/Controllers/CorsairPeripheralController/CorsairK65MiniController.h @@ -1,9 +1,17 @@ -#pragma once +/*---------------------------------------------------------*\ +| CorsairK65MiniController.cpp | +| | +| Driver for Corsair K65 Mini keyboard | +| | +| 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 PACKET_LENGTH 1025 #define K65_WRITE_COMMAND 0x08 diff --git a/Controllers/CorsairPeripheralController/CorsairK95PlatinumXTController.cpp b/Controllers/CorsairPeripheralController/CorsairK95PlatinumXTController.cpp index 07fbcd0b..4f67f85b 100644 --- a/Controllers/CorsairPeripheralController/CorsairK95PlatinumXTController.cpp +++ b/Controllers/CorsairPeripheralController/CorsairK95PlatinumXTController.cpp @@ -1,10 +1,14 @@ -/*-----------------------------------------*\ -| CorsairK195PlatinumXTController.h | -| | -| Driver for Corsair K95 Platinum XT | -| Keyboard | -| Guimard Morgan (morg) 6/07/2022 | -\*-----------------------------------------*/ +/*---------------------------------------------------------*\ +| CorsairK95PlatinumXTController.cpp | +| | +| Driver for Corsair K95 Platinum XT keyboard | +| | +| Morgan Guimard (morg) 07 Jun 2022 | +| | +| This file is part of the OpenRGB project | +| SPDX-License-Identifier: GPL-2.0-only | +\*---------------------------------------------------------*/ + #include "CorsairK95PlatinumXTController.h" CorsairK95PlatinumXTController::CorsairK95PlatinumXTController(hid_device* dev_handle, const char* path) @@ -117,7 +121,7 @@ void CorsairK95PlatinumXTController::SendDirect(const std::vector& col usb_buf[0x03] = 0x01; for(unsigned int i = 0; i < K95_PLATINUM_XT_NUMBER_OF_PAGES; i++) - { + { /*-----------------------------------------------------*\ | Copy colors in current page | \*-----------------------------------------------------*/ diff --git a/Controllers/CorsairPeripheralController/CorsairK95PlatinumXTController.h b/Controllers/CorsairPeripheralController/CorsairK95PlatinumXTController.h index f2245def..a5efbe2f 100644 --- a/Controllers/CorsairPeripheralController/CorsairK95PlatinumXTController.h +++ b/Controllers/CorsairPeripheralController/CorsairK95PlatinumXTController.h @@ -1,16 +1,19 @@ -/*-----------------------------------------*\ -| CorsairK95PlatinumXTController.h | -| | -| Driver for Corsair K95 Platinum XT | -| Keyboard | -| | -| Guimard Morgan (morg) 6/07/2022 | -\*-----------------------------------------*/ +/*---------------------------------------------------------*\ +| CorsairK95PlatinumXTController.h | +| | +| Driver for Corsair K95 Platinum XT keyboard | +| | +| Morgan Guimard (morg) 07 Jun 2022 | +| | +| This file is part of the OpenRGB project | +| SPDX-License-Identifier: GPL-2.0-only | +\*---------------------------------------------------------*/ + #pragma once -#include "RGBController.h" #include #include +#include "RGBController.h" #define K95_PLATINUM_XT_REPORT_LENGTH 65 #define K95_PLATINUM_XT_COLOR_DATA_LENGTH 488 diff --git a/Controllers/CorsairPeripheralController/CorsairPeripheralController.cpp b/Controllers/CorsairPeripheralController/CorsairPeripheralController.cpp index b2a8191a..07bcd7f0 100644 --- a/Controllers/CorsairPeripheralController/CorsairPeripheralController.cpp +++ b/Controllers/CorsairPeripheralController/CorsairPeripheralController.cpp @@ -1,16 +1,17 @@ -/*-----------------------------------------*\ -| CorsairPeripheralController.cpp | -| | -| Driver for Corsair RGB keyboard, mouse, | -| and mousemat lighting controller | -| | -| Adam Honse (CalcProgrammer1) 1/9/2020 | -\*-----------------------------------------*/ - -#include "CorsairPeripheralController.h" -#include "LogManager.h" +/*---------------------------------------------------------*\ +| CorsairPeripheralController.cpp | +| | +| Driver for Corsair peripherals | +| | +| Adam Honse (CalcProgrammer1) 09 Jan 2020 | +| | +| This file is part of the OpenRGB project | +| SPDX-License-Identifier: GPL-2.0-only | +\*---------------------------------------------------------*/ #include +#include "CorsairPeripheralController.h" +#include "LogManager.h" using namespace std::chrono_literals; diff --git a/Controllers/CorsairPeripheralController/CorsairPeripheralController.h b/Controllers/CorsairPeripheralController/CorsairPeripheralController.h index ee8668af..06f48cb1 100644 --- a/Controllers/CorsairPeripheralController/CorsairPeripheralController.h +++ b/Controllers/CorsairPeripheralController/CorsairPeripheralController.h @@ -1,19 +1,19 @@ -/*-----------------------------------------*\ -| CorsairPeripheralController.h | -| | -| Definitions and types for Corsair RGB | -| keyboard, mouse, and mousemat lighting | -| controller | -| | -| Adam Honse (CalcProgrammer1) 1/9/2020 | -\*-----------------------------------------*/ +/*---------------------------------------------------------*\ +| CorsairPeripheralController.h | +| | +| Driver for Corsair peripherals | +| | +| Adam Honse (CalcProgrammer1) 09 Jan 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 CORSAIR_PERIPHERAL_PACKET_LENGTH 65 @@ -139,7 +139,7 @@ private: void SpecialFunctionControl(); void ReadFirmwareInfo(); - + void StreamPacket ( unsigned char packet_id, diff --git a/Controllers/CorsairPeripheralController/CorsairPeripheralControllerDetect.cpp b/Controllers/CorsairPeripheralController/CorsairPeripheralControllerDetect.cpp index 822ba1fa..1c3fee82 100644 --- a/Controllers/CorsairPeripheralController/CorsairPeripheralControllerDetect.cpp +++ b/Controllers/CorsairPeripheralController/CorsairPeripheralControllerDetect.cpp @@ -1,3 +1,12 @@ +/*---------------------------------------------------------*\ +| CorsairPeripheralControllerDetect.cpp | +| | +| Driver for Corsair peripherals | +| | +| This file is part of the OpenRGB project | +| SPDX-License-Identifier: GPL-2.0-only | +\*---------------------------------------------------------*/ + /*-----------------------------------------------------*\ | OpenRGB includes | \*-----------------------------------------------------*/ diff --git a/Controllers/CorsairPeripheralController/RGBController_CorsairK55RGBPROXT.cpp b/Controllers/CorsairPeripheralController/RGBController_CorsairK55RGBPROXT.cpp index 755ed8a3..d9237685 100644 --- a/Controllers/CorsairPeripheralController/RGBController_CorsairK55RGBPROXT.cpp +++ b/Controllers/CorsairPeripheralController/RGBController_CorsairK55RGBPROXT.cpp @@ -1,8 +1,11 @@ -/*--------------------------------------------*\ -| RGBController_CorsairK55RGBPROXT.cpp | -| | -| Driver for Corsair K55 RGB PRO XT Keyboard | -\*--------------------------------------------*/ +/*---------------------------------------------------------*\ +| RGBController_CorsairK55RGBPROXT.cpp | +| | +| RGBController for Corsair K55 RGB PRO XT keyboard | +| | +| This file is part of the OpenRGB project | +| SPDX-License-Identifier: GPL-2.0-only | +\*---------------------------------------------------------*/ #include "RGBController_CorsairK55RGBPROXT.h" #include "RGBControllerKeyNames.h" diff --git a/Controllers/CorsairPeripheralController/RGBController_CorsairK55RGBPROXT.h b/Controllers/CorsairPeripheralController/RGBController_CorsairK55RGBPROXT.h index bafb7a33..ef0a62e0 100644 --- a/Controllers/CorsairPeripheralController/RGBController_CorsairK55RGBPROXT.h +++ b/Controllers/CorsairPeripheralController/RGBController_CorsairK55RGBPROXT.h @@ -1,11 +1,13 @@ -/*--------------------------------------------*\ -| RGBController_CorsairK55RGBPROXT.cpp | -| | -| Driver for Corsair K55 RGB PRO XT Keyboard | -\*--------------------------------------------*/ +/*---------------------------------------------------------*\ +| CorsairK55RGBPROXTController.h | +| | +| Driver for Corsair K55 RGB PRO XT keyboard | +| | +| This file is part of the OpenRGB project | +| SPDX-License-Identifier: GPL-2.0-only | +\*---------------------------------------------------------*/ -#ifndef RGBCONTROLLER_CORSAIRK55RGBPROXT_H -#define RGBCONTROLLER_CORSAIRK55RGBPROXT_H +#pragma once #include "RGBController.h" #include "CorsairK55RGBPROXTController.h" @@ -33,5 +35,3 @@ private: std::atomic keepalive_thread_run; std::chrono::time_point last_update_time; }; - -#endif // RGBCONTROLLER_CORSAIRK55RGBPROXT_H diff --git a/Controllers/CorsairPeripheralController/RGBController_CorsairK65Mini.cpp b/Controllers/CorsairPeripheralController/RGBController_CorsairK65Mini.cpp index af0c9ea6..a945be6f 100644 --- a/Controllers/CorsairPeripheralController/RGBController_CorsairK65Mini.cpp +++ b/Controllers/CorsairPeripheralController/RGBController_CorsairK65Mini.cpp @@ -1,10 +1,13 @@ -#include "RGBController_CorsairK65Mini.h" -/*-----------------------------------------*\ -| RGBController_CorsairK65Mini.cpp | -| | -| Driver for Corsair K65 Mini Keyboard | -\*-----------------------------------------*/ +/*---------------------------------------------------------*\ +| RGBController_CorsairK65Mini.cpp | +| | +| RGBController for Corsair K65 Mini keyboard | +| | +| This file is part of the OpenRGB project | +| SPDX-License-Identifier: GPL-2.0-only | +\*---------------------------------------------------------*/ +#include "RGBController_CorsairK65Mini.h" #include "LogManager.h" #include "RGBControllerKeyNames.h" diff --git a/Controllers/CorsairPeripheralController/RGBController_CorsairK65Mini.h b/Controllers/CorsairPeripheralController/RGBController_CorsairK65Mini.h index f2d2f887..61714b43 100644 --- a/Controllers/CorsairPeripheralController/RGBController_CorsairK65Mini.h +++ b/Controllers/CorsairPeripheralController/RGBController_CorsairK65Mini.h @@ -1,3 +1,12 @@ +/*---------------------------------------------------------*\ +| RGBController_CorsairK65Mini.h | +| | +| RGBController for Corsair K65 Mini keyboard | +| | +| This file is part of the OpenRGB project | +| SPDX-License-Identifier: GPL-2.0-only | +\*---------------------------------------------------------*/ + #pragma once #include "RGBController.h" diff --git a/Controllers/CorsairPeripheralController/RGBController_CorsairK95PlatinumXT.cpp b/Controllers/CorsairPeripheralController/RGBController_CorsairK95PlatinumXT.cpp index fb183b39..605315a0 100644 --- a/Controllers/CorsairPeripheralController/RGBController_CorsairK95PlatinumXT.cpp +++ b/Controllers/CorsairPeripheralController/RGBController_CorsairK95PlatinumXT.cpp @@ -1,9 +1,13 @@ -/*-----------------------------------------*\ -| RGBController_CorsairK95PlatinumXT.h | -| | -| | -| Guimard Morgan (morg) 6/07/2022 | -\*-----------------------------------------*/ +/*---------------------------------------------------------*\ +| RGBController_CorsairK95PlatinumXT.cpp | +| | +| RGBController for Corsair K95 Platinum XT keyboard | +| | +| Morgan Guimard (morg) 07 Jun 2022 | +| | +| This file is part of the OpenRGB project | +| SPDX-License-Identifier: GPL-2.0-only | +\*---------------------------------------------------------*/ #include "RGBControllerKeyNames.h" #include "RGBController_CorsairK95PlatinumXT.h" @@ -251,7 +255,7 @@ RGBController_CorsairK95PlatinumXT::RGBController_CorsairK95PlatinumXT(CorsairK9 } RGBController_CorsairK95PlatinumXT::~RGBController_CorsairK95PlatinumXT() -{ +{ /*---------------------------------------------------------*\ | Delete the matrix map | \*---------------------------------------------------------*/ diff --git a/Controllers/CorsairPeripheralController/RGBController_CorsairK95PlatinumXT.h b/Controllers/CorsairPeripheralController/RGBController_CorsairK95PlatinumXT.h index ce40ff97..d584912a 100644 --- a/Controllers/CorsairPeripheralController/RGBController_CorsairK95PlatinumXT.h +++ b/Controllers/CorsairPeripheralController/RGBController_CorsairK95PlatinumXT.h @@ -1,9 +1,14 @@ -/*-----------------------------------------*\ -| RGBController_CorsairK95PlatinumXT.h | -| | -| | -| Guimard Morgan (morg) 6/07/2022 | -\*-----------------------------------------*/ +/*---------------------------------------------------------*\ +| RGBController_CorsairK95PlatinumXT.h | +| | +| RGBController for Corsair K95 Platinum XT keyboard | +| | +| Morgan Guimard (morg) 07 Jun 2022 | +| | +| This file is part of the OpenRGB project | +| SPDX-License-Identifier: GPL-2.0-only | +\*---------------------------------------------------------*/ + #pragma once #include "RGBController.h" @@ -25,5 +30,5 @@ public: void DeviceUpdateMode(); private: - CorsairK95PlatinumXTController* controller; + CorsairK95PlatinumXTController* controller; }; diff --git a/Controllers/CorsairPeripheralController/RGBController_CorsairPeripheral.cpp b/Controllers/CorsairPeripheralController/RGBController_CorsairPeripheral.cpp index 39824662..eba70806 100644 --- a/Controllers/CorsairPeripheralController/RGBController_CorsairPeripheral.cpp +++ b/Controllers/CorsairPeripheralController/RGBController_CorsairPeripheral.cpp @@ -1,11 +1,13 @@ -/*-----------------------------------------*\ -| RGBController_CorsairPeripheral.cpp | -| | -| Generic RGB Interface for Corsair RGB | -| keyboard, mouse, and mousemat devices | -| | -| Adam Honse (CalcProgrammer1) 1/9/2020 | -\*-----------------------------------------*/ +/*---------------------------------------------------------*\ +| RGBController_CorsairPeripheral.cpp | +| | +| RGBController for Corsair peripherals | +| | +| Adam Honse (CalcProgrammer1) 09 Jan 2020 | +| | +| This file is part of the OpenRGB project | +| SPDX-License-Identifier: GPL-2.0-only | +\*---------------------------------------------------------*/ #include "RGBControllerKeyNames.h" #include "RGBController_CorsairPeripheral.h" diff --git a/Controllers/CorsairPeripheralController/RGBController_CorsairPeripheral.h b/Controllers/CorsairPeripheralController/RGBController_CorsairPeripheral.h index b9a0899d..ec0de8c2 100644 --- a/Controllers/CorsairPeripheralController/RGBController_CorsairPeripheral.h +++ b/Controllers/CorsairPeripheralController/RGBController_CorsairPeripheral.h @@ -1,13 +1,16 @@ -/*-----------------------------------------*\ -| RGBController_CorsairPeripheral.h | -| | -| Generic RGB Interface for Corsair RGB | -| keyboard, mouse, and mousemat devices | -| | -| Adam Honse (CalcProgrammer1) 1/9/2020 | -\*-----------------------------------------*/ +/*---------------------------------------------------------*\ +| RGBController_CorsairPeripheral.h | +| | +| RGBController for Corsair peripherals | +| | +| Adam Honse (CalcProgrammer1) 09 Jan 2020 | +| | +| This file is part of the OpenRGB project | +| SPDX-License-Identifier: GPL-2.0-only | +\*---------------------------------------------------------*/ #pragma once + #include "RGBController.h" #include "CorsairPeripheralController.h" @@ -23,7 +26,7 @@ public: void SetupZones(); void ResizeZone(int zone, int new_size); - + void DeviceUpdateLEDs(); void UpdateZoneLEDs(int zone); void UpdateSingleLED(int led); diff --git a/Controllers/CorsairPeripheralV2Controller/CorsairPeripheralV2Controller.cpp b/Controllers/CorsairPeripheralV2Controller/CorsairPeripheralV2Controller.cpp index b7784b9d..fb483670 100644 --- a/Controllers/CorsairPeripheralV2Controller/CorsairPeripheralV2Controller.cpp +++ b/Controllers/CorsairPeripheralV2Controller/CorsairPeripheralV2Controller.cpp @@ -1,11 +1,13 @@ -/*---------------------------------------------------------------------*\ -| CorsairPeripheralV2Controller.cpp | -| | -| Base class for the 08 based Corsair protocol | -| | -| Chris M (Dr_No) 07 Aug 2022 | -| | -\*---------------------------------------------------------------------*/ +/*---------------------------------------------------------*\ +| CorsairPeripheralV2Controller.cpp | +| | +| Driver for Corsair V2 peripherals | +| | +| Chris M (Dr_No) 07 Aug 2022 | +| | +| This file is part of the OpenRGB project | +| SPDX-License-Identifier: GPL-2.0-only | +\*---------------------------------------------------------*/ #include "CorsairPeripheralV2Controller.h" diff --git a/Controllers/CorsairPeripheralV2Controller/CorsairPeripheralV2Controller.h b/Controllers/CorsairPeripheralV2Controller/CorsairPeripheralV2Controller.h index 6001588e..ed368a10 100644 --- a/Controllers/CorsairPeripheralV2Controller/CorsairPeripheralV2Controller.h +++ b/Controllers/CorsairPeripheralV2Controller/CorsairPeripheralV2Controller.h @@ -1,11 +1,13 @@ -/*---------------------------------------------------------------------*\ -| CorsairPeripheralV2Controller.h | -| | -| Base class for the 08 based Corsair protocol | -| | -| Chris M (Dr_No) 07 Aug 2022 | -| | -\*---------------------------------------------------------------------*/ +/*---------------------------------------------------------*\ +| CorsairPeripheralV2Controller.h | +| | +| Driver for Corsair V2 peripherals | +| | +| Chris M (Dr_No) 07 Aug 2022 | +| | +| This file is part of the OpenRGB project | +| SPDX-License-Identifier: GPL-2.0-only | +\*---------------------------------------------------------*/ #pragma once diff --git a/Controllers/CorsairPeripheralV2Controller/CorsairPeripheralV2ControllerDetect.cpp b/Controllers/CorsairPeripheralV2Controller/CorsairPeripheralV2ControllerDetect.cpp index 099b79d4..a242c1b4 100644 --- a/Controllers/CorsairPeripheralV2Controller/CorsairPeripheralV2ControllerDetect.cpp +++ b/Controllers/CorsairPeripheralV2Controller/CorsairPeripheralV2ControllerDetect.cpp @@ -1,3 +1,12 @@ +/*---------------------------------------------------------*\ +| CorsairPeripheralV2ControllerDetect.cpp | +| | +| Detector for Corsair V2 peripherals | +| | +| This file is part of the OpenRGB project | +| SPDX-License-Identifier: GPL-2.0-only | +\*---------------------------------------------------------*/ + /*-----------------------------------------------------*\ | OpenRGB includes | \*-----------------------------------------------------*/ diff --git a/Controllers/CorsairPeripheralV2Controller/CorsairPeripheralV2Devices.cpp b/Controllers/CorsairPeripheralV2Controller/CorsairPeripheralV2Devices.cpp index 5ccc2fdc..49efc34d 100644 --- a/Controllers/CorsairPeripheralV2Controller/CorsairPeripheralV2Devices.cpp +++ b/Controllers/CorsairPeripheralV2Controller/CorsairPeripheralV2Devices.cpp @@ -1,3 +1,12 @@ +/*---------------------------------------------------------*\ +| CorsairPeripheralV2Devices.cpp | +| | +| Device list for Corsair V2 peripherals | +| | +| This file is part of the OpenRGB project | +| SPDX-License-Identifier: GPL-2.0-only | +\*---------------------------------------------------------*/ + #include "CorsairPeripheralV2Devices.h" /*-------------------------------------------------------------------------*\ diff --git a/Controllers/CorsairPeripheralV2Controller/CorsairPeripheralV2Devices.h b/Controllers/CorsairPeripheralV2Controller/CorsairPeripheralV2Devices.h index 3fc191ad..c1e4ae2a 100644 --- a/Controllers/CorsairPeripheralV2Controller/CorsairPeripheralV2Devices.h +++ b/Controllers/CorsairPeripheralV2Controller/CorsairPeripheralV2Devices.h @@ -1,3 +1,12 @@ +/*---------------------------------------------------------*\ +| CorsairPeripheralV2Devices.h | +| | +| Device list for Corsair V2 peripherals | +| | +| This file is part of the OpenRGB project | +| SPDX-License-Identifier: GPL-2.0-only | +\*---------------------------------------------------------*/ + #pragma once #include diff --git a/Controllers/CorsairPeripheralV2Controller/CorsairPeripheralV2HardwareController.cpp b/Controllers/CorsairPeripheralV2Controller/CorsairPeripheralV2HardwareController.cpp index 1d62fa2c..b8873f9b 100644 --- a/Controllers/CorsairPeripheralV2Controller/CorsairPeripheralV2HardwareController.cpp +++ b/Controllers/CorsairPeripheralV2Controller/CorsairPeripheralV2HardwareController.cpp @@ -1,11 +1,13 @@ -/*---------------------------------------------------------------------*\ -| CorsairPeripheralV2HardwareController.cpp | -| | -| Driver for the newer Corsair peripherals that use the '08' | -| based USB protocol and support hardware lighting modes. | -| | -| Chris M (Dr_No) 07 Dec 2022 | -\*---------------------------------------------------------------------*/ +/*---------------------------------------------------------*\ +| CorsairPeripheralV2HardwareController.cpp | +| | +| Driver for Corsair V2 peripherals - hardware modes | +| | +| Chris M (Dr_No) 07 Dec 2022 | +| | +| This file is part of the OpenRGB project | +| SPDX-License-Identifier: GPL-2.0-only | +\*---------------------------------------------------------*/ #include "LogManager.h" #include "CorsairPeripheralV2HardwareController.h" diff --git a/Controllers/CorsairPeripheralV2Controller/CorsairPeripheralV2HardwareController.h b/Controllers/CorsairPeripheralV2Controller/CorsairPeripheralV2HardwareController.h index 78db7f7f..bdabc835 100644 --- a/Controllers/CorsairPeripheralV2Controller/CorsairPeripheralV2HardwareController.h +++ b/Controllers/CorsairPeripheralV2Controller/CorsairPeripheralV2HardwareController.h @@ -1,11 +1,14 @@ -/*---------------------------------------------------------------------*\ -| CorsairPeripheralV2HardwareController.h | -| | -| Driver for the newer Corsair peripherals that use the '08' | -| based USB protocol and support hardware lighting modes. | -| | -| Chris M (Dr_No) 07 Dec 2022 | -\*---------------------------------------------------------------------*/ +/*---------------------------------------------------------*\ +| CorsairPeripheralV2HardwareController.h | +| | +| Driver for Corsair V2 peripherals - hardware modes | +| | +| Chris M (Dr_No) 07 Dec 2022 | +| | +| This file is part of the OpenRGB project | +| SPDX-License-Identifier: GPL-2.0-only | +\*---------------------------------------------------------*/ + #pragma once #include "RGBController.h" diff --git a/Controllers/CorsairPeripheralV2Controller/CorsairPeripheralV2SoftwareController.cpp b/Controllers/CorsairPeripheralV2Controller/CorsairPeripheralV2SoftwareController.cpp index db7a6658..8a1fa8da 100644 --- a/Controllers/CorsairPeripheralV2Controller/CorsairPeripheralV2SoftwareController.cpp +++ b/Controllers/CorsairPeripheralV2Controller/CorsairPeripheralV2SoftwareController.cpp @@ -1,11 +1,13 @@ -/*---------------------------------------------------------------------*\ -| CorsairPeripheralV2SoftwareController.cpp | -| | -| Common driver for the newer Corsair peripherals that use | -| the `08` based USB protocol | -| | -| Chris M (Dr_No) 11 Aug 2022 | -\*---------------------------------------------------------------------*/ +/*---------------------------------------------------------*\ +| CorsairPeripheralV2SoftwareController.cpp | +| | +| Driver for Corsair V2 peripherals - software modes | +| | +| Chris M (Dr_No) 11 Aug 2022 | +| | +| This file is part of the OpenRGB project | +| SPDX-License-Identifier: GPL-2.0-only | +\*---------------------------------------------------------*/ #include "LogManager.h" #include "CorsairPeripheralV2SoftwareController.h" diff --git a/Controllers/CorsairPeripheralV2Controller/CorsairPeripheralV2SoftwareController.h b/Controllers/CorsairPeripheralV2Controller/CorsairPeripheralV2SoftwareController.h index 1b247a16..4070e8f4 100644 --- a/Controllers/CorsairPeripheralV2Controller/CorsairPeripheralV2SoftwareController.h +++ b/Controllers/CorsairPeripheralV2Controller/CorsairPeripheralV2SoftwareController.h @@ -1,11 +1,14 @@ -/*---------------------------------------------------------------------*\ -| CorsairPeripheralV2SoftwareController.h | -| | -| Common driver for the newer Corsair peripherals that use | -| the `08` based USB protocol | -| | -| Chris M (Dr_No) 11 Aug 2022 | -\*---------------------------------------------------------------------*/ +/*---------------------------------------------------------*\ +| CorsairPeripheralV2SoftwareController.h | +| | +| Driver for Corsair V2 peripherals - software modes | +| | +| Chris M (Dr_No) 11 Aug 2022 | +| | +| This file is part of the OpenRGB project | +| SPDX-License-Identifier: GPL-2.0-only | +\*---------------------------------------------------------*/ + #pragma once #include "RGBController.h" diff --git a/Controllers/CorsairPeripheralV2Controller/RGBController_CorsairV2Hardware.cpp b/Controllers/CorsairPeripheralV2Controller/RGBController_CorsairV2Hardware.cpp index 2abb3f21..82adaef4 100644 --- a/Controllers/CorsairPeripheralV2Controller/RGBController_CorsairV2Hardware.cpp +++ b/Controllers/CorsairPeripheralV2Controller/RGBController_CorsairV2Hardware.cpp @@ -1,11 +1,15 @@ -/*---------------------------------------------------------------------*\ -| RGBController_CorsairV2HardwareController.cpp | -| | -| Driver for the newer Corsair peripherals that use the '08' | -| based USB protocol and support hardware lighting modes. | -| | -| Chris M (Dr_No) 10 Dec 2022 | -\*---------------------------------------------------------------------*/ +/*---------------------------------------------------------*\ +| RGBController_CorsairV2HardwareController.cpp | +| | +| RGBController for Corsair V2 peripherals - hardware | +| modes | +| | +| Chris M (Dr_No) 10 Dec 2022 | +| | +| This file is part of the OpenRGB project | +| SPDX-License-Identifier: GPL-2.0-only | +\*---------------------------------------------------------*/ + #include "LogManager.h" #include "RGBController_CorsairV2Hardware.h" diff --git a/Controllers/CorsairPeripheralV2Controller/RGBController_CorsairV2Hardware.h b/Controllers/CorsairPeripheralV2Controller/RGBController_CorsairV2Hardware.h index d6cff4a2..947cc239 100644 --- a/Controllers/CorsairPeripheralV2Controller/RGBController_CorsairV2Hardware.h +++ b/Controllers/CorsairPeripheralV2Controller/RGBController_CorsairV2Hardware.h @@ -1,11 +1,15 @@ -/*---------------------------------------------------------------------*\ -| RGBController_CorsairV2HardwareController.h | -| | -| Driver for the newer Corsair peripherals that use the '08' | -| based USB protocol and support hardware lighting modes. | -| | -| Chris M (Dr_No) 10 Dec 2022 | -\*---------------------------------------------------------------------*/ +/*---------------------------------------------------------*\ +| RGBController_CorsairV2HardwareController.h | +| | +| RGBController for Corsair V2 peripherals - hardware | +| modes | +| | +| Chris M (Dr_No) 10 Dec 2022 | +| | +| This file is part of the OpenRGB project | +| SPDX-License-Identifier: GPL-2.0-only | +\*---------------------------------------------------------*/ + #pragma once #include "RGBController.h" diff --git a/Controllers/CorsairPeripheralV2Controller/RGBController_CorsairV2Software.cpp b/Controllers/CorsairPeripheralV2Controller/RGBController_CorsairV2Software.cpp index ea94d987..640bfd37 100644 --- a/Controllers/CorsairPeripheralV2Controller/RGBController_CorsairV2Software.cpp +++ b/Controllers/CorsairPeripheralV2Controller/RGBController_CorsairV2Software.cpp @@ -1,11 +1,14 @@ -/*---------------------------------------------------------------------*\ -| RGBController_CorsairV2SoftwareController.cpp | -| | -| Common driver for the newer Corsair peripherals that use | -| the `08` based USB protocol | -| | -| Chris M (Dr_No) 11 Aug 2022 | -\*---------------------------------------------------------------------*/ +/*---------------------------------------------------------*\ +| RGBController_CorsairV2SoftwareController.cpp | +| | +| RGBController for Corsair V2 peripherals - software | +| modes | +| | +| Chris M (Dr_No) 11 Aug 2022 | +| | +| This file is part of the OpenRGB project | +| SPDX-License-Identifier: GPL-2.0-only | +\*---------------------------------------------------------*/ #include "LogManager.h" #include "RGBController_CorsairV2Software.h" diff --git a/Controllers/CorsairPeripheralV2Controller/RGBController_CorsairV2Software.h b/Controllers/CorsairPeripheralV2Controller/RGBController_CorsairV2Software.h index c594eceb..8aeab417 100644 --- a/Controllers/CorsairPeripheralV2Controller/RGBController_CorsairV2Software.h +++ b/Controllers/CorsairPeripheralV2Controller/RGBController_CorsairV2Software.h @@ -1,11 +1,15 @@ -/*---------------------------------------------------------------------*\ -| RGBController_CorsairV2SoftwareController.cpp | -| | -| Common driver for the newer Corsair peripherals that use | -| the `08` based USB protocol | -| | -| Chris M (Dr_No) 11 Aug 2022 | -\*---------------------------------------------------------------------*/ +/*---------------------------------------------------------*\ +| RGBController_CorsairV2SoftwareController.h | +| | +| RGBController for Corsair V2 peripherals - software | +| modes | +| | +| Chris M (Dr_No) 11 Aug 2022 | +| | +| This file is part of the OpenRGB project | +| SPDX-License-Identifier: GPL-2.0-only | +\*---------------------------------------------------------*/ + #pragma once #include "RGBController.h" diff --git a/Controllers/CorsairVengeanceController/CorsairVengeanceController.cpp b/Controllers/CorsairVengeanceController/CorsairVengeanceController.cpp index 600afebf..bd46f680 100644 --- a/Controllers/CorsairVengeanceController/CorsairVengeanceController.cpp +++ b/Controllers/CorsairVengeanceController/CorsairVengeanceController.cpp @@ -1,14 +1,16 @@ -/*-----------------------------------------*\ -| CorsairVengeanceController.h | -| | -| Driver for Corsair Vengeance RGB RAM | -| lighting controller | -| | -| Adam Honse (CalcProgrammer1) 3/8/2019 | -\*-----------------------------------------*/ +/*---------------------------------------------------------*\ +| CorsairVengeanceController.cpp | +| | +| Driver for Corsair Vengeance RGB RAM | +| | +| Adam Honse (CalcProgrammer1) 08 Mar 2019 | +| | +| This file is part of the OpenRGB project | +| SPDX-License-Identifier: GPL-2.0-only | +\*---------------------------------------------------------*/ -#include "CorsairVengeanceController.h" #include +#include "CorsairVengeanceController.h" CorsairVengeanceController::CorsairVengeanceController(i2c_smbus_interface* bus, corsair_dev_id dev) { diff --git a/Controllers/CorsairVengeanceController/CorsairVengeanceController.h b/Controllers/CorsairVengeanceController/CorsairVengeanceController.h index ef71e1a0..e7821da6 100644 --- a/Controllers/CorsairVengeanceController/CorsairVengeanceController.h +++ b/Controllers/CorsairVengeanceController/CorsairVengeanceController.h @@ -1,17 +1,19 @@ -/*-----------------------------------------*\ -| CorsairVengeanceController.h | -| | -| Definitions and types for Corsair | -| Vengeance RGB RAM lighting controller | -| | -| Adam Honse (CalcProgrammer1) 3/8/2019 | -\*-----------------------------------------*/ +/*---------------------------------------------------------*\ +| CorsairVengeanceController.h | +| | +| Driver for Corsair Vengeance RGB RAM | +| | +| Adam Honse (CalcProgrammer1) 08 Mar 2019 | +| | +| This file is part of the OpenRGB project | +| SPDX-License-Identifier: GPL-2.0-only | +\*---------------------------------------------------------*/ + +#pragma once #include #include "i2c_smbus.h" -#pragma once - typedef unsigned char corsair_dev_id; typedef unsigned char corsair_cmd; diff --git a/Controllers/CorsairVengeanceController/CorsairVengeanceControllerDetect.cpp b/Controllers/CorsairVengeanceController/CorsairVengeanceControllerDetect.cpp index 5ca5a70c..f4070791 100644 --- a/Controllers/CorsairVengeanceController/CorsairVengeanceControllerDetect.cpp +++ b/Controllers/CorsairVengeanceController/CorsairVengeanceControllerDetect.cpp @@ -1,12 +1,23 @@ +/*---------------------------------------------------------*\ +| CorsairVengeanceControllerDetect.cpp | +| | +| Detector for Corsair Vengeance RGB RAM | +| | +| Adam Honse (CalcProgrammer1) 08 Mar 2019 | +| | +| This file is part of the OpenRGB project | +| SPDX-License-Identifier: GPL-2.0-only | +\*---------------------------------------------------------*/ + +#include +#include +#include #include "Detector.h" #include "CorsairVengeanceController.h" #include "RGBController.h" #include "RGBController_CorsairVengeance.h" #include "i2c_smbus.h" #include "pci_ids.h" -#include -#include -#include /******************************************************************************************\ * * @@ -64,7 +75,7 @@ void DetectCorsairVengeanceControllers(std::vector &busses { CorsairVengeanceController* new_controller = new CorsairVengeanceController(busses[bus], addr); RGBController_CorsairVengeance* new_rgbcontroller = new RGBController_CorsairVengeance(new_controller); - + ResourceManager::get()->RegisterRGBController(new_rgbcontroller); } } @@ -74,7 +85,7 @@ void DetectCorsairVengeanceControllers(std::vector &busses { CorsairVengeanceController* new_controller = new CorsairVengeanceController(busses[bus], addr); RGBController_CorsairVengeance* new_rgbcontroller = new RGBController_CorsairVengeance(new_controller); - + ResourceManager::get()->RegisterRGBController(new_rgbcontroller); } } diff --git a/Controllers/CorsairVengeanceController/RGBController_CorsairVengeance.cpp b/Controllers/CorsairVengeanceController/RGBController_CorsairVengeance.cpp index a580b49b..22399ab2 100644 --- a/Controllers/CorsairVengeanceController/RGBController_CorsairVengeance.cpp +++ b/Controllers/CorsairVengeanceController/RGBController_CorsairVengeance.cpp @@ -1,11 +1,13 @@ -/*-----------------------------------------*\ -| RGBController_CorsairVengeance.cpp | -| | -| Generic RGB Interface for OpenAuraSDK | -| Corsair Vengeance RGB driver | -| | -| Adam Honse (CalcProgrammer1) 6/13/2019 | -\*-----------------------------------------*/ +/*---------------------------------------------------------*\ +| RGBController_CorsairVengeance.cpp | +| | +| RGBController for Corsair Vengeance RGB RAM | +| | +| Adam Honse (CalcProgrammer1) 16 Jun 2019 | +| | +| This file is part of the OpenRGB project | +| SPDX-License-Identifier: GPL-2.0-only | +\*---------------------------------------------------------*/ #include "RGBController_CorsairVengeance.h" diff --git a/Controllers/CorsairVengeanceController/RGBController_CorsairVengeance.h b/Controllers/CorsairVengeanceController/RGBController_CorsairVengeance.h index ce2209bc..d19ffe41 100644 --- a/Controllers/CorsairVengeanceController/RGBController_CorsairVengeance.h +++ b/Controllers/CorsairVengeanceController/RGBController_CorsairVengeance.h @@ -1,11 +1,13 @@ -/*-----------------------------------------*\ -| RGBController_CorsairVengeance.h | -| | -| Generic RGB Interface for OpenAuraSDK | -| Corsair Vengeance RGB driver | -| | -| Adam Honse (CalcProgrammer1) 6/13/2019 | -\*-----------------------------------------*/ +/*---------------------------------------------------------*\ +| RGBController_CorsairVengeance.h | +| | +| RGBController for Corsair Vengeance RGB RAM | +| | +| Adam Honse (CalcProgrammer1) 16 Jun 2019 | +| | +| This file is part of the OpenRGB project | +| SPDX-License-Identifier: GPL-2.0-only | +\*---------------------------------------------------------*/ #pragma once diff --git a/Controllers/CorsairVengeanceProController/CorsairVengeanceProController.cpp b/Controllers/CorsairVengeanceProController/CorsairVengeanceProController.cpp index cfb2e59e..ce4ba859 100644 --- a/Controllers/CorsairVengeanceProController/CorsairVengeanceProController.cpp +++ b/Controllers/CorsairVengeanceProController/CorsairVengeanceProController.cpp @@ -1,14 +1,16 @@ -/*-----------------------------------------*\ -| CorsairVengeanceProController.cpp | -| | -| Definitions and types for Corsair | -| Vengeance Pro RGB RAM lighting controller| -| | -| Adam Honse (CalcProgrammer1) 6/30/2019 | -\*-----------------------------------------*/ +/*---------------------------------------------------------*\ +| CorsairVengeanceProController.cpp | +| | +| Driver for Corsair Vengeance Pro RGB RAM | +| | +| Adam Honse (CalcProgrammer1) 30 Jun 2019 | +| | +| This file is part of the OpenRGB project | +| SPDX-License-Identifier: GPL-2.0-only | +\*---------------------------------------------------------*/ -#include "CorsairVengeanceProController.h" #include +#include "CorsairVengeanceProController.h" using namespace std::chrono_literals; @@ -22,7 +24,7 @@ CorsairVengeanceProController::CorsairVengeanceProController(i2c_smbus_interface direct_mode = false; effect_mode = CORSAIR_PRO_MODE_STATIC; - + for (unsigned int i = 0; i < led_count; i++) { led_red[i] = 0; diff --git a/Controllers/CorsairVengeanceProController/CorsairVengeanceProController.h b/Controllers/CorsairVengeanceProController/CorsairVengeanceProController.h index fd9cc0a9..6035b28f 100644 --- a/Controllers/CorsairVengeanceProController/CorsairVengeanceProController.h +++ b/Controllers/CorsairVengeanceProController/CorsairVengeanceProController.h @@ -1,18 +1,20 @@ -/*-----------------------------------------*\ -| CorsairVengeanceProController.h | -| | -| Definitions and types for Corsair | -| Vengeance Pro RGB RAM lighting controller| -| | -| Adam Honse (CalcProgrammer1) 6/30/2019 | -\*-----------------------------------------*/ +/*---------------------------------------------------------*\ +| CorsairVengeanceProController.h | +| | +| Driver for Corsair Vengeance Pro RGB RAM | +| | +| Adam Honse (CalcProgrammer1) 30 Jun 2019 | +| | +| This file is part of the OpenRGB project | +| SPDX-License-Identifier: GPL-2.0-only | +\*---------------------------------------------------------*/ + +#pragma once #include #include "i2c_smbus.h" #include "CRC.h" -#pragma once - typedef unsigned char corsair_dev_id; #define CORSAIR_PRO_LED_COUNT ( 10 ) diff --git a/Controllers/CorsairVengeanceProController/CorsairVengeanceProControllerDetect.cpp b/Controllers/CorsairVengeanceProController/CorsairVengeanceProControllerDetect.cpp index b7a37ef1..fe74537a 100644 --- a/Controllers/CorsairVengeanceProController/CorsairVengeanceProControllerDetect.cpp +++ b/Controllers/CorsairVengeanceProController/CorsairVengeanceProControllerDetect.cpp @@ -1,3 +1,17 @@ +/*---------------------------------------------------------*\ +| CorsairVengeanceProControllerDetect.cpp | +| | +| Detector for Corsair Vengeance Pro RGB RAM | +| | +| Adam Honse (CalcProgrammer1) 30 Jun 2019 | +| | +| This file is part of the OpenRGB project | +| SPDX-License-Identifier: GPL-2.0-only | +\*---------------------------------------------------------*/ + +#include +#include +#include #include "Detector.h" #include "CorsairVengeanceProController.h" #include "RGBController.h" @@ -5,9 +19,6 @@ #include "i2c_smbus.h" #include "pci_ids.h" #include "LogManager.h" -#include -#include -#include using namespace std::chrono_literals; diff --git a/Controllers/CorsairVengeanceProController/RGBController_CorsairVengeancePro.cpp b/Controllers/CorsairVengeanceProController/RGBController_CorsairVengeancePro.cpp index 58a4e130..f87b6ab1 100644 --- a/Controllers/CorsairVengeanceProController/RGBController_CorsairVengeancePro.cpp +++ b/Controllers/CorsairVengeanceProController/RGBController_CorsairVengeancePro.cpp @@ -1,11 +1,13 @@ -/*-----------------------------------------*\ -| RGBController_CorsairVengeancePro.cpp | -| | -| Generic RGB Interface for OpenAuraSDK | -| Corsair Vengeance Pro RGB driver | -| | -| Adam Honse (CalcProgrammer1) 6/30/2019 | -\*-----------------------------------------*/ +/*---------------------------------------------------------*\ +| RGBController_CorsairVengeancePro.cpp | +| | +| RGBController for Corsair Vengeance Pro RGB RAM | +| | +| Adam Honse (CalcProgrammer1) 30 Jun 2019 | +| | +| This file is part of the OpenRGB project | +| SPDX-License-Identifier: GPL-2.0-only | +\*---------------------------------------------------------*/ #include "RGBController_CorsairVengeancePro.h" diff --git a/Controllers/CorsairVengeanceProController/RGBController_CorsairVengeancePro.h b/Controllers/CorsairVengeanceProController/RGBController_CorsairVengeancePro.h index 606e0105..353cdffb 100644 --- a/Controllers/CorsairVengeanceProController/RGBController_CorsairVengeancePro.h +++ b/Controllers/CorsairVengeanceProController/RGBController_CorsairVengeancePro.h @@ -1,11 +1,13 @@ -/*-----------------------------------------*\ -| RGBController_CorsairVengeancePro.h | -| | -| Generic RGB Interface for OpenAuraSDK | -| Corsair Vengeance Pro RGB driver | -| | -| Adam Honse (CalcProgrammer1) 6/30/2019 | -\*-----------------------------------------*/ +/*---------------------------------------------------------*\ +| RGBController_CorsairVengeancePro.h | +| | +| RGBController for Corsair Vengeance Pro RGB RAM | +| | +| Adam Honse (CalcProgrammer1) 30 Jun 2019 | +| | +| This file is part of the OpenRGB project | +| SPDX-License-Identifier: GPL-2.0-only | +\*---------------------------------------------------------*/ #pragma once diff --git a/Controllers/CorsairWirelessController/CorsairWirelessController.cpp b/Controllers/CorsairWirelessController/CorsairWirelessController.cpp index 95cccd6f..6feff835 100644 --- a/Controllers/CorsairWirelessController/CorsairWirelessController.cpp +++ b/Controllers/CorsairWirelessController/CorsairWirelessController.cpp @@ -1,15 +1,16 @@ -/*-----------------------------------------*\ -| CorsairWirelessController.cpp | -| | -| Driver for Corsair RGB wireless keyboard | -| lighting controller | -| | -| Adam Honse (CalcProgrammer1) 5/8/2021 | -\*-----------------------------------------*/ - -#include "CorsairWirelessController.h" +/*---------------------------------------------------------*\ +| CorsairWirelessController.cpp | +| | +| Driver for Corsair wireless keyboard | +| | +| Adam Honse (CalcProgrammer1) 08 May 2021 | +| | +| This file is part of the OpenRGB project | +| SPDX-License-Identifier: GPL-2.0-only | +\*---------------------------------------------------------*/ #include +#include "CorsairWirelessController.h" using namespace std::chrono_literals; diff --git a/Controllers/CorsairWirelessController/CorsairWirelessController.h b/Controllers/CorsairWirelessController/CorsairWirelessController.h index f60a8b72..62590d69 100644 --- a/Controllers/CorsairWirelessController/CorsairWirelessController.h +++ b/Controllers/CorsairWirelessController/CorsairWirelessController.h @@ -1,18 +1,19 @@ -/*-----------------------------------------*\ -| CorsairWirelessController.h | -| | -| Definitions and types for Corsair RGB | -| wireless keyboard lighting controller | -| | -| Adam Honse (CalcProgrammer1) 5/8/2021 | -\*-----------------------------------------*/ +/*---------------------------------------------------------*\ +| CorsairWirelessController.h | +| | +| Driver for Corsair wireless keyboard | +| | +| Adam Honse (CalcProgrammer1) 08 May 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" class CorsairWirelessController { diff --git a/Controllers/CorsairWirelessController/CorsairWirelessControllerDetect.cpp b/Controllers/CorsairWirelessController/CorsairWirelessControllerDetect.cpp index a5ee2262..a90c6179 100644 --- a/Controllers/CorsairWirelessController/CorsairWirelessControllerDetect.cpp +++ b/Controllers/CorsairWirelessController/CorsairWirelessControllerDetect.cpp @@ -1,8 +1,19 @@ +/*---------------------------------------------------------*\ +| CorsairWirelessControllerDetect.cpp | +| | +| Detector for Corsair wireless keyboard | +| | +| Adam Honse (CalcProgrammer1) 08 May 2021 | +| | +| This file is part of the OpenRGB project | +| SPDX-License-Identifier: GPL-2.0-only | +\*---------------------------------------------------------*/ + +#include #include "Detector.h" #include "CorsairWirelessController.h" #include "RGBController.h" #include "RGBController_CorsairWireless.h" -#include /*-----------------------------------------------------*\ | Corsair vendor ID | diff --git a/Controllers/CorsairWirelessController/RGBController_CorsairWireless.cpp b/Controllers/CorsairWirelessController/RGBController_CorsairWireless.cpp index c9d96d1c..bad5dff9 100644 --- a/Controllers/CorsairWirelessController/RGBController_CorsairWireless.cpp +++ b/Controllers/CorsairWirelessController/RGBController_CorsairWireless.cpp @@ -1,11 +1,13 @@ -/*-----------------------------------------*\ -| RGBController_CorsairWireless.cpp | -| | -| Generic RGB Interface for Corsair RGB | -| wireless keyboard devices | -| | -| Adam Honse (CalcProgrammer1) 5/8/2021 | -\*-----------------------------------------*/ +/*---------------------------------------------------------*\ +| RGBController_CorsairWireless.cpp | +| | +| RGBController for Corsair wireless keyboard | +| | +| Adam Honse (CalcProgrammer1) 08 May 2021 | +| | +| This file is part of the OpenRGB project | +| SPDX-License-Identifier: GPL-2.0-only | +\*---------------------------------------------------------*/ #include "RGBControllerKeyNames.h" #include "RGBController_CorsairWireless.h" diff --git a/Controllers/CorsairWirelessController/RGBController_CorsairWireless.h b/Controllers/CorsairWirelessController/RGBController_CorsairWireless.h index 49c1709f..6a507f0e 100644 --- a/Controllers/CorsairWirelessController/RGBController_CorsairWireless.h +++ b/Controllers/CorsairWirelessController/RGBController_CorsairWireless.h @@ -1,13 +1,16 @@ -/*-----------------------------------------*\ -| RGBController_CorsairWireless.h | -| | -| Generic RGB Interface for Corsair RGB | -| wireless keyboard devices | -| | -| Adam Honse (CalcProgrammer1) 5/8/2021 | -\*-----------------------------------------*/ +/*---------------------------------------------------------*\ +| RGBController_CorsairWireless.h | +| | +| RGBController for Corsair wireless keyboard | +| | +| Adam Honse (CalcProgrammer1) 08 May 2021 | +| | +| This file is part of the OpenRGB project | +| SPDX-License-Identifier: GPL-2.0-only | +\*---------------------------------------------------------*/ #pragma once + #include "RGBController.h" #include "CorsairWirelessController.h"