diff --git a/Controllers/MSIMysticLightController/MSIMysticLight185Controller/MSIMysticLight185Controller.cpp b/Controllers/MSIMysticLightController/MSIMysticLight185Controller/MSIMysticLight185Controller.cpp index 9b7450fd..2c83ca1c 100644 --- a/Controllers/MSIMysticLightController/MSIMysticLight185Controller/MSIMysticLight185Controller.cpp +++ b/Controllers/MSIMysticLightController/MSIMysticLight185Controller/MSIMysticLight185Controller.cpp @@ -1,22 +1,24 @@ -/*---------------------------------------------*\ -| MSIMysticLight185Controller.cpp | -| | -| Driver for MSI Mystic Light (185-byte) | -| USB lighting controller | -| | -| T-bond 3/4/2020 | -| Adam Honse 3/6/2021 | -| | -| The direct mode part has been implemented | -| based on the mystic-why project provided by | -| Aleksandr Garashchenko | -| (https://github.com/garashchenko/mystic-why) | -\*---------------------------------------------*/ +/*---------------------------------------------------------*\ +| MSIMysticLight185Controller.cpp | +| | +| Driver for MSI Mystic Light 185-byte motherboard | +| | +| Direct mode functionality has been implemented based on | +| the mystic-why project provided by Aleksandr | +| Garashchenko | +| (https://github.com/garashchenko/mystic-why) | +| | +| T-bond 03 Apr 2020 | +| Adam Honse 06 Mar 2021 | +| | +| This file is part of the OpenRGB project | +| SPDX-License-Identifier: GPL-2.0-only | +\*---------------------------------------------------------*/ -#include "MSIMysticLight185Controller.h" #include #include #include +#include "MSIMysticLight185Controller.h" using namespace std::chrono_literals; @@ -33,7 +35,6 @@ using namespace std::chrono_literals; #define PER_LED_BASIC_SYNC_MODE (0x80 | SYNC_SETTING_ONBOARD | SYNC_SETTING_JPIPE1 | SYNC_SETTING_JPIPE2) #define PER_LED_FULL_SYNC_MODE (PER_LED_BASIC_SYNC_MODE | SYNC_SETTING_JRAINBOW1 | SYNC_SETTING_JRAINBOW2 | SYNC_SETTING_JCORSAIR) - struct mystic_light_185_config { unsigned short pid; // PID of the board diff --git a/Controllers/MSIMysticLightController/MSIMysticLight185Controller/MSIMysticLight185Controller.h b/Controllers/MSIMysticLightController/MSIMysticLight185Controller/MSIMysticLight185Controller.h index 210f4acc..3396fd4c 100644 --- a/Controllers/MSIMysticLightController/MSIMysticLight185Controller/MSIMysticLight185Controller.h +++ b/Controllers/MSIMysticLightController/MSIMysticLight185Controller/MSIMysticLight185Controller.h @@ -1,22 +1,28 @@ -/*-----------------------------------------*\ -| MSIMysticLight185Controller.h | -| | -| Definitions and types for MSI Mystic | -| Light (185-byte) USB lighting | -| controllers | -| | -| T-bond 3/4/2020 | -| Adam Honse 3/6/2021 | -\*-----------------------------------------*/ - -#include "MSIMysticLightCommon.h" -#include "RGBController.h" -#include -#include -#include +/*---------------------------------------------------------*\ +| MSIMysticLight185Controller.h | +| | +| Driver for MSI Mystic Light 185-byte motherboard | +| | +| Direct mode functionality has been implemented based on | +| the mystic-why project provided by Aleksandr | +| Garashchenko | +| (https://github.com/garashchenko/mystic-why) | +| | +| T-bond 03 Apr 2020 | +| Adam Honse 06 Mar 2021 | +| | +| This file is part of the OpenRGB project | +| SPDX-License-Identifier: GPL-2.0-only | +\*---------------------------------------------------------*/ #pragma once +#include +#include +#include +#include "MSIMysticLightCommon.h" +#include "RGBController.h" + class MSIMysticLight185Controller { public: diff --git a/Controllers/MSIMysticLightController/MSIMysticLight185Controller/RGBController_MSIMysticLight185.cpp b/Controllers/MSIMysticLightController/MSIMysticLight185Controller/RGBController_MSIMysticLight185.cpp index de1b07ed..4429931f 100644 --- a/Controllers/MSIMysticLightController/MSIMysticLight185Controller/RGBController_MSIMysticLight185.cpp +++ b/Controllers/MSIMysticLightController/MSIMysticLight185Controller/RGBController_MSIMysticLight185.cpp @@ -1,17 +1,18 @@ -/*-----------------------------------------*\ -| RGBController_MSIMysticLight185.cpp | -| | -| Generic RGB Interface for OpenRGB | -| MSI Mystic Light (185-byte) USB Driver | -| | -| T-bond 3/4/2020 | -| Adam Honse 3/6/2021 | -\*-----------------------------------------*/ +/*---------------------------------------------------------*\ +| RGBController_MSIMysticLight185.cpp | +| | +| RGBController for MSI Mystic Light 185-byte motherboard | +| | +| T-bond 03 Apr 2020 | +| Adam Honse 06 Mar 2021 | +| | +| This file is part of the OpenRGB project | +| SPDX-License-Identifier: GPL-2.0-only | +\*---------------------------------------------------------*/ #include "RGBController_MSIMysticLight185.h" #include "LogManager.h" - struct ZoneDescription { std::string name; @@ -33,7 +34,6 @@ const ZoneDescription led_zones[] = ZoneDescription{ "ONBOARD", MSI_ZONE_ON_BOARD_LED_0 } }; - static std::vector zone_description; /*---------------------------------------------------------------------------------------------------------*\ @@ -53,7 +53,6 @@ static int IndexOfZoneForType(MSI_ZONE zone_type) return -1; } - /**------------------------------------------------------------------*\ @name MSI Mystic Light (185 Byte) @category Motherboard diff --git a/Controllers/MSIMysticLightController/MSIMysticLight185Controller/RGBController_MSIMysticLight185.h b/Controllers/MSIMysticLightController/MSIMysticLight185Controller/RGBController_MSIMysticLight185.h index 7a8ca18b..7f06c2cc 100644 --- a/Controllers/MSIMysticLightController/MSIMysticLight185Controller/RGBController_MSIMysticLight185.h +++ b/Controllers/MSIMysticLightController/MSIMysticLight185Controller/RGBController_MSIMysticLight185.h @@ -1,17 +1,20 @@ -/*-----------------------------------------*\ -| RGBController_MSIMysticLight185.h | -| | -| Generic RGB Interface for OpenRGB | -| MSI Mystic Light (185-byte) USB Driver | -| | -| T-bond 3/4/2020 | -| Adam Honse 3/6/2021 | -\*-----------------------------------------*/ +/*---------------------------------------------------------*\ +| RGBController_MSIMysticLight185.h | +| | +| RGBController for MSI Mystic Light 185-byte motherboard | +| | +| T-bond 03 Apr 2020 | +| Adam Honse 06 Mar 2021 | +| | +| This file is part of the OpenRGB project | +| SPDX-License-Identifier: GPL-2.0-only | +\*---------------------------------------------------------*/ #pragma once + +#include #include "RGBController.h" #include "MSIMysticLight185Controller.h" -#include class RGBController_MSIMysticLight185: public RGBController {