From b6d5c64c5bb10f282a189011251d8fc67a2b8e55 Mon Sep 17 00:00:00 2001 From: Adam Honse Date: Tue, 30 Apr 2024 23:37:19 -0500 Subject: [PATCH] Formatting and organizational cleanup for controllers beginning with A --- .../BloodyB820RController.cpp | 20 +- .../BloodyB820RController.h | 6 +- .../RGBController_BloodyB820R.cpp | 234 +++++++++--------- .../RGBController_BloodyB820R.h | 9 +- .../BloodyMouseController.cpp | 8 +- .../BloodyMouseController.h | 7 +- .../RGBController_BloodyMouse.h | 1 + .../AMDWraithPrismController.cpp | 6 +- .../AMDWraithPrismController.h | 5 +- .../AMDWraithPrismControllerDetect.cpp | 13 +- .../RGBController_AMDWraithPrism.cpp | 30 +-- .../RGBController_AMDWraithPrism.h | 1 + .../AOCKeyboardController.h | 8 +- .../RGBController_AOCKeyboard.cpp | 14 +- .../AOCMouseController/AOCMouseController.cpp | 3 +- .../AOCMouseController/AOCMouseController.h | 8 +- .../RGBController_AOCMouse.cpp | 14 +- .../AOCMousematController.cpp | 3 +- .../AOCMousematController.h | 8 +- .../RGBController_AOCMousemat.cpp | 14 +- .../ASRockPolychromeUSBController.cpp | 2 +- .../ASRockPolychromeUSBController.h | 10 +- .../ASRockPolychromeUSBControllerDetect.cpp | 9 +- .../RGBController_ASRockPolychromeUSB.cpp | 2 +- .../ASRockASRRGBSMBusController.h | 10 +- .../ASRockPolychromeV1SMBusController.h | 6 +- .../ASRockPolychromeV2SMBusController.cpp | 2 +- .../ASRockPolychromeV2SMBusController.h | 8 +- .../ASRockSMBusControllerDetect.cpp | 6 +- .../AlienwareController.cpp | 4 +- .../AlienwareController/AlienwareController.h | 8 +- .../AlienwareControllerDetect.cpp | 2 +- .../RGBController_Alienware.cpp | 3 +- .../RGBController_Alienware.h | 3 +- .../AlienwareAW410KController.cpp | 2 +- .../AlienwareAW410KController.h | 5 +- .../RGBController_AlienwareAW410K.cpp | 4 +- .../AlienwareAW510KController.cpp | 2 +- .../AlienwareAW510KController.h | 5 +- .../RGBController_AlienwareAW510K.cpp | 2 +- .../AlienwareKeyboardControllerDetect.cpp | 8 +- .../AnnePro2Controller/AnnePro2Controller.h | 6 +- .../AnnePro2ControllerDetect.cpp | 21 +- .../RGBController_AnnePro2.h | 1 + .../ArcticController/ArcticController.cpp | 2 +- .../ArcticController/ArcticController.h | 2 +- .../ArcticControllerDetect.cpp | 6 +- .../ArcticController/RGBController_Arctic.cpp | 2 +- .../ArcticController/RGBController_Arctic.h | 5 +- .../AsusAuraCoreController.cpp | 4 +- .../AsusAuraCoreController.h | 5 +- .../AsusAuraCoreLaptopController.cpp | 1 - .../AsusAuraCoreLaptopController.h | 4 +- .../AsusAuraGPUController.h | 4 +- .../AsusAuraGPUControllerDetect.cpp | 6 +- .../AsusAuraHeadsetStandController.cpp | 3 +- .../AsusAuraHeadsetStandController.h | 5 +- .../RGBController_AsusAuraHeadsetStand.h | 1 + .../AsusCerberusKeyboardController.cpp | 9 +- .../AsusCerberusKeyboardController.h | 5 +- .../RGBController_AsusCerberusKeyboard.cpp | 4 +- .../RGBController_AsusCerberusKeyboard.h | 1 + .../AsusLegacyUSBControllerDetect.cpp | 6 +- .../AsusSagarisKeyboardController.cpp | 14 +- .../AsusSagarisKeyboardController.h | 9 +- .../RGBController_AsusSagarisKeyboard.cpp | 5 +- .../RGBController_AsusSagarisKeyboard.h | 5 +- .../AsusStrixClawController.cpp | 3 +- .../AsusStrixClawController.h | 5 +- .../RGBController_AsusStrixClaw.h | 2 +- .../AsusTUFLaptopController_Linux.cpp | 11 +- .../AsusTUFLaptopController_Windows.cpp | 15 +- .../AsusTUFLaptopController_Windows.h | 9 +- .../AsusTUFLaptopDetect_Linux.cpp | 5 +- .../AsusTUFLaptopDetect_Windows.cpp | 7 +- .../RGBController_AsusTUFLaptop_Linux.cpp | 12 +- .../RGBController_AsusTUFLaptop_Linux.h | 6 +- .../RGBController_AsusTUFLaptop_Windows.h | 9 +- 78 files changed, 356 insertions(+), 379 deletions(-) diff --git a/Controllers/A4TechController/BloodyB820RController/BloodyB820RController.cpp b/Controllers/A4TechController/BloodyB820RController/BloodyB820RController.cpp index 871213a8..5226c121 100644 --- a/Controllers/A4TechController/BloodyB820RController/BloodyB820RController.cpp +++ b/Controllers/A4TechController/BloodyB820RController/BloodyB820RController.cpp @@ -40,7 +40,7 @@ std::string BloodyB820RController::GetSerial() std::wstring wName = std::wstring(tmpName); std::string serial = std::string(wName.begin(), wName.end()); - return serial; + return(serial); } std::string BloodyB820RController::GetLocation() @@ -50,12 +50,12 @@ std::string BloodyB820RController::GetLocation() void BloodyB820RController::SendControlPacket(uint8_t data) { - uint8_t buffer[BLOODY_B820R_PACKET_SIZE] = { 0x07, 0x03, 0x06, 0x01, 0x00, 0x00, 0x00, 0x00 }; + uint8_t buffer[BLOODY_B820R_PACKET_SIZE] = { 0x07, 0x03, 0x06, 0x01, 0x00, 0x00, 0x00, 0x00 }; hid_send_feature_report(dev, buffer, BLOODY_B820R_PACKET_SIZE); - buffer[BLOODY_B820R_MODE_BYTE] = 0; - buffer[BLOODY_B820R_DATA_BYTE] = data; + buffer[BLOODY_B820R_MODE_BYTE] = 0; + buffer[BLOODY_B820R_DATA_BYTE] = data; hid_send_feature_report(dev, buffer, BLOODY_B820R_PACKET_SIZE); } @@ -75,14 +75,12 @@ void BloodyB820RController::SetLEDDirect(std::vector colors) | packet_map is the index of the Key from full_matrix_map and | | the value is the position in the direct packet buffer | \*-----------------------------------------------------------------*/ - - for(size_t i = 0; i < colors.size(); i++) { - RGBColor color = colors[i]; - uint8_t offset = BLOODY_B820R_RGB_OFFSET; - uint8_t buffer_idx = offset + i % BLOODY_B820R_RGB_BUFFER_SIZE; - uint8_t* buffers[2][3] = + RGBColor color = colors[i]; + uint8_t offset = BLOODY_B820R_RGB_OFFSET; + uint8_t buffer_idx = offset + i % BLOODY_B820R_RGB_BUFFER_SIZE; + uint8_t* buffers[2][3] = { {r1_buffer, g1_buffer, b1_buffer}, {r2_buffer, g2_buffer, b2_buffer} @@ -99,4 +97,4 @@ void BloodyB820RController::SetLEDDirect(std::vector colors) hid_send_feature_report(dev, g2_buffer, BLOODY_B820R_PACKET_SIZE); hid_send_feature_report(dev, b1_buffer, BLOODY_B820R_PACKET_SIZE); hid_send_feature_report(dev, b2_buffer, BLOODY_B820R_PACKET_SIZE); -} \ No newline at end of file +} diff --git a/Controllers/A4TechController/BloodyB820RController/BloodyB820RController.h b/Controllers/A4TechController/BloodyB820RController/BloodyB820RController.h index 02159107..bbd450bb 100644 --- a/Controllers/A4TechController/BloodyB820RController/BloodyB820RController.h +++ b/Controllers/A4TechController/BloodyB820RController/BloodyB820RController.h @@ -7,13 +7,13 @@ | | \*-------------------------------------------------------------------*/ +#pragma once + #include #include #include "RGBController.h" -#pragma once -#define NA 0xFFFFFFFF -#define HID_MAX_STR 255 +#define HID_MAX_STR 255 #define BLOODY_B820R_RGB_BUFFER_SIZE 58 #define BLOODY_B820R_RGB_OFFSET 6 diff --git a/Controllers/A4TechController/BloodyB820RController/RGBController_BloodyB820R.cpp b/Controllers/A4TechController/BloodyB820RController/RGBController_BloodyB820R.cpp index 23c53c93..3fbf02e2 100644 --- a/Controllers/A4TechController/BloodyB820RController/RGBController_BloodyB820R.cpp +++ b/Controllers/A4TechController/BloodyB820RController/RGBController_BloodyB820R.cpp @@ -10,128 +10,131 @@ #include "RGBControllerKeyNames.h" #include "RGBController_BloodyB820R.h" +//0xFFFFFFFF indicates an unused entry in matrix +#define NA 0xFFFFFFFF + static unsigned int matrix_map[6][21] = - { - {0, NA, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, NA, NA, NA, NA, 13, 14, 15}, - {16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36}, - {37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57}, - {58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, NA, NA, NA, NA, 71, 72, 73, NA}, - {74, NA, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, NA, NA, 86, NA, 87, 88, 89, 90}, - {91, 92, 93, 94, NA, NA, NA, NA, NA, NA, 95, 96, 97, 98, 99, 100, 101, 102, NA, 103, NA}, - }; + { + {0, NA, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, NA, NA, NA, NA, 13, 14, 15}, + {16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36}, + {37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57}, + {58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, NA, NA, NA, NA, 71, 72, 73, NA}, + {74, NA, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, NA, NA, 86, NA, 87, 88, 89, 90}, + {91, 92, 93, 94, NA, NA, NA, NA, NA, NA, 95, 96, 97, 98, 99, 100, 101, 102, NA, 103, NA}, + }; static const char *led_names[] = - { - KEY_EN_ESCAPE, //00 - KEY_EN_F1, - KEY_EN_F2, - KEY_EN_F3, - KEY_EN_F4, - KEY_EN_F5, - KEY_EN_F6, - KEY_EN_F7, - KEY_EN_F8, - KEY_EN_F9, - KEY_EN_F10, - KEY_EN_F11, - KEY_EN_F12, - KEY_EN_PRINT_SCREEN, - KEY_EN_SCROLL_LOCK, - KEY_EN_PAUSE_BREAK, + { + KEY_EN_ESCAPE, //00 + KEY_EN_F1, + KEY_EN_F2, + KEY_EN_F3, + KEY_EN_F4, + KEY_EN_F5, + KEY_EN_F6, + KEY_EN_F7, + KEY_EN_F8, + KEY_EN_F9, + KEY_EN_F10, + KEY_EN_F11, + KEY_EN_F12, + KEY_EN_PRINT_SCREEN, + KEY_EN_SCROLL_LOCK, + KEY_EN_PAUSE_BREAK, - KEY_EN_BACK_TICK, //10 - KEY_EN_1, - KEY_EN_2, - KEY_EN_3, - KEY_EN_4, - KEY_EN_5, - KEY_EN_6, - KEY_EN_7, - KEY_EN_8, - KEY_EN_9, - KEY_EN_0, - KEY_EN_MINUS, - KEY_EN_EQUALS, - KEY_EN_BACKSPACE, - KEY_EN_INSERT, - KEY_EN_HOME, - KEY_EN_PAGE_UP, - KEY_EN_NUMPAD_LOCK, - KEY_EN_NUMPAD_DIVIDE, - KEY_EN_NUMPAD_TIMES, - KEY_EN_NUMPAD_MINUS, + KEY_EN_BACK_TICK, //10 + KEY_EN_1, + KEY_EN_2, + KEY_EN_3, + KEY_EN_4, + KEY_EN_5, + KEY_EN_6, + KEY_EN_7, + KEY_EN_8, + KEY_EN_9, + KEY_EN_0, + KEY_EN_MINUS, + KEY_EN_EQUALS, + KEY_EN_BACKSPACE, + KEY_EN_INSERT, + KEY_EN_HOME, + KEY_EN_PAGE_UP, + KEY_EN_NUMPAD_LOCK, + KEY_EN_NUMPAD_DIVIDE, + KEY_EN_NUMPAD_TIMES, + KEY_EN_NUMPAD_MINUS, - KEY_EN_TAB, //20 - KEY_EN_Q, - KEY_EN_W, - KEY_EN_E, - KEY_EN_R, - KEY_EN_T, - KEY_EN_Y, - KEY_EN_U, - KEY_EN_I, - KEY_EN_O, - KEY_EN_P, - KEY_EN_LEFT_BRACKET, - KEY_EN_RIGHT_BRACKET, - KEY_EN_ANSI_BACK_SLASH, - KEY_EN_DELETE, - KEY_EN_END, - KEY_EN_PAGE_DOWN, - KEY_EN_NUMPAD_7, - KEY_EN_NUMPAD_8, - KEY_EN_NUMPAD_9, - KEY_EN_NUMPAD_PLUS, + KEY_EN_TAB, //20 + KEY_EN_Q, + KEY_EN_W, + KEY_EN_E, + KEY_EN_R, + KEY_EN_T, + KEY_EN_Y, + KEY_EN_U, + KEY_EN_I, + KEY_EN_O, + KEY_EN_P, + KEY_EN_LEFT_BRACKET, + KEY_EN_RIGHT_BRACKET, + KEY_EN_ANSI_BACK_SLASH, + KEY_EN_DELETE, + KEY_EN_END, + KEY_EN_PAGE_DOWN, + KEY_EN_NUMPAD_7, + KEY_EN_NUMPAD_8, + KEY_EN_NUMPAD_9, + KEY_EN_NUMPAD_PLUS, - KEY_EN_CAPS_LOCK, //30 - KEY_EN_A, - KEY_EN_S, - KEY_EN_D, - KEY_EN_F, - KEY_EN_G, - KEY_EN_H, - KEY_EN_J, - KEY_EN_K, - KEY_EN_L, - KEY_EN_SEMICOLON, - KEY_EN_QUOTE, - KEY_EN_ANSI_ENTER, - KEY_EN_NUMPAD_4, - KEY_EN_NUMPAD_5, - KEY_EN_NUMPAD_6, + KEY_EN_CAPS_LOCK, //30 + KEY_EN_A, + KEY_EN_S, + KEY_EN_D, + KEY_EN_F, + KEY_EN_G, + KEY_EN_H, + KEY_EN_J, + KEY_EN_K, + KEY_EN_L, + KEY_EN_SEMICOLON, + KEY_EN_QUOTE, + KEY_EN_ANSI_ENTER, + KEY_EN_NUMPAD_4, + KEY_EN_NUMPAD_5, + KEY_EN_NUMPAD_6, - KEY_EN_LEFT_SHIFT, //40 - KEY_EN_Z, - KEY_EN_X, - KEY_EN_C, - KEY_EN_V, - KEY_EN_B, - KEY_EN_N, - KEY_EN_M, - KEY_EN_COMMA, - KEY_EN_PERIOD, - KEY_EN_FORWARD_SLASH, - KEY_EN_RIGHT_SHIFT, - KEY_EN_UP_ARROW, - KEY_EN_NUMPAD_1, - KEY_EN_NUMPAD_2, - KEY_EN_NUMPAD_3, - KEY_EN_NUMPAD_ENTER, + KEY_EN_LEFT_SHIFT, //40 + KEY_EN_Z, + KEY_EN_X, + KEY_EN_C, + KEY_EN_V, + KEY_EN_B, + KEY_EN_N, + KEY_EN_M, + KEY_EN_COMMA, + KEY_EN_PERIOD, + KEY_EN_FORWARD_SLASH, + KEY_EN_RIGHT_SHIFT, + KEY_EN_UP_ARROW, + KEY_EN_NUMPAD_1, + KEY_EN_NUMPAD_2, + KEY_EN_NUMPAD_3, + KEY_EN_NUMPAD_ENTER, - KEY_EN_LEFT_CONTROL, //50 - KEY_EN_LEFT_WINDOWS, - KEY_EN_LEFT_ALT, - KEY_EN_SPACE, - KEY_EN_RIGHT_ALT, - KEY_EN_RIGHT_FUNCTION, - KEY_EN_MENU, - KEY_EN_RIGHT_CONTROL, - KEY_EN_LEFT_ARROW, - KEY_EN_DOWN_ARROW, - KEY_EN_RIGHT_ARROW, - KEY_EN_NUMPAD_0, - KEY_EN_NUMPAD_PERIOD - }; + KEY_EN_LEFT_CONTROL, //50 + KEY_EN_LEFT_WINDOWS, + KEY_EN_LEFT_ALT, + KEY_EN_SPACE, + KEY_EN_RIGHT_ALT, + KEY_EN_RIGHT_FUNCTION, + KEY_EN_MENU, + KEY_EN_RIGHT_CONTROL, + KEY_EN_LEFT_ARROW, + KEY_EN_DOWN_ARROW, + KEY_EN_RIGHT_ARROW, + KEY_EN_NUMPAD_0, + KEY_EN_NUMPAD_PERIOD + }; /**------------------------------------------------------------------*\ @name A4Tech Bloody B820R @@ -225,6 +228,7 @@ void RGBController_BloodyB820R::DeviceUpdateLEDs() void RGBController_BloodyB820R::UpdateZoneLEDs(int zone) { std::vector colour; + for(size_t i = 0; i < zones[zone].leds_count; i++) { colour.push_back(zones[zone].colors[i]); @@ -244,4 +248,4 @@ void RGBController_BloodyB820R::UpdateSingleLED(int led) void RGBController_BloodyB820R::DeviceUpdateMode() { /* This device does not support modes yet */ -} \ No newline at end of file +} diff --git a/Controllers/A4TechController/BloodyB820RController/RGBController_BloodyB820R.h b/Controllers/A4TechController/BloodyB820RController/RGBController_BloodyB820R.h index 1c823443..7ea2995f 100644 --- a/Controllers/A4TechController/BloodyB820RController/RGBController_BloodyB820R.h +++ b/Controllers/A4TechController/BloodyB820RController/RGBController_BloodyB820R.h @@ -1,16 +1,17 @@ /*-------------------------------------------------------------------*\ -| RGBController_BloodyB820R.h | +| RGBController_BloodyB820R.h | | | -| Driver for A4Tech Bloody B820R Keyboard Controller | +| Driver for A4Tech Bloody B820R Keyboard Controller | | | | Mohammed Julfikar Ali Mahbub (o-julfikar) 01 Apr 2024 | | | \*-------------------------------------------------------------------*/ #pragma once + +#include #include "RGBController.h" #include "BloodyB820RController.h" -#include class RGBController_BloodyB820R : public RGBController { @@ -29,4 +30,4 @@ public: private: BloodyB820RController* controller; -}; \ No newline at end of file +}; diff --git a/Controllers/A4TechController/BloodyMouseController/BloodyMouseController.cpp b/Controllers/A4TechController/BloodyMouseController/BloodyMouseController.cpp index 14156994..e0850d64 100644 --- a/Controllers/A4TechController/BloodyMouseController/BloodyMouseController.cpp +++ b/Controllers/A4TechController/BloodyMouseController/BloodyMouseController.cpp @@ -26,7 +26,7 @@ BloodyMouseController::~BloodyMouseController() uint16_t BloodyMouseController::GetPid() { - return pid; + return(pid); } std::string BloodyMouseController::GetSerial() @@ -45,7 +45,7 @@ std::string BloodyMouseController::GetSerial() std::wstring w_tmp = std::wstring(tmp); std::string serial = std::string(w_tmp.begin(), w_tmp.end()); - return serial; + return(serial); } std::string BloodyMouseController::GetLocation() @@ -53,7 +53,7 @@ std::string BloodyMouseController::GetLocation() return("HID: " + location); } -void BloodyMouseController::InitDevice() +void BloodyMouseController::InitDevice() { uint8_t buffer[BLOODYMOUSE_WRITE_PACKET_SIZE] = { 0x07, 0x03, 0x06, 0x01, 0x00, 0x00, 0x00, 0x00 }; @@ -65,7 +65,7 @@ void BloodyMouseController::InitDevice() hid_send_feature_report(dev, buffer, BLOODYMOUSE_WRITE_PACKET_SIZE); } -void BloodyMouseController::SetLedsDirect(std::vector colors) +void BloodyMouseController::SetLedsDirect(std::vector colors) { uint8_t buffer[BLOODYMOUSE_WRITE_PACKET_SIZE] = { 0x07, 0x03, 0x06, 0x02, 0x00, 0x00, 0x00, 0x00 }; diff --git a/Controllers/A4TechController/BloodyMouseController/BloodyMouseController.h b/Controllers/A4TechController/BloodyMouseController/BloodyMouseController.h index f8c8723d..23f088e5 100644 --- a/Controllers/A4TechController/BloodyMouseController/BloodyMouseController.h +++ b/Controllers/A4TechController/BloodyMouseController/BloodyMouseController.h @@ -7,12 +7,12 @@ | | \*---------------------------------------------------------------------*/ +#pragma once + #include #include #include "RGBController.h" -#pragma once - /*-----------------------------------------------------*\ | Mouse product IDs | \*-----------------------------------------------------*/ @@ -24,7 +24,7 @@ \*-----------------------------------------------------*/ #define BLOODY_MP_50RS_PID 0xFA60 -#define HID_MAX_STR 255 +#define HID_MAX_STR 255 #define BLOODYMOUSE_WRITE_PACKET_SIZE 64 #define BLOODYMOUSE_BRIGHTNESS_MIN 0 @@ -54,6 +54,7 @@ public: std::string GetLocation(); void SetLedsDirect(std::vector colors); + private: uint16_t pid; std::string location; diff --git a/Controllers/A4TechController/BloodyMouseController/RGBController_BloodyMouse.h b/Controllers/A4TechController/BloodyMouseController/RGBController_BloodyMouse.h index 5a6d0c52..14b33ae4 100644 --- a/Controllers/A4TechController/BloodyMouseController/RGBController_BloodyMouse.h +++ b/Controllers/A4TechController/BloodyMouseController/RGBController_BloodyMouse.h @@ -8,6 +8,7 @@ \*---------------------------------------------------------------------*/ #pragma once + #include #include "RGBController.h" #include "BloodyMouseController.h" diff --git a/Controllers/AMDWraithPrismController/AMDWraithPrismController.cpp b/Controllers/AMDWraithPrismController/AMDWraithPrismController.cpp index 03c620c4..24188c45 100644 --- a/Controllers/AMDWraithPrismController/AMDWraithPrismController.cpp +++ b/Controllers/AMDWraithPrismController/AMDWraithPrismController.cpp @@ -7,15 +7,15 @@ | Adam Honse (CalcProgrammer1) 12/6/2019 | \*-----------------------------------------*/ -#include "AMDWraithPrismController.h" #include #include #include +#include "AMDWraithPrismController.h" AMDWraithPrismController::AMDWraithPrismController(hid_device* dev_handle, const char* path) { - dev = dev_handle; - location = path; + dev = dev_handle; + location = path; current_fan_mode = AMD_WRAITH_PRISM_FAN_LOGO_MODE_STATIC; current_fan_speed = 0xFF; diff --git a/Controllers/AMDWraithPrismController/AMDWraithPrismController.h b/Controllers/AMDWraithPrismController/AMDWraithPrismController.h index 02008de3..f7218fc6 100644 --- a/Controllers/AMDWraithPrismController/AMDWraithPrismController.h +++ b/Controllers/AMDWraithPrismController/AMDWraithPrismController.h @@ -7,13 +7,12 @@ | Adam Honse (CalcProgrammer1) 12/6/2019 | \*-----------------------------------------*/ +#pragma once + #include #include - #include "RGBController.h" -#pragma once - #define AMD_WRAITH_PRISM_FAN_BRIGHTNESS_DEFAULT_MAX 0xFF #define AMD_WRAITH_PRISM_FAN_BRIGHTNESS_CYCLE_MAX 0x7F diff --git a/Controllers/AMDWraithPrismController/AMDWraithPrismControllerDetect.cpp b/Controllers/AMDWraithPrismController/AMDWraithPrismControllerDetect.cpp index 3b6d49df..5bc44e75 100644 --- a/Controllers/AMDWraithPrismController/AMDWraithPrismControllerDetect.cpp +++ b/Controllers/AMDWraithPrismController/AMDWraithPrismControllerDetect.cpp @@ -1,11 +1,18 @@ +#include #include "Detector.h" #include "AMDWraithPrismController.h" #include "RGBController.h" #include "RGBController_AMDWraithPrism.h" -#include -#define AMD_WRAITH_PRISM_VID 0x2516 -#define AMD_WRAITH_PRISM_PID 0x0051 +/*---------------------------------------------------------*\ +| AMD Wraith Prism vendor ID | +\*---------------------------------------------------------*/ +#define AMD_WRAITH_PRISM_VID 0x2516 + +/*---------------------------------------------------------*\ +| AMD Wraith Prism product ID | +\*---------------------------------------------------------*/ +#define AMD_WRAITH_PRISM_PID 0x0051 /******************************************************************************************\ * * diff --git a/Controllers/AMDWraithPrismController/RGBController_AMDWraithPrism.cpp b/Controllers/AMDWraithPrismController/RGBController_AMDWraithPrism.cpp index 1b13f1f7..ec157b28 100644 --- a/Controllers/AMDWraithPrismController/RGBController_AMDWraithPrism.cpp +++ b/Controllers/AMDWraithPrismController/RGBController_AMDWraithPrism.cpp @@ -25,14 +25,14 @@ RGBController_AMDWraithPrism::RGBController_AMDWraithPrism(AMDWraithPrismController* controller_ptr) { - controller = controller_ptr; + controller = controller_ptr; - name = "AMD Wraith Prism"; - vendor = "Cooler Master"; - type = DEVICE_TYPE_COOLER; - description = "AMD Wraith Prism Device"; - version = controller->GetFirmwareVersionString(); - location = controller->GetLocationString(); + name = "AMD Wraith Prism"; + vendor = "Cooler Master"; + type = DEVICE_TYPE_COOLER; + description = "AMD Wraith Prism Device"; + version = controller->GetFirmwareVersionString(); + location = controller->GetLocationString(); mode Direct; Direct.name = "Direct"; @@ -138,8 +138,8 @@ void RGBController_AMDWraithPrism::SetupZones() /*---------------------------------------------------------*\ | LED maps | \*---------------------------------------------------------*/ - const unsigned int logo_leds[1] = { 0x00 }; - const unsigned int fan_leds[1] = { 0x01 }; + const unsigned int logo_leds[1] = { 0x00 }; + const unsigned int fan_leds[1] = { 0x01 }; const unsigned int ring_leds[14] = { 0x07, 0x06, 0x05, 0x04, 0x03, 0x02, 0x10, 0x0F, 0x0E, 0x0D, 0x0C, 0x0B, 0x0A, 0x09 }; @@ -179,24 +179,24 @@ void RGBController_AMDWraithPrism::SetupZones() for(unsigned int led_idx = 0; led_idx < 1; led_idx++) { led logo_led; - logo_led.name = "Logo LED"; - logo_led.value = logo_leds[led_idx]; + logo_led.name = "Logo LED"; + logo_led.value = logo_leds[led_idx]; leds.push_back(logo_led); } for(unsigned int led_idx = 0; led_idx < 1; led_idx++) { led fan_led; - fan_led.name = "Fan LED"; - fan_led.value = fan_leds[led_idx]; + fan_led.name = "Fan LED"; + fan_led.value = fan_leds[led_idx]; leds.push_back(fan_led); } for(unsigned int led_idx = 0; led_idx < 14; led_idx++) { led ring_led; - ring_led.name = "Ring LED"; - ring_led.value = ring_leds[led_idx]; + ring_led.name = "Ring LED"; + ring_led.value = ring_leds[led_idx]; leds.push_back(ring_led); } diff --git a/Controllers/AMDWraithPrismController/RGBController_AMDWraithPrism.h b/Controllers/AMDWraithPrismController/RGBController_AMDWraithPrism.h index 3d8d3181..b3b79679 100644 --- a/Controllers/AMDWraithPrismController/RGBController_AMDWraithPrism.h +++ b/Controllers/AMDWraithPrismController/RGBController_AMDWraithPrism.h @@ -8,6 +8,7 @@ \*-----------------------------------------*/ #pragma once + #include "RGBController.h" #include "AMDWraithPrismController.h" diff --git a/Controllers/AOCKeyboardController/AOCKeyboardController.h b/Controllers/AOCKeyboardController/AOCKeyboardController.h index bc5c349a..9ca4fe69 100644 --- a/Controllers/AOCKeyboardController/AOCKeyboardController.h +++ b/Controllers/AOCKeyboardController/AOCKeyboardController.h @@ -7,12 +7,12 @@ | Adam Honse (CalcProgrammer1) 5/10/2023 | \*-----------------------------------------*/ -#include "RGBController.h" -#include -#include - #pragma once +#include +#include +#include "RGBController.h" + /*-----------------------------------------*\ | AOC Keyboard Modes | \*-----------------------------------------*/ diff --git a/Controllers/AOCKeyboardController/RGBController_AOCKeyboard.cpp b/Controllers/AOCKeyboardController/RGBController_AOCKeyboard.cpp index 5de4e16a..c485f67d 100644 --- a/Controllers/AOCKeyboardController/RGBController_AOCKeyboard.cpp +++ b/Controllers/AOCKeyboardController/RGBController_AOCKeyboard.cpp @@ -47,14 +47,14 @@ layout_values aoc_keyboard_offset_values = RGBController_AOCKeyboard::RGBController_AOCKeyboard(AOCKeyboardController* controller_ptr) { - controller = controller_ptr; + controller = controller_ptr; - name = "AOC Keyboard Device"; - vendor = "AOC"; - type = DEVICE_TYPE_KEYBOARD; - description = "AOC Keyboard Device"; - location = controller->GetDeviceLocation(); - serial = controller->GetSerialString(); + name = "AOC Keyboard Device"; + vendor = "AOC"; + type = DEVICE_TYPE_KEYBOARD; + description = "AOC Keyboard Device"; + location = controller->GetDeviceLocation(); + serial = controller->GetSerialString(); mode Static; Static.name = "Static"; diff --git a/Controllers/AOCMouseController/AOCMouseController.cpp b/Controllers/AOCMouseController/AOCMouseController.cpp index 4d5f5c11..00aa66b6 100644 --- a/Controllers/AOCMouseController/AOCMouseController.cpp +++ b/Controllers/AOCMouseController/AOCMouseController.cpp @@ -6,9 +6,8 @@ | Adam Honse (CalcProgrammer1) 4/20/2023 | \*-----------------------------------------*/ -#include "AOCMouseController.h" - #include +#include "AOCMouseController.h" AOCMouseController::AOCMouseController(hid_device* dev_handle, const char* path) { diff --git a/Controllers/AOCMouseController/AOCMouseController.h b/Controllers/AOCMouseController/AOCMouseController.h index 2683ea07..f5ac5084 100644 --- a/Controllers/AOCMouseController/AOCMouseController.h +++ b/Controllers/AOCMouseController/AOCMouseController.h @@ -7,12 +7,12 @@ | Adam Honse (CalcProgrammer1) 4/20/2023 | \*-----------------------------------------*/ -#include "RGBController.h" -#include -#include - #pragma once +#include +#include +#include "RGBController.h" + /*-----------------------------------------*\ | AOC Mousemat Modes | | Note: The 0x80 bit is the random flag | diff --git a/Controllers/AOCMouseController/RGBController_AOCMouse.cpp b/Controllers/AOCMouseController/RGBController_AOCMouse.cpp index d15cddb0..21d4548c 100644 --- a/Controllers/AOCMouseController/RGBController_AOCMouse.cpp +++ b/Controllers/AOCMouseController/RGBController_AOCMouse.cpp @@ -21,14 +21,14 @@ RGBController_AOCMouse::RGBController_AOCMouse(AOCMouseController* controller_ptr) { - controller = controller_ptr; + controller = controller_ptr; - name = "AOC Mouse Device"; - vendor = "AOC"; - type = DEVICE_TYPE_MOUSE; - description = "AOC Mouse Device"; - location = controller->GetDeviceLocation(); - serial = controller->GetSerialString(); + name = "AOC Mouse Device"; + vendor = "AOC"; + type = DEVICE_TYPE_MOUSE; + description = "AOC Mouse Device"; + location = controller->GetDeviceLocation(); + serial = controller->GetSerialString(); mode Direct; Direct.name = "Direct"; diff --git a/Controllers/AOCMousematController/AOCMousematController.cpp b/Controllers/AOCMousematController/AOCMousematController.cpp index df085604..720c1203 100644 --- a/Controllers/AOCMousematController/AOCMousematController.cpp +++ b/Controllers/AOCMousematController/AOCMousematController.cpp @@ -7,9 +7,8 @@ | Adam Honse (CalcProgrammer1) 4/15/2023 | \*-----------------------------------------*/ -#include "AOCMousematController.h" - #include +#include "AOCMousematController.h" AOCMousematController::AOCMousematController(hid_device* dev_handle, const char* path) { diff --git a/Controllers/AOCMousematController/AOCMousematController.h b/Controllers/AOCMousematController/AOCMousematController.h index 77371a54..65935ecf 100644 --- a/Controllers/AOCMousematController/AOCMousematController.h +++ b/Controllers/AOCMousematController/AOCMousematController.h @@ -7,12 +7,12 @@ | Adam Honse (CalcProgrammer1) 4/15/2023 | \*-----------------------------------------*/ -#include "RGBController.h" -#include -#include - #pragma once +#include +#include +#include "RGBController.h" + /*-----------------------------------------*\ | AOC Mousemat Modes | | Note: The 0x80 bit is the random flag | diff --git a/Controllers/AOCMousematController/RGBController_AOCMousemat.cpp b/Controllers/AOCMousematController/RGBController_AOCMousemat.cpp index 92395c7e..482928ed 100644 --- a/Controllers/AOCMousematController/RGBController_AOCMousemat.cpp +++ b/Controllers/AOCMousematController/RGBController_AOCMousemat.cpp @@ -21,14 +21,14 @@ RGBController_AOCMousemat::RGBController_AOCMousemat(AOCMousematController* controller_ptr) { - controller = controller_ptr; + controller = controller_ptr; - name = "AOC Mousemat Device"; - vendor = "AOC"; - type = DEVICE_TYPE_MOUSEMAT; - description = "AOC Mousemat Device"; - location = controller->GetDeviceLocation(); - serial = controller->GetSerialString(); + name = "AOC Mousemat Device"; + vendor = "AOC"; + type = DEVICE_TYPE_MOUSEMAT; + description = "AOC Mousemat Device"; + location = controller->GetDeviceLocation(); + serial = controller->GetSerialString(); mode Direct; Direct.name = "Direct"; diff --git a/Controllers/ASRockPolychromeUSBController/ASRockPolychromeUSBController.cpp b/Controllers/ASRockPolychromeUSBController/ASRockPolychromeUSBController.cpp index 19fcf37e..d5870714 100755 --- a/Controllers/ASRockPolychromeUSBController/ASRockPolychromeUSBController.cpp +++ b/Controllers/ASRockPolychromeUSBController/ASRockPolychromeUSBController.cpp @@ -7,9 +7,9 @@ | Ed Kambulow (dredvard) 12/20/2020 | | Shady Nawara (ShadyNawara) 01/16/2023 | \*-----------------------------------------*/ + #include #include - #include "RGBController.h" #include "ResourceManager.h" #include "SettingsManager.h" diff --git a/Controllers/ASRockPolychromeUSBController/ASRockPolychromeUSBController.h b/Controllers/ASRockPolychromeUSBController/ASRockPolychromeUSBController.h index 4c801de7..4f187260 100755 --- a/Controllers/ASRockPolychromeUSBController/ASRockPolychromeUSBController.h +++ b/Controllers/ASRockPolychromeUSBController/ASRockPolychromeUSBController.h @@ -8,12 +8,12 @@ | Shady Nawara (ShadyNawara) 01/16/2023 | \*-----------------------------------------*/ -#include "RGBController.h" -#include -#include - #pragma once +#include +#include +#include "RGBController.h" + /*----------------------------------------------------------------------------------------------*\ | Definitions for Polychrome USB | \*----------------------------------------------------------------------------------------------*/ @@ -159,7 +159,7 @@ private: unsigned char configtable[12]; bool rgswapconfig[8] = { 0 }; - void SetDeviceInfo(); + void SetDeviceInfo(); void ReadConfigTables(); void Commit(); }; diff --git a/Controllers/ASRockPolychromeUSBController/ASRockPolychromeUSBControllerDetect.cpp b/Controllers/ASRockPolychromeUSBController/ASRockPolychromeUSBControllerDetect.cpp index e3a32f1e..d158b23f 100644 --- a/Controllers/ASRockPolychromeUSBController/ASRockPolychromeUSBControllerDetect.cpp +++ b/Controllers/ASRockPolychromeUSBController/ASRockPolychromeUSBControllerDetect.cpp @@ -1,13 +1,14 @@ +#include +#include +#include +#include #include "Detector.h" #include "ASRockPolychromeUSBController.h" #include "RGBController.h" #include "RGBController_ASRockPolychromeUSB.h" #include "i2c_smbus.h" #include "pci_ids.h" -#include -#include -#include -#include + /*---------------------------------------------------------*\ | ASRock vendor ID | diff --git a/Controllers/ASRockPolychromeUSBController/RGBController_ASRockPolychromeUSB.cpp b/Controllers/ASRockPolychromeUSBController/RGBController_ASRockPolychromeUSB.cpp index 6dadf6f4..149cdcb3 100755 --- a/Controllers/ASRockPolychromeUSBController/RGBController_ASRockPolychromeUSB.cpp +++ b/Controllers/ASRockPolychromeUSBController/RGBController_ASRockPolychromeUSB.cpp @@ -8,8 +8,8 @@ | Shady Nawara (ShadyNawara) 01/16/2023 | \*-----------------------------------------*/ -#include "RGBController_ASRockPolychromeUSB.h" #include +#include "RGBController_ASRockPolychromeUSB.h" #define ASROCK_USB_MAX_ZONES 8 #define ASROCK_ADDRESSABLE_MAX_LEDS 100 diff --git a/Controllers/ASRockSMBusController/ASRockASRRGBSMBusController/ASRockASRRGBSMBusController.h b/Controllers/ASRockSMBusController/ASRockASRRGBSMBusController/ASRockASRRGBSMBusController.h index 3362ce5b..da1f399d 100644 --- a/Controllers/ASRockSMBusController/ASRockASRRGBSMBusController/ASRockASRRGBSMBusController.h +++ b/Controllers/ASRockSMBusController/ASRockASRRGBSMBusController/ASRockASRRGBSMBusController.h @@ -1,5 +1,5 @@ /*-----------------------------------------*\ -| ASRockASRRGBSMBusController.h | +| ASRockASRRGBSMBusController.h | | | | Definitions and types for ASRock | | ASR LED and Polychrome RGB lighting | @@ -8,11 +8,11 @@ | Adam Honse (CalcProgrammer1) 12/13/2019 | \*-----------------------------------------*/ -#include "i2c_smbus.h" -#include - #pragma once +#include +#include "i2c_smbus.h" + typedef uint8_t polychrome_dev_id; #define ASROCK_ASR_CONTROLLER_NAME "ASRock ASR RGB SMBus Controller" @@ -63,7 +63,7 @@ public: uint8_t GetMode(); void SetColorsAndSpeed(uint8_t led, uint8_t red, uint8_t green, uint8_t blue); void SetMode(uint8_t zone, uint8_t mode, uint8_t speed); - + uint16_t fw_version; private: diff --git a/Controllers/ASRockSMBusController/ASRockPolychromeV1SMBusController/ASRockPolychromeV1SMBusController.h b/Controllers/ASRockSMBusController/ASRockPolychromeV1SMBusController/ASRockPolychromeV1SMBusController.h index fa61ed58..cd63f0e3 100644 --- a/Controllers/ASRockSMBusController/ASRockPolychromeV1SMBusController/ASRockPolychromeV1SMBusController.h +++ b/Controllers/ASRockSMBusController/ASRockPolychromeV1SMBusController/ASRockPolychromeV1SMBusController.h @@ -8,11 +8,11 @@ | Adam Honse (CalcProgrammer1) 12/13/2019 | \*-----------------------------------------*/ +#pragma once + +#include #include "i2c_smbus.h" #include "RGBController.h" -#include - -#pragma once typedef uint8_t polychrome_dev_id; diff --git a/Controllers/ASRockSMBusController/ASRockPolychromeV2SMBusController/ASRockPolychromeV2SMBusController.cpp b/Controllers/ASRockSMBusController/ASRockPolychromeV2SMBusController/ASRockPolychromeV2SMBusController.cpp index 7cc9f406..ccb76dc1 100644 --- a/Controllers/ASRockSMBusController/ASRockPolychromeV2SMBusController/ASRockPolychromeV2SMBusController.cpp +++ b/Controllers/ASRockSMBusController/ASRockPolychromeV2SMBusController/ASRockPolychromeV2SMBusController.cpp @@ -7,8 +7,8 @@ | Adam Honse (CalcProgrammer1) 12/14/2019 | \*-----------------------------------------*/ -#include "ASRockPolychromeV2SMBusController.h" #include +#include "ASRockPolychromeV2SMBusController.h" #include "dependencies/dmiinfo.h" #include "LogManager.h" diff --git a/Controllers/ASRockSMBusController/ASRockPolychromeV2SMBusController/ASRockPolychromeV2SMBusController.h b/Controllers/ASRockSMBusController/ASRockPolychromeV2SMBusController/ASRockPolychromeV2SMBusController.h index 7a27723c..372c159c 100644 --- a/Controllers/ASRockSMBusController/ASRockPolychromeV2SMBusController/ASRockPolychromeV2SMBusController.h +++ b/Controllers/ASRockSMBusController/ASRockPolychromeV2SMBusController/ASRockPolychromeV2SMBusController.h @@ -8,11 +8,11 @@ | Adam Honse (CalcProgrammer1) 12/13/2019 | \*-----------------------------------------*/ -#include "i2c_smbus.h" -#include - #pragma once +#include +#include "i2c_smbus.h" + typedef uint8_t polychrome_dev_id; #define ASROCK_V2_CONTROLLER_NAME "ASRock Polychrome v2 SMBus Controller" @@ -132,7 +132,7 @@ public: uint8_t zone_led_count[6]; uint16_t fw_version; - + private: std::string device_name; uint8_t active_zone; diff --git a/Controllers/ASRockSMBusController/ASRockSMBusControllerDetect.cpp b/Controllers/ASRockSMBusController/ASRockSMBusControllerDetect.cpp index ee052755..a0520989 100644 --- a/Controllers/ASRockSMBusController/ASRockSMBusControllerDetect.cpp +++ b/Controllers/ASRockSMBusController/ASRockSMBusControllerDetect.cpp @@ -1,3 +1,6 @@ +#include +#include +#include #include "Detector.h" #include "ASRockASRRGBSMBusController.h" #include "ASRockPolychromeV1SMBusController.h" @@ -9,9 +12,6 @@ #include "RGBController_ASRockPolychromeV2SMBus.h" #include "i2c_smbus.h" #include "pci_ids.h" -#include -#include -#include /*******************************************************************************************\ * * diff --git a/Controllers/AlienwareController/AlienwareController.cpp b/Controllers/AlienwareController/AlienwareController.cpp index cf35f636..e6c51374 100644 --- a/Controllers/AlienwareController/AlienwareController.cpp +++ b/Controllers/AlienwareController/AlienwareController.cpp @@ -6,8 +6,6 @@ | Gabriel Marcano (gemarcano) 4/21/2021 | \*-----------------------------------------*/ -#include "RGBController.h" -#include "AlienwareController.h" #include #include #include @@ -15,6 +13,8 @@ #include #include #include +#include "RGBController.h" +#include "AlienwareController.h" #include "LogManager.h" typedef uint32_t alienware_platform_id; diff --git a/Controllers/AlienwareController/AlienwareController.h b/Controllers/AlienwareController/AlienwareController.h index 3cc80e92..b5cabd37 100644 --- a/Controllers/AlienwareController/AlienwareController.h +++ b/Controllers/AlienwareController/AlienwareController.h @@ -7,12 +7,12 @@ | Gabriel Marcano (gemarcano) 4/19/2021 | \*-----------------------------------------*/ -#include "RGBController.h" -#include -#include - #pragma once +#include +#include +#include "RGBController.h" + /*----------------------------------------------------------------------------------------------*\ | Definitions for Alienware Controller | \*----------------------------------------------------------------------------------------------*/ diff --git a/Controllers/AlienwareController/AlienwareControllerDetect.cpp b/Controllers/AlienwareController/AlienwareControllerDetect.cpp index f2099a62..c97ce62d 100644 --- a/Controllers/AlienwareController/AlienwareControllerDetect.cpp +++ b/Controllers/AlienwareController/AlienwareControllerDetect.cpp @@ -11,7 +11,7 @@ /*---------------------------------------------------------*\ | Alienware product ID | \*---------------------------------------------------------*/ -#define ALIENWARE_G_SERIES_PID 0x0550 +#define ALIENWARE_G_SERIES_PID 0x0550 void DetectAlienwareControllers(hid_device_info* info, const std::string& name) { diff --git a/Controllers/AlienwareController/RGBController_Alienware.cpp b/Controllers/AlienwareController/RGBController_Alienware.cpp index 751413b1..becc9fca 100644 --- a/Controllers/AlienwareController/RGBController_Alienware.cpp +++ b/Controllers/AlienwareController/RGBController_Alienware.cpp @@ -7,10 +7,9 @@ | Gabriel Marcano (gemarcano) 4/19/2021 | \*-----------------------------------------*/ -#include "RGBController_Alienware.h" - #include #include +#include "RGBController_Alienware.h" /**------------------------------------------------------------------*\ @name Alienware diff --git a/Controllers/AlienwareController/RGBController_Alienware.h b/Controllers/AlienwareController/RGBController_Alienware.h index a3850a08..59caa7a5 100644 --- a/Controllers/AlienwareController/RGBController_Alienware.h +++ b/Controllers/AlienwareController/RGBController_Alienware.h @@ -9,11 +9,10 @@ #pragma once +#include #include "RGBController.h" #include "AlienwareController.h" -#include - class RGBController_Alienware : public RGBController { public: diff --git a/Controllers/AlienwareKeyboardController/AlienwareAW410KController/AlienwareAW410KController.cpp b/Controllers/AlienwareKeyboardController/AlienwareAW410KController/AlienwareAW410KController.cpp index 973341f1..d7acb74e 100644 --- a/Controllers/AlienwareKeyboardController/AlienwareAW410KController/AlienwareAW410KController.cpp +++ b/Controllers/AlienwareKeyboardController/AlienwareAW410KController/AlienwareAW410KController.cpp @@ -9,8 +9,8 @@ | Dominik Mikolajczyk - dmiko 23/10/2023 | \*------------------------------------------------------*/ -#include "AlienwareAW410KController.h" #include +#include "AlienwareAW410KController.h" AlienwareAW410KController::AlienwareAW410KController(hid_device* dev_handle, const char* path) { diff --git a/Controllers/AlienwareKeyboardController/AlienwareAW410KController/AlienwareAW410KController.h b/Controllers/AlienwareKeyboardController/AlienwareAW410KController/AlienwareAW410KController.h index 9a7e3994..18a246e8 100644 --- a/Controllers/AlienwareKeyboardController/AlienwareAW410KController/AlienwareAW410KController.h +++ b/Controllers/AlienwareKeyboardController/AlienwareAW410KController/AlienwareAW410KController.h @@ -9,12 +9,11 @@ | Dominik Mikolajczyk - dmiko 23/10/2023 | \*------------------------------------------------------*/ -#include "RGBController.h" +#pragma once #include #include - -#pragma once +#include "RGBController.h" enum { diff --git a/Controllers/AlienwareKeyboardController/AlienwareAW410KController/RGBController_AlienwareAW410K.cpp b/Controllers/AlienwareKeyboardController/AlienwareAW410KController/RGBController_AlienwareAW410K.cpp index 5dc395b3..5e58c730 100644 --- a/Controllers/AlienwareKeyboardController/AlienwareAW410KController/RGBController_AlienwareAW410K.cpp +++ b/Controllers/AlienwareKeyboardController/AlienwareAW410KController/RGBController_AlienwareAW410K.cpp @@ -9,9 +9,9 @@ | Dominik Mikolajczyk - dmiko 23/10/2023 | \*------------------------------------------------------*/ +#include #include "RGBControllerKeyNames.h" #include "RGBController_AlienwareAW410K.h" -#include //0xFFFFFFFF indicates an unused entry in matrix #define NA 0xFFFFFFFF @@ -410,7 +410,7 @@ void RGBController_AlienwareAW410K::DeviceUpdateMode() | Load LEDs again in case of profile load etc. | \*-------------------------------------------------------------*/ DeviceUpdateLEDs(); - break; + break; case ALIENWARE_AW410K_MODE_MORPH: /*-------------------------------------------------------------*\ | In case of morph it requires two colors (color1 and color2) | diff --git a/Controllers/AlienwareKeyboardController/AlienwareAW510KController/AlienwareAW510KController.cpp b/Controllers/AlienwareKeyboardController/AlienwareAW510KController/AlienwareAW510KController.cpp index e5c03c45..88a27c52 100644 --- a/Controllers/AlienwareKeyboardController/AlienwareAW510KController/AlienwareAW510KController.cpp +++ b/Controllers/AlienwareKeyboardController/AlienwareAW510KController/AlienwareAW510KController.cpp @@ -7,8 +7,8 @@ | Mohamad Sallal - msallal 05/22/2021 | \*-----------------------------------------*/ -#include "AlienwareAW510KController.h" #include +#include "AlienwareAW510KController.h" AlienwareAW510KController::AlienwareAW510KController(hid_device* dev_handle, const char* path) { diff --git a/Controllers/AlienwareKeyboardController/AlienwareAW510KController/AlienwareAW510KController.h b/Controllers/AlienwareKeyboardController/AlienwareAW510KController/AlienwareAW510KController.h index f6725618..28d41c1b 100644 --- a/Controllers/AlienwareKeyboardController/AlienwareAW510KController/AlienwareAW510KController.h +++ b/Controllers/AlienwareKeyboardController/AlienwareAW510KController/AlienwareAW510KController.h @@ -7,12 +7,11 @@ | Mohamad Sallal - msallal 05/22/2021 | \*-----------------------------------------*/ -#include "RGBController.h" +#pragma once #include #include - -#pragma once +#include "RGBController.h" enum { diff --git a/Controllers/AlienwareKeyboardController/AlienwareAW510KController/RGBController_AlienwareAW510K.cpp b/Controllers/AlienwareKeyboardController/AlienwareAW510KController/RGBController_AlienwareAW510K.cpp index 2a542de5..8f985fa1 100644 --- a/Controllers/AlienwareKeyboardController/AlienwareAW510KController/RGBController_AlienwareAW510K.cpp +++ b/Controllers/AlienwareKeyboardController/AlienwareAW510KController/RGBController_AlienwareAW510K.cpp @@ -7,9 +7,9 @@ | Mohamad Sallal - msallal 05/22/2021 | \*-----------------------------------------*/ +#include #include "RGBControllerKeyNames.h" #include "RGBController_AlienwareAW510K.h" -#include //0xFFFFFFFF indicates an unused entry in matrix #define NA 0xFFFFFFFF diff --git a/Controllers/AlienwareKeyboardController/AlienwareKeyboardControllerDetect.cpp b/Controllers/AlienwareKeyboardController/AlienwareKeyboardControllerDetect.cpp index b091e712..55b2e35b 100644 --- a/Controllers/AlienwareKeyboardController/AlienwareKeyboardControllerDetect.cpp +++ b/Controllers/AlienwareKeyboardController/AlienwareKeyboardControllerDetect.cpp @@ -1,21 +1,21 @@ +#include #include "Detector.h" #include "AlienwareAW510KController.h" #include "AlienwareAW410KController.h" #include "RGBController.h" #include "RGBController_AlienwareAW510K.h" #include "RGBController_AlienwareAW410K.h" -#include /*-----------------------------------------------------*\ | Alienware vendor ID | \*-----------------------------------------------------*/ -#define ALIENWARE_VID 0x04F2 +#define ALIENWARE_VID 0x04F2 /*-----------------------------------------------------*\ | Keyboard product IDs | \*-----------------------------------------------------*/ -#define ALIENWARE_AW510K_PID 0x1830 -#define ALIENWARE_AW410K_PID 0x1968 +#define ALIENWARE_AW510K_PID 0x1830 +#define ALIENWARE_AW410K_PID 0x1968 /******************************************************************************************\ * * diff --git a/Controllers/AnnePro2Controller/AnnePro2Controller.h b/Controllers/AnnePro2Controller/AnnePro2Controller.h index f09faf16..79c3c0b1 100644 --- a/Controllers/AnnePro2Controller/AnnePro2Controller.h +++ b/Controllers/AnnePro2Controller/AnnePro2Controller.h @@ -7,13 +7,11 @@ \*-----------------------------------------*/ #pragma once -#include "RGBController.h" #include #include #include - -#pragma once +#include "RGBController.h" class AnnePro2Controller { @@ -33,4 +31,4 @@ public: private: hid_device* dev; std::string location; -}; \ No newline at end of file +}; diff --git a/Controllers/AnnePro2Controller/AnnePro2ControllerDetect.cpp b/Controllers/AnnePro2Controller/AnnePro2ControllerDetect.cpp index 0ff61d95..840cae82 100644 --- a/Controllers/AnnePro2Controller/AnnePro2ControllerDetect.cpp +++ b/Controllers/AnnePro2Controller/AnnePro2ControllerDetect.cpp @@ -4,13 +4,20 @@ #include "RGBController_AnnePro2.h" #include -#define ANNE_PRO_2_VID_1 0x04D9 -#define ANNE_PRO_2_VID_2 0x3311 -#define ANNE_PRO_2_PID_1 0x8008 -#define ANNE_PRO_2_PID_2 0x8009 -#define ANNE_PRO_2_PID_3 0xA292 -#define ANNE_PRO_2_PID_4 0xA293 -#define ANNE_PRO_2_PID_5 0xA297 +/*---------------------------------------------------------*\ +| Anne Pro 2 vendor IDs | +\*---------------------------------------------------------*/ +#define ANNE_PRO_2_VID_1 0x04D9 +#define ANNE_PRO_2_VID_2 0x3311 + +/*---------------------------------------------------------*\ +| Anne Pro 2 product IDs | +\*---------------------------------------------------------*/ +#define ANNE_PRO_2_PID_1 0x8008 +#define ANNE_PRO_2_PID_2 0x8009 +#define ANNE_PRO_2_PID_3 0xA292 +#define ANNE_PRO_2_PID_4 0xA293 +#define ANNE_PRO_2_PID_5 0xA297 /******************************************************************************************\ * * diff --git a/Controllers/AnnePro2Controller/RGBController_AnnePro2.h b/Controllers/AnnePro2Controller/RGBController_AnnePro2.h index 06dedf98..9a578188 100644 --- a/Controllers/AnnePro2Controller/RGBController_AnnePro2.h +++ b/Controllers/AnnePro2Controller/RGBController_AnnePro2.h @@ -8,6 +8,7 @@ \*-----------------------------------------*/ #pragma once + #include "RGBController.h" #include "AnnePro2Controller.h" diff --git a/Controllers/ArcticController/ArcticController.cpp b/Controllers/ArcticController/ArcticController.cpp index de80a060..2ea1d64e 100644 --- a/Controllers/ArcticController/ArcticController.cpp +++ b/Controllers/ArcticController/ArcticController.cpp @@ -6,8 +6,8 @@ | Armin Wolf (Wer-Wolf) 01/09/2023 | \*-----------------------------------------*/ -#include "ArcticController.h" #include +#include "ArcticController.h" using namespace std::chrono_literals; diff --git a/Controllers/ArcticController/ArcticController.h b/Controllers/ArcticController/ArcticController.h index 7e6ed70f..3c367e6b 100644 --- a/Controllers/ArcticController/ArcticController.h +++ b/Controllers/ArcticController/ArcticController.h @@ -7,8 +7,8 @@ \*-----------------------------------------*/ #pragma once -#include +#include #include "RGBController.h" #include "serial_port.h" diff --git a/Controllers/ArcticController/ArcticControllerDetect.cpp b/Controllers/ArcticController/ArcticControllerDetect.cpp index ddae023e..fea29fdd 100644 --- a/Controllers/ArcticController/ArcticControllerDetect.cpp +++ b/Controllers/ArcticController/ArcticControllerDetect.cpp @@ -6,14 +6,14 @@ | Armin Wolf (Wer-Wolf) 01/09/2023 | \*-----------------------------------------*/ +#include +#include +#include #include "Detector.h" #include "ArcticController.h" #include "RGBController.h" #include "RGBController_Arctic.h" #include "find_usb_serial_port.h" -#include -#include -#include #define CH341_VID 0x1A86 #define CH341_PID 0x7523 diff --git a/Controllers/ArcticController/RGBController_Arctic.cpp b/Controllers/ArcticController/RGBController_Arctic.cpp index 29da475a..719ddf91 100644 --- a/Controllers/ArcticController/RGBController_Arctic.cpp +++ b/Controllers/ArcticController/RGBController_Arctic.cpp @@ -6,8 +6,8 @@ | Armin Wolf (Wer-Wolf) 01/09/2023 | \*-----------------------------------------*/ -#include "RGBController_Arctic.h" #include +#include "RGBController_Arctic.h" using namespace std::chrono_literals; diff --git a/Controllers/ArcticController/RGBController_Arctic.h b/Controllers/ArcticController/RGBController_Arctic.h index 3de7c711..5fa00eb4 100644 --- a/Controllers/ArcticController/RGBController_Arctic.h +++ b/Controllers/ArcticController/RGBController_Arctic.h @@ -7,11 +7,12 @@ \*-----------------------------------------*/ #pragma once + +#include +#include #include "ArcticController.h" #include "RGBController.h" #include "serial_port.h" -#include -#include class RGBController_Arctic : public RGBController { diff --git a/Controllers/AsusAuraCoreController/AsusAuraCoreController/AsusAuraCoreController.cpp b/Controllers/AsusAuraCoreController/AsusAuraCoreController/AsusAuraCoreController.cpp index 79550d87..76275480 100644 --- a/Controllers/AsusAuraCoreController/AsusAuraCoreController/AsusAuraCoreController.cpp +++ b/Controllers/AsusAuraCoreController/AsusAuraCoreController/AsusAuraCoreController.cpp @@ -1,5 +1,5 @@ /*-----------------------------------------*\ -| AsusAuraCoreController.cpp | +| AsusAuraCoreController.cpp | | | | Driver for ASUS ROG Aura Core RGB | | lighting controller | @@ -7,8 +7,8 @@ | Adam Honse (CalcProgrammer1) 4/13/2020 | \*-----------------------------------------*/ -#include "AsusAuraCoreController.h" #include +#include "AsusAuraCoreController.h" #define AURA_CORE_MAX_MESSAGE_SIZE 64 diff --git a/Controllers/AsusAuraCoreController/AsusAuraCoreController/AsusAuraCoreController.h b/Controllers/AsusAuraCoreController/AsusAuraCoreController/AsusAuraCoreController.h index fa8933b8..74c1c5e3 100644 --- a/Controllers/AsusAuraCoreController/AsusAuraCoreController/AsusAuraCoreController.h +++ b/Controllers/AsusAuraCoreController/AsusAuraCoreController/AsusAuraCoreController.h @@ -7,12 +7,11 @@ | Adam Honse (CalcProgrammer1) 4/13/2020 | \*-----------------------------------------*/ -#include "RGBController.h" +#pragma once #include #include - -#pragma once +#include "RGBController.h" enum AuraCoreDeviceType { diff --git a/Controllers/AsusAuraCoreController/AsusAuraCoreLaptopController/AsusAuraCoreLaptopController.cpp b/Controllers/AsusAuraCoreController/AsusAuraCoreLaptopController/AsusAuraCoreLaptopController.cpp index d0024322..f830f4ff 100644 --- a/Controllers/AsusAuraCoreController/AsusAuraCoreLaptopController/AsusAuraCoreLaptopController.cpp +++ b/Controllers/AsusAuraCoreController/AsusAuraCoreLaptopController/AsusAuraCoreLaptopController.cpp @@ -8,7 +8,6 @@ \*---------------------------------------------------------------------*/ #include "AsusAuraCoreLaptopController.h" - #include "SettingsManager.h" static uint8_t packet_map[ASUSAURACORELAPTOP_KEYCOUNT + diff --git a/Controllers/AsusAuraCoreController/AsusAuraCoreLaptopController/AsusAuraCoreLaptopController.h b/Controllers/AsusAuraCoreController/AsusAuraCoreLaptopController/AsusAuraCoreLaptopController.h index ea5e3c7d..a0eef493 100644 --- a/Controllers/AsusAuraCoreController/AsusAuraCoreLaptopController/AsusAuraCoreLaptopController.h +++ b/Controllers/AsusAuraCoreController/AsusAuraCoreLaptopController/AsusAuraCoreLaptopController.h @@ -7,6 +7,8 @@ | | \*---------------------------------------------------------------------*/ +#pragma once + #include #include #include @@ -15,8 +17,6 @@ #include "ResourceManager.h" #include "RGBControllerKeyNames.h" -#pragma once - #define NA 0xFFFFFFFF #define HID_MAX_STR 255 #define ASUSAURACORELAPTOP_TIMEOUT 250 diff --git a/Controllers/AsusAuraGPUController/AsusAuraGPUController.h b/Controllers/AsusAuraGPUController/AsusAuraGPUController.h index 5e0c16c2..6f25cbf9 100644 --- a/Controllers/AsusAuraGPUController/AsusAuraGPUController.h +++ b/Controllers/AsusAuraGPUController/AsusAuraGPUController.h @@ -6,11 +6,11 @@ | Jan Rettig (Klapstuhl) 14.02.2020 | \*-----------------------------------------*/ +#pragma once + #include #include "i2c_smbus.h" -#pragma once - typedef unsigned char aura_gpu_dev_id; #define AURA_GPU_MAGIC_VAL 0x1589 /* This magic value is present in all Aura GPU controllers */ diff --git a/Controllers/AsusAuraGPUController/AsusAuraGPUControllerDetect.cpp b/Controllers/AsusAuraGPUController/AsusAuraGPUControllerDetect.cpp index a5209c6f..e6407fb0 100644 --- a/Controllers/AsusAuraGPUController/AsusAuraGPUControllerDetect.cpp +++ b/Controllers/AsusAuraGPUController/AsusAuraGPUControllerDetect.cpp @@ -6,6 +6,9 @@ | Jan Rettig (Klapstuhl) 14.02.2020 | \*-----------------------------------------*/ +#include +#include +#include #include "Detector.h" #include "AsusAuraGPUController.h" #include "LogManager.h" @@ -13,9 +16,6 @@ #include "RGBController_AsusAuraGPU.h" #include "i2c_smbus.h" #include "pci_ids.h" -#include -#include -#include #define ASUSGPU_CONTROLLER_NAME "ASUS Aura GPU" diff --git a/Controllers/AsusAuraUSBController/AsusAuraHeadsetStandController/AsusAuraHeadsetStandController.cpp b/Controllers/AsusAuraUSBController/AsusAuraHeadsetStandController/AsusAuraHeadsetStandController.cpp index f99deab8..2b58ede1 100644 --- a/Controllers/AsusAuraUSBController/AsusAuraHeadsetStandController/AsusAuraHeadsetStandController.cpp +++ b/Controllers/AsusAuraUSBController/AsusAuraHeadsetStandController/AsusAuraHeadsetStandController.cpp @@ -7,9 +7,8 @@ | Mola19 06/04/2021 | \*-----------------------------------------*/ -#include "AsusAuraHeadsetStandController.h" - #include +#include "AsusAuraHeadsetStandController.h" AuraHeadsetStandController::AuraHeadsetStandController(hid_device* dev_handle, const char* path) { diff --git a/Controllers/AsusAuraUSBController/AsusAuraHeadsetStandController/AsusAuraHeadsetStandController.h b/Controllers/AsusAuraUSBController/AsusAuraHeadsetStandController/AsusAuraHeadsetStandController.h index 1cd1481c..1bfed845 100644 --- a/Controllers/AsusAuraUSBController/AsusAuraHeadsetStandController/AsusAuraHeadsetStandController.h +++ b/Controllers/AsusAuraUSBController/AsusAuraHeadsetStandController/AsusAuraHeadsetStandController.h @@ -7,11 +7,10 @@ | Mola19 06/04/2021 | \*-----------------------------------------*/ -#include "RGBController.h" +#pragma once #include - -#pragma once +#include "RGBController.h" enum { diff --git a/Controllers/AsusAuraUSBController/AsusAuraHeadsetStandController/RGBController_AsusAuraHeadsetStand.h b/Controllers/AsusAuraUSBController/AsusAuraHeadsetStandController/RGBController_AsusAuraHeadsetStand.h index 2be21a5c..33dcd0e8 100644 --- a/Controllers/AsusAuraUSBController/AsusAuraHeadsetStandController/RGBController_AsusAuraHeadsetStand.h +++ b/Controllers/AsusAuraUSBController/AsusAuraHeadsetStandController/RGBController_AsusAuraHeadsetStand.h @@ -8,6 +8,7 @@ \*-----------------------------------------*/ #pragma once + #include "RGBController.h" #include "AsusAuraHeadsetStandController.h" diff --git a/Controllers/AsusLegacyUSBController/AsusCerberusKeyboardController/AsusCerberusKeyboardController.cpp b/Controllers/AsusLegacyUSBController/AsusCerberusKeyboardController/AsusCerberusKeyboardController.cpp index 6c383696..fb2a9392 100644 --- a/Controllers/AsusLegacyUSBController/AsusCerberusKeyboardController/AsusCerberusKeyboardController.cpp +++ b/Controllers/AsusLegacyUSBController/AsusCerberusKeyboardController/AsusCerberusKeyboardController.cpp @@ -7,15 +7,14 @@ | Mola19 05/28/2022 | \*-----------------------------------------*/ -#include "AsusCerberusKeyboardController.h" - +#include #include -#include -#include #include #include +#include #include -#include +#include +#include "AsusCerberusKeyboardController.h" #define ASUS_CERBERUS_KB_PACKET_SIZE 8 diff --git a/Controllers/AsusLegacyUSBController/AsusCerberusKeyboardController/AsusCerberusKeyboardController.h b/Controllers/AsusLegacyUSBController/AsusCerberusKeyboardController/AsusCerberusKeyboardController.h index f475add4..b8b934d4 100644 --- a/Controllers/AsusLegacyUSBController/AsusCerberusKeyboardController/AsusCerberusKeyboardController.h +++ b/Controllers/AsusLegacyUSBController/AsusCerberusKeyboardController/AsusCerberusKeyboardController.h @@ -7,13 +7,12 @@ | Mola19 03/03/2021 | \*-----------------------------------------*/ -#include "RGBController.h" +#pragma once #include #include #include - -#pragma once +#include "RGBController.h" enum { diff --git a/Controllers/AsusLegacyUSBController/AsusCerberusKeyboardController/RGBController_AsusCerberusKeyboard.cpp b/Controllers/AsusLegacyUSBController/AsusCerberusKeyboardController/RGBController_AsusCerberusKeyboard.cpp index 3ec44d04..c014a236 100644 --- a/Controllers/AsusLegacyUSBController/AsusCerberusKeyboardController/RGBController_AsusCerberusKeyboard.cpp +++ b/Controllers/AsusLegacyUSBController/AsusCerberusKeyboardController/RGBController_AsusCerberusKeyboard.cpp @@ -7,10 +7,10 @@ | Mola19 05/28/2022 | \*-----------------------------------------*/ -#include "RGBController_AsusCerberusKeyboard.h" -#include #include +#include #include "RGBControllerKeyNames.h" +#include "RGBController_AsusCerberusKeyboard.h" /**------------------------------------------------------------------*\ @name Asus Cerberus Mech Keyboard diff --git a/Controllers/AsusLegacyUSBController/AsusCerberusKeyboardController/RGBController_AsusCerberusKeyboard.h b/Controllers/AsusLegacyUSBController/AsusCerberusKeyboardController/RGBController_AsusCerberusKeyboard.h index a633348f..bf3a6e74 100644 --- a/Controllers/AsusLegacyUSBController/AsusCerberusKeyboardController/RGBController_AsusCerberusKeyboard.h +++ b/Controllers/AsusLegacyUSBController/AsusCerberusKeyboardController/RGBController_AsusCerberusKeyboard.h @@ -8,6 +8,7 @@ \*-----------------------------------------*/ #pragma once + #include "RGBController.h" #include "AsusCerberusKeyboardController.h" diff --git a/Controllers/AsusLegacyUSBController/AsusLegacyUSBControllerDetect.cpp b/Controllers/AsusLegacyUSBController/AsusLegacyUSBControllerDetect.cpp index 74be9171..921516eb 100644 --- a/Controllers/AsusLegacyUSBController/AsusLegacyUSBControllerDetect.cpp +++ b/Controllers/AsusLegacyUSBController/AsusLegacyUSBControllerDetect.cpp @@ -1,3 +1,5 @@ +#include +#include #include "Detector.h" #include "AsusCerberusKeyboardController.h" #include "AsusSagarisKeyboardController.h" @@ -6,8 +8,6 @@ #include "RGBController_AsusCerberusKeyboard.h" #include "RGBController_AsusSagarisKeyboard.h" #include "RGBController_AsusStrixClaw.h" -#include -#include #include "dependencies/dmiinfo.h" #define ASUS_LEGACY_USB_VID 0x195D @@ -59,4 +59,4 @@ void DetectAsusStrixClaw(hid_device_info* info, const std::string& name) REGISTER_HID_DETECTOR_IPU("ASUS Cerberus Mech", DetectAsusCerberusMech, ASUS_LEGACY_USB_VID, ASUS_CERBERUS_MECH_PID, 1, 0xFF01, 1); REGISTER_HID_DETECTOR_IPU("ASUS Sagaris GK1100", DetectAsusSagarisKeyboard, ASUS_USB_VID, ASUS_SAGARIS_GK1100_PID, 1, 0xFF02, 2); -REGISTER_HID_DETECTOR_IPU("ASUS ROG Strix Claw", DetectAsusStrixClaw, ASUS_LEGACY_USB_VID, ASUS_ROG_STRIX_CLAW_PID, 0, 0xFF01, 1); \ No newline at end of file +REGISTER_HID_DETECTOR_IPU("ASUS ROG Strix Claw", DetectAsusStrixClaw, ASUS_LEGACY_USB_VID, ASUS_ROG_STRIX_CLAW_PID, 0, 0xFF01, 1); diff --git a/Controllers/AsusLegacyUSBController/AsusSagarisKeyboardController/AsusSagarisKeyboardController.cpp b/Controllers/AsusLegacyUSBController/AsusSagarisKeyboardController/AsusSagarisKeyboardController.cpp index bbb41f67..cf5a4ecf 100644 --- a/Controllers/AsusLegacyUSBController/AsusSagarisKeyboardController/AsusSagarisKeyboardController.cpp +++ b/Controllers/AsusLegacyUSBController/AsusSagarisKeyboardController/AsusSagarisKeyboardController.cpp @@ -1,20 +1,18 @@ /*-----------------------------------------*\ -| AsusSagarisKeyboardController.cpp | +| AsusSagarisKeyboardController.cpp | | | -| Driver for ASUS Sagaris USB lighting | +| Driver for ASUS Sagaris USB lighting | | controller | | | | Mola19 08/20/2023 | \*-----------------------------------------*/ -#include "AsusSagarisKeyboardController.h" - #include -#include #include -#include +#include #include - +#include +#include "AsusSagarisKeyboardController.h" #include "LogManager.h" #define ASUS_SAGARIS_KB_PACKET_SIZE 65 @@ -194,4 +192,4 @@ void AsusSagarisKeyboardController::ClearResponses() { result = hid_read_timeout(dev, usb_buf_flush, 65, 0); } -} \ No newline at end of file +} diff --git a/Controllers/AsusLegacyUSBController/AsusSagarisKeyboardController/AsusSagarisKeyboardController.h b/Controllers/AsusLegacyUSBController/AsusSagarisKeyboardController/AsusSagarisKeyboardController.h index ad86bfd9..7b5a9bc9 100644 --- a/Controllers/AsusLegacyUSBController/AsusSagarisKeyboardController/AsusSagarisKeyboardController.h +++ b/Controllers/AsusLegacyUSBController/AsusSagarisKeyboardController/AsusSagarisKeyboardController.h @@ -1,19 +1,18 @@ /*-----------------------------------------*\ -| AsusSagarisKeyboardController.h | +| AsusSagarisKeyboardController.h | | | -| Definitions and types for ASUS Sagaris | +| Definitions and types for ASUS Sagaris | | USB RGB lighting controller | | | | Mola19 08/20/2023 | \*-----------------------------------------*/ -#include "RGBController.h" +#pragma once #include #include #include - -#pragma once +#include "RGBController.h" enum { diff --git a/Controllers/AsusLegacyUSBController/AsusSagarisKeyboardController/RGBController_AsusSagarisKeyboard.cpp b/Controllers/AsusLegacyUSBController/AsusSagarisKeyboardController/RGBController_AsusSagarisKeyboard.cpp index a5870ba5..6be19a61 100644 --- a/Controllers/AsusLegacyUSBController/AsusSagarisKeyboardController/RGBController_AsusSagarisKeyboard.cpp +++ b/Controllers/AsusLegacyUSBController/AsusSagarisKeyboardController/RGBController_AsusSagarisKeyboard.cpp @@ -7,8 +7,9 @@ | Mola19 08/20/2023 | \*-----------------------------------------*/ -#include "RGBController_AsusSagarisKeyboard.h" +#include #include +#include "RGBController_AsusSagarisKeyboard.h" /**------------------------------------------------------------------*\ @name Asus Sagaris Keyboard @@ -21,8 +22,6 @@ @comment Missing controls for modifier keys, as they have independent lighting \*-------------------------------------------------------------------*/ -#include - RGBController_AsusSagarisKeyboard::RGBController_AsusSagarisKeyboard(AsusSagarisKeyboardController* controller_ptr) { controller = controller_ptr; diff --git a/Controllers/AsusLegacyUSBController/AsusSagarisKeyboardController/RGBController_AsusSagarisKeyboard.h b/Controllers/AsusLegacyUSBController/AsusSagarisKeyboardController/RGBController_AsusSagarisKeyboard.h index 01d6b4fb..b4cc26ff 100644 --- a/Controllers/AsusLegacyUSBController/AsusSagarisKeyboardController/RGBController_AsusSagarisKeyboard.h +++ b/Controllers/AsusLegacyUSBController/AsusSagarisKeyboardController/RGBController_AsusSagarisKeyboard.h @@ -1,13 +1,14 @@ /*-----------------------------------------*\ -| RGBController_AsusSagarisKeyboard.h | +| RGBController_AsusSagarisKeyboard.h | | | -| Generic RGB Interface for Asus Sagaris | +| Generic RGB Interface for Asus Sagaris | | USB controller driver | | | | Mola19 08/20/2023 | \*-----------------------------------------*/ #pragma once + #include "RGBController.h" #include "AsusSagarisKeyboardController.h" diff --git a/Controllers/AsusLegacyUSBController/AsusStrixClawController/AsusStrixClawController.cpp b/Controllers/AsusLegacyUSBController/AsusStrixClawController/AsusStrixClawController.cpp index 830c8876..3c4fb697 100644 --- a/Controllers/AsusLegacyUSBController/AsusStrixClawController/AsusStrixClawController.cpp +++ b/Controllers/AsusLegacyUSBController/AsusStrixClawController/AsusStrixClawController.cpp @@ -7,10 +7,9 @@ | Mola19 08/06/2022 | \*-----------------------------------------*/ -#include "AsusStrixClawController.h" - #include #include +#include "AsusStrixClawController.h" StrixClawController::StrixClawController(hid_device* dev_handle, const char* path) { diff --git a/Controllers/AsusLegacyUSBController/AsusStrixClawController/AsusStrixClawController.h b/Controllers/AsusLegacyUSBController/AsusStrixClawController/AsusStrixClawController.h index e56f55db..50e1a358 100644 --- a/Controllers/AsusLegacyUSBController/AsusStrixClawController/AsusStrixClawController.h +++ b/Controllers/AsusLegacyUSBController/AsusStrixClawController/AsusStrixClawController.h @@ -7,12 +7,11 @@ | Mola19 08/06/2022 | \*-----------------------------------------*/ -#include "RGBController.h" +#pragma once #include #include - -#pragma once +#include "RGBController.h" #define HID_MAX_STR 255 diff --git a/Controllers/AsusLegacyUSBController/AsusStrixClawController/RGBController_AsusStrixClaw.h b/Controllers/AsusLegacyUSBController/AsusStrixClawController/RGBController_AsusStrixClaw.h index 1da0f858..d595f0af 100644 --- a/Controllers/AsusLegacyUSBController/AsusStrixClawController/RGBController_AsusStrixClaw.h +++ b/Controllers/AsusLegacyUSBController/AsusStrixClawController/RGBController_AsusStrixClaw.h @@ -8,10 +8,10 @@ \*-----------------------------------------*/ #pragma once + #include "RGBController.h" #include "AsusStrixClawController.h" - class RGBController_StrixClaw : public RGBController { public: diff --git a/Controllers/AsusTUFLaptopController/AsusTUFLaptopController_Linux.cpp b/Controllers/AsusTUFLaptopController/AsusTUFLaptopController_Linux.cpp index 587adb94..2f44facb 100644 --- a/Controllers/AsusTUFLaptopController/AsusTUFLaptopController_Linux.cpp +++ b/Controllers/AsusTUFLaptopController/AsusTUFLaptopController_Linux.cpp @@ -1,16 +1,15 @@ +#include #include "AsusTUFLaptopController_Linux.h" -#include - void AsusTUFLaptopLinuxController::SendUpdate -( + ( unsigned char mode, unsigned char speed, unsigned char save, unsigned char red, unsigned char green, unsigned char blue -) + ) { std::string s = ""; s.append(ASUS_KBD_BACKLIGHT_BASE_PATH); @@ -36,9 +35,9 @@ void AsusTUFLaptopLinuxController::SendUpdate } void AsusTUFLaptopLinuxController::SendBrightness -( + ( unsigned char brightness -) + ) { std::string s = ""; s.append(ASUS_KBD_BACKLIGHT_BASE_PATH); diff --git a/Controllers/AsusTUFLaptopController/AsusTUFLaptopController_Windows.cpp b/Controllers/AsusTUFLaptopController/AsusTUFLaptopController_Windows.cpp index a78ec616..cc11e28c 100644 --- a/Controllers/AsusTUFLaptopController/AsusTUFLaptopController_Windows.cpp +++ b/Controllers/AsusTUFLaptopController/AsusTUFLaptopController_Windows.cpp @@ -1,15 +1,11 @@ -#ifdef _WIN32 - -#include "AsusTUFLaptopController_Windows.h" - +#include +#include +#include #include #include #include #include - -#include -#include -#include +#include "AsusTUFLaptopController_Windows.h" static bool coInitialized = 0; @@ -324,6 +320,3 @@ void AsusTUFLaptopController::setFanMode(int mode) { deviceControl(ASUS_WMI_DEVID_FAN_BOOST_MODE, mode); } - - -#endif diff --git a/Controllers/AsusTUFLaptopController/AsusTUFLaptopController_Windows.h b/Controllers/AsusTUFLaptopController/AsusTUFLaptopController_Windows.h index 1bafa02a..d64a9227 100644 --- a/Controllers/AsusTUFLaptopController/AsusTUFLaptopController_Windows.h +++ b/Controllers/AsusTUFLaptopController/AsusTUFLaptopController_Windows.h @@ -1,7 +1,4 @@ -#ifndef ASUSTUFLAPTOPCONTROLLER_H -#define ASUSTUFLAPTOPCONTROLLER_H - -#ifdef _WIN32 +#pragma once #include @@ -76,7 +73,3 @@ public: void setFanMode(int mode); }; - -#endif - -#endif // ASUSTUFLAPTOPCONTROLLER_H diff --git a/Controllers/AsusTUFLaptopController/AsusTUFLaptopDetect_Linux.cpp b/Controllers/AsusTUFLaptopController/AsusTUFLaptopDetect_Linux.cpp index 69caf6c9..6c124ecf 100644 --- a/Controllers/AsusTUFLaptopController/AsusTUFLaptopDetect_Linux.cpp +++ b/Controllers/AsusTUFLaptopController/AsusTUFLaptopDetect_Linux.cpp @@ -1,8 +1,7 @@ -#include "RGBController_AsusTUFLaptop_Linux.h" - #include -#include "Detector.h" #include +#include "Detector.h" +#include "RGBController_AsusTUFLaptop_Linux.h" static void DetectAsusTUFLaptopLinuxControllers() { diff --git a/Controllers/AsusTUFLaptopController/AsusTUFLaptopDetect_Windows.cpp b/Controllers/AsusTUFLaptopController/AsusTUFLaptopDetect_Windows.cpp index e792e2cb..77f1f2b1 100644 --- a/Controllers/AsusTUFLaptopController/AsusTUFLaptopDetect_Windows.cpp +++ b/Controllers/AsusTUFLaptopController/AsusTUFLaptopDetect_Windows.cpp @@ -1,10 +1,9 @@ #ifdef _WIN32 -#include "RGBController_AsusTUFLaptop_Windows.h" - -#include "Detector.h" -#include "wmi.h" #include +#include "Detector.h" +#include "RGBController_AsusTUFLaptop_Windows.h" +#include "wmi.h" static void DetectAsusTUFLaptopWMIControllers() { diff --git a/Controllers/AsusTUFLaptopController/RGBController_AsusTUFLaptop_Linux.cpp b/Controllers/AsusTUFLaptopController/RGBController_AsusTUFLaptop_Linux.cpp index 35912dd2..cacd35a1 100644 --- a/Controllers/AsusTUFLaptopController/RGBController_AsusTUFLaptop_Linux.cpp +++ b/Controllers/AsusTUFLaptopController/RGBController_AsusTUFLaptop_Linux.cpp @@ -16,13 +16,13 @@ RGBController_AsusTUFLaptopLinux::RGBController_AsusTUFLaptopLinux(AsusTUFLaptopLinuxController* controller_ptr) { - controller = controller_ptr; + controller = controller_ptr; - name = "ASUS TUF Keyboard"; - vendor = "ASUS"; - type = DEVICE_TYPE_KEYBOARD; - description = "Asus TUF Device"; - location = ASUS_KBD_BACKLIGHT_BASE_PATH; + name = "ASUS TUF Keyboard"; + vendor = "ASUS"; + type = DEVICE_TYPE_KEYBOARD; + description = "Asus TUF Device"; + location = ASUS_KBD_BACKLIGHT_BASE_PATH; mode Direct; Direct.name = "Direct"; diff --git a/Controllers/AsusTUFLaptopController/RGBController_AsusTUFLaptop_Linux.h b/Controllers/AsusTUFLaptopController/RGBController_AsusTUFLaptop_Linux.h index 06dcf40a..adca6aea 100644 --- a/Controllers/AsusTUFLaptopController/RGBController_AsusTUFLaptop_Linux.h +++ b/Controllers/AsusTUFLaptopController/RGBController_AsusTUFLaptop_Linux.h @@ -1,10 +1,8 @@ -#ifndef RGBCONTROLLER_ASUSTUFLAPTOPLINUX_H -#define RGBCONTROLLER_ASUSTUFLAPTOPLINUX_H +#pragma once #include "RGBController.h" #include "AsusTUFLaptopController_Linux.h" - class RGBController_AsusTUFLaptopLinux : public RGBController { public: @@ -23,5 +21,3 @@ public: private: AsusTUFLaptopLinuxController* controller; }; - -#endif // RGBCONTROLLER_ASUSTUFLAPTOPLINUX_H diff --git a/Controllers/AsusTUFLaptopController/RGBController_AsusTUFLaptop_Windows.h b/Controllers/AsusTUFLaptopController/RGBController_AsusTUFLaptop_Windows.h index 3ba8d61e..de51e61e 100644 --- a/Controllers/AsusTUFLaptopController/RGBController_AsusTUFLaptop_Windows.h +++ b/Controllers/AsusTUFLaptopController/RGBController_AsusTUFLaptop_Windows.h @@ -1,7 +1,4 @@ -#ifdef _WIN32 - -#ifndef RGBCONTROLLER_ASUSTUFLAPTOPWMI_H -#define RGBCONTROLLER_ASUSTUFLAPTOPWMI_H +#pragma once #include "AsusTUFLaptopController_Windows.h" #include "RGBController.h" @@ -29,7 +26,3 @@ private: void ReadConfiguration(); void ControllerSetMode(bool save); }; - -#endif // RGBCONTROLLER_ASUSTUFLAPTOPWMI_H - -#endif // _WIN32