diff --git a/Controllers/BlinkyTapeController/BlinkyTapeController.cpp b/Controllers/BlinkyTapeController/BlinkyTapeController.cpp index ee89dc86..3bf7cdc1 100644 --- a/Controllers/BlinkyTapeController/BlinkyTapeController.cpp +++ b/Controllers/BlinkyTapeController/BlinkyTapeController.cpp @@ -6,12 +6,11 @@ | Matt Mets (matt@blinkinlabs.com), 07/01/2021 | \*---------------------------------------------------------*/ -#include "BlinkyTapeController.h" - #include #include #include #include +#include "BlinkyTapeController.h" #ifndef WIN32 #define LPSTR char * diff --git a/Controllers/BlinkyTapeController/BlinkyTapeController.h b/Controllers/BlinkyTapeController/BlinkyTapeController.h index 0b4c7774..60855a85 100644 --- a/Controllers/BlinkyTapeController/BlinkyTapeController.h +++ b/Controllers/BlinkyTapeController/BlinkyTapeController.h @@ -4,8 +4,7 @@ | Matt Mets (matt@blinkinlabs.com), 07/01/2021 | \*---------------------------------------------------------*/ -#ifndef BLINKYTAPE_H -#define BLINKYTAPE_H +#pragma once #include "RGBController.h" #include "serial_port.h" @@ -34,5 +33,3 @@ private: std::string port_name; serial_port *serialport = nullptr; }; - -#endif diff --git a/Controllers/BlinkyTapeController/BlinkyTapeControllerDetect.cpp b/Controllers/BlinkyTapeController/BlinkyTapeControllerDetect.cpp index e70239d3..14ffeb1c 100644 --- a/Controllers/BlinkyTapeController/BlinkyTapeControllerDetect.cpp +++ b/Controllers/BlinkyTapeController/BlinkyTapeControllerDetect.cpp @@ -1,14 +1,17 @@ +#include +#include +#include #include "Detector.h" #include "BlinkyTapeController.h" #include "RGBController.h" #include "RGBController_BlinkyTape.h" #include "find_usb_serial_port.h" -#include -#include -#include -#define BLINKINLABS_VID 0x1D50 -#define BLINKYTAPE_PID 0x605E +/*-----------------------------------------------------*\ +| BlinkyTape VID and PID | +\*-----------------------------------------------------*/ +#define BLINKINLABS_VID 0x1D50 +#define BLINKYTAPE_PID 0x605E /******************************************************************************************\ * * diff --git a/Controllers/BlinkyTapeController/RGBController_BlinkyTape.cpp b/Controllers/BlinkyTapeController/RGBController_BlinkyTape.cpp index 16f22629..d6a1b34d 100644 --- a/Controllers/BlinkyTapeController/RGBController_BlinkyTape.cpp +++ b/Controllers/BlinkyTapeController/RGBController_BlinkyTape.cpp @@ -21,19 +21,19 @@ RGBController_BlinkyTape::RGBController_BlinkyTape(BlinkyTapeController* controller_ptr) { - controller = controller_ptr; + controller = controller_ptr; - name = "BlinkyTape"; - vendor = "Blinkinlabs"; - type = DEVICE_TYPE_LEDSTRIP; - description = "BlinkyTape Controller Device"; - location = controller->GetLocation(); + name = "BlinkyTape"; + vendor = "Blinkinlabs"; + type = DEVICE_TYPE_LEDSTRIP; + description = "BlinkyTape Controller Device"; + location = controller->GetLocation(); mode Direct; - Direct.name = "Direct"; - Direct.value = 0; - Direct.flags = MODE_FLAG_HAS_PER_LED_COLOR; - Direct.color_mode = MODE_COLORS_PER_LED; + Direct.name = "Direct"; + Direct.value = 0; + Direct.flags = MODE_FLAG_HAS_PER_LED_COLOR; + Direct.color_mode = MODE_COLORS_PER_LED; modes.push_back(Direct); SetupZones(); diff --git a/Controllers/BlinkyTapeController/RGBController_BlinkyTape.h b/Controllers/BlinkyTapeController/RGBController_BlinkyTape.h index 06f3da69..36e28fac 100644 --- a/Controllers/BlinkyTapeController/RGBController_BlinkyTape.h +++ b/Controllers/BlinkyTapeController/RGBController_BlinkyTape.h @@ -7,6 +7,7 @@ \*---------------------------------------------------------*/ #pragma once + #include "RGBController.h" #include "serial_port.h" #include "BlinkyTapeController.h" diff --git a/Controllers/CherryKeyboardController/CherryKeyboardController.cpp b/Controllers/CherryKeyboardController/CherryKeyboardController.cpp index 690d5d5b..c71b3aef 100644 --- a/Controllers/CherryKeyboardController/CherryKeyboardController.cpp +++ b/Controllers/CherryKeyboardController/CherryKeyboardController.cpp @@ -7,9 +7,8 @@ | Sebastian Kraus 12/25/2021 | \*-----------------------------------------*/ -#include "CherryKeyboardController.h" - #include +#include "CherryKeyboardController.h" CherryKeyboardController::CherryKeyboardController(hid_device* dev_handle, const char* path) { @@ -62,7 +61,7 @@ void CherryKeyboardController::SetKeyboardColors { packet_size = size; } - + SendKeyboardData ( &color_data[packet_offset], @@ -148,7 +147,7 @@ void CherryKeyboardController::SendKeyboardBegin() usb_buf[0x01] = CHERRY_KB_COMMAND_BEGIN; usb_buf[0x02] = 0x00; usb_buf[0x03] = CHERRY_KB_COMMAND_BEGIN; - + /*-----------------------------------------------------*\ | Send packet | \*-----------------------------------------------------*/ @@ -174,7 +173,7 @@ void CherryKeyboardController::SendKeyboardEnd() usb_buf[0x01] = CHERRY_KB_COMMAND_END; usb_buf[0x02] = 0x00; usb_buf[0x03] = CHERRY_KB_COMMAND_END; - + /*-----------------------------------------------------*\ | Send packet | \*-----------------------------------------------------*/ @@ -210,7 +209,7 @@ void CherryKeyboardController::SendKeyboardData | Copy in data bytes | \*-----------------------------------------------------*/ memcpy(&usb_buf[0x08], data, data_size); - + /*-----------------------------------------------------*\ | Compute Checksum | \*-----------------------------------------------------*/ diff --git a/Controllers/CherryKeyboardController/CherryKeyboardController.h b/Controllers/CherryKeyboardController/CherryKeyboardController.h index e7ca4b5d..1d6e07c4 100644 --- a/Controllers/CherryKeyboardController/CherryKeyboardController.h +++ b/Controllers/CherryKeyboardController/CherryKeyboardController.h @@ -7,12 +7,11 @@ | Sebastian Kraus 12/25/2021 | \*-----------------------------------------*/ -#include "RGBController.h" +#pragma once #include #include - -#pragma once +#include "RGBController.h" #define CHERRY_KB_PACKET_SIZE 64 #define CHERRY_KB_MAX_PACKET_SIZE ( 0x36 )/* max packet size for color*/ @@ -85,7 +84,7 @@ enum CHERRY_KB_MODE_RADIATION = 0x12, CHERRY_KB_MODE_RIPPLES = 0x13, CHERRY_KB_MODE_SINGLE_KEY = 0x15, - + }; enum diff --git a/Controllers/CherryKeyboardController/CherryKeyboardControllerDetect.cpp b/Controllers/CherryKeyboardController/CherryKeyboardControllerDetect.cpp index 140f088b..41ed36c4 100644 --- a/Controllers/CherryKeyboardController/CherryKeyboardControllerDetect.cpp +++ b/Controllers/CherryKeyboardController/CherryKeyboardControllerDetect.cpp @@ -1,15 +1,15 @@ +#include +#include #include "Detector.h" #include "CherryKeyboardController.h" #include "RGBController.h" #include "RGBController_CherryKeyboard.h" -#include -#include /*-----------------------------------------------------*\ | Cherry keyboard VID and usage page | \*-----------------------------------------------------*/ -#define CHERRY_KEYBOARD_VID 0x046A -#define CHERRY_KEYBOARD_USAGE_PAGE 0xFF1C +#define CHERRY_KEYBOARD_VID 0x046A +#define CHERRY_KEYBOARD_USAGE_PAGE 0xFF1C /******************************************************************************************\ * * diff --git a/Controllers/CherryKeyboardController/RGBController_CherryKeyboard.h b/Controllers/CherryKeyboardController/RGBController_CherryKeyboard.h index 94381a55..ed421a73 100644 --- a/Controllers/CherryKeyboardController/RGBController_CherryKeyboard.h +++ b/Controllers/CherryKeyboardController/RGBController_CherryKeyboard.h @@ -8,6 +8,7 @@ \*-----------------------------------------*/ #pragma once + #include "RGBController.h" #include "CherryKeyboardController.h" @@ -20,7 +21,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/ColorfulGPUController/ColorfulGPUController.cpp b/Controllers/ColorfulGPUController/ColorfulGPUController.cpp index 56b3a072..3afa8215 100644 --- a/Controllers/ColorfulGPUController/ColorfulGPUController.cpp +++ b/Controllers/ColorfulGPUController/ColorfulGPUController.cpp @@ -1,5 +1,5 @@ -#include "ColorfulGPUController.h" #include +#include "ColorfulGPUController.h" #include "pci_ids.h" #include "LogManager.h" diff --git a/Controllers/ColorfulGPUController/ColorfulGPUController.h b/Controllers/ColorfulGPUController/ColorfulGPUController.h index 5972c24c..3a8a2f12 100644 --- a/Controllers/ColorfulGPUController/ColorfulGPUController.h +++ b/Controllers/ColorfulGPUController/ColorfulGPUController.h @@ -1,9 +1,9 @@ +#pragma once + #include #include "i2c_smbus.h" #include "RGBController.h" -#pragma once - typedef unsigned char colorful_gpu_dev_id; #define COLORFUL_PACKET_LENGTH_V1 11 diff --git a/Controllers/ColorfulGPUController/ColorfulGPUControllerDetect.cpp b/Controllers/ColorfulGPUController/ColorfulGPUControllerDetect.cpp index 4b35f58d..30203faa 100644 --- a/Controllers/ColorfulGPUController/ColorfulGPUControllerDetect.cpp +++ b/Controllers/ColorfulGPUController/ColorfulGPUControllerDetect.cpp @@ -1,13 +1,13 @@ -#include "Detector.h" +#include +#include +#include +#include "Detector.h" #include "LogManager.h" #include "ColorfulGPUController.h" #include "RGBController.h" #include "RGBController_ColorfulGPU.h" #include "i2c_smbus.h" #include "pci_ids.h" -#include -#include -#include bool TestForColorfulGPU(i2c_smbus_interface* bus, uint8_t i2c_addr) { diff --git a/Controllers/ColorfulGPUController/RGBController_ColorfulGPU.cpp b/Controllers/ColorfulGPUController/RGBController_ColorfulGPU.cpp index 56593ba4..8b1d7eb3 100644 --- a/Controllers/ColorfulGPUController/RGBController_ColorfulGPU.cpp +++ b/Controllers/ColorfulGPUController/RGBController_ColorfulGPU.cpp @@ -1,5 +1,5 @@ -#include "RGBController_ColorfulGPU.h" #include +#include "RGBController_ColorfulGPU.h" /**------------------------------------------------------------------*\ @name Colorful GPU diff --git a/Controllers/ColorfulTuringGPUController/ColorfulTuringGPUController.cpp b/Controllers/ColorfulTuringGPUController/ColorfulTuringGPUController.cpp index a888859d..0cc16a8a 100644 --- a/Controllers/ColorfulTuringGPUController/ColorfulTuringGPUController.cpp +++ b/Controllers/ColorfulTuringGPUController/ColorfulTuringGPUController.cpp @@ -1,5 +1,5 @@ -#include "ColorfulTuringGPUController.h" #include +#include "ColorfulTuringGPUController.h" ColorfulTuringGPUController::ColorfulTuringGPUController(i2c_smbus_interface* bus, colorful_gpu_dev_id dev) { diff --git a/Controllers/ColorfulTuringGPUController/ColorfulTuringGPUController.h b/Controllers/ColorfulTuringGPUController/ColorfulTuringGPUController.h index 466ec8c1..e039343c 100644 --- a/Controllers/ColorfulTuringGPUController/ColorfulTuringGPUController.h +++ b/Controllers/ColorfulTuringGPUController/ColorfulTuringGPUController.h @@ -1,9 +1,9 @@ +#pragma once + #include #include "i2c_smbus.h" #include "RGBController.h" -#pragma once - typedef unsigned char colorful_gpu_dev_id; #define COLORFUL_COLOR_PACKET_LENGTH 8 diff --git a/Controllers/ColorfulTuringGPUController/ColorfulTuringGPUControllerDetect.cpp b/Controllers/ColorfulTuringGPUController/ColorfulTuringGPUControllerDetect.cpp index b0ac63ec..9f884007 100644 --- a/Controllers/ColorfulTuringGPUController/ColorfulTuringGPUControllerDetect.cpp +++ b/Controllers/ColorfulTuringGPUController/ColorfulTuringGPUControllerDetect.cpp @@ -1,12 +1,12 @@ -#include "Detector.h" +#include +#include +#include +#include "Detector.h" #include "ColorfulTuringGPUController.h" #include "RGBController.h" #include "RGBController_ColorfulTuringGPU.h" #include "i2c_smbus.h" #include "pci_ids.h" -#include -#include -#include void DetectColorfulTuringGPUControllers(i2c_smbus_interface* bus, uint8_t i2c_addr, const std::string& name) { diff --git a/Controllers/ColorfulTuringGPUController/RGBController_ColorfulTuringGPU.cpp b/Controllers/ColorfulTuringGPUController/RGBController_ColorfulTuringGPU.cpp index c9273713..ad6a3703 100644 --- a/Controllers/ColorfulTuringGPUController/RGBController_ColorfulTuringGPU.cpp +++ b/Controllers/ColorfulTuringGPUController/RGBController_ColorfulTuringGPU.cpp @@ -1,5 +1,5 @@ -#include "RGBController_ColorfulTuringGPU.h" #include +#include "RGBController_ColorfulTuringGPU.h" /**------------------------------------------------------------------*\ @name Colorful GPU diff --git a/Controllers/ColorfulTuringGPUController/RGBController_ColorfulTuringGPU.h b/Controllers/ColorfulTuringGPUController/RGBController_ColorfulTuringGPU.h index 28ee79d5..6baac4b8 100644 --- a/Controllers/ColorfulTuringGPUController/RGBController_ColorfulTuringGPU.h +++ b/Controllers/ColorfulTuringGPUController/RGBController_ColorfulTuringGPU.h @@ -20,7 +20,6 @@ public: private: ColorfulTuringGPUController* controller; int getModeIndex(int mode_value); - }; diff --git a/Controllers/CoolerMasterController/CMARGBController/CMARGBController.cpp b/Controllers/CoolerMasterController/CMARGBController/CMARGBController.cpp index cd14b54a..2dbaa4ef 100644 --- a/Controllers/CoolerMasterController/CMARGBController/CMARGBController.cpp +++ b/Controllers/CoolerMasterController/CMARGBController/CMARGBController.cpp @@ -85,12 +85,12 @@ void CMARGBController::GetStatus() std::string CMARGBController::GetDeviceName() { - return device_name; + return(device_name); } std::string CMARGBController::GetSerial() { - return serial; + return(serial); } std::string CMARGBController::GetLocation() @@ -100,37 +100,37 @@ std::string CMARGBController::GetLocation() unsigned char CMARGBController::GetZoneIndex() { - return zone_index; + return(zone_index); } unsigned char CMARGBController::GetMode() { - return current_mode; + return(current_mode); } unsigned char CMARGBController::GetLedRed() { - return current_red; + return(current_red); } unsigned char CMARGBController::GetLedGreen() { - return current_green; + return(current_green); } unsigned char CMARGBController::GetLedBlue() { - return current_blue; + return(current_blue); } unsigned char CMARGBController::GetLedSpeed() { - return current_speed; + return(current_speed); } bool CMARGBController::GetRandomColours() { - return bool_random; + return(bool_random); } void CMARGBController::SetLedCount(int zone, int led_count) diff --git a/Controllers/CoolerMasterController/CMARGBController/CMARGBController.h b/Controllers/CoolerMasterController/CMARGBController/CMARGBController.h index 4dedb7fc..cd199c02 100644 --- a/Controllers/CoolerMasterController/CMARGBController/CMARGBController.h +++ b/Controllers/CoolerMasterController/CMARGBController/CMARGBController.h @@ -9,6 +9,8 @@ | | \*-------------------------------------------------------------------*/ +#pragma once + #include #include #include @@ -16,8 +18,6 @@ #include #include "RGBController.h" //Needed to set the direct mode -#pragma once - #define CM_ARGB_COLOUR_MODE_DATA_SIZE (sizeof(colour_mode_data[0]) / sizeof(colour_mode_data[0][0])) #define CM_ARGB_HEADER_DATA_SIZE (sizeof(argb_header_data) / sizeof(argb_headers) ) #define CM_ARGB_INTERRUPT_TIMEOUT 250 diff --git a/Controllers/CoolerMasterController/CMARGBController/RGBController_CMARGBController.h b/Controllers/CoolerMasterController/CMARGBController/RGBController_CMARGBController.h index 02264b8e..b6bfa48a 100644 --- a/Controllers/CoolerMasterController/CMARGBController/RGBController_CMARGBController.h +++ b/Controllers/CoolerMasterController/CMARGBController/RGBController_CMARGBController.h @@ -8,9 +8,10 @@ \*-------------------------------------------------------------------*/ #pragma once + +#include #include "RGBController.h" #include "CMARGBController.h" -#include #define first_zone(zn) ((zones.size() > 1) ? 1 : 0) #define last_zone(zn) ((zones.size() > 1) ? 4 : 1) diff --git a/Controllers/CoolerMasterController/CMARGBGen2A1Controller/CMARGBGen2A1Controller.cpp b/Controllers/CoolerMasterController/CMARGBGen2A1Controller/CMARGBGen2A1Controller.cpp index 16ecb8f7..41cbc5bd 100644 --- a/Controllers/CoolerMasterController/CMARGBGen2A1Controller/CMARGBGen2A1Controller.cpp +++ b/Controllers/CoolerMasterController/CMARGBGen2A1Controller/CMARGBGen2A1Controller.cpp @@ -7,8 +7,8 @@ | | \*-------------------------------------------------------------------*/ -#include "CMARGBGen2A1Controller.h" #include +#include "CMARGBGen2A1Controller.h" CMARGBGen2A1controller::CMARGBGen2A1controller(hid_device* dev_handle, const hid_device_info& info) { @@ -288,7 +288,7 @@ std::vector CMARGBGen2A1controller::CreateColorData(std::vector #include - -#pragma once +#include "RGBController.h" #define CM_ARGB_GEN2_A1_PACKET_LENGTH 65 #define CM_ARGB_GEN2_A1_CHANNEL_MAX_SIZE 48 diff --git a/Controllers/CoolerMasterController/CMARGBGen2A1Controller/RGBController_CMARGBGen2A1Controller.cpp b/Controllers/CoolerMasterController/CMARGBGen2A1Controller/RGBController_CMARGBGen2A1Controller.cpp index fe62f7c3..1cf5489f 100644 --- a/Controllers/CoolerMasterController/CMARGBGen2A1Controller/RGBController_CMARGBGen2A1Controller.cpp +++ b/Controllers/CoolerMasterController/CMARGBGen2A1Controller/RGBController_CMARGBGen2A1Controller.cpp @@ -7,10 +7,9 @@ | | \*-------------------------------------------------------------------*/ -#include "RGBController_CMARGBGen2A1Controller.h" - -#include #include +#include +#include "RGBController_CMARGBGen2A1Controller.h" /**------------------------------------------------------------------*\ @name Coolermaster ARGB A1 @@ -245,7 +244,7 @@ void RGBController_CMARGBGen2A1Controller::DeviceUpdateLEDs() } void RGBController_CMARGBGen2A1Controller::UpdateZoneLEDs(int zone) -{ +{ if(zones[zone].leds_count > 0) { unsigned int start = zones[zone].start_idx; @@ -265,7 +264,7 @@ void RGBController_CMARGBGen2A1Controller::UpdateZoneLEDs(int zone) } void RGBController_CMARGBGen2A1Controller::UpdateSingleLED(int /*led*/) -{ +{ DeviceUpdateLEDs(); } diff --git a/Controllers/CoolerMasterController/CMARGBGen2A1Controller/RGBController_CMARGBGen2A1Controller.h b/Controllers/CoolerMasterController/CMARGBGen2A1Controller/RGBController_CMARGBGen2A1Controller.h index e19c8b19..c1b478ce 100644 --- a/Controllers/CoolerMasterController/CMARGBGen2A1Controller/RGBController_CMARGBGen2A1Controller.h +++ b/Controllers/CoolerMasterController/CMARGBGen2A1Controller/RGBController_CMARGBGen2A1Controller.h @@ -8,9 +8,10 @@ \*-------------------------------------------------------------------*/ #pragma once + +#include #include "RGBController.h" #include "CMARGBGen2A1Controller.h" -#include class RGBController_CMARGBGen2A1Controller : public RGBController { diff --git a/Controllers/CoolerMasterController/CMKeyboardController/CMKeyboardAbstractController.cpp b/Controllers/CoolerMasterController/CMKeyboardController/CMKeyboardAbstractController.cpp index ba3bbf9d..d19b48e3 100644 --- a/Controllers/CoolerMasterController/CMKeyboardController/CMKeyboardAbstractController.cpp +++ b/Controllers/CoolerMasterController/CMKeyboardController/CMKeyboardAbstractController.cpp @@ -6,6 +6,7 @@ | Tam D (too.manyhobbies) 30th Nov 2023 | | | \*-------------------------------------------------------------------*/ + #include "CMKeyboardAbstractController.h" CMKeyboardAbstractController::CMKeyboardAbstractController(hid_device* dev_handle, hid_device_info* dev_info) @@ -31,16 +32,15 @@ CMKeyboardAbstractController::CMKeyboardAbstractController(hid_device* dev_handl { if(cm_kb_device_list[i]->product_id == m_productId) { - bNotFound = false; - m_deviceIndex = i; + bNotFound = false; + m_deviceIndex = i; break; } } if(bNotFound) { - LOG_ERROR("[%s] device capabilities not found. Please creata a new device request.", - m_deviceName.c_str()); + LOG_ERROR("[%s] device capabilities not found. Please creata a new device request.", m_deviceName.c_str()); } }; @@ -54,7 +54,7 @@ CMKeyboardAbstractController::~CMKeyboardAbstractController() std::string CMKeyboardAbstractController::GetDeviceName() { - return m_deviceName; + return(m_deviceName); } void CMKeyboardAbstractController::SetDeviceName(std::string name) @@ -64,32 +64,32 @@ void CMKeyboardAbstractController::SetDeviceName(std::string name) std::string CMKeyboardAbstractController::GetDeviceVendor() { - return m_vendorName; + return(m_vendorName); } std::string CMKeyboardAbstractController::GetDeviceSerial() { - return m_serialNumber; + return(m_serialNumber); } const cm_kb_device* CMKeyboardAbstractController::GetDeviceData() { - return cm_kb_device_list[m_deviceIndex]; + return(cm_kb_device_list[m_deviceIndex]); } std::string CMKeyboardAbstractController::GetLocation() { - return m_sLocation; + return(m_sLocation); } std::string CMKeyboardAbstractController::GetFirmwareVersion() { - return m_sFirmwareVersion; + return(m_sFirmwareVersion); } int CMKeyboardAbstractController::GetProductID() { - return m_productId; + return(m_productId); } std::vector CMKeyboardAbstractController::SendCommand(std::vector buf, uint8_t fill) @@ -112,7 +112,7 @@ std::vector CMKeyboardAbstractController::SendCommand(std::vector CMKeyboardAbstractController::SendCommand(std::vector CMKeyboardAbstractController::SendCommand(std::vector 4) { - return (int)data[4]; + return((int)data[4]); } - return 0xFF; // error + return(0xFF); // error } /*---------------------------------------------------------*\ @@ -187,7 +187,8 @@ void CMKeyboardAbstractController::SaveProfile() uint8_t CMKeyboardAbstractController::GetModeStatus() { std::vector data = SendCommand({0x52, 0x28}); - return data[4]; + + return(data[4]); }; std::string CMKeyboardAbstractController::GetHexString(std::vector buf) @@ -199,5 +200,5 @@ std::string CMKeyboardAbstractController::GetHexString(std::vector buf) hexss << std::hex << b << " "; } - return hexss.str(); + return(hexss.str()); } diff --git a/Controllers/CoolerMasterController/CMKeyboardController/CMKeyboardAbstractController.h b/Controllers/CoolerMasterController/CMKeyboardController/CMKeyboardAbstractController.h index 6109a220..e9bb197c 100644 --- a/Controllers/CoolerMasterController/CMKeyboardController/CMKeyboardAbstractController.h +++ b/Controllers/CoolerMasterController/CMKeyboardController/CMKeyboardAbstractController.h @@ -15,15 +15,12 @@ #include #include #include - #include - #include "CMKeyboardDevices.h" #include "KeyboardLayoutManager.h" #include "RGBController.h" #include "LogManager.h" - #define HID_MAX_STR 255 #define CM_KEYBOARD_WRITE_SIZE 65 #define CM_MAX_LEDS 255 diff --git a/Controllers/CoolerMasterController/CMKeyboardController/CMKeyboardDevices.cpp b/Controllers/CoolerMasterController/CMKeyboardController/CMKeyboardDevices.cpp index c479c987..117a6497 100644 --- a/Controllers/CoolerMasterController/CMKeyboardController/CMKeyboardDevices.cpp +++ b/Controllers/CoolerMasterController/CMKeyboardController/CMKeyboardDevices.cpp @@ -6,6 +6,7 @@ | Tam D (too.manyhobbies) 30th Nov 2023 | | | \*-------------------------------------------------------------------*/ + #include "CMKeyboardDevices.h" /*-------------------------------------------------------------------------*\ diff --git a/Controllers/CoolerMasterController/CMKeyboardController/CMKeyboardDevices.h b/Controllers/CoolerMasterController/CMKeyboardController/CMKeyboardDevices.h index 4ce21a7c..db959676 100644 --- a/Controllers/CoolerMasterController/CMKeyboardController/CMKeyboardDevices.h +++ b/Controllers/CoolerMasterController/CMKeyboardController/CMKeyboardDevices.h @@ -6,6 +6,7 @@ | Tam D (too.manyhobbies) 30th Nov 2023 | | | \*-------------------------------------------------------------------*/ + #pragma once #include "RGBController.h" diff --git a/Controllers/CoolerMasterController/CMKeyboardController/CMKeyboardV1Controller.cpp b/Controllers/CoolerMasterController/CMKeyboardController/CMKeyboardV1Controller.cpp index 14913edb..77bbcb74 100644 --- a/Controllers/CoolerMasterController/CMKeyboardController/CMKeyboardV1Controller.cpp +++ b/Controllers/CoolerMasterController/CMKeyboardController/CMKeyboardV1Controller.cpp @@ -6,9 +6,10 @@ | Tam D (too.manyhobbies) 30th Nov 2023 | | | \*-------------------------------------------------------------------*/ + +#include #include "CMKeyboardV1Controller.h" #include "LogManager.h" -#include CMKeyboardV1Controller::CMKeyboardV1Controller(hid_device* dev_handle, hid_device_info* dev_info) : CMKeyboardAbstractController(dev_handle, dev_info) { diff --git a/Controllers/CoolerMasterController/CMKeyboardController/CMKeyboardV1Controller.h b/Controllers/CoolerMasterController/CMKeyboardController/CMKeyboardV1Controller.h index 0b0b7f0d..2daa557d 100644 --- a/Controllers/CoolerMasterController/CMKeyboardController/CMKeyboardV1Controller.h +++ b/Controllers/CoolerMasterController/CMKeyboardController/CMKeyboardV1Controller.h @@ -6,6 +6,9 @@ | Tam D (too.manyhobbies) 30th Nov 2023 | | | \*-------------------------------------------------------------------*/ + +#pragma once + #include "CMKeyboardAbstractController.h" class CMKeyboardV1Controller : public CMKeyboardAbstractController @@ -35,5 +38,4 @@ public: private: std::string _GetFirmwareVersion(); - }; diff --git a/Controllers/CoolerMasterController/CMKeyboardController/CMKeyboardV2Controller.cpp b/Controllers/CoolerMasterController/CMKeyboardController/CMKeyboardV2Controller.cpp index f262f02d..04d021c4 100644 --- a/Controllers/CoolerMasterController/CMKeyboardController/CMKeyboardV2Controller.cpp +++ b/Controllers/CoolerMasterController/CMKeyboardController/CMKeyboardV2Controller.cpp @@ -6,6 +6,7 @@ | Tam D (too.manyhobbies) 30th Nov 2023 | | | \*-------------------------------------------------------------------*/ + #include #include #include @@ -71,7 +72,7 @@ KEYBOARD_LAYOUT CMKeyboardV2Controller::GetKeyboardLayout() layout = KEYBOARD_LAYOUT_ISO_QWERTY; } - return layout; + return(layout); } /*-----------------------------------------------------------------*\ @@ -89,7 +90,7 @@ std::string CMKeyboardV2Controller::_GetFirmwareVersion() uint8_t cVersionStr[CM_KEYBOARD_WRITE_SIZE]; size_t i = 0; - for(auto it : read) + for(uint8_t it : read) { cVersionStr[i++] = it; } @@ -237,7 +238,6 @@ void CMKeyboardV2Controller::SetLeds(std::vector leds, std::vector leds, std::vector - { - 0x56, 0x81, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, - 0x01, 0x00, 0x00, 0x00, 0x88, 0x88, 0x88, 0x88, - }; - break; + data = std::vector + { + 0x56, 0x81, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, + 0x01, 0x00, 0x00, 0x00, 0x88, 0x88, 0x88, 0x88, + }; + break; case WAVE: - data = std::vector - { - 0x56, 0x81, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, - 0x01, 0x00, 0x00, 0x00, 0x99, 0x99, 0x99, 0x99 - }; - break; + data = std::vector + { + 0x56, 0x81, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, + 0x01, 0x00, 0x00, 0x00, 0x99, 0x99, 0x99, 0x99 + }; + break; case STARS: case RAINDROPS: @@ -321,22 +322,22 @@ void CMKeyboardV2Controller::_SetEffectMode(uint8_t effectId) case HEARTBEAT: case FIREBALL: case WATER_RIPPLE: - data = std::vector - { - 0x56, 0x81, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, - 0x02, 0x00, 0x00, 0x00, 0x88, 0x88, 0x88, 0x88, - }; - break; + data = std::vector + { + 0x56, 0x81, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, + 0x02, 0x00, 0x00, 0x00, 0x88, 0x88, 0x88, 0x88, + }; + break; case CUSTOMIZED: - data = std::vector{ - 0x56, 0x81, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, - 0x09, 0x00, 0x00, 0x00, 0xBB, 0xBB, 0xBB, 0xBB, - }; - break; + data = std::vector{ + 0x56, 0x81, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, + 0x09, 0x00, 0x00, 0x00, 0xBB, 0xBB, 0xBB, 0xBB, + }; + break; default: - break; + break; } SendCommand(data); @@ -361,69 +362,69 @@ void CMKeyboardV2Controller::_UpdateSpeed(mode selectedMode, uint8_t &cSpeed1, u { case CROSS: case REACTIVE_FADE: - vSpeed1 = std::vector{0x17, 0x0E, 0x0B, 0x0A, 0x04}; - vSpeed2 = std::vector{0x01, 0x01, 0x02, 0x05, 0x04}; - break; + vSpeed1 = std::vector{0x17, 0x0E, 0x0B, 0x0A, 0x04}; + vSpeed2 = std::vector{0x01, 0x01, 0x02, 0x05, 0x04}; + break; case WAVE: - vSpeed1 = std::vector{0x17, 0x0D, 0x07, 0x09, 0x08}; - vSpeed2 = std::vector{0x01, 0x04, 0x06, 0x0C, 0x11}; - break; + vSpeed1 = std::vector{0x17, 0x0D, 0x07, 0x09, 0x08}; + vSpeed2 = std::vector{0x01, 0x04, 0x06, 0x0C, 0x11}; + break; case REACTIVE_PUNCH: - vSpeed1 = std::vector{0x0E, 0x0A, 0x04, 0x07, 0x01}; - break; + vSpeed1 = std::vector{0x0E, 0x0A, 0x04, 0x07, 0x01}; + break; case BREATHE: - vSpeed1 = std::vector{0x08, 0x0A, 0x0C, 0x07, 0x09}; - vSpeed2 = std::vector{0x01, 0x02, 0x04, 0x04, 0x09}; - break; + vSpeed1 = std::vector{0x08, 0x0A, 0x0C, 0x07, 0x09}; + vSpeed2 = std::vector{0x01, 0x02, 0x04, 0x04, 0x09}; + break; case CIRCLE_SPECTRUM: case REACTIVE_TORNADO: - switch (selectedMode.direction) - { - case MODE_DIRECTION_LEFT: - vSpeed1 = std::vector{0xFF, 0xFE, 0xFD, 0xFC, 0xFC}; - vSpeed2 = std::vector{0x04, 0x08, 0x08, 0x0C, 0x00}; - break; + switch (selectedMode.direction) + { + case MODE_DIRECTION_LEFT: + vSpeed1 = std::vector{0xFF, 0xFE, 0xFD, 0xFC, 0xFC}; + vSpeed2 = std::vector{0x04, 0x08, 0x08, 0x0C, 0x00}; + break; - default: - case MODE_DIRECTION_RIGHT: - vSpeed1 = std::vector{0x00, 0x01, 0x02, 0x03, 0x04}; - vSpeed2 = std::vector{0x0C, 0x08, 0x08, 0x04, 0x00}; + default: + case MODE_DIRECTION_RIGHT: + vSpeed1 = std::vector{0x00, 0x01, 0x02, 0x03, 0x04}; + vSpeed2 = std::vector{0x0C, 0x08, 0x08, 0x04, 0x00}; + break; + } break; - } - break; case CYCLE: - vSpeed1 = std::vector{0x10, 0x0C, 0x08, 0x04, 0x00}; - break; + vSpeed1 = std::vector{0x10, 0x0C, 0x08, 0x04, 0x00}; + break; case RIPPLE: case WATER_RIPPLE: - vSpeed1 = std::vector{0x36, 0x18, 0x0C, 0x06, 0x02}; - break; + vSpeed1 = std::vector{0x36, 0x18, 0x0C, 0x06, 0x02}; + break; case FIREBALL: case HEARTBEAT: - vSpeed1 = std::vector{0x01, 0x02, 0x03, 0x05, 0x09}; - break; + vSpeed1 = std::vector{0x01, 0x02, 0x03, 0x05, 0x09}; + break; case RAINDROPS: case SNOW: - vSpeed1 = std::vector{0x0B, 0x08, 0x05, 0x02, 0x00}; - vSpeed2 = std::vector{0x08, 0x18, 0x30, 0x38, 0x40}; - break; + vSpeed1 = std::vector{0x0B, 0x08, 0x05, 0x02, 0x00}; + vSpeed2 = std::vector{0x08, 0x18, 0x30, 0x38, 0x40}; + break; case STARS: - vSpeed1 = std::vector{0x17, 0x0E, 0x08, 0x0A, 0x0A}; - vSpeed2 = std::vector{0x01, 0x01, 0x01, 0x02, 0x04}; - break; + vSpeed1 = std::vector{0x17, 0x0E, 0x08, 0x0A, 0x0A}; + vSpeed2 = std::vector{0x01, 0x01, 0x01, 0x02, 0x04}; + break; case OFF: default: - break; + break; } if(selectedMode.speed >= 1 && selectedMode.speed <= 5) @@ -481,24 +482,24 @@ void CMKeyboardV2Controller::SetMode(mode selectedMode) { case MODE_DIRECTION_LEFT: case MODE_DIRECTION_HORIZONTAL: - cDirection = 0x04; - break; + cDirection = 0x04; + break; case MODE_DIRECTION_RIGHT: - cDirection = 0x00; - break; + cDirection = 0x00; + break; case MODE_DIRECTION_UP: case MODE_DIRECTION_VERTICAL: - cDirection = 0x06; - break; + cDirection = 0x06; + break; case MODE_DIRECTION_DOWN: - cDirection = 0x02; - break; + cDirection = 0x02; + break; default: - break; + break; } SetCustomMode(); @@ -509,452 +510,453 @@ void CMKeyboardV2Controller::SetMode(mode selectedMode) switch(effectId) { case OFF: - break; + break; case DIRECT: - break; + break; case STATIC: - { - data = std::vector { - 0x56, 0x83, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, - 0x00, 0x01, 0x00, 0xC1, 0x00, 0x00, 0x00, 0x00, - cColor1_R, cColor1_G, cColor1_B, cBright, 0x00, 0x00, 0x00, 0x00, - }; - SendCommand(data); - } - break; + data = std::vector + { + 0x56, 0x83, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, + 0x00, 0x01, 0x00, 0xC1, 0x00, 0x00, 0x00, 0x00, + cColor1_R, cColor1_G, cColor1_B, cBright, 0x00, 0x00, 0x00, 0x00, + }; + SendCommand(data); + } + break; case WAVE: - { - data = std::vector { - 0x56, 0x83, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, - 0x00, 0x32, 0x00, 0xC1, cSpeed1, 0x00, 0x00, 0x00, - 0xFF, 0xFF, 0xFF, cBright, 0x00, cDirection, cSpeed2, 0x00, - 0x00, 0x04, 0x08 - }; - SendCommand(data); - } - break; + data = std::vector + { + 0x56, 0x83, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, + 0x00, 0x32, 0x00, 0xC1, cSpeed1, 0x00, 0x00, 0x00, + 0xFF, 0xFF, 0xFF, cBright, 0x00, cDirection, cSpeed2, 0x00, + 0x00, 0x04, 0x08 + }; + SendCommand(data); + } + break; case STARS: - { - data = std::vector { - 0x56, 0x83, 0x00, 0x00, 0x0D, 0x00, 0x0D, 0x00, - 0x03, 0x00, 0x00, 0x00, 0x07, 0x00, 0x01, 0x00, - 0x00, 0x01, 0x00, 0xC1, 0x00, 0x00, 0x00, 0x00, - cColor2_R, cColor2_G, cColor2_B, cBright, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x40, 0x00, 0x80, cSpeed1, 0x10, 0x00, 0x00, - cColor1_R, cColor1_G, cColor1_B, cBright, 0x00, 0x00, cSpeed2, 0x01, - 0x01, 0x10, 0x08, 0x01, 0x10, 0x00, 0x00, 0x00, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF - }; - SendCommand(data); + data = std::vector + { + 0x56, 0x83, 0x00, 0x00, 0x0D, 0x00, 0x0D, 0x00, + 0x03, 0x00, 0x00, 0x00, 0x07, 0x00, 0x01, 0x00, + 0x00, 0x01, 0x00, 0xC1, 0x00, 0x00, 0x00, 0x00, + cColor2_R, cColor2_G, cColor2_B, cBright, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x40, 0x00, 0x80, cSpeed1, 0x10, 0x00, 0x00, + cColor1_R, cColor1_G, cColor1_B, cBright, 0x00, 0x00, cSpeed2, 0x01, + 0x01, 0x10, 0x08, 0x01, 0x10, 0x00, 0x00, 0x00, + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF + }; + SendCommand(data); - data1 = std::vector - { - 0x56, 0x83, 0x01, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF - }; + data1 = std::vector + { + 0x56, 0x83, 0x01, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, + 0xFF, 0xFF, 0xFF, 0xFF + }; - data2 = std::vector - { - 0x56, 0x83, 0x01, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF - }; + data2 = std::vector + { + 0x56, 0x83, 0x01, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, + 0xFF, 0xFF, 0xFF, 0xFF + }; - data = m_bMoreFFs ? data2 : data1; + data = m_bMoreFFs ? data2 : data1; - SendCommand(data); - } - break; + SendCommand(data); + } + break; case RAINDROPS: - { - data = std::vector { - 0x56, 0x83, 0x00, 0x00, 0x0D, 0x00, 0x0D, 0x00, - 0x03, 0x00, 0x00, 0x00, 0x07, 0x00, 0x01, 0x00, - 0x00, 0x01, 0x00, 0xC1, 0x00, 0x00, 0x00, 0x00, - cColor2_R, cColor2_G, cColor2_B, cBright, 0x00, 0x00, 0x00, 0x00, - 0x81, 0x40, 0x00, 0x80, cSpeed1, 0x10, 0x00, 0x00, - cColor1_R, cColor1_G, cColor1_B, cBright, 0x00, 0x00, 0x03, 0x00, - cSpeed2, 0x18, 0x04, 0x10, 0x01, 0x00, 0x00, 0x00, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF - }; - SendCommand(data); + data = std::vector + { + 0x56, 0x83, 0x00, 0x00, 0x0D, 0x00, 0x0D, 0x00, + 0x03, 0x00, 0x00, 0x00, 0x07, 0x00, 0x01, 0x00, + 0x00, 0x01, 0x00, 0xC1, 0x00, 0x00, 0x00, 0x00, + cColor2_R, cColor2_G, cColor2_B, cBright, 0x00, 0x00, 0x00, 0x00, + 0x81, 0x40, 0x00, 0x80, cSpeed1, 0x10, 0x00, 0x00, + cColor1_R, cColor1_G, cColor1_B, cBright, 0x00, 0x00, 0x03, 0x00, + cSpeed2, 0x18, 0x04, 0x10, 0x01, 0x00, 0x00, 0x00, + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF + }; + SendCommand(data); - data1 = std::vector - { - 0x56, 0x83, 0x01, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF - }; + data1 = std::vector + { + 0x56, 0x83, 0x01, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, + 0xFF, 0xFF, 0xFF, 0xFF + }; - data2 = std::vector - { - 0x56, 0x83, 0x01, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF - }; + data2 = std::vector + { + 0x56, 0x83, 0x01, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, + 0xFF, 0xFF, 0xFF, 0xFF + }; - data = m_bMoreFFs ? data2 : data1; + data = m_bMoreFFs ? data2 : data1; - SendCommand(data); - } - break; + SendCommand(data); + } + break; case SNOW: - { - data = std::vector { - 0x56, 0x83, 0x00, 0x00, 0x0D, 0x00, 0x0D, 0x00, - 0x03, 0x00, 0x00, 0x00, 0x07, 0x00, 0x01, 0x00, - 0x00, 0x01, 0x00, 0xC1, 0x00, 0x00, 0x00, 0x00, - cColor2_R, cColor2_G, cColor2_B, cBright, 0x00, 0x00, 0x00, 0x00, - 0x81, 0x40, 0x00, 0x80, cSpeed1, 0x10, 0x00, 0x00, - cColor1_R, cColor1_G, cColor1_B, cBright, 0x00, 0x00, 0x03, 0x00, - cSpeed2, 0xFF, 0x10, 0x10, 0x01, 0x40, 0x00, 0x00, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF - }; - SendCommand(data); + data = std::vector + { + 0x56, 0x83, 0x00, 0x00, 0x0D, 0x00, 0x0D, 0x00, + 0x03, 0x00, 0x00, 0x00, 0x07, 0x00, 0x01, 0x00, + 0x00, 0x01, 0x00, 0xC1, 0x00, 0x00, 0x00, 0x00, + cColor2_R, cColor2_G, cColor2_B, cBright, 0x00, 0x00, 0x00, 0x00, + 0x81, 0x40, 0x00, 0x80, cSpeed1, 0x10, 0x00, 0x00, + cColor1_R, cColor1_G, cColor1_B, cBright, 0x00, 0x00, 0x03, 0x00, + cSpeed2, 0xFF, 0x10, 0x10, 0x01, 0x40, 0x00, 0x00, + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF + }; + SendCommand(data); - data = std::vector - { - 0x56, 0x83, 0x01, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF - }; - SendCommand(data); - } - break; + data = std::vector + { + 0x56, 0x83, 0x01, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, + 0xFF, 0xFF, 0xFF, 0xFF + }; + SendCommand(data); + } + break; case CYCLE: - { - data = std::vector { - 0x56, 0x83, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, - 0x00, 0x31, 0x00, 0xC1, cSpeed1, 0x00, 0x00, 0x00, - 0x40, 0x00, 0xFF, cBright, 0x00, 0x00, 0x03, 0x00, - }; + data = std::vector + { + 0x56, 0x83, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, + 0x00, 0x31, 0x00, 0xC1, cSpeed1, 0x00, 0x00, 0x00, + 0x40, 0x00, 0xFF, cBright, 0x00, 0x00, 0x03, 0x00, + }; - SendCommand(data); - } - break; + SendCommand(data); + } + break; case BREATHE: - { - data = std::vector { - 0x56, 0x83, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, - 0x00, 0x30, 0x00, 0xC1, cSpeed1, 0x00, 0x00, 0x00, - cColor1_R, cColor1_G, cColor1_B, cBright, 0x01, 0x00, cSpeed2, 0x00, - }; - SendCommand(data); - } - break; + data = std::vector + { + 0x56, 0x83, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, + 0x00, 0x30, 0x00, 0xC1, cSpeed1, 0x00, 0x00, 0x00, + cColor1_R, cColor1_G, cColor1_B, cBright, 0x01, 0x00, cSpeed2, 0x00, + }; + SendCommand(data); + } + break; case CIRCLE_SPECTRUM: - { - /*---------------------------------------------------*\ - | Speed and directions are interlinked. Probably has | - | to do how speed is computed within the firmware. | - | The speed values for this mode take into account | - | the direction. | - \*---------------------------------------------------*/ - data = std::vector { - 0x56, 0x83, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, - 0x00, 0x34, 0x00, 0xC1, 0x04, 0x00, 0x00, 0x00, - 0x00, 0x00, 0xFF, cBright, 0x00, 0x00, cSpeed1, 0x00, - 0x00, cSpeed2, 0x00, 0x04, 0xA0, 0x00, 0x30, 0x00, - }; - SendCommand(data); - } - break; + /*---------------------------------------------------*\ + | Speed and directions are interlinked. Probably has | + | to do how speed is computed within the firmware. | + | The speed values for this mode take into account | + | the direction. | + \*---------------------------------------------------*/ + data = std::vector + { + 0x56, 0x83, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, + 0x00, 0x34, 0x00, 0xC1, 0x04, 0x00, 0x00, 0x00, + 0x00, 0x00, 0xFF, cBright, 0x00, 0x00, cSpeed1, 0x00, + 0x00, cSpeed2, 0x00, 0x04, 0xA0, 0x00, 0x30, 0x00, + }; + SendCommand(data); + } + break; case CROSS: - { - data = std::vector { - 0x56, 0x83, 0x00, 0x00, 0x0C, 0x00, 0x0C, 0x00, - 0x03, 0x00, 0x00, 0x00, 0x07, 0x00, 0x01, 0x00, - 0x00, 0x01, 0x00, 0xC1, 0x00, 0x00, 0x00, 0x00, - cColor2_R, cColor2_G, cColor2_B, cBright, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x80, 0x00, 0x80, cSpeed1, 0x10, 0x00, 0x00, - cColor1_R, cColor1_G, cColor1_B, cBright, 0x00, 0x00, cSpeed2, 0x01, - 0x03, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF - }; - SendCommand(data); + data = std::vector + { + 0x56, 0x83, 0x00, 0x00, 0x0C, 0x00, 0x0C, 0x00, + 0x03, 0x00, 0x00, 0x00, 0x07, 0x00, 0x01, 0x00, + 0x00, 0x01, 0x00, 0xC1, 0x00, 0x00, 0x00, 0x00, + cColor2_R, cColor2_G, cColor2_B, cBright, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x80, 0x00, 0x80, cSpeed1, 0x10, 0x00, 0x00, + cColor1_R, cColor1_G, cColor1_B, cBright, 0x00, 0x00, cSpeed2, 0x01, + 0x03, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF + }; + SendCommand(data); - data1 = std::vector - { - 0x56, 0x83, 0x01, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - }; + data1 = std::vector + { + 0x56, 0x83, 0x01, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, + }; - data2 = std::vector - { - 0x56, 0x83, 0x01, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - }; + data2 = std::vector + { + 0x56, 0x83, 0x01, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, + }; - data = m_bMoreFFs ? data2 : data1; - SendCommand(data); - } - break; + data = m_bMoreFFs ? data2 : data1; + SendCommand(data); + } + break; case SINGLE: - break; + break; case RIPPLE: - { - data = std::vector { - 0x56, 0x83, 0x00, 0x00, 0x0C, 0x00, 0x0C, 0x00, - 0x03, 0x00, 0x00, 0x00, 0x07, 0x00, 0x01, 0x00, - 0x00, 0x01, 0x00, 0xC1, 0x00, 0x00, 0x00, 0x00, - cColor2_R, cColor2_G, cColor2_B, cBright, 0x00, 0x00, 0x00, 0x00, - 0x01, 0x82, 0x00, 0x80, cSpeed1, 0x10, 0x00, 0x00, - cColor1_R, cColor1_G, cColor1_B, cBright, 0x00, 0x00, 0x01, 0x00, - 0x00, 0x01, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF - }; - SendCommand(data); + data = std::vector + { + 0x56, 0x83, 0x00, 0x00, 0x0C, 0x00, 0x0C, 0x00, + 0x03, 0x00, 0x00, 0x00, 0x07, 0x00, 0x01, 0x00, + 0x00, 0x01, 0x00, 0xC1, 0x00, 0x00, 0x00, 0x00, + cColor2_R, cColor2_G, cColor2_B, cBright, 0x00, 0x00, 0x00, 0x00, + 0x01, 0x82, 0x00, 0x80, cSpeed1, 0x10, 0x00, 0x00, + cColor1_R, cColor1_G, cColor1_B, cBright, 0x00, 0x00, 0x01, 0x00, + 0x00, 0x01, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF + }; + SendCommand(data); - data = std::vector - { - 0x56, 0x83, 0x01, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF - }; - SendCommand(data); - } - break; + data = std::vector + { + 0x56, 0x83, 0x01, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF + }; + SendCommand(data); + } + break; case REACTIVE_PUNCH: - { - data = std::vector { - 0x56, 0x83, 0x00, 0x00, 0x0B, 0x00, 0x0B, 0x00, - 0x03, 0x00, 0x00, 0x00, 0x07, 0x00, 0x01, 0x00, - 0x00, 0x01, 0x00, 0xC1, 0x00, 0x00, 0x00, 0x00, - cColor2_R, cColor2_G, cColor2_B, cBright, 0x00, 0x00, 0x00, 0x00, - 0x28, 0x80, 0x00, 0x80, cSpeed1, 0x10, 0x00, 0x00, - cColor1_R, cColor1_G, cColor1_B, cBright, 0x00, 0x00, 0x01, 0x00, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF - }; + data = std::vector + { + 0x56, 0x83, 0x00, 0x00, 0x0B, 0x00, 0x0B, 0x00, + 0x03, 0x00, 0x00, 0x00, 0x07, 0x00, 0x01, 0x00, + 0x00, 0x01, 0x00, 0xC1, 0x00, 0x00, 0x00, 0x00, + cColor2_R, cColor2_G, cColor2_B, cBright, 0x00, 0x00, 0x00, 0x00, + 0x28, 0x80, 0x00, 0x80, cSpeed1, 0x10, 0x00, 0x00, + cColor1_R, cColor1_G, cColor1_B, cBright, 0x00, 0x00, 0x01, 0x00, + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF + }; - SendCommand(data); + SendCommand(data); - data1 = std::vector - { - 0x56, 0x83, 0x01, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF - }; + data1 = std::vector + { + 0x56, 0x83, 0x01, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, + 0xFF, 0xFF, 0xFF, 0xFF + }; - data2 = std::vector - { - 0x56, 0x83, 0x01, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF - }; + data2 = std::vector + { + 0x56, 0x83, 0x01, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, + 0xFF, 0xFF, 0xFF, 0xFF + }; - data = m_bMoreFFs ? data2 : data1; + data = m_bMoreFFs ? data2 : data1; - SendCommand(data); - } - break; + SendCommand(data); + } + break; case REACTIVE_FADE: - { - data = std::vector { - 0x56, 0x83, 0x00, 0x00, 0x0C, 0x00, 0x0C, 0x00, - 0x03, 0x00, 0x00, 0x00, 0x07, 0x00, 0x01, 0x00, - 0x00, 0x01, 0x00, 0xC1, 0x00, 0x00, 0x00, 0x00, - cColor2_R, cColor2_G, cColor2_B, cBright, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x80, 0x00, 0x80, cSpeed1, 0x10, 0x00, 0x00, - cColor1_R, cColor1_G, cColor1_B, cBright, 0x00, 0x00, 0x01, 0x00, - 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF - }; - SendCommand(data); + data = std::vector + { + 0x56, 0x83, 0x00, 0x00, 0x0C, 0x00, 0x0C, 0x00, + 0x03, 0x00, 0x00, 0x00, 0x07, 0x00, 0x01, 0x00, + 0x00, 0x01, 0x00, 0xC1, 0x00, 0x00, 0x00, 0x00, + cColor2_R, cColor2_G, cColor2_B, cBright, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x80, 0x00, 0x80, cSpeed1, 0x10, 0x00, 0x00, + cColor1_R, cColor1_G, cColor1_B, cBright, 0x00, 0x00, 0x01, 0x00, + 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF + }; + SendCommand(data); - data1 = std::vector - { - 0x56, 0x83, 0x01, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - }; + data1 = std::vector + { + 0x56, 0x83, 0x01, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, + }; - data2 = std::vector - { - 0x56, 0x83, 0x01, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - }; + data2 = std::vector + { + 0x56, 0x83, 0x01, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, + }; - data = m_bMoreFFs ? data2 : data1; + data = m_bMoreFFs ? data2 : data1; - SendCommand(data); - } - break; + SendCommand(data); + } + break; case REACTIVE_TORNADO: - { - /*---------------------------------------------------*\ - | Speed and directions are interlinked. Probably has | - | to do how speed is computed within the firmware. | - | The speed values for this mode take into account | - | the direction. | - \*---------------------------------------------------*/ - data = std::vector { - 0x56, 0x83, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, - 0x00, 0x83, 0x00, 0xC1, 0x04, 0x00, 0x00, 0x00, - 0x00, 0x00, 0xFF, cBright, 0x00, 0x00, cSpeed1, 0x00, - 0x00, cSpeed2, 0x00, 0x00, 0x30, 0x00, 0x10, 0x00, - }; - SendCommand(data); - } - break; + /*---------------------------------------------------*\ + | Speed and directions are interlinked. Probably has | + | to do how speed is computed within the firmware. | + | The speed values for this mode take into account | + | the direction. | + \*---------------------------------------------------*/ + data = std::vector + { + 0x56, 0x83, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, + 0x00, 0x83, 0x00, 0xC1, 0x04, 0x00, 0x00, 0x00, + 0x00, 0x00, 0xFF, cBright, 0x00, 0x00, cSpeed1, 0x00, + 0x00, cSpeed2, 0x00, 0x00, 0x30, 0x00, 0x10, 0x00, + }; + SendCommand(data); + } + break; - case HEARTBEAT: - { - data = std::vector + case HEARTBEAT: { - 0x56, 0x83, 0x00, 0x00, 0x0C, 0x00, 0x0C, 0x00, - 0x03, 0x00, 0x00, 0x00, 0x07, 0x00, 0x01, 0x00, - 0x00, 0x01, 0x00, 0xC1, 0x00, 0x00, 0x00, 0x00, - cColor2_R, cColor2_G, cColor2_B, cBright, 0x00, 0x00, 0x00, 0x00, - 0x20, 0xA0, 0x00, 0x80, 0x20, 0x10, 0x00, 0x00, - cColor1_R, cColor1_G, cColor1_B, cBright, 0x00, 0x00, cSpeed1, 0x00, - 0x02, 0xFF, 0x00, 0x03, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF - }; - SendCommand(data); + data = std::vector + { + 0x56, 0x83, 0x00, 0x00, 0x0C, 0x00, 0x0C, 0x00, + 0x03, 0x00, 0x00, 0x00, 0x07, 0x00, 0x01, 0x00, + 0x00, 0x01, 0x00, 0xC1, 0x00, 0x00, 0x00, 0x00, + cColor2_R, cColor2_G, cColor2_B, cBright, 0x00, 0x00, 0x00, 0x00, + 0x20, 0xA0, 0x00, 0x80, 0x20, 0x10, 0x00, 0x00, + cColor1_R, cColor1_G, cColor1_B, cBright, 0x00, 0x00, cSpeed1, 0x00, + 0x02, 0xFF, 0x00, 0x03, 0xFF, 0xFF, 0xFF, 0xFF, + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF + }; + SendCommand(data); - data = std::vector - { - 0x56, 0x83, 0x01, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - }; - SendCommand(data); - } - break; + data = std::vector + { + 0x56, 0x83, 0x01, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, + }; + SendCommand(data); + } + break; case FIREBALL: - { - data = std::vector { - 0x56, 0x83, 0x00, 0x00, 0x0C, 0x00, 0x0C, 0x00, - 0x03, 0x00, 0x00, 0x00, 0x07, 0x00, 0x01, 0x00, - 0x00, 0x01, 0x00, 0xC1, 0x00, 0x00, 0x00, 0x00, - cColor2_R, cColor2_G, cColor2_B, cBright, 0x00, 0x00, 0x00, 0x00, - 0x20, 0xA0, 0x00, 0x80, 0x10, 0x10, 0x00, 0x00, - cColor1_R, cColor1_G, cColor1_B, cBright, 0x00, 0x00, cSpeed1, 0x00, - 0x01, 0x08, 0x09, 0x04, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF - }; - SendCommand(data); + data = std::vector + { + 0x56, 0x83, 0x00, 0x00, 0x0C, 0x00, 0x0C, 0x00, + 0x03, 0x00, 0x00, 0x00, 0x07, 0x00, 0x01, 0x00, + 0x00, 0x01, 0x00, 0xC1, 0x00, 0x00, 0x00, 0x00, + cColor2_R, cColor2_G, cColor2_B, cBright, 0x00, 0x00, 0x00, 0x00, + 0x20, 0xA0, 0x00, 0x80, 0x10, 0x10, 0x00, 0x00, + cColor1_R, cColor1_G, cColor1_B, cBright, 0x00, 0x00, cSpeed1, 0x00, + 0x01, 0x08, 0x09, 0x04, 0xFF, 0xFF, 0xFF, 0xFF, + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF + }; + SendCommand(data); - data = std::vector - { - 0x56, 0x83, 0x01, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - }; - SendCommand(data); - } - break; + data = std::vector + { + 0x56, 0x83, 0x01, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, + }; + SendCommand(data); + } + break; case WATER_RIPPLE: - { - data = std::vector { - 0x56, 0x83, 0x00, 0x00, 0x0C, 0x00, 0x0C, 0x00, - 0x03, 0x00, 0x00, 0x00, 0x07, 0x00, 0x01, 0x00, - 0x00, 0x01, 0x00, 0xC1, 0x00, 0x00, 0x00, 0x00, - cColor2_R, cColor2_G, cColor2_B, cBright, 0x00, 0x00, 0x00, 0x00, - 0x01, 0x82, 0x00, 0x80, cSpeed1, 0x10, 0x00, 0x00, - cColor1_R, cColor1_G, cColor1_B, cBright, 0x00, 0x00, 0x06, 0x00, - 0x00, 0x90, 0x14, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF - }; - SendCommand(data); + data = std::vector + { + 0x56, 0x83, 0x00, 0x00, 0x0C, 0x00, 0x0C, 0x00, + 0x03, 0x00, 0x00, 0x00, 0x07, 0x00, 0x01, 0x00, + 0x00, 0x01, 0x00, 0xC1, 0x00, 0x00, 0x00, 0x00, + cColor2_R, cColor2_G, cColor2_B, cBright, 0x00, 0x00, 0x00, 0x00, + 0x01, 0x82, 0x00, 0x80, cSpeed1, 0x10, 0x00, 0x00, + cColor1_R, cColor1_G, cColor1_B, cBright, 0x00, 0x00, 0x06, 0x00, + 0x00, 0x90, 0x14, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF + }; + SendCommand(data); - data = std::vector - { - 0x56, 0x83, 0x01, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - }; - SendCommand(data); - } + data = std::vector + { + 0x56, 0x83, 0x01, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, + }; + SendCommand(data); + } + break; case SNAKE: default: - break; + break; } - switch (effectId) + switch(effectId) { case OFF: - SendCommand({0x51, 0x28, 0x00, 0x00, 0x10}); - SendCommand({0x41, 0x80}); - break; + SendCommand({0x51, 0x28, 0x00, 0x00, 0x10}); + SendCommand({0x41, 0x80}); + break; default: - SendCommand({0x41, 0x80}); - SendCommand({0x51, 0x28, 0x00, 0x00, 0xFF}); - break; + SendCommand({0x41, 0x80}); + SendCommand({0x51, 0x28, 0x00, 0x00, 0xFF}); + break; } } @@ -1020,7 +1022,7 @@ void CMKeyboardV2Controller::InitializeModes(std::vector &modes) { stCMKeyboardV2_mode * pCurrentMode = CMKeyboardV2_modes; - while (pCurrentMode->value != NONE) + while(pCurrentMode->value != NONE) { mode m; diff --git a/Controllers/CoolerMasterController/CMKeyboardController/CMKeyboardV2Controller.h b/Controllers/CoolerMasterController/CMKeyboardController/CMKeyboardV2Controller.h index 9c2dd35c..3fb924d0 100644 --- a/Controllers/CoolerMasterController/CMKeyboardController/CMKeyboardV2Controller.h +++ b/Controllers/CoolerMasterController/CMKeyboardController/CMKeyboardV2Controller.h @@ -6,6 +6,9 @@ | Tam D (too.manyhobbies) 30th Nov 2023 | | | \*-------------------------------------------------------------------*/ + +#pragma once + #include "CMKeyboardAbstractController.h" struct stCMKeyboardV2_mode diff --git a/Controllers/CoolerMasterController/CMMM711Controller/CMMM711Controller.cpp b/Controllers/CoolerMasterController/CMMM711Controller/CMMM711Controller.cpp index 4b2e0146..822d3145 100644 --- a/Controllers/CoolerMasterController/CMMM711Controller/CMMM711Controller.cpp +++ b/Controllers/CoolerMasterController/CMMM711Controller/CMMM711Controller.cpp @@ -7,8 +7,8 @@ | | \*-------------------------------------------------------------------*/ -#include "CMMM711Controller.h" #include +#include "CMMM711Controller.h" CMMM711Controller::CMMM711Controller(hid_device* dev_handle, char *_path) { @@ -87,12 +87,12 @@ void CMMM711Controller::GetModeStatus() std::string CMMM711Controller::GetDeviceName() { - return device_name; + return(device_name); } std::string CMMM711Controller::GetSerial() { - return serial; + return(serial); } std::string CMMM711Controller::GetLocation() @@ -102,37 +102,37 @@ std::string CMMM711Controller::GetLocation() unsigned char CMMM711Controller::GetMode() { - return current_mode; + return(current_mode); } unsigned char CMMM711Controller::GetLedRed() { - return current_red; + return(current_red); } unsigned char CMMM711Controller::GetLedGreen() { - return current_green; + return(current_green); } unsigned char CMMM711Controller::GetLedBlue() { - return current_blue; + return(current_blue); } unsigned char CMMM711Controller::GetLedSpeed() { - return current_speed; + return(current_speed); } RGBColor CMMM711Controller::GetWheelColour() { - return wheel_colour; + return(wheel_colour); } RGBColor CMMM711Controller::GetLogoColour() { - return logo_colour; + return(logo_colour); } void CMMM711Controller::SetLedsDirect(RGBColor wheel_colour, RGBColor logo_colour) diff --git a/Controllers/CoolerMasterController/CMMM711Controller/CMMM711Controller.h b/Controllers/CoolerMasterController/CMMM711Controller/CMMM711Controller.h index 141721b1..c7c256e1 100644 --- a/Controllers/CoolerMasterController/CMMM711Controller/CMMM711Controller.h +++ b/Controllers/CoolerMasterController/CMMM711Controller/CMMM711Controller.h @@ -7,13 +7,13 @@ | | \*-------------------------------------------------------------------*/ -#include +#pragma once + #include +#include #include #include "RGBController.h" -#pragma once - #define CM_MM711_PACKET_SIZE 65 #define CM_MM711_COLOUR_MODE_DATA_SIZE (sizeof(colour_mode_data[0]) / sizeof(colour_mode_data[0][0])) #define CM_MM711_HEADER_DATA_SIZE (sizeof(argb_header_data) / sizeof(argb_headers) ) diff --git a/Controllers/CoolerMasterController/CMMM711Controller/RGBController_CMMM711Controller.cpp b/Controllers/CoolerMasterController/CMMM711Controller/RGBController_CMMM711Controller.cpp index 7468e1c4..41c5b3c9 100644 --- a/Controllers/CoolerMasterController/CMMM711Controller/RGBController_CMMM711Controller.cpp +++ b/Controllers/CoolerMasterController/CMMM711Controller/RGBController_CMMM711Controller.cpp @@ -7,10 +7,10 @@ | | \*-------------------------------------------------------------------*/ -#define applyBrightness(c, bright) ((RGBColor) ((RGBGetBValue(c) * bright / CM_MM_ARGB_BRIGHTNESS_MAX_DEFAULT) << 16 | (RGBGetGValue(c) * bright / CM_MM_ARGB_BRIGHTNESS_MAX_DEFAULT) << 8 | (RGBGetRValue(c) * bright / CM_MM_ARGB_BRIGHTNESS_MAX_DEFAULT))) - #include "RGBController_CMMM711Controller.h" +#define applyBrightness(c, bright) ((RGBColor) ((RGBGetBValue(c) * bright / CM_MM_ARGB_BRIGHTNESS_MAX_DEFAULT) << 16 | (RGBGetGValue(c) * bright / CM_MM_ARGB_BRIGHTNESS_MAX_DEFAULT) << 8 | (RGBGetRValue(c) * bright / CM_MM_ARGB_BRIGHTNESS_MAX_DEFAULT))) + /**------------------------------------------------------------------*\ @name Coolermaster Master Mouse @category Mouse diff --git a/Controllers/CoolerMasterController/CMMM711Controller/RGBController_CMMM711Controller.h b/Controllers/CoolerMasterController/CMMM711Controller/RGBController_CMMM711Controller.h index a6c67c2d..6ca2af7d 100644 --- a/Controllers/CoolerMasterController/CMMM711Controller/RGBController_CMMM711Controller.h +++ b/Controllers/CoolerMasterController/CMMM711Controller/RGBController_CMMM711Controller.h @@ -8,9 +8,10 @@ \*-------------------------------------------------------------------*/ #pragma once + +#include #include "RGBController.h" #include "CMMM711Controller.h" -#include #define CM_MM_ARGB_BRIGHTNESS_MIN 0x00 #define CM_MM_ARGB_BRIGHTNESS_MAX_DEFAULT 0xFF diff --git a/Controllers/CoolerMasterController/CMMMController/CMMMController.cpp b/Controllers/CoolerMasterController/CMMMController/CMMMController.cpp index 1cb1e27a..7968bb1c 100644 --- a/Controllers/CoolerMasterController/CMMMController/CMMMController.cpp +++ b/Controllers/CoolerMasterController/CMMMController/CMMMController.cpp @@ -8,8 +8,8 @@ | | \*-------------------------------------------------------------------*/ -#include "CMMMController.h" #include +#include "CMMMController.h" CMMMController::CMMMController(hid_device* dev_handle, char *_path, uint16_t pid) : product_id(pid) { @@ -60,8 +60,8 @@ CMMMController::CMMMController(hid_device* dev_handle, char *_path, uint16_t pid wheel_bytes[0] = CM_MM_MODE_BYTE; wheel_bytes[1] = CM_MM_SPEED_BYTE; wheel_bytes[2] = CM_MM_NFI_1; - } - + } + logo_bytes[0] = CM_MM_NFI_2; logo_bytes[1] = CM_MM_NFI_3; logo_bytes[2] = CM_MM_BRIGHTNESS_BYTE; diff --git a/Controllers/CoolerMasterController/CMMMController/CMMMController.h b/Controllers/CoolerMasterController/CMMMController/CMMMController.h index f4153ac2..74d503ea 100644 --- a/Controllers/CoolerMasterController/CMMMController/CMMMController.h +++ b/Controllers/CoolerMasterController/CMMMController/CMMMController.h @@ -8,13 +8,13 @@ | | \*-------------------------------------------------------------------*/ -#include +#pragma once + #include +#include #include #include "RGBController.h" -#pragma once - #define CM_MM_PACKET_SIZE 65 #define CM_MM_COLOUR_MODE_DATA_SIZE (sizeof(colour_mode_data[0]) / sizeof(colour_mode_data[0][0])) #define CM_MM_HEADER_DATA_SIZE (sizeof(argb_header_data) / sizeof(argb_headers) ) diff --git a/Controllers/CoolerMasterController/CMMMController/RGBController_CMMMController.cpp b/Controllers/CoolerMasterController/CMMMController/RGBController_CMMMController.cpp index e431b85c..8533099c 100644 --- a/Controllers/CoolerMasterController/CMMMController/RGBController_CMMMController.cpp +++ b/Controllers/CoolerMasterController/CMMMController/RGBController_CMMMController.cpp @@ -8,10 +8,10 @@ | | \*-------------------------------------------------------------------*/ -#define applyBrightness(c, bright) ((RGBColor) ((RGBGetBValue(c) * bright / CM_MM_ARGB_BRIGHTNESS_MAX_DEFAULT) << 16 | (RGBGetGValue(c) * bright / CM_MM_ARGB_BRIGHTNESS_MAX_DEFAULT) << 8 | (RGBGetRValue(c) * bright / CM_MM_ARGB_BRIGHTNESS_MAX_DEFAULT))) - #include "RGBController_CMMMController.h" +#define applyBrightness(c, bright) ((RGBColor) ((RGBGetBValue(c) * bright / CM_MM_ARGB_BRIGHTNESS_MAX_DEFAULT) << 16 | (RGBGetGValue(c) * bright / CM_MM_ARGB_BRIGHTNESS_MAX_DEFAULT) << 8 | (RGBGetRValue(c) * bright / CM_MM_ARGB_BRIGHTNESS_MAX_DEFAULT))) + /**------------------------------------------------------------------*\ @name Coolermaster Master Mouse @category Mouse diff --git a/Controllers/CoolerMasterController/CMMMController/RGBController_CMMMController.h b/Controllers/CoolerMasterController/CMMMController/RGBController_CMMMController.h index 79d23691..f1b48254 100644 --- a/Controllers/CoolerMasterController/CMMMController/RGBController_CMMMController.h +++ b/Controllers/CoolerMasterController/CMMMController/RGBController_CMMMController.h @@ -9,9 +9,10 @@ \*-------------------------------------------------------------------*/ #pragma once + +#include #include "RGBController.h" #include "CMMMController.h" -#include #define CM_MM_ARGB_BRIGHTNESS_MIN 0x00 #define CM_MM_ARGB_BRIGHTNESS_MAX_DEFAULT 0xFF diff --git a/Controllers/CoolerMasterController/CMMP750Controller/CMMP750Controller.h b/Controllers/CoolerMasterController/CMMP750Controller/CMMP750Controller.h index a6c9e3ca..775071ef 100644 --- a/Controllers/CoolerMasterController/CMMP750Controller/CMMP750Controller.h +++ b/Controllers/CoolerMasterController/CMMP750Controller/CMMP750Controller.h @@ -14,12 +14,12 @@ | BYTE5 = Colour Modes: SPEED else ignored | \*-------------------------------------------------------------------*/ -#include -#include -#include - #pragma once +#include +#include +#include + #define CM_COLOUR_MODE_DATA_SIZE (sizeof(colour_mode_data[0]) / sizeof(colour_mode_data[0][0])) #define CM_INTERRUPT_TIMEOUT 250 #define CM_DEVICE_NAME_SIZE (sizeof(device_name) / sizeof(device_name[ 0 ])) diff --git a/Controllers/CoolerMasterController/CMMP750Controller/RGBController_CMMP750Controller.h b/Controllers/CoolerMasterController/CMMP750Controller/RGBController_CMMP750Controller.h index 69e3f56d..8450332c 100644 --- a/Controllers/CoolerMasterController/CMMP750Controller/RGBController_CMMP750Controller.h +++ b/Controllers/CoolerMasterController/CMMP750Controller/RGBController_CMMP750Controller.h @@ -8,6 +8,7 @@ \*-------------------------------------------------------------------*/ #pragma once + #include "RGBController.h" #include "CMMP750Controller.h" diff --git a/Controllers/CoolerMasterController/CMMonitorController/CMMonitorController.cpp b/Controllers/CoolerMasterController/CMMonitorController/CMMonitorController.cpp index e4de9283..71381329 100644 --- a/Controllers/CoolerMasterController/CMMonitorController/CMMonitorController.cpp +++ b/Controllers/CoolerMasterController/CMMonitorController/CMMonitorController.cpp @@ -7,8 +7,8 @@ | | \*-------------------------------------------------------------------*/ -#include "CMMonitorController.h" #include +#include "CMMonitorController.h" using namespace std::chrono_literals; diff --git a/Controllers/CoolerMasterController/CMMonitorController/CMMonitorController.h b/Controllers/CoolerMasterController/CMMonitorController/CMMonitorController.h index fb4b4d0b..908e7f96 100644 --- a/Controllers/CoolerMasterController/CMMonitorController/CMMonitorController.h +++ b/Controllers/CoolerMasterController/CMMonitorController/CMMonitorController.h @@ -7,11 +7,11 @@ | | \*-------------------------------------------------------------------*/ -#include "RGBController.h" +#pragma once + #include #include - -#pragma once +#include "RGBController.h" #define CM_MONITOR_PACKET_LENGTH 65 #define CM_MONITOR_COLOR_DATA_LENGTH 436 diff --git a/Controllers/CoolerMasterController/CMMonitorController/RGBController_CMMonitorController.cpp b/Controllers/CoolerMasterController/CMMonitorController/RGBController_CMMonitorController.cpp index 648e2aeb..4cf38ee0 100644 --- a/Controllers/CoolerMasterController/CMMonitorController/RGBController_CMMonitorController.cpp +++ b/Controllers/CoolerMasterController/CMMonitorController/RGBController_CMMonitorController.cpp @@ -7,10 +7,9 @@ | | \*-------------------------------------------------------------------*/ -#include "RGBController_CMMonitorController.h" - -#include #include +#include +#include "RGBController_CMMonitorController.h" /**------------------------------------------------------------------*\ @name Coolermaster Gaming Monitor @@ -175,7 +174,7 @@ void RGBController_CMMonitorController::ResizeZone(int /*zone*/, int /*new_size* } void RGBController_CMMonitorController::DeviceUpdateLEDs() -{ +{ if(modes[active_mode].value == CM_MONITOR_DIRECT_MODE) { controller->SendDirect(colors); @@ -187,12 +186,12 @@ void RGBController_CMMonitorController::DeviceUpdateLEDs() } void RGBController_CMMonitorController::UpdateZoneLEDs(int /*zone*/) -{ +{ DeviceUpdateLEDs(); } void RGBController_CMMonitorController::UpdateSingleLED(int /*led*/) -{ +{ DeviceUpdateLEDs(); } diff --git a/Controllers/CoolerMasterController/CMMonitorController/RGBController_CMMonitorController.h b/Controllers/CoolerMasterController/CMMonitorController/RGBController_CMMonitorController.h index 3f39386c..969e6c74 100644 --- a/Controllers/CoolerMasterController/CMMonitorController/RGBController_CMMonitorController.h +++ b/Controllers/CoolerMasterController/CMMonitorController/RGBController_CMMonitorController.h @@ -6,10 +6,12 @@ | morg (Morgan Guimard) 9/18/2023 | | | \*-------------------------------------------------------------------*/ + #pragma once + +#include #include "RGBController.h" #include "CMMonitorController.h" -#include class RGBController_CMMonitorController : public RGBController { @@ -25,6 +27,6 @@ public: void SetCustomMode(); void DeviceUpdateMode(); -private: +private: CMMonitorController* controller; }; diff --git a/Controllers/CoolerMasterController/CMR6000Controller/CMR6000Controller.cpp b/Controllers/CoolerMasterController/CMR6000Controller/CMR6000Controller.cpp index 77ebb1cf..2a2bdc54 100644 --- a/Controllers/CoolerMasterController/CMR6000Controller/CMR6000Controller.cpp +++ b/Controllers/CoolerMasterController/CMR6000Controller/CMR6000Controller.cpp @@ -6,8 +6,8 @@ | Eric S (edbgon) 2nd Feb 2021 | \*-------------------------------------------------------------------*/ -#include "CMR6000Controller.h" #include +#include "CMR6000Controller.h" CMR6000Controller::CMR6000Controller(hid_device* dev_handle, char *_path, uint16_t _pid) { diff --git a/Controllers/CoolerMasterController/CMR6000Controller/CMR6000Controller.h b/Controllers/CoolerMasterController/CMR6000Controller/CMR6000Controller.h index d8b82ea3..57fe65c6 100644 --- a/Controllers/CoolerMasterController/CMR6000Controller/CMR6000Controller.h +++ b/Controllers/CoolerMasterController/CMR6000Controller/CMR6000Controller.h @@ -6,13 +6,13 @@ | Eric S (edbgon) 2nd Feb 2021 | \*-------------------------------------------------------------------*/ -#include +#pragma once + #include +#include #include #include "RGBController.h" -#pragma once - #define COOLERMASTER_RADEON_6000_PID 0x014D #define COOLERMASTER_RADEON_6900_PID 0x015B diff --git a/Controllers/CoolerMasterController/CMR6000Controller/RGBController_CMR6000Controller.h b/Controllers/CoolerMasterController/CMR6000Controller/RGBController_CMR6000Controller.h index 0bf823dc..ee086c36 100644 --- a/Controllers/CoolerMasterController/CMR6000Controller/RGBController_CMR6000Controller.h +++ b/Controllers/CoolerMasterController/CMR6000Controller/RGBController_CMR6000Controller.h @@ -7,6 +7,7 @@ \*-------------------------------------------------------------------*/ #pragma once + #include "RGBController.h" #include "CMR6000Controller.h" diff --git a/Controllers/CoolerMasterController/CMRGBController/CMRGBController.cpp b/Controllers/CoolerMasterController/CMRGBController/CMRGBController.cpp index b18c38f3..6d9b5b39 100644 --- a/Controllers/CoolerMasterController/CMRGBController/CMRGBController.cpp +++ b/Controllers/CoolerMasterController/CMRGBController/CMRGBController.cpp @@ -7,9 +7,9 @@ | | \*-------------------------------------------------------------------*/ +#include #include "RGBController_CMRGBController.h" #include "CMRGBController.h" -#include CMRGBController::CMRGBController(hid_device* dev_handle, char* path) { @@ -328,10 +328,10 @@ RGBColor CMRGBController::GetModeColor(int color_number) { case 0: return(current_mode_color_1); - + case 1: return(current_mode_color_2); - + default: return(ToRGBColor(0, 0, 0)); } @@ -343,16 +343,16 @@ RGBColor CMRGBController::GetPortColor(int port_number) { case 0: return(current_port1_color); - + case 1: return(current_port2_color); - + case 2: return(current_port3_color); - + case 3: return(current_port4_color); - + default: return(ToRGBColor(0, 0, 0)); } diff --git a/Controllers/CoolerMasterController/CMRGBController/CMRGBController.h b/Controllers/CoolerMasterController/CMRGBController/CMRGBController.h index 4ea1a2ae..2e2720ff 100644 --- a/Controllers/CoolerMasterController/CMRGBController/CMRGBController.h +++ b/Controllers/CoolerMasterController/CMRGBController/CMRGBController.h @@ -7,11 +7,12 @@ | | \*-------------------------------------------------------------------*/ +#pragma once + #include #include #include "RGBController.h" -#pragma once #define CM_RGBC_NUM_LEDS 4 #define REPORT_ID_OFFSET 1 diff --git a/Controllers/CoolerMasterController/CMRGBController/RGBController_CMRGBController.h b/Controllers/CoolerMasterController/CMRGBController/RGBController_CMRGBController.h index 9b9cc7cf..30f65a8f 100644 --- a/Controllers/CoolerMasterController/CMRGBController/RGBController_CMRGBController.h +++ b/Controllers/CoolerMasterController/CMRGBController/RGBController_CMRGBController.h @@ -8,9 +8,10 @@ \*-------------------------------------------------------------------*/ #pragma once + +#include #include "RGBController.h" #include "CMRGBController.h" -#include class RGBController_CMRGBController : public RGBController { diff --git a/Controllers/CoolerMasterController/CMSmallARGBController/CMSmallARGBController.cpp b/Controllers/CoolerMasterController/CMSmallARGBController/CMSmallARGBController.cpp index 96ca8f1c..21980d86 100644 --- a/Controllers/CoolerMasterController/CMSmallARGBController/CMSmallARGBController.cpp +++ b/Controllers/CoolerMasterController/CMSmallARGBController/CMSmallARGBController.cpp @@ -9,8 +9,8 @@ | | \*-------------------------------------------------------------------*/ -#include "CMSmallARGBController.h" #include +#include "CMSmallARGBController.h" cm_small_argb_headers cm_small_argb_header_data[1] = { diff --git a/Controllers/CoolerMasterController/CMSmallARGBController/CMSmallARGBController.h b/Controllers/CoolerMasterController/CMSmallARGBController/CMSmallARGBController.h index 59976cc1..fa81a91e 100644 --- a/Controllers/CoolerMasterController/CMSmallARGBController/CMSmallARGBController.h +++ b/Controllers/CoolerMasterController/CMSmallARGBController/CMSmallARGBController.h @@ -9,13 +9,13 @@ | | \*-------------------------------------------------------------------*/ -#include +#pragma once + #include +#include #include #include "RGBController.h" //Needed to set the direct mode -#pragma once - #define CM_SMALL_ARGB_PACKET_SIZE 65 #define CM_SMALL_ARGB_INTERRUPT_TIMEOUT 250 diff --git a/Controllers/CoolerMasterController/CMSmallARGBController/RGBController_CMSmallARGBController.h b/Controllers/CoolerMasterController/CMSmallARGBController/RGBController_CMSmallARGBController.h index 961ca7c4..de5b3988 100644 --- a/Controllers/CoolerMasterController/CMSmallARGBController/RGBController_CMSmallARGBController.h +++ b/Controllers/CoolerMasterController/CMSmallARGBController/RGBController_CMSmallARGBController.h @@ -8,9 +8,10 @@ \*-------------------------------------------------------------------*/ #pragma once + +#include #include "RGBController.h" #include "CMSmallARGBController.h" -#include #define CM_SMALL_ARGB_MIN_LEDS 4 #define CM_SMALL_ARGB_MAX_LEDS 48